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 cc8318d0d9..50aaf2a432 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
@@ -102,18 +102,17 @@
                             <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 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 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="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>
@@ -257,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>
@@ -696,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>
@@ -742,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>
@@ -907,14 +906,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>
@@ -1014,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>
@@ -1089,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>
@@ -1193,19 +1190,18 @@
                             <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 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 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">
-
+                    <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>
@@ -1345,19 +1341,18 @@
                             <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 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 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-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                     aria-labelledby="cosu-whitelist-applications-body">
-
+                    <hr/>
                     <div id="cosu-whitelist-applications-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-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 bb5f8b3cbb..84153dce3c 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
@@ -1,1480 +1,1569 @@
 <div class="row no-gutter">
-<div class="wr-hidden-operations-nav col-lg-4">
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('passcode-policy', this)" class="selected">
+    <div class="wr-hidden-operations-nav col-lg-4">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('passcode-policy', this)" class="selected">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>
-        Passcode Policy
-        <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
+            Passcode Policy
+            <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
-        Restrictions
-        <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
+            Restrictions
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <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-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>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
+            Encryption Settings
+            <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>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
-        Wi-Fi Settings
-        <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
+            Wi-Fi Settings
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
-        Virtual Private Network
-        <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
+            Virtual Private Network
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
              <span class="wr-hidden-operations-icon fw-stack">
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
-        Work-Profile Configurations
-        <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
+            Work-Profile Configurations
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
                 <span class="fw-stack fw-lg">
                     <i class="fw fw-application fw-stack-1x"></i>
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
-        Applications Restrictions
-        <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>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
+            Applications Restrictions
+            <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>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
             <span class="wr-hidden-operation-icon fw-stack">
                 <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-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
+            &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-whitelist-applications', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
-        Whitelist Apps (COSU)
-        <span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-</div>
+            Whitelist Apps (COSU)
+            <span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
+        </a>
+    </div>
 
-<div class="wr-hidden-operations-content col-lg-8">
-<!-- passcode-policy -->
-<div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
-    <div class="panel panel-default operation-data" data-operation="passcode-policy" data-operation-code="PASSCODE_POLICY">
-        <div id="passcode-policy-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Passcode Policy
-                <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse" data-target="#passcode-policy-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 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 class="wr-hidden-operations-content col-lg-8">
+        <!-- passcode-policy -->
+        <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
+            <div class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
+                <div id="passcode-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Passcode Policy
+                        <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
-            </h2>
-        </div>
-        <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
-
-            <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-allow-simple" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple" checked="checked" disabled/>
-                            <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
                                 &nbsp;&nbsp;&nbsp;Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-            </div>
+                        </label>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-require-alphanumeric" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric" checked="checked" disabled/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked" disabled/>
                             <span class="helper" title="Require passcode to contain both letters and numbers">
                                 &nbsp;&nbsp;&nbsp;Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-            </div>
+                        </label>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-length">
-                    Minimum passcode length
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-length">
+                            Minimum passcode length
                             <span class="helper" title="Minimum number of characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-min-length" class="form-control operationDataKeys" data-key="passcodePolicyMinLength" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                    <option value="6">06</option>
-                    <option value="7">07</option>
-                    <option value="8">08</option>
-                    <option value="9">09</option>
-                    <option value="10">10</option>
-                    <option value="11">11</option>
-                    <option value="12">12</option>
-                    <option value="13">13</option>
-                    <option value="14">14</option>
-                    <option value="15">15</option>
-                </select>
-            </div>
+                        </label>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-complex-chars">
-                    Minimum number of complex characters
-                            <span class="helper" title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-complex-chars">
+                            Minimum number of complex characters
+                            <span class="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys" data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="1">01</option>
-                    <option value="2">02</option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                </select>
-            </div>
+                        </label>
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="1">01</option>
+                            <option value="2">02</option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
-                    Maximum passcode age in days
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Maximum passcode age in days
                             <span class="helper" title="Number of days after which a passcode must be changed">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be in between 1-to-730 days or none )
-                </label>
-                <input id="passcode-policy-max-passcode-age-in-days" type="text" class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" placeholder="[ Requires Number Input ]" disabled>
-            </div>
+                            <br>
+                            ( Should be in between 1-to-730 days or none )
+                        </label>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3" placeholder="[ Requires Number Input ]" disabled>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-passcode-history">
-                    Passcode history
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-passcode-history">
+                            Passcode history
                             <span class="helper" title="Number of consequent unique passcodes to be used before reuse">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be in between 1-to-50 passcodes or none )
