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 6e87be0775..81356aef4c 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
@@ -1185,8 +1185,7 @@
                     </h2>
                     <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
+                        Once this configuration profile is installed on a device, corresponding users will not be able
                         to modify these settings on their devices.
                     </div>
                 </div>
@@ -1331,8 +1330,7 @@
                     </h2>
                     <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
+                        Once this configuration profile is installed on a device, corresponding users will not be able
                         to modify these settings on their devices.
                     </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.policy.edit/public/templates/hidden-operations-android-edit.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-edit.hbs
index 510e70a29d..c6edc117da 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-edit.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-edit.hbs
@@ -1311,7 +1311,6 @@
                 </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"
@@ -1328,8 +1327,7 @@
                         <hr>
                         <div class="panel-title-description">
                             This configuration can be used to set system update policy to an Android Device in COSU.
-                            Once this configuration profile is installed on a device, corresponding users will not be
-                            able
+                            Once this configuration profile is installed on a device, corresponding users will not be able
                             to modify these settings on their devices.
                         </div>
                     </h2>
@@ -1460,7 +1458,6 @@
                 </div>
             </div>
         </div>
-
         <!-- cosu-whitelist-applications -->
         <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
             <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
@@ -1477,8 +1474,7 @@
                         <hr>
                         <div class="panel-title-description">
                             This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU.
-                            Once this configuration profile is installed on a device, corresponding users will not be
-                            able
+                            Once this configuration profile is installed on a device, corresponding users will not be able
                             to modify these settings on their devices.
                         </div>
                     </h2>
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-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.policy.view/public/templates/hidden-operations-android-view.hbs
index 4e6758d94e..51f837b549 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-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.policy.view/public/templates/hidden-operations-android-view.hbs
@@ -65,18 +65,18 @@
         <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">
+        <span class="wr-hidden-operation-icon fw-stack">
                 <i class="fw fw-import fw-stack-2x"></i>
-            </span>
+        </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-whitelisted-applications', this)">
-            <span class="wr-hidden-operations-icon fw-stack">
+        <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
-            </span>
+        </span>
         Whitelist Apps (COSU)
         <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
@@ -1238,7 +1238,6 @@
         </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"
@@ -1255,8 +1254,7 @@
                     <hr>
                     <div class="panel-title-description">
                         This configuration can be used to set system update policy to an Android Device in COSU.
-                        Once this configuration profile is installed on a device, corresponding users will not be
-                        able
+                        Once this configuration profile is installed on a device, corresponding users will not be able
                         to modify these settings on their devices.
                     </div>
                 </h2>
@@ -1385,7 +1383,6 @@
             </div>
         </div>
     </div>
-
 <!-- cosu-whitelist-applications -->
     <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
         <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
@@ -1402,8 +1399,7 @@
                     <hr>
                     <div class="panel-title-description">
                         This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU.
-                        Once this configuration profile is installed on a device, corresponding users will not be
-                        able
+                        Once this configuration profile is installed on a device, corresponding users will not be able
                         to modify these settings on their devices.
                     </div>
                 </h2>
@@ -1417,9 +1413,9 @@
                 <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>
+                        <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">