diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
index 4b205346d9..b970b04cf9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@@ -40,7 +40,7 @@ deviceModule = function () {
 
 //    var deviceCloudService = devicemgtProps["httpsURL"] + "/common/device_manager";
 
-/**
+    /**
      * Only GET method is implemented for now since there are no other type of methods used this method.
      * @param url - URL to call the backend without the host
      * @param method - HTTP Method (GET, POST)
@@ -273,6 +273,9 @@ deviceModule = function () {
                         deviceObject[constants["DEVICE_PROPERTIES"]] = properties;
                         response["content"] = deviceObject;
                         return response;
+                    } else if (backendResponse.status == 401) {
+                        response["status"] = "unauthorized";
+                        return response;
                     } else {
                         response["status"] = "error";
                         return response;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
index 86f161ae35..6bb4257acc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
@@ -121,48 +121,49 @@
     </div>
 
     <div id="remove-certificate-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Done. Certificate was successfully removed.</h3>
-                    <div class="buttons">
-                        <a href="#" id="remove-certificate-success-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">Done. Certificate was successfully removed.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>
 
     <div id="remove-certificate-error-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>An unexpected error occurred. Please try again later.</h3>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
 
-                    <div class="buttons">
-                        <a href="#" id="remove-certificate-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>
 
     <div id="errorCertificateView" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stack-2x"></i>
                     <i class="fw fw-error fw-stack-1x"></i>
                 </span>
-                        Unauthorized action!
-                    </h3>
-                </div>
+                Unauthorized action!
+            </h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>