diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index 63edd3ba21..e9ddee339d 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -39,7 +39,7 @@
     <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
            aria-controls="event_log">Operations Log</a></li>
     <li><a class="list-group-item location_tab" href="#geo_dashboard" role="tab" data-toggle="tab"
-           aria-controls="geo_dashboard">Device Location</a></li>
+           aria-controls="geo_dashboard" onclick="initializeGeoFencing()">Device Location</a></li>
 {{/zone}}
 
 {{#zone "device-view-tab-contents"}}
@@ -73,6 +73,8 @@
     <div class="panel panel-default tab-pane"
          id="geo_dashboard" role="tabpanel" aria-labelledby="geo_dashboard">
         <div class="panel-heading">Device Location</div>
+        <br/>
+        {{unit "cdmf.unit.geo-dashboard" device=device}}
         {{#if locationHistory}}
             <div id="device-location"
                  data-locations = "{{locationHistory}}">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 189bcf0877..5e8b39e2d8 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -1,4 +1,4 @@
-{{unit "cdmf.unit.device.type.android.leaflet"}}
+{{!unit "cdmf.unit.device.type.android.leaflet"}}
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "cdmf.unit.device.type.qr-modal"}}
 
@@ -137,7 +137,8 @@
                 <a href="#device_location_tab" role="tab" data-toggle="tab"
                    data-lat="{{device.location.latitude}}"
                    data-long="{{device.location.longitude}}"
-                   aria-controls="device_location_tab">
+                   aria-controls="device_location_tab"
+                   onclick="initializeGeoFencing()">
                     <i class="icon fw fw-map-location"></i><span
                         class="hidden-sm">Device Location</span>
                 </a>
@@ -345,21 +346,7 @@
                      aria-labelledby="device_location">
                     <div class="panel-body">
                         {{#if device.location}}
-                            <div id="device-location"
-                                 data-lat="{{device.location.latitude}}"
-                                 data-long="{{device.location.longitude}}"
-                                 data-locations="{{device.locationHistory}}">
-                            </div>
-                            <br/>
-                            {{#unless isCloud}}
-                                <a class="padding-left" target="_blank"
-                                   href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
-                                <span class="fw-stack">
-                                    <i class="fw fw-circle-outline fw-stack-2x"></i>
-                                    <i class="fw fw-map-location fw-stack-1x"></i>
-                                </span> Add Geo Fencing
-                                </a>
-                            {{/unless}}
+                            {{unit "cdmf.unit.geo-dashboard" device=device}}
                         {{else}}
                             <div id="map-error" class="message message-warning">
                                 <h4 class="remove-margin">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
index ea56974afa..ef84b0c0f2 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
@@ -142,6 +142,7 @@ function onRequest(context) {
                     viewModel["location"] = {};
                     viewModel["location"]["latitude"] = filteredDeviceData["latestDeviceInfo"]["location"]["latitude"];
                     viewModel["location"]["longitude"] = filteredDeviceData["latestDeviceInfo"]["location"]["longitude"];
+                    viewModel["location"]["updatedTime"] = filteredDeviceData["latestDeviceInfo"]["location"]["updatedTime"];
                 }
                 if (filteredDeviceData["latestDeviceInfo"]["vendor"] && filteredDeviceData["latestDeviceInfo"]["deviceModel"]) {
                     viewModel["vendor"] = filteredDeviceData["latestDeviceInfo"]["vendor"];