-                </label>
-                <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys" data-key="passcodePolicyPasscodeHistory" maxlength="2" placeholder="[ Requires Number Input ]" disabled>
-            </div>
+                            <br>
+                            ( Should be in between 1-to-50 passcodes or none )
+                        </label>
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2"
+                               placeholder="[ Requires Number Input ]" disabled>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
-                    Maximum number of failed attempts
-                            <span class="helper" title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
+                            Maximum number of failed attempts
+                            <span class="helper"
+                                  title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys" data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                    <option value="6">06</option>
-                    <option value="7">07</option>
-                    <option value="8">08</option>
-                    <option value="9">09</option>
-                    <option value="10">10</option>
-                </select>
+                        </label>
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                        </select>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-<!-- /passcode-policy -->
-
-<!-- camera -->
-<div class="wr-hidden-operation" data-operation="camera">
-<div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
-<div id="camera-heading" class="panel-heading" role="tab">
-    <h2 class="sub-title panel-title">
-        Restrictions
-        <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
-            <input type="checkbox"/>
-            <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>
-<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">
-    <i class="icon fw fw-error"></i><span></span>
-</div>
-<br>
-<br>
+        <!-- /passcode-policy -->
+
+        <!-- camera -->
+        <div class="wr-hidden-operation" data-operation="camera">
+            <div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
+                <div id="camera-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Restrictions
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
+                    <br>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="camera-enabled" type="checkbox" class="operationDataKeys" data-key="cameraEnabled"
-               checked="checked"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="camera-enabled" type="checkbox" class="operationDataKeys"
+                                   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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br><b>
-    Bellow restrictions will be applied on devices with Android version 5.0 Lollipop onwards only
-</b>
-<br><br>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowAdjustVolumeEnabled"/>
+                        </label>
+                    </div>
+                    <br><b>
+                    Bellow restrictions will be applied on devices with Android version 5.0 Lollipop onwards only
+                </b>
+                    <br><br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-bluetooth-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigBluetooth"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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.
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-cell-broadcast-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigCellBroadcasts"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-cell-broadcast-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCellBroadcasts"/>
                             <span class="helper" title="Having this checked would disallow configuring cell broadcast.">
                                 &nbsp;&nbsp;&nbsp;Disallow cell broadcast
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-credentials-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigCredentials"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-credentials-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCredentials"/>
                             <span class="helper" title="Having this checked would disallow configuring credentials.">
                                 &nbsp;&nbsp;&nbsp;Disallow configuring credentials
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-mobile-networkst-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigMobileNetworks"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-mobile-networkst-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigMobileNetworks"/>
                             <span class="helper"
                                   title="Having this checked would disallow configuring mobile networks.">
                                 &nbsp;&nbsp;&nbsp;Disallow configuring mobile networks
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-tethering-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigTethering"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-tethering-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigTethering"/>
                             <span class="helper" title="Having this checked would disallow configuring tethering.">
                                 &nbsp;&nbsp;&nbsp;Disallow configuring tethering
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-VPN-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigVpn"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigWifi"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-app-control-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowAppControl"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-app-control-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowAppControl"/>
                             <span class="helper" title="Having this checked would disallow configuring app control.">
                                 &nbsp;&nbsp;&nbsp;Disallow configuring app control
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-create-window-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowCreateWindows"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-cross-profile-copy-paste-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowCrossProfileCopyPaste"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-cross-profile-copy-paste-enabled" type="checkbox"
+                                   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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-debugging-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowDebugging"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-factory-reset-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowFactoryReset"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-add-user-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowAddUser"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-install-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowInstallApps"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-installing-from-unknown-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowInstallUnknownSources"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-installing-from-unknown-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowInstallUnknownSources"/>
                             <span class="helper" title="Having this checked would disallow installing from unknown
                             sources.">
                                 &nbsp;&nbsp;&nbsp;Disallow install from unknown sources
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-modify-accounts-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowModifyAccounts"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-mount-physical-media-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowMountPhysicalMedia"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-network-reset-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowNetworkReset"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-outgoing-beam-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowOutgoingBeam"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowOutgoingCalls"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-remove-user-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowRemoveUser"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-safe-boot-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowSafeBoot"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-location-sharing-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowLocationSharing"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowSMS"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-uninstall-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUninstallApps"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUnmuteMicrophone"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-USB-transfer-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUSBFileTransfer"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-parent-profile-app-linking-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowParentProfileAppLinking"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-parent-profile-app-linking-enabled" type="checkbox"
+                                   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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="ensureVerifyApps"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
-               data-key="enableAutoTime"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
+                        </label>
+                    </div>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disableScreenCapture"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
-<br><b>
-    Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.
-</b>
-<br><br>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disableStatusBar"/>
+                        </label>
+                    </div>
+                    <br>
+                    <br><b>
+                    Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.
+                </b>
+                    <br><br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <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
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<br>
-</div>
-</div>
-</div>
-<!-- /camera -->
-
-<!-- encrypt-storage -->
-<div class="wr-hidden-operation" data-operation="encrypt-storage">
-    <div class="panel panel-default operation-data" data-operation="encrypt-storage" data-operation-code="ENCRYPT_STORAGE">
-        <div id="encrypt-storage-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Encryption Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#encrypt-storage-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 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.
+                        </label>
+                    </div>
+                    <br>
                 </div>
