diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/asset/android-agent.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/asset/android-agent.apk
index a1d4ebfdb7..71b0f1337e 100644
Binary files a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/asset/android-agent.apk and b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/asset/android-agent.apk differ
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.dashboard/dashboard.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
index fbc3f27531..2026ed97ad 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
@@ -37,7 +37,7 @@
                                     </span>
                                     View
                                 </a>
-                                {{#if permissions.ENROLL_DEVICE)}}
+                                {{#if permissions.ENROLL_DEVICE}}
                                     <a href="javascript:toggleEnrollment()">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
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.dashboard/public/js/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js
index 740ec8f200..66f554c219 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js
@@ -53,7 +53,7 @@ $(document).ready(function () {
         updateStats("/api/device-mgt/v1.0/policies?offset=0&limit=1", "#policy-count");
     }
     if ($("#user-count").data("user-count")) {
-        updateStats("/api/device-mgt/v1.0/users?offset=0&limit=1", "#user-count");
+        updateStats("/api/device-mgt/v1.0/users/count", "#user-count");
     }
     if ($("#role-count").data("role-count")) {
         updateStats("/api/device-mgt/v1.0/roles?offset=0&limit=1", "#role-count");
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 f47bbd9976..a7002bb7f7 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
@@ -80,7 +80,9 @@ var operationModule = function () {
         "AUTO_TIME" : "AUTO_TIME",
         "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
         "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
-        "APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
+        "APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
+        "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
+        "KIOSK_APPS_CODE": "KIOSK_APPS"
     };
 
     // Constants to define Windows Operation Constants
@@ -1012,6 +1014,24 @@ var operationModule = function () {
                     }
                 };
                 break;
+            case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
+                operationType = operationTypeConstants["PROFILE"];
+                payload = {
+                    "operation": {
+                        "type": operationData["cosuSystemUpdateType"],
+                        "startTime": operationData["cosuWindowStartTime"],
+                        "endTime": operationData["cosuWindowEndTime"]
+                    }
+                };
+                break;
+            case androidOperationConstants["KIOSK_APPS_CODE"]:
+                operationType = operationTypeConstants["PROFILE"];
+                payload = {
+                    "operation": {
+                        "whitelistedApplications": operationData["cosuWhitelistedApplications"]
+                    }
+                };
+                break;
             default:
                 // If the operation is neither of above, it is a command operation
                 operationType = operationTypeConstants["COMMAND"];
@@ -1276,6 +1296,8 @@ var operationModule = function () {
                     value = operationDataObj.val();
                 } else if (operationDataObj.is(":checkbox")) {
                     value = operationDataObj.is(":checked");
+                } else if (operationDataObj.is(":radio") && operationDataObj.is(":checked")) {
+                        value = operationDataObj.val();
                 } else if (operationDataObj.is("select")) {
                     value = operationDataObj.find("option:selected").attr("value");
                 } else if (operationDataObj.hasClass("grouped-array-input")) {
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.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index 8345741ac9..862ef44fd8 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.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -219,7 +219,7 @@
                                     <div class="panel-heading display-none-xs">
                                         Policy Compliance
                                         <span>
-                                            <a href="#" id="refresh-policy">
+                                            <a href="javascript:void(0);" id="refresh-policy">
                                                 <i class="fw fw-refresh"></i>
                                             </a>
                                         </span>
@@ -227,7 +227,7 @@
                                     <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="policy_compliance">
                                         <div class="panel-body ">
                                             <span class="visible-xs add-padding-2x text-right">
-                                                <a href="#" id="refresh-policy">
+                                                <a href="javascript:void(0);" id="refresh-policy">
                                                     <i class="fw fw-refresh"></i>
                                                 </a>
                                             </span>
@@ -278,7 +278,7 @@
                                     <div class="panel-heading display-none-xs">
                                         Installed Applications
                                         <span>
-                                            <a href="#" id="refresh-apps">
+                                            <a href="javascript:void(0);" id="refresh-apps">
                                                 <i class="fw fw-refresh"></i>
                                             </a>
                                         </span>
@@ -286,7 +286,7 @@
                                     <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="installed_applications">
                                         <div class="panel-body ">
                                             <span class="visible-xs add-padding-2x text-right">
-                                                <a href="#" id="refresh-apps">
+                                                <a href="javascript:void(0);" id="refresh-apps">
                                                     <i class="fw fw-refresh"></i>
                                                 </a>
                                             </span>
@@ -315,7 +315,7 @@
                                     <div class="panel-heading display-none-xs">
                                         Operations Logs
                                         <span>
-                                            <a href="#" id="refresh-operations">
+                                            <a href="javascript:void(0);" id="refresh-operations">
                                                 <i class="fw fw-refresh"></i>
                                             </a>
                                         </span>
@@ -323,7 +323,7 @@
                                     <div id="collapseFive" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="event_log">
                                         <div class="panel-body">
                                             <span class="visible-xs add-padding-2x text-right">
-                                                <a href="#" id="refresh-operations">
+                                                <a href="javascript:void(0);" id="refresh-operations">
                                                     <i class="fw fw-refresh"></i>
                                                 </a>
                                             </span>
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 a3ba6759bd..5d5c13a911 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
@@ -86,6 +86,7 @@
                                         </div>
                                         <br class="c-both"/>
                                     </div>
+                                    <br class="c-both"/>
                                     <label class="wr-input-label">
                                         Add a description
                                     </label>
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/public/js/policy-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/public/js/policy-create.js
index be9a56826d..655acfc1d7 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/public/js/policy-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/public/js/policy-create.js
@@ -2441,6 +2441,24 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
         );
     }
 };
+
+var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
+    var selectedValueOnChange = selectElement.value;
+
+    var i, slideDownVotes = 0;
+    for (i = 0; i < valueSet.length; i++) {
+        if (selectedValueOnChange == valueSet[i]) {
+            slideDownVotes++;
+        }
+    }
+
+    var paneSelector = "#" + paneID;
+    if(slideDownVotes > 0) {
+        $(paneSelector).removeClass("hidden");
+    } else {
+        $(paneSelector).addClass("hidden");
+    }
+};
 // End of HTML embedded invoke methods
 
 
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/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.create/public/templates/hidden-operations-android.hbs
index 9eb9fac829..bc5c26c46e 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/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.create/public/templates/hidden-operations-android.hbs
@@ -57,6 +57,17 @@
             <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
+        <!--COSU-->
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('android-for-work-cosu', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-service fw-stack-2x"></i>
+            </span>
+            &nbsp;&nbsp;COSU Configuration
+            <span id="android-for-work-cosu-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="android-for-work-cosu-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="android-for-work-cosu-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <!--/COSU-->
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
                 <span class="fw-stack fw-lg">
                     <i class="fw fw-application fw-stack-1x"></i>
@@ -1268,6 +1279,249 @@
             </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="system-update-policy"
+                 data-operation-code="SYSTEM_UPDATE_POLICY">
+                <div id="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">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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">
+                        <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">
+                            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>
+                    </div>
+
+
+                    <div id="android-for-work-cosu-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>
+                            </ul>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="android-for-work-cosu-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>
+                                <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="android-for-work-cosu-window-end-time">
+                                Start 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>
+                                <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>
+            <!--system-update-policy-->
+
+            <!--whitelisted-applications-->
+            <div class="panel panel-default operation-data" data-operation="whitelisted-applications"
+                 data-operation-code="KIOSK_APPS">
+                <div id="whitelisted-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">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="whitelisted-application">
+                            <br><br>Whitelisted Application List to enter Lock Task Mode
+                            <span class="helper" title="Add an application to whitelist.">
+                                <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">
+                                <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="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="#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="#whitelisted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="App Name">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Gmail ]"/>
+                                    </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 ]"/>
+                                    </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>
+                                    </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.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 d80f6c6d51..13c43e5dac 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
@@ -117,7 +117,7 @@ function loadNewNotifications() {
         var currentUser = notifications.data("currentUser");
 
         $.template("notification-listing", notifications.attr("src"), function (template) {
-            var serviceURL = emmAdminBasePath + "/notifications?status=NEW";
+            var serviceURL = emmAdminBasePath + "/notifications?offset=0&limit=5&status=NEW";
             invokerUtil.get(
                 serviceURL,
                 // on success
@@ -128,6 +128,7 @@ function loadNewNotifications() {
                         if (responsePayload["notifications"]) {
                             if (responsePayload.count > 0) {
                                 viewModel["notifications"] = responsePayload["notifications"];
+                                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>');
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/templates/notifications.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/public/templates/notifications.hbs
index 82edfc498f..91205c3765 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/templates/notifications.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/public/templates/notifications.hbs
@@ -2,11 +2,11 @@
     <li class="message message-info" data-type="selectable" >
         <h4>
             <i class="icon fw fw-info"></i>
-            <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
-               data-id="{{notificationId}}"
-               data-url="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}"
+            <a href="{{../appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
+               data-id="{{operationId}}"
+               data-url="device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
                class="new-notification" data-click-event="remove-form">
-                Device Type : {{deviceIdentifier.type}}
+               {{deviceType}}
             </a>
         </h4>
         <p>{{description}}</p>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
index aa84ad75b1..b5428ba074 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 
+import io.swagger.annotations.Api;
 import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
@@ -35,11 +36,12 @@ import javax.ws.rs.*;
 @API(name = "Windows Configuration Management", version = "1.0.0",
      context = "api/device-mgt/windows/v1.0/services/configuration",
      tags = {"windows"})
-
+@Api(value = "Windows Configuration Management",
+     description = "This carries all the resources related to Windows configurations management functionalities")
 @WebService
+@Path("services/configuration")
 @Produces({"application/json", "application/xml"})
 @Consumes({"application/json", "application/xml"})
-@Path("services/configuration")
 public interface ConfigurationMgtService {
 
     /**
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index 4d96f8acd3..c53d914179 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -18,10 +18,17 @@
 
 package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 
+import io.swagger.annotations.Api;
+import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsDeviceEnrolmentException;
 
-import javax.ws.rs.*;
+import javax.jws.WebService;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -29,6 +36,12 @@ import java.util.List;
 /**
  * Interface for Admin operations persisting. This interface accepts operations added via UI.
  */
+@Api(value = "Windows Device Management Administrative Service",
+     description = "Device management related admin APIs.")
+@API(name = "Windows Device Management Administrative Service", version = "1.0.0",
+     context = "api/device-mgt/windows/v1.0/admin/devices",
+     tags = {"devicemgt_windows"})
+@WebService
 @Path("/admin/devices")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
index 2559fc25d6..5f0f844213 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
@@ -18,20 +18,31 @@
 
 package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 
+import io.swagger.annotations.Api;
+import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsConfigurationException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.Message;
 
 import javax.jws.WebService;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 
 /**
- * Windows Device Management REST-API implementation.
- * All end points supports JSON, XMl with content negotiation.
+ * Windows Device Management REST-API implementation. All end points supports JSON, XMl with content negotiation.
  */
+@Api(value = "Windows Device Management",
+     description = "This carries all the resources related to Windows device management functionalities")
+@API(name = "Windows Device Management", version = "1.0.0",
+     context = "api/device-mgt/windows/v1.0/devices",
+     tags = {"devicemgt_windows"})
 @WebService
 @Path("/devices")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@@ -61,14 +72,15 @@ public interface DeviceManagementService {
     /**
      * Update Windows device details of given device id.
      *
-     * @param deviceId     Device Id.
-     * @param device Device details to be updated.
+     * @param deviceId Device Id.
+     * @param device   Device details to be updated.
      * @return Returns the message whether device update or not.
      * @throws WindowsConfigurationException occurred while updating the Device Info.
      */
     @PUT
     @Path("{id}")
     Message updateDevice(@PathParam("id") String deviceId, Device device) throws WindowsConfigurationException;
+
     /**
      * Fetch the Licence agreement for specific windows platform.
      *