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 a032462b97..be99f83a94 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
@@ -68,16 +68,16 @@
             <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)">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hidden">
             <span class="wr-hidden-operation-icon fw-stack">
                 <i class="fw fw-import fw-stack-2x"></i>
             </span>
-            &nbsp;&nbsp;System Update Policy (COSU)
+            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-whitelisted-applications', this)">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hidden">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
@@ -124,7 +124,7 @@
                                    checked="checked"/>
                             <span class="helper"
                                   title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
+                                Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -136,7 +136,7 @@
                                    class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
                                    checked="checked"/>
                             <span class="helper" title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
+                                Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -278,7 +278,7 @@
                                    data-key="cameraEnabled" checked="checked"/>
                             <span class="helper"
                                   title="Having this checked would enable Usage of phone camera in the device.">
-                                &nbsp;&nbsp;&nbsp;Allow use of camera
+                                Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -296,7 +296,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowConfigCredentials"/>
                             <span class="helper" title="Having this checked would disallow configuring credentials.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring credentials
+                                Disallow configuring credentials
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -307,7 +307,7 @@
                             <input id="disallow-configuring-VPN-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowConfigVpn"/>
                             <span class="helper" title="Having this checked would disallow configuring VPN.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring VPN
+                                Disallow configuring VPN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -320,7 +320,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowAppControl"/>
                             <span class="helper" title="Having this checked would disallow configuring app control.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring app control
+                                Disallow configuring app control
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -332,7 +332,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowCrossProfileCopyPaste"/>
                             <span class="helper" title="Having this checked would disallow cross profile copy paste.">
-                                &nbsp;&nbsp;&nbsp;Disallow cross profile copy paste
+                                Disallow cross profile copy paste
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -343,7 +343,7 @@
                             <input id="disallow-debugging-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowDebugging"/>
                             <span class="helper" title="Having this checked would disallow debugging.">
-                                &nbsp;&nbsp;&nbsp;Disallow debuging
+                                Disallow debuging
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -354,7 +354,7 @@
                             <input id="disallow-install-apps-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowInstallApps"/>
                             <span class="helper" title="Having this checked would disallow install apps.">
-                                &nbsp;&nbsp;&nbsp;Disallow install apps
+                                Disallow install apps
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -367,7 +367,7 @@
                                    data-key="disallowInstallUnknownSources"/>
                             <span class="helper" title="Having this checked would disallow installing from unknown
                             sources.">
-                                &nbsp;&nbsp;&nbsp;Disallow install from unknown sources
+                                Disallow install from unknown sources
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -378,7 +378,7 @@
                             <input id="disallow-modify-accounts-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowModifyAccounts"/>
                             <span class="helper" title="Having this checked would disallow modify accounts.">
-                                &nbsp;&nbsp;&nbsp;Disallow modify accounts
+                                Disallow modify accounts
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -389,7 +389,7 @@
                             <input id="disallow-outgoing-beam-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowOutgoingBeam"/>
                             <span class="helper" title="Having this checked would disallow outgoing beam.">
-                                &nbsp;&nbsp;&nbsp;Disallow outgoing beam
+                                Disallow outgoing beam
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -400,7 +400,7 @@
                             <input id="disallow-location-sharing-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowLocationSharing"/>
                             <span class="helper" title="Having this checked would disallow location sharing.">
-                                &nbsp;&nbsp;&nbsp;Disallow location sharing
+                                Disallow location sharing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -411,7 +411,7 @@
                             <input id="disallow-uninstall-apps-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowUninstallApps"/>
                             <span class="helper" title="Having this checked would disallow uninstall apps.">
-                                &nbsp;&nbsp;&nbsp;Disallow uninstall apps
+                                Disallow uninstall apps
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -423,7 +423,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowParentProfileAppLinking"/>
                             <span class="helper" title="Having this checked would disallow parent profile app linking.">
