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 2cd1a50382..f05d320f93 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
@@ -73,10 +73,8 @@
                 <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-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)">
@@ -84,11 +82,9 @@
                 <i class="fw fw-register fw-stack-2x"></i>
             </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-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>
-            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
-                    class="fw fw-error"></i></span>
+            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>
 
@@ -106,16 +102,17 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
+                    </h2>
                         <div class="panel-title-description">
-                            Configure the passcode policy for Android device. Once the policy is applied on a device,
-                            the device owner will not be able to modify the password settings via the device.
+                            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="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="passcode-policy-body">
-
+                    <hr/>
                     <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -259,17 +256,17 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <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
-                            to modify these settings on their devices.
-                        </div>
                     </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
+                        to modify these settings on their devices.
+                    </div>
                 </div>
                 <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="camera-body">
+                    <hr/>
                     <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -698,18 +695,18 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <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,
-                            corresponding users will not be able to modify these settings on their devices.
-                        </div>
                     </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,
+                        corresponding users will not be able to modify these settings on their devices.
+                    </div>
                 </div>
                 <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="encrypt-storage-body">
+                    </hr>
                     <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -744,17 +741,17 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <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
-                            to modify these settings on their devices.
-                        </div>
                     </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
+                        to modify these settings on their devices.
+                    </div>
                 </div>
                 <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="wifi-body">
+                    <hr/>
                     Please note that * sign represents required fields of data.
                     <br>
                     <br>
@@ -764,7 +761,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="wifi-ssid">
                             Service Set Identifier (SSID)*
-                            <span class="helper" title="Identification of the wireless network to be configured.">
+                                <span class="helper" title="Identification of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -777,8 +774,8 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="wifi-type">
                             Security*
-                            <span class="helper"
-                                  title="Security type of the wireless network to be configured. 802.1x EAP works with Android 4.3 and above devices only.">
+                                    <span class="helper"
+                                          title="Security type of the wireless network to be configured. 802.1x EAP works with Android 4.3 and above devices only.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -794,13 +791,12 @@
                     <div class="wr-input-control" id="control-wifi-eap" style="display:none;">
                         <label class="wr-input-label" for="wifi-eap">
                             EAP Method
-                            <span class="helper" title="EAP Method of the wireless network to be configured.">
+                                    <span class="helper" title="EAP Method of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
                         <select class="form-control operationDataKeys" id="wifi-eap"
-                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
-                                data-key="wifiEAP">
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))" data-key="wifiEAP">
                             <option value="peap">PEAP</option>
                             <option value="tls">TLS</option>
                             <option value="ttls">TTLS</option>
@@ -812,8 +808,8 @@
                     <div class="wr-input-control" id="control-wifi-phase2" style="display:none;">
                         <label class="wr-input-label" for="wifi-phase2">
                             Phase 2 Authentication
-                            <span class="helper"
-                                  title="Phase 2 authentication of the wireless network to be configured.">
+                                    <span class="helper"
+                                          title="Phase 2 authentication of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -828,12 +824,11 @@
                     <div class="wr-input-control" id="control-wifi-provisioning" style="display:none;">
                         <label class="wr-input-label" for="wifi-provisioning">
                             Provisioning
-                            <span class="helper" title="Provisioning of the wireless network to be configured.">
+                                    <span class="helper" title="Provisioning of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
-                        <select class="form-control operationDataKeys" id="wifi-provisioning"
-                                data-key="wifiProvisioning">
+                        <select class="form-control operationDataKeys" id="wifi-provisioning" data-key="wifiProvisioning">
                             <option value="0">0</option>
                             <option value="1">1</option>
                             <option value="2">2</option>
@@ -843,7 +838,7 @@
                     <div class="wr-input-control" id="control-wifi-identity" style="display:none;">
                         <label class="wr-input-label" for="wifi-identity">
                             Identity
-                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                <span class="helper" title="Identity of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -857,7 +852,7 @@
                     <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
                         <label class="wr-input-label" for="wifi-anoidentity">
                             Anonymous Identity
-                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                <span class="helper" title="Identity of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -871,21 +866,21 @@
                     <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
                         <label class="wr-input-label" for="wifi-password">
                             CA Certificate
-                            <span class="helper" title="CA Certificate for the wireless network.">
+                                <span class="helper" title="CA Certificate for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
                         <input id="wifi-cacert-upload" type="file" class="form-control"
                                onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'), document.getElementById('wifi-cacert-name'))"/>
                         <input id="wifi-cacert" type="hidden" class="form-control operationDataKeys"