-            </h2>
-        </div>
-        <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
-            <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
             </div>
-            Un-check following checkbox in case you do not need the device to be encrypted.
-            <br>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys" data-key="encryptStorageEnabled" checked="checked" disabled/>
-                            <span class="helper" title="Having this checked would enable Storage-encryption in the device">
+        </div>
+        <!-- /camera -->
+
+        <!-- encrypt-storage -->
+        <div class="wr-hidden-operation" data-operation="encrypt-storage">
+            <div class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
+                <div id="encrypt-storage-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Encryption Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </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,
+                        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>
+                    Un-check following checkbox in case you do not need the device to be encrypted.
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
                                 &nbsp;&nbsp;&nbsp;Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
+                        </label>
+                    </div>
+                    <br>
+                </div>
             </div>
-            <br>
         </div>
-    </div>
-</div>
-<!-- /encrypt-storage -->
-
-<!-- wi-fi -->
-<div class="wr-hidden-operation" data-operation="wifi">
-    <div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">
-        <div id="wifi-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Wi-Fi Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#wifi-body">
-                    <input type="checkbox" />
-                    <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.
+        <!-- /encrypt-storage -->
+
+        <!-- wi-fi -->
+        <div class="wr-hidden-operation" data-operation="wifi">
+            <div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">
+                <div id="wifi-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Wi-Fi Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#wifi-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
-            </h2>
-        </div>
-        <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">
-            <!--<div class="cloneable">-->
-            <!--<a href="#" class="multi-view add enabled">-->
-            <!--<span class="icon fw-stack">-->
-            <!--<i class="fw fw-add fw-stack-1x"></i>-->
-            <!--<i class="fw fw-ring fw-stack-2x"></i>-->
-            <!--</span>-->
-            <!--</a>-->
-            <!--<a href="#" class="multi-view remove disabled">-->
-            <!--<span class="icon fw-stack">-->
-            <!--<i class="fw fw-minus fw-stack-1x"></i>-->
-            <!--<i class="fw fw-ring fw-stack-2x"></i>-->
-            <!--</span>-->
-            <!--</a>-->
-            <!--Wi-Fi Setting :-->
-            <!--<br>-->
-            <!--<br>-->
-            Please note that * sign represents required fields of data.
-            <br>
-            <br>
-            <div id="wifi-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="wifi-ssid">
-                    Service Set Identifier (SSID) *
+                <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">-->
+                    <!--<i class="fw fw-add fw-stack-1x"></i>-->
+                    <!--<i class="fw fw-ring fw-stack-2x"></i>-->
+                    <!--</span>-->
+                    <!--</a>-->
+                    <!--<a href="#" class="multi-view remove disabled">-->
+                    <!--<span class="icon fw-stack">-->
+                    <!--<i class="fw fw-minus fw-stack-1x"></i>-->
+                    <!--<i class="fw fw-ring fw-stack-2x"></i>-->
+                    <!--</span>-->
+                    <!--</a>-->
+                    <!--Wi-Fi Setting :-->
+                    <!--<br>-->
+                    <!--<br>-->
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+                    <div id="wifi-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="wifi-ssid">
+                            Service Set Identifier (SSID) *
                                 <span class="helper" title="Identification of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                    <br>
