diff --git a/opensrp-reveal/build.gradle b/opensrp-reveal/build.gradle
index 7837c99da..f2748cf15 100644
--- a/opensrp-reveal/build.gradle
+++ b/opensrp-reveal/build.gradle
@@ -155,7 +155,7 @@ android {
             buildConfigField "long", "PULL_UNIQUE_IDS_MINUTES", '15'
             buildConfigField "String", "ADMIN_PASSWORD_NOT_NEAR_STRUCTURES", '"AdminPass1"'
             buildConfigField "float", "MY_LOCATION_BUFFER", '25'
-            buildConfigField "boolean", "VALIDATE_FAR_STRUCTURES", 'true'
+            buildConfigField "boolean", "VALIDATE_FAR_STRUCTURES", 'false'
             buildConfigField "int", "RESOLVE_LOCATION_TIMEOUT_IN_SECONDS", '90'
             buildConfigField "boolean", "DISPLAY_OUTSIDE_OPERATIONAL_AREA_MASK", 'false'
             buildConfigField "boolean", "DISPLAY_DISTANCE_SCALE", 'true'
diff --git a/opensrp-reveal/src/main/assets/map-download-style.json b/opensrp-reveal/src/main/assets/map-download-style.json
index 3c4395e13..6b52ff6b0 100644
--- a/opensrp-reveal/src/main/assets/map-download-style.json
+++ b/opensrp-reveal/src/main/assets/map-download-style.json
@@ -25,12 +25,13 @@
         "features": []
       }
     },
-    "diimagery": {
+    "mapbox-streets": {
+      "url": "mapbox://mapbox.mapbox-streets-v8",
+      "type": "vector"
+    },
+    "mapbox-satellite": {
+      "url": "mapbox://mapbox.satellite",
       "type": "raster",
-      "scheme": "tms",
-      "tiles": [
-        "https://access.maxar.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@png/{z}/{x}/{y}.png?connectId=DIGITAL_GLOBE_ID"
-      ],
       "tileSize": 256
     },
     "select-data": {
@@ -55,7 +56,7 @@
       "id": "Thailand EarthWatch Imagery",
       "type": "raster",
       "metadata": {},
-      "source": "diimagery",
+      "source": "mapbox-satellite",
       "layout": {},
       "paint": {}
     },
diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/Constants.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/Constants.java
index ad916275c..49d2c1b54 100644
--- a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/Constants.java
+++ b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/Constants.java
@@ -326,12 +326,12 @@ interface BusinessStatusWrapper {
     }
 
     interface Map {
-        int MAX_SELECT_ZOOM_LEVEL = 16;
+        int MAX_SELECT_ZOOM_LEVEL = 13;
         int SELECT_JURISDICTION_MAX_SELECT_ZOOM_LEVEL = 12;
         int CLICK_SELECT_RADIUS = 24;
         String NAME_PROPERTY = "name";
-        double DOWNLOAD_MAX_ZOOM = 21.0;
-        double DOWNLOAD_MIN_ZOOM = 13.5;
+        double DOWNLOAD_MAX_ZOOM = 15.0;
+        double DOWNLOAD_MIN_ZOOM = 1.0;
     }
 
     interface JsonForm {
diff --git a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealMapHelper.java b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealMapHelper.java
index 461d4d22c..76b0c5cde 100644
--- a/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealMapHelper.java
+++ b/opensrp-reveal/src/main/java/org/smartregister/reveal/util/RevealMapHelper.java
@@ -263,8 +263,8 @@ public static void addBaseLayers(KujakuMapView kujakuMapView, Style style, Conte
         MapBoxLayer mapBoxLayer = new MapBoxLayer();
 
 
-        baseLayerSwitcherPlugin.addBaseLayer(digitalGlobeLayer, true);
-        baseLayerSwitcherPlugin.addBaseLayer(mapBoxLayer, false);
+        baseLayerSwitcherPlugin.addBaseLayer(digitalGlobeLayer, false);
+        baseLayerSwitcherPlugin.addBaseLayer(mapBoxLayer, true);
         kujakuMapView.getMbTilesHelper().setMBTileLayers(context, baseLayerSwitcherPlugin);
 
         baseLayerSwitcherPlugin.show();
diff --git a/opensrp-reveal/src/test/java/org/smartregister/reveal/view/ListTasksActivityTest.java b/opensrp-reveal/src/test/java/org/smartregister/reveal/view/ListTasksActivityTest.java
index 5e81aee70..40008a5ab 100644
--- a/opensrp-reveal/src/test/java/org/smartregister/reveal/view/ListTasksActivityTest.java
+++ b/opensrp-reveal/src/test/java/org/smartregister/reveal/view/ListTasksActivityTest.java
@@ -198,7 +198,7 @@ public class ListTasksActivityTest extends BaseUnitTest {
     @Before
     public void setUp() {
         Context.bindtypes = new ArrayList<>();
-        listTasksActivity = Robolectric.buildActivity(ListTasksActivity.class).create().get();
+        listTasksActivity = Robolectric.buildActivity(ListTasksActivity.class).create().start().get();
         myLocationButton = new ImageButton(listTasksActivity);
         layerSwitcherFab = new ImageButton(listTasksActivity);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);