diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
index 31bbf8b..d17d437 100644
--- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
+++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
@@ -116,8 +116,20 @@ private void setUpNavigationHeader() {
 
     private void setUpNavigationHeaderValue() {
         // TODO : Set Profile Image
-        userName.setText(mSharedPreferences.getString(NAME, getResources().getString(R.string.sign_in)));
+        userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in)));
         emailId.setText(mSharedPreferences.getString(EMAIL, ""));
+
+        changeSignInSignOutOption();
+    }
+
+    private void changeSignInSignOutOption() {
+        Menu menu = navigationView.getMenu();
+        MenuItem sign_in_out_item = menu.findItem(R.id.nav_sign_in_out);
+        if (checkIfLoggedIn()) {
+            sign_in_out_item.setTitle(R.string.sign_out);
+        } else {
+            sign_in_out_item.setTitle(R.string.sign_in);
+        }
     }
 
     private void setUpFab() {
@@ -143,9 +155,10 @@ private void signOut() {
             @Override
             public void onResult(@NonNull Status status) {
                 if (status.isSuccess()) {
-                    snackMsg("Signed Out!!");
+                    fab.show();
+                    snackMsg(getString(R.string.sign_out_msg));
                 } else {
-                    snackMsg("Some error while signing out!");
+                    snackMsg(getString(R.string.sign_out_error_msg));
                     Log.d(DEBUG, "Sign out error : " + status.toString());
                 }
             }
@@ -185,10 +198,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             case MY_PERMISSIONS_REQUEST_FINE_LOCATIONS:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     loadMapFragment();
-                    snackMsg("Permission granted!!");
+                    snackMsg(getString(R.string.location_permission_success));
                 } else {
                     loadFragment(new NoLocationPermission());
-                    snackMsg("Please give permission for location");
+                    snackMsg(getString(R.string.location_permission_failed));
                 }
                 break;
 
@@ -245,7 +258,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if (id == R.id.nav_request_new) {
             loadAddNewPrivyActivity();
             closeDrawer();
-        } else if (id == R.id.nav_sign_in_up) {
+        } else if (id == R.id.nav_sign_in_out) {
             if (checkIfLoggedIn())
                 signOut();
             else
@@ -268,10 +281,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 if (placeToAdd.getLatLng() != null) {
                     requestNewPrivy(placeToAdd);
                 } else {
-                    snackMsg("Some Error!! Was not able to retrieve information properly");
+                    snackMsg(getString(R.string.error_retrieving_data_msg));
                 }
             } else {
-                snackMsg("Please Select a Location if you wished to request Privy!");
+                snackMsg(getString(R.string.select_location_request_msg));
             }
 
             navigationView.getMenu().getItem(0).setChecked(true);
@@ -303,7 +316,7 @@ private void handleSignInResultAndLaunchNewRequestPrivy(GoogleSignInResult resul
             fab.hide();
         } else {
             clearSharedPreference();
-            snackMsg("Please Sign in to request new Privy");
+            snackMsg(getString(R.string.request_location_permission));
         }
         setUpNavigationHeaderValue();
     }
@@ -318,7 +331,7 @@ private void handleSignInResult(GoogleSignInResult result) {
             fab.hide();
         } else {
             clearSharedPreference();
-            snackMsg("Please Sign in to request new Privy");
+            snackMsg(getString(R.string.request_location_permission));
         }
         setUpNavigationHeaderValue();
     }
@@ -330,6 +343,8 @@ private void addLoginInfo(GoogleSignInAccount acct) {
         editor.putString(NAME, acct.getDisplayName());
         editor.putString(EMAIL, acct.getEmail());
         editor.commit();
+
+        snackMsg(getString(R.string.sign_in_msg));
     }
 
     private void clearSharedPreference() {
@@ -364,7 +379,7 @@ private void loadAddNewPrivyActivity() {
             }
         } else {
             startGoogleSignInActivity(RC_SIGN_IN_NEW_PRIVY_REQUEST);
-            snackMsg("Please Sign In to add new Privy");
+            snackMsg(getString(R.string.request_location_permission));
         }
     }
 
@@ -390,7 +405,7 @@ private boolean checkLocationEnabledPermission() {
 
     @Override
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-        snackMsg("Some Error while Connecting to Google Service!!");
+        snackMsg(getString(R.string.google_api_client_connection_faliure_msg));
         Log.d(DEBUG, "OnConnectionFailed: " + connectionResult.toString());
     }
 
diff --git a/app/src/main/res/drawable/google.png b/app/src/main/res/drawable/google.png
new file mode 100644
index 0000000..8688a62
Binary files /dev/null and b/app/src/main/res/drawable/google.png differ
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 53d3c39..b4ecc57 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -30,6 +30,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+        app:srcCompat="@drawable/google"
+        app:backgroundTint="@android:color/white"
+        />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 56926df..9fcc469 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -5,19 +5,19 @@
         <item
             android:id="@+id/nav_nearby_privy"
             android:icon="@drawable/ic_menu_camera"
-            android:title="Nearby Privy's" />
+            android:title="@string/nav_nearby_privy" />
         <item
             android:id="@+id/nav_request_new"
             android:icon="@drawable/ic_menu_gallery"
-            android:title="Add Privy" />
+            android:title="@string/nav_add_privy" />
         <!--<item-->
             <!--android:id="@+id/nav_slideshow"-->
             <!--android:icon="@drawable/ic_menu_slideshow"-->
             <!--android:title="Slideshow" />-->
         <item
-            android:id="@+id/nav_sign_in_up"
+            android:id="@+id/nav_sign_in_out"
             android:icon="@drawable/ic_menu_manage"
-            android:title="Sign In" />
+            android:title="@string/sign_in" />
     </group>
 
     <item android:title="Communicate">
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 336b8f7..3cfc99c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,10 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="nav_header_height">160dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">16sp</dimen>
     <dimen name="fab_margin">16sp</dimen>
+    <!--Floating action button-->
+    <dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68e7587..f433e71 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,15 @@
     <string name="navigation_drawer_close">Close Navigation Drawer</string>
     <string name="action_settings">Settings</string>
     <string name="sign_in">Sign In</string>
+    <string name="sign_out">Sign Out</string>
+    <string name="sign_out_msg">Signed Out!!</string>
+    <string name="sign_in_msg">Signed In!!</string>
+    <string name="sign_out_error_msg">Some error while signing out!</string>
+    <string name="location_permission_success">Permission granted!!</string>
+    <string name="location_permission_failed">Please give permission for location</string>
+    <string name="request_location_permission">Please Sign In to request new Privy.</string>
+    <string name="google_api_client_connection_faliure_msg">Some Error while Connecting to Google Service!!</string>
+    <string name="select_location_request_msg">Please select a location to request new Privy.</string>
+    <string name="nav_nearby_privy">Nearby Privy\'s</string>
+    <string name="nav_add_privy">Add Privy</string>
 </resources>