-                    ( should be 1-to-30 characters long )
-                </label>
-                <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Required field ]" disabled/>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="wifi-type">
-                    Security*
+                            <br>
+                            ( should be 1-to-30 characters long )
+                        </label>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" placeholder="[ Required field ]" disabled/>
+                    </div>
+                    <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.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-                </label>
-                <select class="form-control operationDataKeys" id="wifi-type"
-                        onchange="changeAndroidWifiPolicy(this)" data-key="wifiType" disabled>
-                    <option value="none" selected>None</option>
-                    <option value="wep">WEP</option>
-                    <option value="wpa">WPA/WPA 2 PSK</option>
-                    <option value="802eap">802.1x EAP</option>
-                </select>
-            </div>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-type"
+                                onchange="changeAndroidWifiPolicy(this)" data-key="wifiType" disabled>
+                            <option value="none" selected>None</option>
+                            <option value="wep">WEP</option>
+                            <option value="wpa">WPA/WPA 2 PSK</option>
+                            <option value="802eap">802.1x EAP</option>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control" id="control-wifi-eap" style="display:none;">
-                <label class="wr-input-label" for="wifi-eap">
-                    EAP Method
+                    <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="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" disabled>
-                    <option value="peap">PEAP</option>
-                    <option value="tls">TLS</option>
-                    <option value="ttls">TTLS</option>
-                    <option value="pwd">PWD</option>
-                    <option value="sim">SIM</option>
-                    <option value="aka">AKA</option>
-                </select>
-            </div>
-            <div class="wr-input-control" id="control-wifi-phase2" style="display:none;">
-                <label class="wr-input-label" for="wifi-phase2">
-                    Phase 2 Authentication
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-eap"
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
+                                data-key="wifiEAP" disabled>
+                            <option value="peap">PEAP</option>
+                            <option value="tls">TLS</option>
+                            <option value="ttls">TTLS</option>
+                            <option value="pwd">PWD</option>
+                            <option value="sim">SIM</option>
+                            <option value="aka">AKA</option>
+                        </select>
+                    </div>
+                    <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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-                </label>
-                <select class="form-control operationDataKeys" id="wifi-phase2" data-key="wifiPhase2" disabled>
-                    <option value="none">None</option>
-                    <option value="pap">PAP</option>
-                    <option value="mchap">MCHAP</option>
-                    <option value="mchapv2">MCHAPV2</option>
-                    <option value="gtc">GTC</option>
-                </select>
-            </div>
-            <div class="wr-input-control" id="control-wifi-provisioning" style="display:none;">
-                <label class="wr-input-label" for="wifi-provisioning">
-                    Provisioning
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-phase2" data-key="wifiPhase2" disabled>
+                            <option value="none">None</option>
+                            <option value="pap">PAP</option>
+                            <option value="mchap">MCHAP</option>
+                            <option value="mchapv2">MCHAPV2</option>
+                            <option value="gtc">GTC</option>
+                        </select>
+                    </div>
+                    <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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-                </label>
-                <select class="form-control operationDataKeys" id="wifi-provisioning" data-key="wifiProvisioning" disabled>
-                    <option value="0">0</option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                </select>
-            </div>
-            <div class="wr-input-control" id="control-wifi-identity" style="display:none;">
-                <label class="wr-input-label" for="wifi-identity">
-                    Identity
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-provisioning"
+                                data-key="wifiProvisioning" disabled>
+                            <option value="0">0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                        </select>
+                    </div>
+                    <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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <label id="wifiIdentityValidationText" class="wr-input-label hidden">
-                    Identity should be 1-to-30 characters long
-                </label>
-                <input id="wifi-identity" type="text" class="form-control operationDataKeys"
-                       data-key="wifiIdentity"
-                       maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled />
-            </div>
-            <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
-                <label class="wr-input-label" for="wifi-anoidentity">
-                    Anonymous Identity
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-identity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled/>
+                    </div>
+                    <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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <label id="wifiIdentityValidationText" class="wr-input-label hidden">
-                    Anonymous Identity should be 1-to-30 characters long
-                </label>
-                <input id="wifi-anoidentity" type="text" class="form-control operationDataKeys"
-                       data-key="wifiAnoIdentity"
-                       maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled/>
-            </div>
-            <div class="wr-input-control" id="control-wifi-password" style="display:none;">
-                <label class="wr-input-label" for="wifi-password">
-                    Password
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Anonymous Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-anoidentity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiAnoIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled/>
+                    </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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="wifi-password" type="password" class="form-control operationDataKeys"
-                       data-key="wifiPassword" maxlength="100" disabled/>
+                        </label>
+                        <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                               data-key="wifiPassword" maxlength="100" disabled/>
+                    </div>
+                    <!--</div>-->
+                </div>
             </div>
