diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
index bd682f859d2..8d684fd56a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
@@ -69,7 +69,7 @@
                 <th colspan="3"></th>
             </tr>
             </thead>
-            <tbody id="ast-container" data-app-context="{{@app.context}}"></tbody>
+            <tbody id="ast-container" data-app-context="{{@app.context}}/"></tbody>
         </table>
     </div>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
index 6acbcdc68c0..22e8da110ae 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
@@ -44,6 +44,7 @@ function loadNotifications() {
                         if (data["notifications"] && data["notifications"].length > 0) {
                             var viewModel = {};
                             viewModel["notifications"] = data["notifications"];
+                            viewModel["appContext"] = context;
                             var content = template(viewModel);
                             $("#ast-container").html(content);
                             $("#unread-notifications").datatables_extended();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
index 4f98c03e9be..22066898453 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
@@ -57,7 +57,7 @@
                     <tr data-type="selectable" data-id="{{id}}">
                         <td  data-display="{{description}}" data-grid-label="Description">{{description}}</td>
                         <td style="text-align: center;">
-                            <a href="device/{{deviceType}}?id={{deviceIdentifier}}" data-click-event="remove-form">
+                            <a href="{{appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}" data-click-event="remove-form">
                                  <span class="fw-stack">
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                     <i class="fw fw-view fw-stack-1x"></i>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
index f4c6ff77540..1b998267184 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
@@ -90,99 +90,106 @@
     </div>
 
     <div id="apply-changes-modal-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Do you really want to apply changes to all policies?</h3>
-
-                    <div class="buttons">
-                        <a href="javascript:void(0)" id="apply-changes-yes-link" class="btn-operations">
-                            Yes
-                        </a>
-                        <a href="javascript:void(0)" id="apply-changes-cancel-link" class="btn-operations">
-                            No
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>Do you really want to apply changes to all policies?</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="apply-changes-yes-link" class="btn-operations">
+                    Yes
+                </a>
+                <a href="javascript:void(0)" id="apply-changes-cancel-link" class="btn-operations">
+                    No
+                </a>
             </div>
         </div>
     </div>
 
     <div id="apply-changes-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Done. Changes applied successfully.</h3>
-
-                    <div class="buttons">
-                        <a href="javascript:void(0)" id="apply-changes-success-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>Done. Changes applied successfully.</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="apply-changes-success-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
 
     <div id="apply-changes-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="buttons">
-                        <a href="javascript:void(0)" id="apply-changes-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>An unexpected error occurred. Please try again later.</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="apply-changes-error-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
 
     <div id="remove-policy-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="buttons">
-                        <a href="javascript:void(0)" id="remove-policy-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>An unexpected error occurred. Please try again later.</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="remove-policy-error-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
 
     <div id="save-policy-priorities-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Done. New Policy priorities were successfully updated.</h3>
-
-                    <div class="buttons">
-                        <a href="javascript:void(0)" id="save-policy-priorities-success-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>Done. New Policy priorities were successfully updated.</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="save-policy-priorities-success-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
 
     <div id="save-policy-priorities-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="buttons">
-                        <a href="javascript:void(0)" id="save-policy-priorities-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <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">
+            <h3>An unexpected error occurred. Please try again later.</h3>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:void(0)" id="save-policy-priorities-error-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
index 63e9d48646b..44decccefca 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs
@@ -82,16 +82,18 @@
             </div>
         </div>
         <div id="child-deselect-error-content" class="hide">
-            <div class="content">
-                <div class="row">
-                    <div class="col-lg-5 col-md-6 col-centered">
-                        <h3>Can't deselect child permissions when parent permission is selected.</h3>
-                        <div class="buttons">
-                            <a href="#" id="child-deselect-error-link" class="btn-operations">
-                                Ok
-                            </a>
-                        </div>
-                    </div>
+            <div class="modal-header">
+                <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">
+                <h3>Can't deselect child permissions when parent permission is selected.</h3>
+            </div>
+            <div class="modal-footer">
+                <div class="buttons">
+                    <a href="#" id="child-deselect-error-link" class="btn-operations">
+                        Ok
+                    </a>
                 </div>
             </div>
         </div>