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 88b5d3d06..189bcf087 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
@@ -337,6 +337,9 @@
                             <i class="fw fw-refresh"></i>
                         </a>
                     </span>
+                    <div id="map-spinner" class="wr-advance-operations-init hidden">
+                        <i class="fw fw-settings fw-spin fw-2x"></i> Fetching the latest location...
+                    </div>
                 </div>
                 <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
                      aria-labelledby="device_location">
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 10464f22c..49318af68 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
@@ -32,6 +32,8 @@ function loadLeafletMap(refresh) {
         attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
 
     if (refresh && !isAnalitics) {
+
+        $("#map-spinner").removeClass("hidden");
         var applicationsList = $("#applications-list");
         var deviceId = applicationsList.data("device-id");
         var deviceType = applicationsList.data("device-type");
@@ -43,8 +45,10 @@ function loadLeafletMap(refresh) {
                     data = JSON.parse(data);
                     if (data.latitude && data.longitude) {
                         map.removeLayer(marker);
-                        marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
-                        // marker = L.marker([data.latitude, data.longitude], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        // marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        marker = L.marker([data.latitude, data.longitude], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        map.panTo(new L.LatLng(data.latitude, data.longitude));
+                        // map.panTo(new L.LatLng(40.737, -73.923));
                         marker.on('mouseover', function (e) {
                             this.openPopup();
                         });
@@ -52,14 +56,16 @@ function loadLeafletMap(refresh) {
                             this.closePopup();
                         });
                     }
+                    $("#map-spinner").addClass("hidden");
                 } else {
-
+                    $("#map-spinner").adddClass("hidden");
                     $("#device-location").hide();
                     $("#map-error").show();
                 }
             },
             // error-callback
             function () {
+                $("#map-spinner").addClass("hidden");
                 $("#device-location").hide();
                 $("#map-error").show();
             });
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.operation-bar/operation-bar.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.operation-bar/operation-bar.hbs
index b25fdf558..5e46d0009 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.operation-bar/operation-bar.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.operation-bar/operation-bar.hbs
@@ -65,8 +65,6 @@
                                 {{description}}
                                 <br>
                             </h4>
-                            <div style="height:200px" class="hidden" data-toggle="loading" data-loading-inverse="false"
-                                 data-loading-text="Sending to device"></div>
                             <div id="operation-form">
                                 <form action="{{params.0.uri}}" method="{{params.0.method}}"
                                       style="padding-bottom: 20px;"
@@ -106,12 +104,13 @@
                                         {{/equal}}
                                     {{/each}}
                                     <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')"
-                                            class="btn btn-default">&nbsp;&nbsp;&nbsp;&nbsp;Send
-                                        to Device&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                            class="btn btn-default">Send
+                                        to Device</button>
                                     <label id="lblSending" class="wr-input-label hidden"><i
                                             class="fw fw-lifecycle fw-spin fw-2x"></i> Sending..</label>
                                     <label id="lblSent" class="wr-input-label hidden"><i
                                             class="fw fw-check fw-2x"></i> Sent</label>
+                                    <i id="lbl-execution" class="fw fw-wso2-logo fw-pulse fw-2x hidden"> Executing Operation </i>
                                 </form>
                             </div>
                         </div>
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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
index 4ab3a2271..8b621e931 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.operation-bar/public/js/operation-bar.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.operation-bar/public/js/operation-bar.js
@@ -28,10 +28,8 @@ function operationSelect(selection) {
 }
 
 function submitForm(formId) {
-    $("#operation-form").addClass("hidden");
-    $('[data-toggle="loading"]').removeClass("hidden");
-    $('[data-toggle="loading"]').loading('show');
-
+    $("#btnSend").addClass("hidden");
+    $("#lbl-execution").removeClass("hidden");
     var form = $("#" + formId);
     var uri = form.attr("action");
     var deviceId = form.data("device-id");
@@ -75,8 +73,8 @@ function submitForm(formId) {
     description.html("");
 
     var resetLoader = function () {
-        $("#operation-form").removeClass("hidden");
-        $('[data-toggle="loading"]').addClass("hidden");
+        $("#btnSend").removeClass("hidden");
+        $('#lbl-execution').addClass("hidden");
     };
 
     var successCallBack = function (response) {