diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
index 02be4f0a7e..199e362a46 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
@@ -26,25 +26,26 @@
 {{/zone}}
 
 {{#zone "content"}}
-    <div class="wr-content">
+    <div class="row">
         {{#if permissions.VIEW_DASHBOARD}}
-            <div class="row wr-stats-board">
-                <div class="col-md-4">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Devices</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-mobile"></i></div>
-                            <div class="tile-stats">
-                                <span id="device-count">{{device_count}}</span>
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Devices</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-mobile"></i></div>
+                        <div class="tile-stats">
+                            <span id="device-count">{{deviceCount}}</span>
                         <span class="tile-stats-free">
                             <!--suppress HtmlUnknownTarget -->
-                            <a href="{{@app.context}}/devices">
-                                <span class="fw-stack">
-                                    <i class="fw fw-ring fw-stack-2x"></i>
-                                    <i class="fw fw-view fw-stack-1x"></i>
-                                </span>
-                                View
-                            </a>
+                            {{#if deviceCount}}
+                                <a href="{{@app.context}}/devices">
+                                    <span class="fw-stack">
+                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                        <i class="fw fw-view fw-stack-1x"></i>
+                                    </span>
+                                    View
+                                </a>
+                            {{/if}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/device/enroll">
                                 <span class="fw-stack">
@@ -54,20 +55,19 @@
                                 Add
                             </a>
                         </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row wr-stats-board">
-                <div class="col-md-4">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Groups</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-grouping"></i></div>
-                            <div class="tile-stats">
-                                <span id="group-count">{{group_count}}</span>
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Groups</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-grouping"></i></div>
+                        <div class="tile-stats">
+                            <span id="group-count">{{groupCount}}</span>
                         <span class="tile-stats-free">
+                        {{#if groupCount}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/groups">
                                 <span class="fw-stack">
@@ -76,6 +76,7 @@
                                 </span>
                                 View
                             </a>
+                        {{/if}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/group/add">
                                 <span class="fw-stack">
@@ -85,20 +86,19 @@
                                 Add
                             </a>
                         </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row wr-stats-board">
-                <div class="col-md-4">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Users</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-user"></i></div>
-                            <div class="tile-stats">
-                                <span id="user-count">{{user_count}}</span>
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Users</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-user"></i></div>
+                        <div class="tile-stats">
+                            <span id="user-count">{{userCount}}</span>
                         <span class="tile-stats-free">
+                        {{#if userCount}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/users">
                                 <span class="fw-stack">
@@ -107,6 +107,7 @@
                                 </span>
                                 View
                             </a>
+                        {{/if}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/user/add">
                                 <span class="fw-stack">
@@ -116,20 +117,19 @@
                                 Add
                             </a>
                         </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row wr-stats-board">
-                <div class="col-md-4">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Policies</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-policy"></i></div>
-                            <div class="tile-stats">
-                                <span id="policy-count">{{policy_count}}</span>
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Policies</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-policy"></i></div>
+                        <div class="tile-stats">
+                            <span id="policy-count">{{policyCount}}</span>
                         <span class="tile-stats-free">
+                        {{#if policyCount}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/policies">
                                 <span class="fw-stack">
@@ -138,6 +138,7 @@
                                 </span>
                                 View
                             </a>
+                        {{/if}}
                             <!--suppress HtmlUnknownTarget -->
                             <a href="{{@app.context}}/policy/add">
                                 <span class="fw-stack">
@@ -147,20 +148,19 @@
                                 Add
                             </a>
                         </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row wr-stats-board">
-                <div class="col-md-4">
-                    <div class="wr-stats-board-tile">
-                        <div class="tile-name">Roles</div>
-                        <div>
-                            <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
-                            <div class="tile-stats">
-                                <span id="role-count">{{role_count}}</span>
+            <div class="col-md-3 wr-stats-board">
+                <div class="wr-stats-board-tile">
+                    <div class="tile-name">Roles</div>
+                    <div>
+                        <div class="tile-icon"><i class="fw fw-bookmark"></i></div>
+                        <div class="tile-stats">
+                            <span id="role-count">{{roleCount}}</span>
                             <span class="tile-stats-free">
+                            {{#if roleCount}}
                                 <!--suppress HtmlUnknownTarget -->
                                 <a id="device-count-view-btn" href="{{@app.context}}/roles">
                                     <span class="fw-stack">
@@ -169,6 +169,7 @@
                                     </span>
                                     View
                                 </a>
+                            {{/if}}
                                 <!--suppress HtmlUnknownTarget -->
                                 <a href="{{@app.context}}/roles/add-role">
                                     <span class="fw-stack">
@@ -178,32 +179,14 @@
                                     Add
                                 </a>
                             </span>
-                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         {{else}}
-            Permission denied
+            <h1 class="page-sub-title">
+                Permitted None
+            </h1>
         {{/if}}
     </div>
-    <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>
-                        Scan QR code to start enrollment
-                    </h3>
-                    <h4>
-                        Please scan the QR code using your mobile device to retrieve enrollment URL.
-                    </h4>
-                    <div class="panel panel-default">
-                        <div class="panel-body col-centered ">
-                            <div class="qr-code"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.js
index c5682c0c5b..c848b86f6e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.js
@@ -32,16 +32,16 @@ function onRequest() {
         return;
     }
 
-    var page = {};
-    page.permissions = permissions;
-    page.enrollmentURL = devicemgtProps.enrollmentURL;
-    page.device_count = deviceModule.getDevicesCount();
+    var viewModel = {};
+    viewModel.permissions = permissions;
+    viewModel.enrollmentURL = devicemgtProps.enrollmentURL;
+    viewModel.deviceCount = deviceModule.getDevicesCount();
     //TODO: Enable Group Management Service API on CDMF
     //page.group_count = groupModule.getGroupCount();
-    page.group_count = -1;
-    page.user_count = userModule.getUsersCount();
-    page.policy_count = policyModule.getPoliciesCount();
-    page.role_count = userModule.getRolesCount();
+    viewModel.groupCount = -1;
+    viewModel.userCount = userModule.getUsersCount();
+    viewModel.policyCount = policyModule.getPoliciesCount();
+    viewModel.roleCount = userModule.getRolesCount();
 
-    return page;
+    return viewModel;
 }
\ No newline at end of file