diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
index 1a58360409..689881c493 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
@@ -38,6 +38,45 @@
     </li>
 {{/zone}}
 
+{{#zone "navbarActions"}}
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-statistics fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            View Analytics
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-group fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Device Grouping
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-edit fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Edit
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-delete fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Delete
+        </a>
+    </li>
+{{/zone}}
+
 {{#zone "content"}}
     {{unit deviceViewUnitName}}
     {{unit "cdmf.unit.lib.data-table"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index b5f0f93954..37fb95a809 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -66,6 +66,33 @@
                 View Analytics
             </a>
         </li>
+        <li>
+            <a href="{{@app.context}}/device/enroll" class="cu-btn">
+                <span class="icon fw-stack">
+                    <i class="fw fw-share fw-stack-1x"></i>
+                    <i class="fw fw-circle-outline fw-stack-2x"></i>
+                </span>
+                Group Sharing
+            </a>
+        </li>
+        <li>
+            <a href="{{@app.context}}/device/enroll" class="cu-btn">
+                <span class="icon fw-stack">
+                    <i class="fw fw-edit fw-stack-1x"></i>
+                    <i class="fw fw-circle-outline fw-stack-2x"></i>
+                </span>
+                Edit
+            </a>
+        </li>
+        <li>
+            <a href="{{@app.context}}/device/enroll" class="cu-btn">
+                <span class="icon fw-stack">
+                    <i class="fw fw-delete fw-stack-1x"></i>
+                    <i class="fw fw-circle-outline fw-stack-2x"></i>
+                </span>
+                Delete
+            </a>
+        </li>
     {{else}}
         {{#if permissions.enroll}}
             <li>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
index 01acd48ffa..72590d7d87 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
@@ -35,6 +35,36 @@
     </li>
 {{/zone}}
 
+{{#zone "navbarActions"}}
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-key fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Reset password
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-edit fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Edit
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/device/enroll" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-delete fw-stack-1x"></i>
+                <i class="fw fw-circle-outline fw-stack-2x"></i>
+            </span>
+            Delete
+        </a>
+    </li>
+{{/zone}}
+
 {{#zone "content"}}
     {{#if canView}}
     {{#zone "contentTitle"}}