diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index b56d066f1..748d8b9d4 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -138,20 +138,19 @@
         </div>
         <div id="no-device-view" class="ast-container list-view hidden">
             <div class="ctrl-info-panel col-centered text-center wr-login">
-                <h2>You don't have any device registered at the moment.</h2>
-                <br/>
+                <h2>You do not have any device enrolled at the moment.</h2>
                 <p class="text-center">
                     <a href="javascript:toggleEnrollment()" class="wr-btn">
                                     <span class="fw-stack">
                                        <i class="fw fw-ring fw-stack-2x"></i>
                                        <i class="fw fw-mobile fw-stack-1x"></i>
                                        <span class="fw-stack fw-move-right fw-move-bottom">
-                                          <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
-                                           <i class="fw fw-circle fw-stack-2x"></i>
-                                          <i class="fw fw-add fw-stack-1x"></i>
+                                          <i class="fw fw-ring fw-stack-2x"></i>
+                                          <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                                          <i class="fw fw-add fw-stack-1x fw-inverse"></i>
                                        </span>
                                     </span>
-                        Enroll New Device
+                        &nbsp;&nbsp;Enroll New Device
                     </a>
                 </p>
             </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index 03cdd769e..db25e3447 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -228,7 +228,7 @@ function initPage() {
         function (data) {
             if (data) {
                 data = JSON.parse(data);
-                if (data.devices.length > 0) {
+                if (data["count"] > 0) {
                     $(".bulk-action-row").removeClass('hidden');
                     loadDevices();
                 } else {