diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
index d277763be..64e28fbe9 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyMapFragment.java
@@ -317,6 +317,7 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment
         MarkerOptions currentLocationMarkerOptions = new MarkerOptions()
                 .position(new com.mapbox.mapboxsdk.geometry.LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()));
         currentLocationMarkerOptions.setIcon(icon); // Set custom icon
+        Marker currentLocationMarker = mapboxMap.addMarker(currentLocationMarkerOptions);
 
         List<com.mapbox.mapboxsdk.geometry.LatLng> circle = UiUtils.createCircleArray(curLatLng.getLatitude(), curLatLng.getLongitude(),
                 curLatLng.getAccuracy() * 2, 100);
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java
index b30e62724..6bfee060c 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java
@@ -188,17 +188,16 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
     private boolean isNetworkErrorOccurred = false;
     private Snackbar snackbar;
     FragmentTransaction transaction;
-    View view;
+    private View view;
 
     public NearbyParentFragmentPresenter nearbyParentFragmentPresenter;
-    boolean isDarkTheme;
-    boolean isFabOpen;
-    boolean isBottomListSheetExpanded;
+    private boolean isDarkTheme;
+    private boolean isFabOpen;
     private Marker selectedMarker;
     private Place selectedPlace;
 
-    private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.06;
-    private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.04;
+    private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.005;
+    private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.004;
 
     NearbyMapFragment nearbyMapFragment;
 
@@ -769,21 +768,21 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
 
         if (ViewUtil.isPortrait(getActivity())){
             position = new CameraPosition.Builder()
-                    .target(isBottomListSheetExpanded ?
+                    .target(isListBottomSheetExpanded() ?
                             new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT,
                                     curLatLng.getLongitude())
                             : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
-                    .zoom(isBottomListSheetExpanded ?
+                    .zoom(isListBottomSheetExpanded() ?
                             ZOOM_LEVEL
                             : nearbyMapFragment.getMapboxMap().getCameraPosition().zoom) // Same zoom level
                     .build();
         }else {
             position = new CameraPosition.Builder()
-                    .target(isBottomListSheetExpanded ?
+                    .target(isListBottomSheetExpanded() ?
                             new LatLng(curLatLng.getLatitude() - CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE,
                                     curLatLng.getLongitude())
                             : new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude(), 0)) // Sets the new camera position
-                    .zoom(isBottomListSheetExpanded ?
+                    .zoom(isListBottomSheetExpanded() ?
                             ZOOM_LEVEL
                             : nearbyMapFragment.getMapboxMap().getCameraPosition().zoom) // Same zoom level
                     .build();
@@ -808,7 +807,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
         NearbyMarker nearbyMarker = (NearbyMarker) marker;
         Place place = nearbyMarker.getNearbyBaseMarker().getPlace();
         passInfoToSheet(place);
-        bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+        hideBottomSheet();
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java
index ca2253e78..48e58eec2 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/UiUtils.java
@@ -56,7 +56,7 @@ public class UiUtils {
      *
      * @return List List of LatLng points of the circle.
      */
-    public static List<LatLng> createCircleArray(
+    public static List<com.mapbox.mapboxsdk.geometry.LatLng> createCircleArray(
             double centerLat, double centerLong, float radius, int nodes) {
         List<com.mapbox.mapboxsdk.geometry.LatLng> circle = new ArrayList<>();
         float radiusKilometer = radius / 1000;