diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 49f4e02bad..151a91e9fd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -576,8 +576,8 @@
         <div id="setWithinAlert">
             <form role="form" style="width: auto;">
                 <div class="form-group">
-                    <label class="text-primary" for="areaName">Fence name</label>
-                    <input class="form-control" id="areaName" placeholder="Fence name" type="text">
+                    <label class="text-primary" for="withinAlertAreaName">Fence name</label>
+                    <input class="form-control" id="withinAlertAreaName" placeholder="Fence name" type="text">
                     <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
@@ -589,9 +589,8 @@
                             </button>
                         </div>
                         <div class="btn-group">
-                            <button id="editGeoJson"
-                                    onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
-                                    type="button" class="btn btn-default btn-xs">Edit
+                            <button onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
+                                    type="button" class="btn btn-default btn-xs editGeoJson">Edit
                             </button>
                         </div>
                         <div class="btn-group">
@@ -607,8 +606,8 @@
         <div id="setExitAlert">
             <form role="form" style="width: auto;">
                 <div class="form-group">
-                    <label class="text-primary" for="areaName">Fence name</label>
-                    <input class="form-control" id="areaName" placeholder="Fence name" type="text">
+                    <label class="text-primary" for="exitAlertAreaName">Fence name</label>
+                    <input class="form-control" id="exitAlertAreaName" placeholder="Fence name" type="text">
                     <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
@@ -620,9 +619,8 @@
                             </button>
                         </div>
                         <div class="btn-group">
-                            <button id="editGeoJson"
-                                    onclick="$('#editExitGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editExitGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editExitGeoJSON').modal('toggle')"
-                                    type="button" class="btn btn-default btn-xs">Edit
+                            <button onclick="$('#editExitGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editExitGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editExitGeoJSON').modal('toggle')"
+                                    type="button" class="btn btn-default btn-xs editGeoJson">Edit
                             </button>
                         </div>
                         <div class="btn-group">
@@ -639,8 +637,8 @@
         <div id="setStationeryAlert">
             <form role="form" style="width: auto;">
                 <div class="form-group">
-                    <label class="text-primary" for="areaName">Fence name</label>
-                    <input class="form-control" id="areaName" placeholder="Stationery name" type="text">
+                    <label class="text-primary" for="stationaryAlertAreaName">Fence name</label>
+                    <input class="form-control" id="stationaryAlertAreaName" placeholder="Stationery name" type="text">
                     <span class="help-block">Name of the selected area(e.g. colombo)</span>
 
                     <label class="text-primary" for="fRadius">Fluctuation radius</label>
@@ -658,9 +656,8 @@
                             </button>
                         </div>
                         <div class="btn-group">
-                            <button id="editGeoJson"
-                                    onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
-                                    type="button" class="btn btn-default btn-xs">Edit
+                            <button onclick="$('#editWithinGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editWithinGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editWithinGeoJSON').modal('toggle')"
+                                    type="button" class="btn btn-default btn-xs editGeoJson">Edit
                             </button>
                         </div>
                         <div class="btn-group">
@@ -676,8 +673,8 @@
         <div id="setTrafficAlert">
             <form role="form" style="width: auto;">
                 <div class="form-group">
-                    <label class="text-primary" for="areaName">Fence name</label>
-                    <input class="form-control" id="areaName" placeholder="Area Name" type="text">
+                    <label class="text-primary" for="trafficAlertAreaName">Fence name</label>
+                    <input class="form-control" id="trafficAlertAreaName" placeholder="Area Name" type="text">
                     <span class="help-block">Name of the selected area(e.g. colombo)</span>
                 </div>
                 <div>
@@ -689,9 +686,8 @@
                             </button>
                         </div>
                         <div class="btn-group">
-                            <button id="editGeoJson"
-                                    onclick="$('#editTrafficGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editTrafficGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editTrafficGeoJSON').modal('toggle')"
-                                    type="button" class="btn btn-default btn-xs">Edit
+                            <button onclick="$('#editTrafficGeoJSON #updateGeoJson').attr('leaflet_id',$(this).attr('leaflet_id'));$('#editTrafficGeoJSON textarea').text(JSON.stringify(map._layers[$(this).attr('leaflet_id')].toGeoJSON(),null, '\t'));$('#editTrafficGeoJSON').modal('toggle')"
+                                    type="button" class="btn btn-default btn-xs editGeoJson">Edit
                             </button>
                         </div>
                         <div class="btn-group">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
index 4094fc89dc..f18b117259 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.js
@@ -60,6 +60,6 @@ function onRequest(context) {
     } else {
         viewModel.lastLocation = stringify({});
     }
-    viewModel.geoServicesEnabled = devicemgtProps.serverConfig.operationAnalyticsConfiguration.isEnabled;
+    viewModel.geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
     return viewModel;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
index 8457e973e5..5996dbcac3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_fencing.js
@@ -271,8 +271,8 @@ function createPopup(layer,id) {
     	return;
     }
     
-    popupTemplate.find('#exportGeoJson').attr('leaflet_id', layer._leaflet_id);
-    popupTemplate.find('#editGeoJson').attr('leaflet_id', layer._leaflet_id);
+    popupTemplate.find('.exportGeoJson').attr('leaflet_id', layer._leaflet_id);
+    popupTemplate.find('.editGeoJson').attr('leaflet_id', layer._leaflet_id);
 
     layer.bindPopup(popupTemplate.html(), {closeOnClick: false, closeButton: false}).openPopup();
     // transparent the layer .leaflet-popup-content-wrapper
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
index 04a94dd62f..e5894ceee1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/geo_remote.js
@@ -233,7 +233,7 @@ function setWithinAlert(leafletId) {
      * (look in get_alerts for .replace() method)
      * */
     var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'");
-    var areaName = $("#areaName").val();
+    var areaName = $("#withinAlertAreaName").val();
     var queryName = areaName;
 
 
@@ -292,7 +292,7 @@ function setExitAlert(leafletId) {
      * (look in get_alerts for .replace() method)
      * */
     var selectedAreaGeoJson = JSON.stringify(map._layers[leafletId].toGeoJSON().geometry).replace(/"/g, "'");
-    var areaName = $("#areaName").val();
+    var areaName = $("#exitAlertAreaName").val();
     var queryName = areaName;
 
 
@@ -357,7 +357,7 @@ function setStationeryAlert(leafletId) {
 
     var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'");
 
-    var stationeryName = $("#areaName").val();
+    var stationeryName = $("#stationaryAlertAreaName").val();
     var queryName = stationeryName;
     var fluctuationRadius = $("#fRadius").val();
     var time = $("#time").val();
@@ -477,7 +477,7 @@ function setTrafficAlert(leafletId) {
 
     var selectedProcessedAreaGeoJson = JSON.stringify(selectedAreaGeoJson).replace(/"/g, "'");
 
-    var areaName = $("#areaName").val();
+    var areaName = $("#trafficAlertAreaName").val();
     var queryName = areaName;
     //var time = $("#time").val();