-            <!--</div>-->
         </div>
-    </div>
-</div>
-<!-- /wi-fi -->
-<!--app-restriction-->
-<div class="wr-hidden-operation" data-operation="app-restriction">
-    <div class="panel panel-default operation-data" data-operation="app-restriction" data-operation-code="APP-RESTRICTION">
-        <div id="app-restriction-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Application Restriction Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#app-restriction-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 create a black list or white list of applications.
+        <!-- /wi-fi -->
+        <!--app-restriction-->
+        <div class="wr-hidden-operation" data-operation="app-restriction">
+            <div class="panel panel-default operation-data" data-operation="app-restriction"
+                 data-operation-code="APP-RESTRICTION">
+                <div id="app-restriction-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Application Restriction Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#app-restriction-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to create a black list or white list of applications.
+                    </div>
                 </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-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </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>
 
-            <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType" disabled>
-                <option value="" selected="selected">
-                    None
-                </option>
-                <option value="black-list">Black List</option>
-                <option value="white-list">White List</option>
-            </select>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"
+                            disabled>
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="restricted-applications">
+                            Restricted Application List
                             <span class="helper" title="Add an application to restrict.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <br>
-                    <a href="#restricted-applications-grid" class="grid-input-add hidden" data-click-event="add-form">
+                            <br>
+                            <br>
+                            <a href="#restricted-applications-grid" class="grid-input-add hidden"
+                               data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                        &nbsp;
-                        Add Application
-                    </a>
-                </label>
-                <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Application Name/Description</th>
-                            <th>Package Name</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#restricted-applications-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="4">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#restricted-applications-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="App Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="appName" maxlength="100" data-default="" placeholder="[ Gmail ]" disabled/>
-                            </td>
-                            <td data-title="Package Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="packageName" maxlength="100" data-default="" placeholder="[ com.google.android.gm ]" disabled/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add Application
+                            </a>
+                        </label>
+                        <div id="restricted-applications"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="restrictedApplications" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name/Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#restricted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#restricted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="App Name">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Gmail ]" disabled/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ com.google.android.gm ]" disabled/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions hidden">
-                                                <a href="#restricted-applications-grid" class="grid-input-remove" data-click-event="remove-form">
+                                                <a href="#restricted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
                                                     <span class="fw-stack helper" title="Remove Entry">
                                                         <i class="fw fw-ring fw-stack-2x"></i>
                                                         <i class="fw fw-delete fw-stack-1x"></i>
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</div>
-<!--/app-restriction-->
-
-<!-- VPN -->
-<div class="wr-hidden-operation" data-operation="vpn">
-    <div class="panel panel-default operation-data" data-operation="vpn" data-operation-code="VPN">
-        <div id="vpn-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                VPN Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#vpn-body">
-                    <input type="checkbox" />
-                    <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.
+        <!--/app-restriction-->
+
+        <!-- VPN -->
+        <div class="wr-hidden-operation" data-operation="vpn">
+            <div class="panel panel-default operation-data" data-operation="vpn" data-operation-code="VPN">
+                <div id="vpn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        VPN Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#vpn-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
-            </h2>
-        </div>
-        <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="vpn-body">
-            Please note that * sign represents required fields of data.
-            <br>
-            <br>
-            <div id="vpn-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="vpn-server-address">
-                    VPN Server Address*
+                <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>
+                    <div id="vpn-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="vpn-server-address">
+                            VPN Server Address*
                                 <span class="helper" title="Address of the VPN server to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="vpn-server-address" type="text" class="form-control operationDataKeys" data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]" disabled/>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="vpn-server-port">
-                    VPN Server Port
+                        </label>
+                        <input id="vpn-server-address" type="text" class="form-control operationDataKeys"
+                               data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]"
+                               disabled/>
+                    </div>
+                    <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="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="vpn-server-port" type="text" class="form-control operationDataKeys" data-key="serverPort" maxlength="100" placeholder="[ Optional field ]" disabled/>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="vpn-shared-secret">
-                    Shared Secret
+                        </label>
+                        <input id="vpn-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="serverPort" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-shared-secret">
+                            Shared Secret
                                 <span class="helper" title="Shared secret.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys" data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]" disabled/>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="vpn-dns">
