diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
index ddaa7b1..8eb3dfb 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
@@ -104,11 +104,11 @@ public class BlackList extends AppCompatActivity {
                 .create(UserService.class);
 
         if (PrefUtils.isBlackListing(this)){
-            aSwitch.setText(getString(R.string.action_black_list) +" ON");
+            aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.on));
             aSwitch.setChecked(true);
             handleChangeRequest(true);
         }else{
-            aSwitch.setText(getString(R.string.action_black_list) +" OFF");
+            aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.off) );
             aSwitch.setChecked(false);
             handleChangeRequest(false);
         }
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
index 2f5240c..7837ce8 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
@@ -229,6 +229,7 @@ public class UsersListFragment extends Fragment {
                                         fragmentTransaction.hide(usersListFragment);
                                         fragmentTransaction.commit();
                                         ((MapActivity) getActivity()).searchUser(user.getFirstName());
+                                        ((MapActivity) getActivity()).updateNavigationBarState();
 
                                      /*   List<User> list = new ArrayList<User>();
                                         list.add(user);
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
index c767af3..f471947 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
@@ -88,11 +88,11 @@ public class WhiteList extends AppCompatActivity {
                 .create(UserService.class);
 
         if (PrefUtils.isWhiteListing(this)) {
-            aSwitch.setText(getString(R.string.action_white_list) + " ON");
+            aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.on) );
             aSwitch.setChecked(true);
             handleChangeRequest(true);
         } else {
-            aSwitch.setText(getString(R.string.action_white_list) + " OFF");
+            aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.off) );
             aSwitch.setChecked(false);
             handleChangeRequest(false);
         }
diff --git a/app/src/main/res/layout/activity_black_list.xml b/app/src/main/res/layout/activity_black_list.xml
index b4c9188..60c0e30 100644
--- a/app/src/main/res/layout/activity_black_list.xml
+++ b/app/src/main/res/layout/activity_black_list.xml
@@ -40,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:text="Block the users"
+                    android:text="@string/block_the_users"
                     android:textSize="15sp"/>
 
                 <Switch
diff --git a/app/src/main/res/layout/activity_white_list.xml b/app/src/main/res/layout/activity_white_list.xml
index 7c196c5..9426c75 100644
--- a/app/src/main/res/layout/activity_white_list.xml
+++ b/app/src/main/res/layout/activity_white_list.xml
@@ -40,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:text="Be visible for these users"
+                    android:text="@string/be_visible_for_these_users "
                     android:textSize="15sp"/>
 
                 <Switch
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ab7b9b2..5f99fa4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -276,14 +276,17 @@
     <!--(ENG) Blacked/Whited users  -->
     <string name="add_user_to_list">Użytkownik został dodany!</string>
     <string name="user_removed">Użytkownik usunięty!</string>
+    <string name="floor">Piętro</string>
+    <string name="block_the_users">Zablokuj użytkowników</string>
+    <string name="be_visible_for_these_users">Bądź dostępny dla użytkowników</string>
 
     <!--(ENG) Sharing Modes  -->
-    <string name="manual_mode">manualny</string>
-    <string name="exact_mode">dokładny</string>
-    <string name="approx_mode">przybliżony</string>
+    <string name="manual_mode">manual</string>
+    <string name="exact_mode">exact</string>
+    <string name="approx_mode">approximate</string>
 
     <!--(ENG) Undefined manual  -->
-    <string name="other_location">Niezapisana lokalizacja.</string>
+    <string name="other_location">Not saved location.</string>
 
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 763579d..2119d2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,9 +222,9 @@
     <string name="nav_profile">User profile</string>
     <string name="remove_manual_location">Remove Manual location</string>
     <string name="title_activity_tutor_tab">TutorTab</string>
-    <string name="manual_modal_title">Do you want to save this localization?</string>
-    <string name="lbl_ok">Save!</string>
-    <string name="lbl_cancel">Cancel!</string>
+    <string name="manual_modal_title">Manual localization</string>
+    <string name="lbl_ok">Save</string>
+    <string name="lbl_cancel">Cancel</string>
     <string name="manual_marker_info">Your marker will disappear in next couple minutes</string>
     <string name="manual_location_selected">Manual Locations selected!</string>
     <string name="location_saved">Location saved!</string>
@@ -342,7 +342,7 @@
 
     <string name="network_err">Network Error !</string>
     <string name="search_null">Search response is empty!</string>
-    <string name="modal_manual_hint">Insert a name for this localization.</string>
+    <string name="modal_manual_hint">Name the localization</string>
     <string name="online">Online</string>
     <string name="offline">Offline</string>
     <string name="inactive">Inactive</string>
@@ -351,6 +351,9 @@
     <!--(ENG) Blacked/Whited users  -->
     <string name="add_user_to_list">User has been added!</string>
     <string name="user_removed">User removed!</string>
+    <string name="floor">Floor</string>
+    <string name="block_the_users">Block the users</string>
+    <string name="be_visible_for_these_users">Be visible for these users</string>
     <string name="title_activity_scrolling">ScrollingActivity</string>
     <string name="large_text">
         "Material is the metaphor.\n\n"
@@ -441,8 +444,9 @@
         "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
         "when a user tries to pick up one of cards.\n\n"
     </string>
+
     <string name="manual_mode">manualny</string>
     <string name="exact_mode">dokładny</string>
     <string name="approx_mode">przybliżony</string>
-    <string name="other_location">Not saved location.</string>
+    <string name="other_location">Niezapisana lokalizacja.</string>
 </resources>