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 4a24616964..c4bf5d25fa 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
@@ -22,7 +22,7 @@
         {{#zone "overview-section"}}
             <div class="media-body asset-desc add-padding-left-5x">
                 <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
-                                                                                                 Overview
+                    Overview
                 </div>
                 <table class="table table-responsive table-striped" id="members">
                     <tbody>
@@ -89,7 +89,7 @@
                     {{#if device.osBuildDate}}
                         <tr role="row" class="even">
                             <td class="sorting_1" style="padding:10px 15px; width: 15%;">Firmware Build
-                                                                                         Date
+                                Date
                             </td>
                             <td style="padding:10px 15px;">{{device.osBuildDate}}</td>
                         </tr>
@@ -185,19 +185,19 @@
                                     </div>
                                 {{/if}}
                                     <!--{{#if device.cpuUsage}}-->
-                            <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
-                            <!--<div class="col-md-12">-->
-                            <!--<div class="wr-stats-board-tile">-->
-                            <!--<div class="tile-name">CPU Usage</div>-->
-                            <!--<div>-->
-                            <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
-                            <!--<div class="tile-stats">-->
-                            <!--{{device.cpuUsage.value}} %-->
-                            <!--</div>-->
-                            <!--</div>-->
-                            <!--</div>-->
-                            <!--</div>-->
-                            <!--</div>-->
+                                <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
+                                <!--<div class="col-md-12">-->
+                                <!--<div class="wr-stats-board-tile">-->
+                                <!--<div class="tile-name">CPU Usage</div>-->
+                                <!--<div>-->
+                                <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
+                                <!--<div class="tile-stats">-->
+                                <!--{{device.cpuUsage.value}} %-->
+                                <!--</div>-->
+                                <!--</div>-->
+                                <!--</div>-->
+                                <!--</div>-->
+                                <!--</div>-->
                                     <!--{{/if}}-->
                                 {{#if device.ramUsage}}
                                     <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
@@ -228,9 +228,9 @@
                                                     <div class="tile-stats">
                                                         {{device.internalMemory
                                                         .usage}} %
-                                                                                <span class="tile-stats-free">
+                                                        <span class="tile-stats-free">
                                                             TOTAL OF {{device.internalMemory
-                                                                                .total}} GB
+                                                        .total}} GB
                                                         </span>
                                                     </div>
                                                 </div>
@@ -249,9 +249,9 @@
                                                     <div class="tile-stats">
                                                         {{device.externalMemory
                                                         .usage}} %
-                                                                                <span class="tile-stats-free">
+                                                        <span class="tile-stats-free">
                                                             TOTAL OF {{device.externalMemory
-                                                                                .total}} GB
+                                                        .total}} GB
                                                         </span>
                                                     </div>
                                                 </div>
@@ -291,7 +291,7 @@
                 <div class="panel-heading display-none-xs">
                     Policy Compliance
 
-                                        <span>
+                    <span>
                             <a href="javascript:void(0);" id="refresh-policy">
                                 <i class="fw fw-refresh"></i>
                             </a>
@@ -308,7 +308,7 @@
                         <div id="policy-spinner"
                              class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
                             <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
-                                                                        Compliance...
+                            Compliance...
                         </div>
                         <div id="policy-list-container">
                         </div>
@@ -335,7 +335,8 @@
                         {{#if device.location}}
                             <div id="device-location"
                                  data-lat="{{device.location.latitude}}"
-                                 data-long="{{device.location.longitude}}">
+                                 data-long="{{device.location.longitude}}"
+                                 data-locations = "{{device.locationHistory}}">
                             </div>
                             <br/>
                             <a class="padding-left" target="_blank"
@@ -375,7 +376,7 @@
                 <div class="panel-heading display-none-xs">
                     Installed Applications
 
-                                        <span>
+                    <span>
                             <a href="javascript:void(0);" id="refresh-apps">
                                 <i class="fw fw-refresh"></i>
                             </a>
@@ -391,7 +392,7 @@
                             </span>
                         <div id="apps-spinner" class="wr-advance-operations-init hidden">
                             <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications
-                                                                         List...
+                            List...
                         </div>
                         <div id="applications-list-container">
                             <div class="message message-info">
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 4dcc25e5dd..a5816da5b9 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
@@ -17,7 +17,7 @@
  */
 
 function onRequest(context) {
-    // var log = new Log("device-view.js");
+// var log = new Log("device-view.js");
     var deviceType = context["uriParams"]["deviceType"];
     var deviceId = request.getParameter("id");
     var deviceViewData = {};
@@ -32,7 +32,7 @@ function onRequest(context) {
 
             var filteredDeviceData = response["content"];
 
-            // creating deviceView information model from filtered device data
+// creating deviceView information model from filtered device data
             var viewModel = {};
             if (filteredDeviceData["type"]) {
                 viewModel["type"] = filteredDeviceData["type"];
@@ -194,7 +194,7 @@ function onRequest(context) {
             if (!filteredDeviceData["initialDeviceInfo"] && !filteredDeviceData["latestDeviceInfo"]) {
                 viewModel["deviceInfoAvailable"] = false;
             }
-
+            viewModel.locationHistory = stringify(filteredDeviceData["locationHistory"]);
             deviceViewData["device"] = viewModel;
         } else if (response["status"] == "unauthorized") {
             deviceViewData["deviceFound"] = true;
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/public/js/load-map.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/public/js/load-map.js
index c09ab8ddb7..c9daa3f440 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/public/js/load-map.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/public/js/load-map.js
@@ -22,15 +22,27 @@ function loadLeafletMap() {
     var deviceLocationID = "#device-location",
         lat = $(deviceLocationID).data("lat"),
         long = $(deviceLocationID).data("long"),
+        locations = $(deviceLocationID).data("locations"),
         container = "device-location",
         zoomLevel = 13,
         tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
         attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
 
-    if (lat && long) {
+    if (locations) {
+
+        var locationSets = locations.locations;
         map = L.map(container).setView([lat, long], zoomLevel);
         L.tileLayer(tileSet, {attribution: attribution}).addTo(map);
-        L.marker([lat, long]).addTo(map).bindPopup("Device is here...").openPopup();
+
+        for(var i = 0; i < locationSets.length; i++){
+            var m = L.marker(locationSets[i]).addTo(map).bindPopup(new Date(locations.times[i].time).toISOString())
+            m.on('mouseover', function (e) {
+                this.openPopup();
+            });
+            m.on('mouseout', function (e) {
+                this.closePopup();
+            });
+        }
 
         $("#map-error").hide();
         $("#device-location").show();