-                    DNS Server
+                        </label>
+                        <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys"
+                               data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-dns">
+                            DNS Server
                                 <span class="helper" title="DNS Server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                        </label>
+                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer"
+                               maxlength="100" placeholder="[ Optional field ]" disabled/>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-<!-- /VPN -->
-
-<!-- install-applications -->
-<!--<div class="wr-hidden-operation" data-operation="install-apps">-->
-<!--<div class="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;App Installations-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="installApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installApp">-->
-<!--<div id="install-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
-<!--</div>-->
-<!--<div class="wr-input-control">-->
-<!--<label class="wr-input-control dropdown">-->
-<!--<span class="helper" title="App Type">App Type<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>-->
-<!--<select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type" data-key="type">-->
-<!--<option>Public</option>-->
-<!--<option>Enterprise</option>-->
-<!--</select>-->
-<!--</label>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /install-applications -->
-
-<!-- /uninstall-applications -->
-<!--<div class="wr-hidden-operation" data-operation="uninstall-apps">-->
-<!--<div class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="uninstallApp">-->
-<!--<div id="uninstall-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<!--span>Identification of the wireless network to connect to</span-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /uninstall-applications -->
-
-<!-- /web-clips -->
-<!--<div class="wr-hidden-operation" data-operation="web-clips">-->
-<!--<div class="panel panel-default operation-data" data-operation="WEBCLIP">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;Web clips-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installWebClip">-->
-<!--<div id="install-webclip-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Title of the web clip">Title<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="title" data-key="title" placeholder="Enter Title"/>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /web-clips -->
-
-<!--Work-profile-->
-<div class="wr-hidden-operation" data-operation="work-profile">
-    <div class="panel panel-default operation-data" data-operation="work-profile" data-operation-code="WORK_PROFILE">
-        <div id="work-profile-policy-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Work-Profile Configurations
-                <label id="work-profile-policy-lbl" class="wr-input-control switch" data-toggle="collapse" data-target="#work-profile-policy-body">
-                    <input type="checkbox" />
-                    <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.
+        <!-- /VPN -->
+
+        <!-- install-applications -->
+        <!--<div class="wr-hidden-operation" data-operation="install-apps">-->
+        <!--<div class="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;App Installations-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="installApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installApp">-->
+        <!--<div id="install-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
+        <!--</div>-->
+        <!--<div class="wr-input-control">-->
+        <!--<label class="wr-input-control dropdown">-->
+        <!--<span class="helper" title="App Type">App Type<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>-->
+        <!--<select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type" data-key="type">-->
+        <!--<option>Public</option>-->
+        <!--<option>Enterprise</option>-->
+        <!--</select>-->
+        <!--</label>-->
+        <!--</div>-->
+        <!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!-- /install-applications -->
+
+        <!-- /uninstall-applications -->
+        <!--<div class="wr-hidden-operation" data-operation="uninstall-apps">-->
+        <!--<div class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="uninstallApp">-->
+        <!--<div id="uninstall-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+        <!--<!--span>Identification of the wireless network to connect to</span-->
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!-- /uninstall-applications -->
+
+        <!-- /web-clips -->
+        <!--<div class="wr-hidden-operation" data-operation="web-clips">-->
+        <!--<div class="panel panel-default operation-data" data-operation="WEBCLIP">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--&nbsp;&nbsp;&nbsp;Web clips-->
+        <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
+        <!--<input type="checkbox" />-->
+        <!--<span class="helper"></span>-->
+        <!--<span class="text"></span>-->
+        <!--</label>-->
+        <!--<br>-->
+        <!--<br>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installWebClip">-->
+        <!--<div id="install-webclip-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
+        <!--<i class="icon fw fw-error"></i><span></span>-->
+        <!--</div>-->
+        <!--<label class="wr-input-label" title="Title of the web clip">Title<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="title" data-key="title" placeholder="Enter Title"/>-->
+        <!--</div>-->
+        <!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
+        <!--<div class="wr-input-control">-->
+        <!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!-- /web-clips -->
+
+        <!--Work-profile-->
+        <div class="wr-hidden-operation" data-operation="work-profile">
+            <div class="panel panel-default operation-data" data-operation="work-profile"
+                 data-operation-code="WORK_PROFILE">
+                <div id="work-profile-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Work-Profile Configurations
+                        <label id="work-profile-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#work-profile-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
-            </h2>
-        </div>
-        <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="work-profile-policy-body">
-
-            <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>
+                <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>
 