-                               data-key="wifiCaCert"/>
+                               data-key="wifiCaCert" />
                         <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
-                               data-key="wifiCaCertName"/>
+                               data-key="wifiCaCertName" />
                     </div>
                     <div class="wr-input-control" id="control-wifi-password" style="display:none;">
                         <label class="wr-input-label" for="wifi-password">
                             Password
-                            <span class="helper" title="Password for the wireless network.">
+                                <span class="helper" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -911,15 +906,13 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
+                    </h2>
                         <div class="panel-title-description">
-                            This configuration can be used to create a blacklist or whitelist of applications.
+                            This configuration can be used to create a black list or white list of applications.
                         </div>
-                    </h2>
                 </div>
-                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="app-restriction-body">
-
+                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
+                    <hr/>
                     <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -932,8 +925,8 @@
                         <br>
                     </label>
                     <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
-                        <option value="black-list" selected="selected">BlackList</option>
-                        <option value="white-list">Whitelist</option>
+                        <option value="black-list" selected="selected">Black List</option>
+                        <option value="white-list">White List</option>
                     </select>
 
                     <div class="wr-input-control">
@@ -1019,17 +1012,17 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <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
-                            to modify these settings on their devices.
-                        </div>
                     </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
+                        to modify these settings on their devices.
+                    </div>
                 </div>
                 <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="vpn-body">
+                    <hr/>
                     Please note that * sign represents required fields of data.
                     <br>
                     <br>
@@ -1039,7 +1032,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-server-address">
                             VPN Server Address*
-                            <span class="helper" title="Address of the VPN server to be configured.">
+                                <span class="helper" title="Address of the VPN server to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1049,7 +1042,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-server-port">
                             VPN Server Port
-                            <span class="helper" title="Port of the VPN server to be configured.">
+                                <span class="helper" title="Port of the VPN server to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1059,7 +1052,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-shared-secret">
                             Shared Secret
-                            <span class="helper" title="Shared secret.">
+                                <span class="helper" title="Shared secret.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1069,7 +1062,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-dns">
                             DNS Server
-                            <span class="helper" title="DNS Server.">
+                                <span class="helper" title="DNS Server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1094,16 +1087,15 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <div class="panel-title-description">
-                            The configurations below can be applied to the devices where the agent is running in Android
-                            Work-Profile.
-                        </div>
                     </h2>
+                    <div class="panel-title-description">
+                        The configurations below can be applied to the devices where the agent is running in Android
+                        Work-Profile.
+                    </div>
                 </div>
                 <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="work-profile-policy-body">
-
+                    <hr/>
                     <div id="work-profile-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -1188,7 +1180,7 @@
         <!-- 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">
+                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)
@@ -1198,21 +1190,19 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <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
-                            to modify these settings on their devices.
-                        </div>
                     </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
+                        to modify these settings on their devices.
+                    </div>
                 </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">
+                    aria-labelledby="cosu-system-update-policy-body">
+                    <hr/>
+                    <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>
 
@@ -1226,32 +1216,25 @@
                         <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">
+                                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">
+                                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">
+                                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>
@@ -1275,8 +1258,8 @@
                                 </span>
                             </label>
                             <select id="cosu-system-update-policy-window-start-time"
-                                    class="form-control operationDataKeys"
-                                    data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                                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>
@@ -1311,8 +1294,8 @@
                                 </span>
                             </label>
                             <select id="cosu-system-update-policy-window-end-time"
-                                    class="form-control operationDataKeys"
-                                    data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                                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>
@@ -1348,45 +1331,40 @@
         <!-- 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"
-                 data-operation-code="KIOSK_APPS">
+                data-operation-code="KIOSK_APPS">
                 <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Whitelist Applications (COSU)
-                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch"
-                               data-toggle="collapse"
-                               data-target="#cosu-whitelisted-applications-body">
+                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
+                            data-target="#cosu-whitelisted-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 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
-                            to modify these settings on their devices.
-                        </div>
                     </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
+                        to modify these settings on their devices.
+                    </div>
                 </div>
 
                 <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="cosu-whitelisted-applications-body">
-
-                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden"
-                         role="alert">
+                    aria-labelledby="cosu-whitelisted-applications-body">
+                    <hr/>
+                    <div id="cosu-whitelisted-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="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">
+                            <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>
@@ -1396,42 +1374,40 @@
                             </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">
