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 adf9008d46..6e87be0775 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
@@ -24,11 +24,9 @@
                     <i class="fw fw-security fw-stack-2x"></i>
                 </span>
             Encryption Settings
-            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
-                    class="fw fw-error"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
@@ -63,8 +61,7 @@
                 <i class="fw fw-block fw-stack-2x"></i>
             </span>
             Application Restrictions
-            <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+            <span id="app-restriction-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
             <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>
@@ -105,8 +102,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>
@@ -259,8 +255,7 @@
                     </h2>
                     <div class="panel-title-description">
                         This configurations can be used to restrict certain settings on 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>
@@ -662,8 +657,7 @@
                     <div>
                         <ul class="message message-info">
                             <i class="icon fw fw-info"></i>
-                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
-                                version 6.0 Marshmallow onwards only.</a>
+                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.</a>
                         </ul>
                     </div>
                     <div class="wr-input-control">
@@ -697,10 +691,8 @@
                         </label>
                     </h2>
                     <div class="panel-title-description">
-                        This configuration can be used to encrypt data on an Android device, when the device is
-                        locked and
-                        make it readable when the passcode is entered. Once this configuration profile is installed
-                        on a device,
+                        This configuration can be used to encrypt data on an Android device, when the device is locked and
+                        make it readable when the passcode is entered. Once this configuration profile is installed on a device,
                         corresponding users will not be able to modify these settings on their devices.
                     </div>
                 </div>
@@ -744,8 +736,7 @@
                     </h2>
                     <div class="panel-title-description">
                         This configurations can be used to configure Wi-Fi access on 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>
@@ -1018,8 +1009,7 @@
                     </h2>
                     <div class="panel-title-description">
                         This configurations can be used to configure VPN settings on 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>
@@ -1179,7 +1169,6 @@
                 </div>
             </div>
         </div>
-
         <!-- 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"
@@ -1326,7 +1315,6 @@
                 </div>
             </div>
         </div>
-
         <!-- cosu-whitelist-applications -->
         <div class="wr-hidden-operation hidden" data-operation="cosu-whitelisted-applications">
             <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
@@ -1367,7 +1355,6 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
                                 Add Application
                             </a>
                         </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.edit/public/js/edit.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.edit/public/js/edit.js
index 7c899b3cb4..402873a6ac 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/js/edit.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.edit/public/js/edit.js
@@ -2321,16 +2321,14 @@ 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) {
+    if (slideDownVotes > 0) {
         $(paneSelector).removeClass("hidden");
     } else {
         $(paneSelector).addClass("hidden");