diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 402607909..a03b8c004 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -840,6 +840,24 @@ var operationModule = function () {
                     "restrictedApplications": operationPayload["restricted-applications"]
                 };
                 break;
+            case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
+                if (operationPayload["type"] != "window") {
+                    payload = {
+                        "cosuSystemUpdatePolicyType": operationPayload["type"]
+                    };
+                } else {
+                    payload = {
+                        "cosuSystemUpdatePolicyType": operationPayload["type"],
+                        "cosuSystemUpdatePolicyWindowStartTime": operationPayload["startTime"],
+                        "cosuSystemUpdatePolicyWindowEndTime": operationPayload["endTime"]
+                    };
+                }
+                break;
+            case androidOperationConstants["KIOSK_APPS_CODE"]:
+                payload = {
+                    "cosuWhitelistedApplications": operationPayload["whitelistedApplications"]
+                };
+                break;
         }
         return payload;
     };
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
index 5d5c13a91..183d45284 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
@@ -177,7 +177,7 @@
                                             </div>
                                         </div>
                                     {{/if}}
-                                    {{#if isAuthorizedVieUsers}}
+                                    {{#if isAuthorizedViewUsers}}
                                         <div id="users-select-field" class="select-users">
                                             <div class="wr-input-control">
                                                 <div class="cus-col-50">
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
index 8d7c124bd..7fadabcd6 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
@@ -60,8 +60,8 @@ function onRequest() {
         viewModelData["roles"] = result["content"];
     }
     viewModelData.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
-    viewModelData.isAuthorizedViewUsers = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
-    viewModelData.isAuthorizedViewRoles = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    viewModelData.isAuthorizedViewUsers = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    viewModelData.isAuthorizedViewRoles = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
 
     return viewModelData;
 }
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
index e33d995ea..55f8e4859 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
@@ -97,6 +97,24 @@
         <!--</span>-->
         <!--Web clips-->
         <!--</a>-->
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-import fw-stack-2x"></i>
+            </span>
+            &nbsp;&nbsp;System Update Policy (COSU)
+            <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
+            <span class="wr-hidden-operations-icon fw-stack">
+                <i class="fw fw-register fw-stack-2x"></i>
+            </span>
+            Whitelist Apps (COSU)
+            <span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
     </div>
 
     <div class="wr-hidden-operations-content col-lg-8">
@@ -1298,88 +1316,91 @@
             </div>
         </div>
 
-        <!--android-for-work-cosu-->
-        <div class="wr-hidden-operation" data-operation="android-for-work-cosu">
-            <!--system-update-policy-->
-            <div class="panel panel-default operation-data" data-operation="android-for-work-cosu"
+        <!-- cosu-system-update-policy -->
+        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
+            <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
                  data-operation-code="SYSTEM_UPDATE_POLICY">
-                <div id="system-update-policy-heading" class="panel-heading" role="tab">
+                <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
-                        System Update Policy
-                        <label id="system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
-                               data-target="#system-update-policy-body">
+                        System Update Policy (COSU)
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#cosu-system-update-policy-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
+                        <hr>
+                        <div class="panel-title-description">
+                            This configuration can be used to set a passcode policy to an Android Device.
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
+                            to modify these settings on their devices.
+                        </div>
                     </h2>
                 </div>
-                <div id="system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="android-for-work-cosu-policy-body">
 
-                    <div id="system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="cosu-system-update-policy-body">
+
+                    <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
 
                     <div class="wr-input-control">
-                        <label class="wr-input-label" for="android-for-work-cosu-policy-system-update">
+                        <label class="wr-input-label">
                             System Update
                             <span class="helper" title="Type of the System Update to be set by the Device Owner">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                            <br>
                         </label>
-                        <br>
-                        <div class="wr-input-control">
-                            <label class="wr-input-control radio light">
-                                <input id="automatic-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])" checked/>
-                                <span class="helper" title="Installs system update automatically as soon as one is available">
-                                    &nbsp;Automatic
-                                </span>
-                                </span>
-                            </label>
-                            <label class="wr-input-control radio light">
-                                <input id="postpone-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
-                                <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
-                                    &nbsp;Postpone
-                                </span>
-                            </label>
-                            <label class="wr-input-control radio light">
-                                <input id="window-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
-                                <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
-                                    &nbsp;Window
-                                </span>
-                            </label>
-                        </div>
+                        <br><br>
+                        <label class="wr-input-control radio light">
+                            <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" checked/>
+                            <span class="helper" title="Installs system update automatically as soon as one is available">
+                                &nbsp;Automatic
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                                &nbsp;Postpone
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                                &nbsp;Window
+                            </span>
+                        </label>
                     </div>
 
-
-                    <div id="android-for-work-cosu-window-select" class="hidden">
+                    <div id="cosu-system-update-policy-window-select" class="hidden">
                         <div>
                             <ul class="message message-info">
                                 <i class="icon fw fw-info"></i>
-                                <a id="android-for-work-cosu-window-select-msg"> Below configuration of start time and end time are valid only when
-                                    <b>window</b> option is selected.</a>
+                                <a id="cosu-system-update-policy-window-select-msg">
+                                    Below configuration of start time and end time are valid only when
+                                    <b>window</b> option is selected.
+                                </a>
                             </ul>
                         </div>
                         <div class="wr-input-control">
-                            <label class="wr-input-label" for="android-for-work-cosu-window-start-time">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
                                 Start Time
                                 <span class="helper" title="Window start time for system update">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
-                            <select id="android-for-work-cosu-start-time" class="form-control operationDataKeys"
-                                    data-key="cosuWindowStartTime" data-default="0">
-                                <option value="1440" selected="selected">
-                                    12 AM
-                                </option>
+                            <select id="cosu-system-update-policy-window-start-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
                                 <option value="60">1 AM</option>
                                 <option value="120">2 AM</option>
                                 <option value="180">3 AM</option>
@@ -1406,17 +1427,16 @@
                             </select>
                         </div>
                         <div class="wr-input-control">
-                            <label class="wr-input-label" for="android-for-work-cosu-window-end-time">
-                                Start Time
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
+                                End Time
                                 <span class="helper" title="Window end time for system update">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
-                            <select id="android-for-work-cosu-end-time" class="form-control operationDataKeys"
-                                    data-key="cosuWindowEndTime" data-default="0">
-                                <option value="1440" selected="selected">
-                                    12 AM
-                                </option>
+                            <select id="cosu-system-update-policy-window-end-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
                                 <option value="60">1 AM</option>
                                 <option value="120">2 AM</option>
                                 <option value="180">3 AM</option>
@@ -1428,7 +1448,7 @@
                                 <option value="540">9 AM</option>
                                 <option value="600">10 AM</option>
                                 <option value="660">11 AM</option>
-                                <option value="720">12 noon</option>
+                                <option value="720">12 Noon</option>
                                 <option value="780">1 PM</option>
                                 <option value="840">2 PM</option>
                                 <option value="900">3 PM</option>
@@ -1443,39 +1463,49 @@
                             </select>
                         </div>
                     </div>
+
                 </div>
             </div>
-            <!--system-update-policy-->
+        </div>
 
-            <!--whitelisted-applications-->
-            <div class="panel panel-default operation-data" data-operation="whitelisted-applications"
+        <!-- cosu-whitelist-applications -->
+        <div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
+            <div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
                  data-operation-code="KIOSK_APPS">
-                <div id="whitelisted-applications-heading" class="panel-heading" role="tab">
+                <div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
-                        Whitelisted Applications
-                        <label id="whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
-                               data-target="#whitelisted-applications-body">
+                        Whitelist Applications (COSU)
+                        <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#cosu-whitelist-applications-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
+                        <hr>
+                        <div class="panel-title-description">
+                            This configuration can be used to set a passcode policy to an Android Device.
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
+                            to modify these settings on their devices.
+                        </div>
                     </h2>
                 </div>
-                <div id="whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="whitelisted-applications-body">
 
-                    <div id="whitelisted-applications-error-msg" class="alert alert-danger hidden" role="alert">
+                <div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="cosu-whitelist-applications-body">
+
+                    <div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
 
                     <div class="wr-input-control">
-                        <label class="wr-input-label" for="whitelisted-applications">
-                            <br><br>Whitelisted Applications List to enter Lock Task Mode
-                            <span class="helper" title="Add an application to whitelist.">
+                        <label class="wr-input-label" for="cosu-whitelisted-applications">
+                            Whitelisted Applications to enter Lock Task Mode
+                            <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1484,62 +1514,58 @@
                                 Add Application
                             </a>
                         </label>
-                        <div id="whitelisted-applications"
+                        <div id="cosu-whitelisted-applications"
                              class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
                              data-key="cosuWhitelistedApplications" data-column-count="2">
                             <table class="table table-responsive table-striped">
                                 <thead>
                                 <tr>
                                     <th>No:</th>
-                                    <th>Application Name/Description</th>
+                                    <th>Application Name / Description</th>
                                     <th>Package Name</th>
                                     <th></th>
                                 </tr>
                                 </thead>
-                                <tbody data-add-form-container="#whitelisted-applications-grid">
+                                <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
                                 <tr data-help-text="add-form">
                                     <td colspan="4">
-                                        No entries added yet.
+                                        No entries added yet .
                                     </td>
                                 </tr>
                                 </tbody>
                             </table>
                             <table class="template hidden">
-                                <tbody data-add-form="#whitelisted-applications-grid">
+                                <tbody data-add-form="#cosu-whitelisted-applications-grid">
                                 <tr data-add-form-element="clone">
                                     <td data-title="No:">
                                         <span class="index"></span>
                                     </td>
-                                    <td data-title="App Name">
+                                    <td data-title="Application Name / Description">
                                         <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                               maxlength="100" data-default="" placeholder="[ Gmail ]"/>
+                                               maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
                                     </td>
                                     <td data-title="Package Name">
-                                        <input type="text" class="form-control grid-input-text"
-                                               data-child-key="packageName" maxlength="100" data-default=""
-                                               placeholder="[ com.google.android.gm ]"/>
+                                        <input type="text" class="form-control grid-input-text" data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]"/>
                                     </td>
                                     <td>
-                                    <span class="list-group-item-actions">
-                                        <a href="#whitelisted-applications-grid" class="grid-input-remove"
-                                           data-click-event="remove-form">
-                                            <span class="fw-stack helper" title="Remove Entry">
-                                                <i class="fw fw-ring fw-stack-2x"></i>
-                                                <i class="fw fw-delete fw-stack-1x"></i>
-                                            </span>
-                                        </a>
-                                    </span>
+                                        <span class="list-group-item-actions">
+                                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                               data-click-event="remove-form">
+                                                <span class="fw-stack helper" title="Remove Entry">
+                                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                                    <i class="fw fw-delete fw-stack-1x"></i>
+                                                </span>
+                                            </a>
+                                        </span>
                                     </td>
                                 </tr>
                                 </tbody>
                             </table>
                         </div>
                     </div>
-
                 </div>
             </div>
-            <!--/whitelisted-applications-->
         </div>
-        <!--/android-for-work-cosu-->
     </div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
index f6c51ffe9..bb5f8b3cb 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
@@ -64,6 +64,24 @@
         <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
     </a>
+    <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-import fw-stack-2x"></i>
+            </span>
+        &nbsp;&nbsp;System Update Policy (COSU)
+        <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+        <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+        <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+    </a>
+    <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
+            <span class="wr-hidden-operations-icon fw-stack">
+                <i class="fw fw-register fw-stack-2x"></i>
+            </span>
+        Whitelist Apps (COSU)
+        <span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+        <span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+        <span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+    </a>
 </div>
 
 <div class="wr-hidden-operations-content col-lg-8">
@@ -1223,5 +1241,257 @@
         </div>
     </div>
 </div>
+
+<!-- cosu-system-update-policy -->
+    <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
+        <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
+             data-operation-code="SYSTEM_UPDATE_POLICY">
+            <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
+                <h2 class="sub-title panel-title">
+                    System Update Policy (COSU)
+                    <label id="cosu-system-update-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                           data-target="#cosu-system-update-policy-body">
+                        <input type="checkbox"/>
+                        <span class="helper"></span>
+                        <span class="text"></span>
+                    </label>
+                    <hr>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be
+                        able
+                        to modify these settings on their devices.
+                    </div>
+                </h2>
+            </div>
+
+            <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                 aria-labelledby="cosu-system-update-policy-body">
+
+                <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                    <i class="icon fw fw-error"></i><span></span>
+                </div>
+
+                <div class="wr-input-control">
+                    <label class="wr-input-label">
+                        System Update
+                            <span class="helper" title="Type of the System Update to be set by the Device Owner">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                    </label>
+                    <br><br>
+                    <label class="wr-input-control radio light">
+                        <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                               class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                               value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" checked disabled/>
+                            <span class="helper" title="Installs system update automatically as soon as one is available">
+                                &nbsp;Automatic
+                            </span>
+                    </label>
+                    <label class="wr-input-control radio light">
+                        <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                               class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                               value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" disabled/>
+                            <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                                &nbsp;Postpone
+                            </span>
+                    </label>
+                    <label class="wr-input-control radio light">
+                        <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                               class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                               value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" disabled/>
+                            <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                                &nbsp;Window
+                            </span>
+                    </label>
+                </div>
+
+                <div id="cosu-system-update-policy-window-select" class="hidden">
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="cosu-system-update-policy-window-select-msg">
+                                Below configuration of start time and end time are valid only when
+                                <b>window</b> option is selected.
+                            </a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
+                            Start Time
+                                <span class="helper" title="Window start time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <select id="cosu-system-update-policy-window-start-time"
+                                class="form-control operationDataKeys"
+                                data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                            <option value="1440" selected="selected">12 AM</option>
+                            <option value="60">1 AM</option>
+                            <option value="120">2 AM</option>
+                            <option value="180">3 AM</option>
+                            <option value="240">4 AM</option>
+                            <option value="300">5 AM</option>
+                            <option value="360">6 AM</option>
+                            <option value="420">7 AM</option>
+                            <option value="480">8 AM</option>
+                            <option value="540">9 AM</option>
+                            <option value="600">10 AM</option>
+                            <option value="660">11 AM</option>
+                            <option value="720">12 noon</option>
+                            <option value="780">1 PM</option>
+                            <option value="840">2 PM</option>
+                            <option value="900">3 PM</option>
+                            <option value="960">4 PM</option>
+                            <option value="1020">5 PM</option>
+                            <option value="1080">6 PM</option>
+                            <option value="1140">7 PM</option>
+                            <option value="1200">8 PM</option>
+                            <option value="1260">9 PM</option>
+                            <option value="1320">10 PM</option>
+                            <option value="1380">11 PM</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
+                            End Time
+                                <span class="helper" title="Window end time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <select id="cosu-system-update-policy-window-end-time"
+                                class="form-control operationDataKeys"
+                                data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                            <option value="1440" selected="selected">12 AM</option>
+                            <option value="60">1 AM</option>
+                            <option value="120">2 AM</option>
+                            <option value="180">3 AM</option>
+                            <option value="240">4 AM</option>
+                            <option value="300">5 AM</option>
+                            <option value="360">6 AM</option>
+                            <option value="420">7 AM</option>
+                            <option value="480">8 AM</option>
+                            <option value="540">9 AM</option>
+                            <option value="600">10 AM</option>
+                            <option value="660">11 AM</option>
+                            <option value="720">12 Noon</option>
+                            <option value="780">1 PM</option>
+                            <option value="840">2 PM</option>
+                            <option value="900">3 PM</option>
+                            <option value="960">4 PM</option>
+                            <option value="1020">5 PM</option>
+                            <option value="1080">6 PM</option>
+                            <option value="1140">7 PM</option>
+                            <option value="1200">8 PM</option>
+                            <option value="1260">9 PM</option>
+                            <option value="1320">10 PM</option>
+                            <option value="1380">11 PM</option>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+<!-- cosu-whitelist-applications -->
+    <div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
+        <div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
+             data-operation-code="KIOSK_APPS">
+            <div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
+                <h2 class="sub-title panel-title">
+                    Whitelist Applications (COSU)
+                    <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                           data-target="#cosu-whitelist-applications-body">
+                        <input type="checkbox"/>
+                        <span class="helper"></span>
+                        <span class="text"></span>
+                    </label>
+                    <hr>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be
+                        able
+                        to modify these settings on their devices.
+                    </div>
+                </h2>
+            </div>
+
+            <div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                 aria-labelledby="cosu-whitelist-applications-body">
+
+                <div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                    <i class="icon fw fw-error"></i><span></span>
+                </div>
+
+                <div class="wr-input-control">
+                    <label class="wr-input-label" for="cosu-whitelisted-applications">
+                        Whitelisted Applications to enter Lock Task Mode
+                            <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        <br>
+                        <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+                            &nbsp;
+                            Add Application
+                        </a>
+                    </label>
+                    <div id="cosu-whitelisted-applications"
+                         class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                         data-key="cosuWhitelistedApplications" data-column-count="2">
+                        <table class="table table-responsive table-striped">
+                            <thead>
+                            <tr>
+                                <th>No:</th>
+                                <th>Application Name / Description</th>
+                                <th>Package Name</th>
+                                <th></th>
+                            </tr>
+                            </thead>
+                            <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
+                            <tr data-help-text="add-form">
+                                <td colspan="4">
+                                    No entries added yet .
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <table class="template hidden">
+                            <tbody data-add-form="#cosu-whitelisted-applications-grid">
+                            <tr data-add-form-element="clone">
+                                <td data-title="No:">
+                                    <span class="index"></span>
+                                </td>
+                                <td data-title="Application Name / Description">
+                                    <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                           maxlength="100" data-default="" placeholder="[ Application Name / Description ]" disabled/>
+                                </td>
+                                <td data-title="Package Name">
+                                    <input type="text" class="form-control grid-input-text" data-child-key="packageName"
+                                           maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
+                                </td>
+                                <td>
+                                    <span class="list-group-item-actions">
+                                        <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                           data-click-event="remove-form">
+                                            <span class="fw-stack helper" title="Remove Entry">
+                                                <i class="fw fw-ring fw-stack-2x"></i>
+                                                <i class="fw fw-delete fw-stack-1x"></i>
+                                            </span>
+                                        </a>
+                                    </span>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
index 1e9135d6b..db1507922 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -94,11 +94,12 @@
 {{#zone "sidePanes"}}
     <!--suppress HtmlUnknownAttribute -->
     <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{permissions.LIST_NOTIFICATIONS}}"
-         data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="50" data-spy="affix"
-         data-offset-top="80">
-        <ul class="sidebar-messages">
-        </ul>
-        <div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show all notifications</a></div>
+        data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="60" data-spy="affix"
+        data-offset-top="80">
+        <br>
+        <ul class="sidebar-messages"></ul>
+        <br>
+        <div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show All Notifications</a></div>
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index 13c43e5da..6184a2430 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -128,22 +128,27 @@ function loadNewNotifications() {
                         if (responsePayload["notifications"]) {
                             if (responsePayload.count > 0) {
                                 viewModel["notifications"] = responsePayload["notifications"];
-                                viewModel["appContext"] = context;
+                                // viewModel["appContext"] = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
+                                $(messageSideBar).html(
+                                    "<h4 class='text-center'>No New Notifications</h4>" +
+                                    "<h5 class='text-center text-muted'>" +
+                                        "Check this section for error notifications<br>related to device operations" +
+                                    "</h5>"
+                                );
                             }
                         } else {
-                            $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +
-                                "occurred while loading new notifications.</h4>");
+                            $(messageSideBar).html("<h4 class ='message-danger text-center'>Unexpected error " +
+                                "occurred while loading new notifications</h4>");
                         }
                     }
                 },
                 // on error
                 function (jqXHR) {
                     if (jqXHR.status = 500) {
-                        $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error occurred while trying " +
-                            "to retrieve any new notifications.</h4>");
+                        $(messageSideBar).html("<h4 class ='message-danger text-center'>Unexpected error occurred while trying " +
+                            "to retrieve any new notifications</h4>");
                     }
                 }
             );