diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb2286f9b..31d3e41f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,7 +84,8 @@
             android:label="@string/title_activity_signup"/>
         <activity
             android:name=".nearby.NearbyActivity"
-            android:label="@string/title_activity_nearby" />
+            android:label="@string/title_activity_nearby"
+            android:parentActivityName=".contributions.ContributionsActivity"/>
 
         <service android:name=".upload.UploadService" >
         </service>
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index fe745d926..a06d98eea 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -30,7 +30,9 @@ public class NearbyActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_nearby);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
         registerLocationManager();
 
         // Begin the transaction
@@ -38,23 +40,11 @@ public class NearbyActivity extends AppCompatActivity {
         NearbyListFragment fragment = new NearbyListFragment();
         ft.add(R.id.container, fragment);
         ft.commit();
-
-        /*
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.container, new NearbyListFragment())
-                    .commit();
-        }
-        */
     }
 
     @Override
     protected void onResume(){
         super.onResume();
-
-
-        //TODO: Check if we need String or double coords, and in what format
-        //gpsCoords = String.valueOf(currentLatitude) + "|" + String.valueOf(currentLongitude);
     }
 
     protected LatLng getmLatestLocation() {
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
index 3136a740e..78a5d01af 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
@@ -187,7 +187,7 @@ public class NearbyListFragment extends ListFragment {
             tvName.setText(quotelessName);
             tvDesc.setText(place.description);
             distance.setText(place.distance);
-            
+
             //Types of desc: landmark, city, edu, event, mountain, isle
             switch(place.description) {
                 case "landmark":