-                                &nbsp;&nbsp;&nbsp;Disallow parent profile app linking
+                                Disallow parent profile app linking
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -434,7 +434,7 @@
                             <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="ensureVerifyApps"/>
                             <span class="helper" title="Having this checked would ensure verifying apps .">
-                                &nbsp;&nbsp;&nbsp;Ensure verifying apps
+                                Ensure verifying apps
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -445,7 +445,7 @@
                             <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="enableAutoTime"/>
                             <span class="helper" title="Having this checked would enable auto timing .">
-                                &nbsp;&nbsp;&nbsp;Enable auto timing
+                                Enable auto timing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -456,7 +456,7 @@
                             <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disableScreenCapture"/>
                             <span class="helper" title="Having this checked would disable screen capture .">
-                                &nbsp;&nbsp;&nbsp;Disable screen capture
+                                Disable screen capture
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -473,7 +473,7 @@
                             <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowSMS"/>
                             <span class="helper" title="Having this checked would disallow SMS.">
-                                &nbsp;&nbsp;&nbsp;Disallow SMS
+                                Disallow SMS
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -484,7 +484,7 @@
                             <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowAdjustVolumeEnabled"/>
                             <span class="helper" title="Having this checked would disallow volume adjust.">
-                                &nbsp;&nbsp;&nbsp;Disallow volume adjust
+                                Disallow volume adjust
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -496,7 +496,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowConfigCellBroadcasts"/>
                             <span class="helper" title="Having this checked would disallow configuring cell broadcast.">
-                                &nbsp;&nbsp;&nbsp;Disallow cell broadcast
+                                Disallow cell broadcast
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -507,7 +507,7 @@
                             <input id="disallow-configuring-bluetooth-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowConfigBluetooth"/>
                             <span class="helper" title="Having this checked would disallow configuring bluetooth.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring bluetooth.
+                                Disallow configuring bluetooth.
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -520,7 +520,7 @@
                                    data-key="disallowConfigMobileNetworks"/>
                             <span class="helper"
                                   title="Having this checked would disallow configuring mobile networks.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring mobile networks
+                                Disallow configuring mobile networks
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -532,7 +532,7 @@
                                    class="operationDataKeys"
                                    data-key="disallowConfigTethering"/>
                             <span class="helper" title="Having this checked would disallow configuring tethering.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring tethering
+                                Disallow configuring tethering
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -543,7 +543,7 @@
                             <input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowConfigWifi"/>
                             <span class="helper" title="Having this checked would disallow configuring Wifi.">
-                                &nbsp;&nbsp;&nbsp;Disallow configuring Wifi
+                                Disallow configuring Wifi
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -554,7 +554,7 @@
                             <input id="disallow-safe-boot-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowSafeBoot"/>
                             <span class="helper" title="Having this checked would disallow safe boot.">
-                                &nbsp;&nbsp;&nbsp;Disallow safe boot
+                                Disallow safe boot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -565,7 +565,7 @@
                             <input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowOutgoingCalls"/>
                             <span class="helper" title="Having this checked would disallow outgoing calls.">
-                                &nbsp;&nbsp;&nbsp;Disallow outgoing calls
+                                Disallow outgoing calls
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -576,7 +576,7 @@
                             <input id="disallow-mount-physical-media-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowMountPhysicalMedia"/>
                             <span class="helper" title="Having this checked would disallow mount physical media.">
-                                &nbsp;&nbsp;&nbsp;Disallow mount physical media
+                                Disallow mount physical media
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -587,7 +587,7 @@
                             <input id="disallow-create-window-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowCreateWindows"/>
                             <span class="helper" title="Having this checked would disallow create window.">
-                                &nbsp;&nbsp;&nbsp;Disallow create window
+                                Disallow create window
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -598,7 +598,7 @@
                             <input id="disallow-factory-reset-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowFactoryReset"/>
                             <span class="helper" title="Having this checked would disallow factory reset.">