+                            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>
+                                    <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>
+                                    <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 ]"/>
-                                    </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 ]"/>
-                                    </td>
-                                    <td>
+                                    <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 ]"/>
+                                        </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 ]"/>
+                                        </td>
+                                        <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
                                                    data-click-event="remove-form">
@@ -1441,8 +1417,8 @@
                                                     </span>
                                                 </a>
                                             </span>
-                                    </td>
-                                </tr>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1451,4 +1427,4 @@
             </div>
         </div>
     </div>
-</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 851adebf13..e75127b616 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
@@ -96,16 +96,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
+            </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
                     to modify these settings on their devices.
                 </div>
-            </h2>
         </div>
         <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
-
+            <hr/>
             <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -236,16 +235,16 @@
             <span class="helper"></span>
             <span class="text"></span>
         </label>
-        <hr>
+    </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
             to modify these settings on their devices.
         </div>
-    </h2>
 </div>
 <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
-<div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
+    <hr/>
+    <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
     <i class="icon fw fw-error"></i><span></span>
 </div>
 <br>
@@ -651,7 +650,7 @@
 <div class="wr-input-control">
     <label class="wr-input-control checkbox">
         <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disableScreenCapture" disabled/>
+               data-key="disableScreenCapture disabled"/>
                             <span class="helper" title="Having this checked would disable screen capture .">
                                 &nbsp;&nbsp;&nbsp;Disable screen capture
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
@@ -690,15 +689,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
+            </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,
                     corresponding users will not be able to modify these settings on their devices.
                 </div>
-            </h2>
         </div>
         <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
+            <hr/>
             <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -731,15 +730,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
+            </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
                     to modify these settings on their devices.
                 </div>
-            </h2>
         </div>
         <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">
+            <hr/>
             <!--<div class="cloneable">-->
             <!--<a href="#" class="multi-view add enabled">-->
             <!--<span class="icon fw-stack">-->
@@ -891,14 +890,13 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
+            </h2>
                 <div class="panel-title-description">
                     This configuration can be used to create a black list or white list of applications.
                 </div>
-            </h2>
         </div>
         <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
-
+            <hr/>
             <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -989,15 +987,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
+            </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
                     to modify these settings on their devices.
                 </div>
-            </h2>
         </div>
         <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="vpn-body">
+            <hr/>
             Please note that * sign represents required fields of data.
             <br>
             <br>
@@ -1163,14 +1161,13 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    The configurations below can be applied to the devices where the agent is running in Android Work-Profile.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                The configurations below can be applied to the devices where the agent is running in Android Work-Profile.
+            </div>
         </div>
         <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="work-profile-policy-body">
-
+            <hr/>
             <div id="work-profile-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </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.view/public/templates/hidden-operations-ios.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-ios.hbs
index 718f213df5..37a776b6f8 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-ios.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-ios.hbs
@@ -175,14 +175,13 @@
             <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 iOS 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 class="panel-title-description">
+        This configuration can be used to set a passcode policy to an iOS Device.
+        Once this configuration profile is installed on a device, corresponding users
+        will not be able
+        to modify these settings on their devices.
+    </div>
 </div>
 <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
      aria-labelledby="passcode-policy-body">
@@ -399,17 +398,17 @@
             <span class="helper"></span>
             <span class="text"></span>
         </label>
-        <hr>
-        <div class="panel-title-description">
-            This configurations can be used to configure VPN settings on an iOS 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 class="panel-title-description">
+        This configurations can be used to configure VPN settings on an iOS device.
+        Once this configuration profile is installed on a device, corresponding users will not
+        be able
+        to modify these settings on their devices.
+    </div>
 </div>
 <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
      aria-labelledby="vpn-body">
+    <hr/>
 Please note that * sign represents required fields of data.
 <br>
 <br>
@@ -1173,18 +1172,18 @@ Please note that * sign represents required fields of data.
                 <span class="helper"></span>
                 <span class="text"></span>
             </label>
-            <hr>
-            <div class="panel-title-description">
-                This configuration can be used to configure add-on VPN software (per-app VPN),
-                and it works only on VPN services of
-                type 'VPN'. 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 class="panel-title-description">
+            This configuration can be used to configure add-on VPN software (per-app VPN),
+            and it works only on VPN services of
+            type 'VPN'. Once this configuration profile is installed on a device,
+            corresponding users will not be able
+            to modify these settings on their devices.
+        </div>
     </div>
     <div id="per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
          aria-labelledby="per-app-vpn-body">
