diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..e95f22e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c591ffe..914731c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,21 +21,15 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".SplashActivity"
-            android:label="@string/app_name">
+            android:theme="@style/Theme.Design.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".LoginActivity"></activity>
         <activity android:name=".PersonalSpaceActivity" />
-        <activity android:name=".LoginActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
index 0caf2a6..8bf155a 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
@@ -199,7 +199,7 @@ public class GPSUtils extends Service implements LocationListener {
                 return addresses;
 
             } else {
-                Toast.makeText(this, "latitude and longitude are null",
+                Toast.makeText(mContext, "latitude and longitude are null",
                         Toast.LENGTH_LONG).show();
                 return null;
             }
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java
index 5d4ac8a..3b134df 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SplashActivity.java
@@ -3,24 +3,40 @@ package com.android_app.matan.ara.sagi.thesocialnotework;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Window;
 import android.widget.ImageView;
 
 public class SplashActivity extends AppCompatActivity {
 
     private ImageView appSplashScreen;
+    private int timerDelay = 3000;
+    private final String TAG = "Splash Screen Activity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
 
-        appSplashScreen = (ImageView) findViewById(R.id.sa_splashScreenImage);
-        Intent intent = new Intent(this, LoginActivity.class);
-        startActivity(intent);
-        finish();
+        Thread timerThread = new Thread(){
+            public void run(){
+                try{
+                    sleep(timerDelay);
+                }catch(InterruptedException e){
+                    e.printStackTrace();
+                }finally{
+                    startActivity(new Intent(SplashActivity.this, LoginActivity.class));
+                    finish();
+                }
+            }
+        };
+        timerThread.start();
     }
 
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//        setContentView(R.layout.activity_splash);
-//    }
+    @Override
+    protected void onPause() {
+        // TODO Auto-generated method stub
+        super.onPause();
+        finish();
+    }
 }
diff --git a/app/src/main/res/drawable/splash_screen.JPG b/app/src/main/res/drawable/splash_screen.JPG
new file mode 100644
index 0000000..fb959b8
Binary files /dev/null and b/app/src/main/res/drawable/splash_screen.JPG differ
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 7036fbc..792f6c9 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.android_app.matan.ara.sagi.thesocialnotework.SplashActivity">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/sa_splashScreenImage"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true" />
-</RelativeLayout>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/splash_screen"
+    tools:context="com.android_app.matan.ara.sagi.thesocialnotework.SplashActivity"
+    android:visibility="visible">
+</LinearLayout>
diff --git a/app/src/main/res/layout/note_view_full.xml b/app/src/main/res/layout/note_view_full.xml
index de1b3a7..50d052b 100644
--- a/app/src/main/res/layout/note_view_full.xml
+++ b/app/src/main/res/layout/note_view_full.xml
@@ -8,11 +8,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
+    </FrameLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="10dp">
+
         <Switch
             android:id="@+id/nvf_note_permission"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
+            android:layout_gravity="center_horizontal"
             android:layout_marginTop="25dp"
             android:checked="true"
             android:text="@string/nvf_public_label" />
@@ -21,44 +30,42 @@
             android:id="@+id/nvf_note_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            android:layout_marginTop="65dp"
             android:autoText="false"
             android:editable="true"
             android:elegantTextHeight="false"
             android:maxLines="1"
-            android:text="Title"
+            android:text="@string/nvf_title"
             android:textColor="#c5c4c4" />
 
         <EditText
             android:id="@+id/nvf_note_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            android:layout_marginTop="100dp"
             android:editable="true"
-            android:text="Content"
-            android:textColor="#c5c4c4" />
+            android:text="@string/nvf_content"
+            android:textColor="#c5c4c4"
+            android:layout_marginTop="20dp" />
 
-        <Button
-            android:id="@+id/nvf_note_submit_btn"
+        <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|top"
-            android:layout_marginRight="15dp"
-            android:layout_marginTop="150dp"
-            android:text="Note Me" />
+            android:layout_height="wrap_content">
 
-        <Button
-            android:id="@+id/nvf_note_cancel_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:text="Throw Me" />
+            <Button
+                android:id="@+id/nvf_note_submit_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/note_me"
+                android:layout_margin="15dp" />
+
+            <Button
+                android:id="@+id/nvf_note_cancel_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/throw_me"
+                android:layout_marginTop="15dp" />
+        </LinearLayout>
+
+    </LinearLayout>
 
-    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5767cc2..d29f110 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">TSN</string>
+    <string name="app_name">TheSocialNotework</string>
 
     <!-- Strings related to login -->
     <string name="prompt_email">Email</string>
@@ -19,5 +19,9 @@
     <string name="nvf_private_label">Private</string>
     <string name="nvf_public_label">Public</string>
     <string name="logo">Logo</string>
+    <string name="nvf_title">Title</string>
+    <string name="nvf_content">Content</string>
+    <string name="throw_me">Throw Me</string>
+    <string name="note_me">Note Me</string>
 
 </resources>