diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/device.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/device.js
index f29aaeb9..bf69621c 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/device.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/device.js
@@ -177,7 +177,7 @@ deviceModule = function () {
 
         var data = {};
         //XMLHTTPRequest's POST
-        return post(updateDeviceEndpoint+ "?name="+device.name, data, "json");
+        return post(updateDeviceEndpoint+ "?name="+device.name, data, "text");
     };
 
     /*
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
index c2f9870e..07e7116b 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.hbs
@@ -11,7 +11,7 @@
                         <div class="tile-stats">
                             <span id="device-count">Loading...</span>
                             <span class="tile-stats-free">
-                                <a href="home.html">
+                                <a href="devices/">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-view fw-stack-1x"></i>
@@ -23,6 +23,7 @@
                     </div>
                 </div>
             </div>
+            {{#if permissions.ADD_USER}}
             <div class="col-md-4">
                 <div class="wr-stats-board-tile">
                     <div class="tile-name">Users</div>
@@ -50,6 +51,7 @@
                     </div>
                 </div>
             </div>
+            {{/if}}
             <div class="col-md-4">
                 <div class="wr-stats-board-tile">
                     <div class="tile-name">Policies</div>
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.js
index 688371b4..a28530c1 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/dashboard/dashboard.js
@@ -1,3 +1,6 @@
 function onRequest(context){
+    var userModule = require("/modules/user.js").userModule;
+    var permissions = userModule.getUIPermissions();
+    context.permissions = permissions;
     return context;
 }
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
index 5e4565d5..9f91dd7e 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
@@ -301,8 +301,7 @@ function attachEvents() {
         showPopup();
 
         $("a#edit-device-yes-link").click(function () {
-            device={};
-            device.name = $('#edit-device-name').val();
+            var device={"device":{"name" : $('#edit-device-name').val()}};
             invokerUtil.post(
                 editDeviceAPI,
                 device,
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
index e7d40e4c..58b12d9b 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
@@ -20,21 +20,21 @@
                         <span class="ast-published">{{status}}</span>
 
                         <div class="ast-btn-group">
-                            <a href="/iotserver/device/{{type}}/{{id}}">
+                            <a href="/iotserver/device/{{type}}/{{deviceIdentifier}}">
 											<span class="fw-stack">
 												<i class="fw fw-ring fw-stack-2x"></i>
 												<i class="fw fw-view fw-stack-1x"></i>
 											</span>
                                 <span class="lbl-action">View</span>
                             </a>
-                            <a href="#" class="edit-device-link" data-deviceid="{{id}}" data-devicetype="{{type}}" data-devicename="{{name}}">
+                            <a href="#" class="edit-device-link" data-deviceid="{{deviceIdentifier}}" data-devicetype="{{type}}" data-devicename="{{name}}">
 											<span class="fw-stack">
 												<i class="fw fw-ring fw-stack-2x"></i>
 												<i class="fw fw-edit fw-stack-1x"></i>
 											</span>
                                 <span class="lbl-action">Edit</span>
                             </a>
-                            <a href="#" class="remove-device-link" data-deviceid="{{id}}" data-devicetype="{{type}}">
+                            <a href="#" class="remove-device-link" data-deviceid="{{deviceIdentifier}}" data-devicetype="{{type}}">
 											<span class="fw-stack">
 												<i class="fw fw-ring fw-stack-2x"></i>
 												<i class="fw fw-delete fw-stack-1x"></i>