-            <!--<div class="wr-input-control">
-            <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
-                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                    </span>
-            </label>
-            </div> -->
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
-                    Profile Name
+                    <!--<div class="wr-input-control">
+                    <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
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                    </label>
+                    </div> -->
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
+                            Profile Name
                             <span class="helper" title="Name of the Work-Profile created by EMM Agent">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                </label>
-                <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys" data-key="workProfilePolicyProfileName" maxlength="20">
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
-                    Enable System Apps
+                            <br>
+                        </label>
+                        <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys"
+                               data-key="workProfilePolicyProfileName" maxlength="20">
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
+                            Enable System Apps
                             <span class="helper" title="The set of system apps needed to be added to the work-profile">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps, com.google.android.calculator )
-                </label>
-                <textarea id="workProfilePolicyEnableSystemApps" type ="text" class="form-control operationDataKeys" rows="4" data-key="workProfilePolicyEnableSystemApps"></textarea>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
-                    Hide System Apps
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="workProfilePolicyEnableSystemApps" type="text"
+                                  class="form-control operationDataKeys" rows="4"
+                                  data-key="workProfilePolicyEnableSystemApps"></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
+                            Hide System Apps
                             <span class="helper" title="The set of system apps needed to be hide in the work-profile">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps, com.google.android.calculator )
-                </label>
-                <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys" rows="4" data-key="workProfilePolicyHideSystemApps" placeholder=""></textarea>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
-                    Unhide System Apps
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyHideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
+                            Unhide System Apps
                             <span class="helper" title="The set of system apps needed to be unhide in the work-profile">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps, com.google.android.calculator )
-                </label>
-                <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys" rows="4" data-key="workProfilePolicyUnhideSystemApps" placeholder=""></textarea>
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
-                    Enable Google Play Store Apps
-                            <span class="helper" title="The set of apps needed to be installed from Google Playstore to work-profile">
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyUnhideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Enable Google Play Store Apps
+                            <span class="helper"
+                                  title="The set of apps needed to be installed from Google Playstore to work-profile">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps, com.google.android.calculator )
-                </label>
-                <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys" rows="4" data-key="workProfilePolicyEnablePlaystoreApps" placeholder=""></textarea>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyEnablePlaystoreApps" placeholder=""></textarea>
+                    </div>
+                </div>
             </div>
         </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"
-             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)
-                    <label id="cosu-system-update-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
-                           data-target="#cosu-system-update-policy-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 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>
+        <!-- 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">
+                <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        System Update Policy (COSU)
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch hidden"
+                               data-toggle="collapse"
+                               data-target="#cosu-system-update-policy-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 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="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-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">
-                    <i class="icon fw fw-error"></i><span></span>
-                </div>
+                    <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>
 
-                <div class="wr-input-control">
-                    <label class="wr-input-label">
-                        System Update
+                    <div class="wr-input-control">
+                        <label class="wr-input-label">
+                            System Update
                             <span class="helper" title="Type of the System Update to be set by the Device Owner">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    </label>
-                    <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 disabled/>
-                            <span class="helper" title="Installs system update automatically as soon as one is available">
+                        </label>
+                        <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 disabled/>
+                            <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'])" disabled/>
-                            <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                        </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'])"
+                                   disabled/>
+                            <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'])" disabled/>
-                            <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                        </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'])"
+                                   disabled/>
+                            <span class="helper"
+                                  title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
                                 &nbsp;Window
                             </span>
-                    </label>
-                </div>
-
-                <div id="cosu-system-update-policy-window-select" class="hidden">
-                    <div>
-                        <ul class="message message-info">
-                            <i class="icon fw fw-info"></i>
-                            <a id="cosu-system-update-policy-window-select-msg">
-                                Below configuration of start time and end time are valid only when
-                                <b>window</b> option is selected.
-                            </a>
-                        </ul>
+                        </label>
                     </div>
-                    <div class="wr-input-control">
-                        <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
-                            Start Time
+
+                    <div id="cosu-system-update-policy-window-select" class="hidden">
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a id="cosu-system-update-policy-window-select-msg">
+                                    Below configuration of start time and end time are valid only when
+                                    <b>window</b> option is selected.
+                                </a>
+                            </ul>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
+                                Start Time
                                 <span class="helper" title="Window start time for system update">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                        </label>