+        <hr/>
         Please note that * sign represents required fields of data.
         <br>
         <br>
@@ -1408,16 +1407,15 @@ Please note that * sign represents required fields of data.
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to create a black list or white list of
-                    applications.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to create a black list or white list of
+                applications.
+            </div>
         </div>
         <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="app-restriction-body">
-
+            <hr/>
             <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden"
                  role="alert">
                 <i class="icon fw fw-error"></i><span></span>
@@ -1523,18 +1521,18 @@ Please note that * sign represents required fields of data.
             <span class="helper"></span>
             <span class="text"></span>
         </label>
-        <hr>
-        <div class="panel-title-description">
-            These configurations can be used to set how devices connect to your wireless network(s),
-            including the necessary authentication
-            information. Once this configuration profile is installed on an iOS device,
-            corresponding users will not be able
-            to modify these settings on their devices.
-        </div>
     </h2>
+    <div class="panel-title-description">
+        These configurations can be used to set how devices connect to your wireless network(s),
+        including the necessary authentication
+        information. Once this configuration profile is installed on an iOS device,
+        corresponding users will not be able
+        to modify these settings on their devices.
+    </div>
 </div>
 <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
      aria-labelledby="wifi-body">
+    <hr/>
 <div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">
     <i class="icon fw fw-error"></i><span></span>
 </div>
@@ -2397,18 +2395,17 @@ EAP-Fast Support :
             <span class="helper"></span>
             <span class="text"></span>
         </label>
-        <hr>
-        <div class="panel-title-description">
-            These configurations can be used to define settings for connecting
-            to your POP or IMAP email accounts.
-            Once this configuration profile is installed on an iOS device,
-            corresponding users will not be able to modify these settings on their devices.
-        </div>
     </h2>
+    <div class="panel-title-description">
+        These configurations can be used to define settings for connecting
+        to your POP or IMAP email accounts.
+        Once this configuration profile is installed on an iOS device,
+        corresponding users will not be able to modify these settings on their devices.
+    </div>
 </div>
 <div id="email-body" class="panel-collapse panel-body collapse" role="tabpanel"
      aria-labelledby="email-body">
-
+    <hr/>
 <div id="email-feature-error-msg" class="alert alert-danger hidden" role="alert">
     <i class="icon fw fw-error"></i><span></span>
 </div>
@@ -2768,19 +2765,18 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to define settings for connecting to AirPlay
-                    destinations.
-                    Once this configuration profile is installed on an iOS device,
-                    corresponding users will not be able to modify these settings on their devices.
-                    <br><br>(This feature is supported only on iOS 7.0 and later.)
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to define settings for connecting to AirPlay
+                destinations.
+                Once this configuration profile is installed on an iOS device,
+                corresponding users will not be able to modify these settings on their devices.
+                <br><br>(This feature is supported only on iOS 7.0 and later.)
+            </div>
         </div>
         <div id="airplay-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="airplay-body">
-
+            <hr/>
             <div id="airplay-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -2950,18 +2946,17 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to define settings for connecting to LDAP
-                    servers.
-                    Once this configuration profile is installed on an iOS device,
-                    corresponding users will not be able to modify these settings on their devices.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to define settings for connecting to LDAP
+                servers.
+                Once this configuration profile is installed on an iOS device,
+                corresponding users will not be able to modify these settings on their devices.
+            </div>
         </div>
         <div id="ldap-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="ldap-body">
-
+            <hr/>
             <div id="ldap-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -3138,18 +3133,17 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to define settings for connecting to CalDAV
-                    servers.
-                    Once this configuration profile is installed on an iOS device,
-                    corresponding users will not be able to modify these settings on their devices.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to define settings for connecting to CalDAV
+                servers.
+                Once this configuration profile is installed on an iOS device,
+                corresponding users will not be able to modify these settings on their devices.
+            </div>
         </div>
         <div id="calendar-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="calendar-body">
-
+            <hr/>
             <div id="calendar-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -3263,17 +3257,16 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to define settings for calendar subscriptions.
