diff --git a/OsmAnd/res/layout/radius_search_list_element.xml b/OsmAnd/res/layout/radius_search_list_element.xml
index a558a98657..51e1700893 100644
--- a/OsmAnd/res/layout/radius_search_list_element.xml
+++ b/OsmAnd/res/layout/radius_search_list_element.xml
@@ -4,8 +4,8 @@
 			  android:orientation="horizontal"
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content"
-			  android:layout_marginTop="3dp"
-			  android:layout_marginBottom="3dp">
+			  android:layout_marginTop="5dp"
+			  android:layout_marginBottom="5dp">
 
 	<ProgressBar
 			android:layout_width="wrap_content"
@@ -15,7 +15,7 @@
 			android:layout_marginLeft="4dp"/>
 
 	<TextView android:id="@+id/header"
-			  android:text="@string/search_radius"
+			  android:text="@string/search_radius_proximity"
 			  android:layout_width="0dp"
 			  android:layout_marginLeft="8dp"
 			  android:layout_height="wrap_content"
diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index a0b74947ce..79e153e8fd 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -4,8 +4,8 @@
 			  android:orientation="horizontal"
 			  android:layout_width="fill_parent"
 			  android:layout_height="match_parent"
-			  android:layout_marginTop="3dp"
-			  android:layout_marginBottom="3dp"
+			  android:layout_marginTop="5dp"
+			  android:layout_marginBottom="5dp"
 			  android:layout_marginRight="3dp">
 	<ProgressBar
 			android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/configuremap/ConfigureSettingsMenu.java b/OsmAnd/src/net/osmand/plus/configuremap/ConfigureSettingsMenu.java
index ae7a4d9d0e..1f4a8b964a 100644
--- a/OsmAnd/src/net/osmand/plus/configuremap/ConfigureSettingsMenu.java
+++ b/OsmAnd/src/net/osmand/plus/configuremap/ConfigureSettingsMenu.java
@@ -73,14 +73,15 @@ public class ConfigureSettingsMenu {
 			@Override
 			public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
 				onMenuItemClick(items.get(pos), (CheckBox) view.findViewById(R.id.check));
-
 			}
 		});
 	}
 
 	//checkBox should be set only if u have checkBox preference
 	private void onMenuItemClick(ConfigureMapMenuItem item, CheckBox ch) {
-		if (item.type == LAYER) {
+		if (item.type == BACK_HEADER){
+			app.getMapActivity().getMapActions().createOptionsMenuAsDrawer(false);
+		} else if (item.type == LAYER) {
 			if (ch != null){
 				ch.setChecked(!ch.isChecked());
 			}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 0446c1570d..f7053535f8 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -360,13 +360,14 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 											int value = WaypointHelper.SEARCH_RADIUS_VALUES[i];
 											if (waypointHelper.getPoiSearchDeviationRadius() != value){
 												running[0] = position;
+												thisAdapter.notifyDataSetInvalidated();
 												waypointHelper.setPoiSearchDeviationRadius(value);
 												radius.setText(OsmAndFormatter.getFormattedDistance(value, app));
 												recalculatePoints(running, thisAdapter, WaypointHelper.POI);
 												dialogInterface.dismiss();
 											}
 										}
-									}).setTitle(app.getString(R.string.search_radius)+ " " + app.getString(R.string.poi))
+									}).setTitle(app.getString(R.string.search_radius_proximity)+ " " + app.getString(R.string.poi))
 									.setNegativeButton(R.string.default_buttons_cancel, null)
 									.show();
 						}
@@ -395,13 +396,14 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 											int value = WaypointHelper.SEARCH_RADIUS_VALUES[i];
 											if (waypointHelper.getSearchDeviationRadius() != value){
 												running[0] = position;
+												thisAdapter.notifyDataSetInvalidated();
 												waypointHelper.setSearchDeviationRadius(value);
 												radius.setText(OsmAndFormatter.getFormattedDistance(value, app));
 												recalculatePoints(running, thisAdapter, -1);
 												dialogInterface.dismiss();
 											}
 										}
-									}).setTitle(app.getString(R.string.search_radius))
+									}).setTitle(app.getString(R.string.search_radius_proximity))
 									.setNegativeButton(R.string.default_buttons_cancel, null)
 									.show();
 						}