-                        <select id="cosu-system-update-policy-window-start-time"
-                                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>
-                            <option value="180">3 AM</option>
-                            <option value="240">4 AM</option>
-                            <option value="300">5 AM</option>
-                            <option value="360">6 AM</option>
-                            <option value="420">7 AM</option>
-                            <option value="480">8 AM</option>
-                            <option value="540">9 AM</option>
-                            <option value="600">10 AM</option>
-                            <option value="660">11 AM</option>
-                            <option value="720">12 noon</option>
-                            <option value="780">1 PM</option>
-                            <option value="840">2 PM</option>
-                            <option value="900">3 PM</option>
-                            <option value="960">4 PM</option>
-                            <option value="1020">5 PM</option>
-                            <option value="1080">6 PM</option>
-                            <option value="1140">7 PM</option>
-                            <option value="1200">8 PM</option>
-                            <option value="1260">9 PM</option>
-                            <option value="1320">10 PM</option>
-                            <option value="1380">11 PM</option>
-                        </select>
-                    </div>
-                    <div class="wr-input-control">
-                        <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
-                            End Time
+                            </label>
+                            <select id="cosu-system-update-policy-window-start-time"
+                                    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>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
+                                End Time
                                 <span class="helper" title="Window end time for system update">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                        </label>
-                        <select id="cosu-system-update-policy-window-end-time"
-                                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>
-                            <option value="180">3 AM</option>
-                            <option value="240">4 AM</option>
-                            <option value="300">5 AM</option>
-                            <option value="360">6 AM</option>
-                            <option value="420">7 AM</option>
-                            <option value="480">8 AM</option>
-                            <option value="540">9 AM</option>
-                            <option value="600">10 AM</option>
-                            <option value="660">11 AM</option>
-                            <option value="720">12 Noon</option>
-                            <option value="780">1 PM</option>
-                            <option value="840">2 PM</option>
-                            <option value="900">3 PM</option>
-                            <option value="960">4 PM</option>
-                            <option value="1020">5 PM</option>
-                            <option value="1080">6 PM</option>
-                            <option value="1140">7 PM</option>
-                            <option value="1200">8 PM</option>
-                            <option value="1260">9 PM</option>
-                            <option value="1320">10 PM</option>
-                            <option value="1380">11 PM</option>
-                        </select>
+                            </label>
+                            <select id="cosu-system-update-policy-window-end-time"
+                                    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>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 Noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
                     </div>
-                </div>
 
+                </div>
             </div>
         </div>
-    </div>
 
-<!-- cosu-whitelist-applications -->
-    <div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
-        <div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
-             data-operation-code="KIOSK_APPS">
-            <div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
-                <h2 class="sub-title panel-title">
-                    Whitelist Applications (COSU)
-                    <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
-                           data-target="#cosu-whitelist-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 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>
+        <!-- cosu-whitelist-applications -->
+        <div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
+            <div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
+                 data-operation-code="KIOSK_APPS">
+                <div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Whitelist Applications (COSU)
+                        <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch hidden"
+                               data-toggle="collapse"
+                               data-target="#cosu-whitelist-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 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="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                 aria-labelledby="cosu-whitelist-applications-body">
+                <div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="cosu-whitelist-applications-body">
 
-                <div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                    <i class="icon fw fw-error"></i><span></span>
-                </div>
+                    <div id="cosu-whitelist-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.">
+                    <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>
-                        <br>
-                        <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <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>
                                 </span>
-                            &nbsp;
-                            Add Application
-                        </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">
-                        <table class="table table-responsive table-striped">
-                            <thead>
-                            <tr>
-                                <th>No:</th>
-                                <th>Application Name / Description</th>
-                                <th>Package Name</th>
-                                <th></th>
-                            </tr>
-                            </thead>
-                            <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
-                            <tr data-help-text="add-form">
-                                <td colspan="4">
-                                    No entries added yet .
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                        <table class="template hidden">
-                            <tbody data-add-form="#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 ]" disabled/>
-                                </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 ]" disabled/>
-                                </td>
-                                <td>
+                                &nbsp;
+                                Add Application
+                            </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">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name / Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#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 ]" disabled/>
+                                    </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 ]" disabled/>
+                                    </td>
+                                    <td>
                                     <span class="list-group-item-actions">
                                         <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
                                            data-click-event="remove-form">
@@ -1484,14 +1573,14 @@
                                             </span>
                                         </a>
                                     </span>
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </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.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>