-                    Once this configuration profile is installed on an iOS device,
-                    corresponding users will not be able to modify these settings on their devices.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to define settings for calendar subscriptions.
+                Once this configuration profile is installed on an iOS device,
+                corresponding users will not be able to modify these settings on their devices.
+            </div>
         </div>
         <div id="calendar-subscription-body" class="panel-collapse panel-body collapse"
              role="tabpanel" aria-labelledby="calendar-subscription-body">
-
+            <hr/>
             <div id="calendar-subscription-feature-error-msg" class="alert alert-danger hidden"
                  role="alert">
                 <i class="icon fw fw-error"></i><span></span>
@@ -3362,19 +3355,18 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    These configurations can be used to specify Access Point Names ( APN ).
-                    Once this configuration profile is installed on an iOS device, corresponding
-                    users will not
-                    be able to modify these settings on their devices.
-                    <br><br>(This feature is not supported on iOS 7.0 and later.)
-                </div>
             </h2>
+            <div class="panel-title-description">
+                These configurations can be used to specify Access Point Names ( APN ).
+                Once this configuration profile is installed on an iOS device, corresponding
+                users will not
+                be able to modify these settings on their devices.
+                <br><br>(This feature is not supported on iOS 7.0 and later.)
+            </div>
         </div>
         <div id="apn-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="apn-body">
-
+            <hr/>
             <div id="apn-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -3489,21 +3481,20 @@ Outgoing Mail Settings :
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    These configurations can be used to specify Cellular Network Settings on an iOS
-                    device.
-                    Cellular settings cannot be installed if an APN setting is already installed and
-                    upon successful installation, corresponding users will not be able to modify
-                    these
-                    settings on their devices.
-                    <br><br>(This feature is supported only on iOS 7.0 and later.)
-                </div>
             </h2>
+            <div class="panel-title-description">
+                These configurations can be used to specify Cellular Network Settings on an iOS
+                device.
+                Cellular settings cannot be installed if an APN setting is already installed and
+                upon successful installation, corresponding users will not be able to modify
+                these
+                settings on their devices.
+                <br><br>(This feature is supported only on iOS 7.0 and later.)
+            </div>
         </div>
         <div id="cellular-body" class="panel-collapse panel-body collapse" role="tabpanel"
              aria-labelledby="cellular-body">
-
+            <hr/>
             <div id="cellular-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -3677,18 +3668,17 @@ Outgoing Mail Settings :
             <span class="helper"></span>
             <span class="text"></span>
         </label>
-        <hr>
-        <div class="panel-title-description">
-            These configurations can be used to restrict apps, device features and
-            media content available on an iOS 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 class="panel-title-description">
+        These configurations can be used to restrict apps, device features and
+        media content available on an iOS device. Once this configuration profile is installed
+        on a device, corresponding users will not be able to modify these settings on their
+        devices.
+    </div>
 </div>
 <div id="restrictions-body" class="panel-collapse panel-body collapse" role="tabpanel"
      aria-labelledby="restrictions-body">
-
+    <hr/>
 <div id="restrictions-feature-error-msg" class="alert alert-danger hidden" role="alert">
     <i class="icon fw fw-error"></i><span></span>
 </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.view/public/templates/hidden-operations-windows.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-windows.hbs
index 172fff975e..c05725b89d 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-windows.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-windows.hbs
@@ -78,16 +78,15 @@
                     <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 Windows 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 class="panel-title-description">
+                This configuration can be used to set a passcode policy to an Windows Device.
+                Once this configuration profile is installed on a device, corresponding users will not be able
+                to modify these settings on their devices.
+            </div>
         </div>
         <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
-
+            <hr/>
             <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -221,15 +220,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera.
-                    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 class="panel-title-description">
+                This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera.
+                Once this configuration profile is installed on a device, corresponding users will not be able
+                to modify these settings on their devices.
+            </div>
         </div>
         <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
+            <hr/>
             <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -262,15 +261,15 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to encrypt data on an Windows 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>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to encrypt data on an Windows 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>
         <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
+            <hr/>
             <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
@@ -303,14 +302,13 @@
                     <span class="helper"></span>
                     <span class="text"></span>
                 </label>
-                <hr>
-                <div class="panel-title-description">
-                    This configuration can be used to create a black list or white list of applications.
-                </div>
             </h2>
+            <div class="panel-title-description">
+                This configuration can be used to create a black list or white list of applications.
+            </div>
         </div>
         <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
-
+            <hr/>
             <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
                 <i class="icon fw fw-error"></i><span></span>
             </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
index df883ea6d3..d523681a97 100644
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk and b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk differ