-                                &nbsp;&nbsp;&nbsp;Disallow factory reset
+                                Disallow factory reset
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -609,7 +609,7 @@
                             <input id="disallow-remove-user-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowRemoveUser"/>
                             <span class="helper" title="Having this checked would disallow remove user.">
-                                &nbsp;&nbsp;&nbsp;Disallow remove user
+                                Disallow remove user
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -620,7 +620,7 @@
                             <input id="disallow-add-user-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowAddUser"/>
                             <span class="helper" title="Having this checked would disallow add user.">
-                                &nbsp;&nbsp;&nbsp;Disallow add user
+                                Disallow add user
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -631,7 +631,7 @@
                             <input id="disallow-network-reset-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowNetworkReset"/>
                             <span class="helper" title="Having this checked would disallow network reset.">
-                                &nbsp;&nbsp;&nbsp;Disallow network reset
+                                Disallow network reset
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -642,7 +642,7 @@
                             <input id="disallow-USB-transfer-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowUSBFileTransfer"/>
                             <span class="helper" title="Having this checked would disallow USB file transfer.">
-                                &nbsp;&nbsp;&nbsp;Disallow USB file transfer
+                                Disallow USB file transfer
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -653,7 +653,7 @@
                             <input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disallowUnmuteMicrophone"/>
                             <span class="helper" title="Having this checked would disallow unmute microphone.">
-                                &nbsp;&nbsp;&nbsp;Disallow unmute microphone
+                                Disallow unmute microphone
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -671,7 +671,7 @@
                             <input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys"
                                    data-key="disableStatusBar"/>
                             <span class="helper" title="Having this checked would disable status bar .">
-                                &nbsp;&nbsp;&nbsp;Disable status bar
+                                Disable status bar
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -719,7 +719,7 @@
                                    data-key="encryptStorageEnabled" checked="checked"/>
                             <span class="helper"
                                   title="Having this checked would enable Storage-encryption in the device">
-                                &nbsp;&nbsp;&nbsp;Enable storage-encryption
+                                Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -945,7 +945,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                            &nbsp;
+                            
                             Add Application
                         </a>
                         <div id="restricted-applications"
@@ -1106,7 +1106,7 @@
                         <label class="wr-input-control checkbox">
                             <input id="work-profile-policy-allow-cross-profile" type="checkbox" class="form-control operationDataKeys" data-key="workProfilePolicyAllowCopyPaste" checked="checked" />
                                 <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
-                                    &nbsp;&nbsp;&nbsp;Allow cross profile copy-paste
+                                    Allow cross profile copy-paste
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1181,7 +1181,7 @@
         </div>
 
         <!-- cosu-system-update-policy -->
-        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
+        <div class="wr-hidden-operation hidden" 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">
@@ -1202,7 +1202,7 @@
                     </div>
                 </div>
 
-                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                <div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse" role="tabpanel"
                     aria-labelledby="cosu-system-update-policy-body">
                     <hr/>
                     <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
@@ -1222,7 +1222,7 @@
                                 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
+                                Automatic
                             </span>
                         </label>
                         <label class="wr-input-control radio light">
@@ -1230,7 +1230,7 @@
                                 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
+                                Postpone
                             </span>
                         </label>
                         <label class="wr-input-control radio light">
@@ -1238,7 +1238,7 @@
                                 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
+                                Window
                             </span>
                         </label>
                     </div>
@@ -1332,7 +1332,7 @@
         </div>
 
         <!-- cosu-whitelist-applications -->
-        <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
+        <div class="wr-hidden-operation hidden" data-operation="cosu-whitelisted-applications">
             <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
                 data-operation-code="KIOSK_APPS">
                 <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
@@ -1372,7 +1372,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Application
                             </a>
                         </label>
diff --git a/pom.xml b/pom.xml
index b24c1a9878..8c2f067911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1202,7 +1202,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>1.2.4</carbon.devicemgt.version>
+        <carbon.devicemgt.version>1.2.5</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>