From 9887016f04c439e98434ce792c14a47d7f7e6c12 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <imeshc@wso2.com>
Date: Thu, 15 Sep 2016 11:19:35 +0530
Subject: [PATCH 01/22] Adding modal changes

---
 .../devicemgt/app/pages/mdm.page.policies/policies.hbs    | 8 ++++----
 .../public/templates/operations.hbs                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
index 5737957bd..2caad6f1e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
@@ -273,7 +273,7 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="#" id="remove-policy-yes-link" class="btn-operations">Remove</a>
-                <a href="#" id="remove-policy-cancel-link" class="btn-operations">Cancel</a>
+                <a href="#" id="remove-policy-cancel-link" class="btn-operations btn-default">Cancel</a>
             </div>
         </div>
     </div>
@@ -342,7 +342,7 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a>
-                <a href="#" id="publish-policy-cancel-link" class="btn-operations">No</a>
+                <a href="#" id="publish-policy-cancel-link" class="btn-operations btn-default">No</a>
             </div>
         </div>
     </div>
@@ -398,7 +398,7 @@
                     Yes
                 </a>
 
-                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations">
+                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations btn-default">
                     No
                 </a>
             </div>
@@ -492,7 +492,7 @@
                     Yes
                 </a>
 
-                <a href="#" id="change-policy-cancel-link" class="btn-operations">
+                <a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">
                     No
                 </a>
             </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.device.operation-bar/public/templates/operations.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
index 43a601915..cd3221674 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
@@ -235,7 +235,7 @@
             <div class="modal-footer">
                 <div class="buttons">
                     <a href="javascript:runOperation('{{code}}')" class="btn-operations">Yes</a>
-                    <a href="javascript:hidePopup()" class="btn-operations">No</a>
+                    <a href="javascript:hidePopup()" class="btn-operations btn-default">No</a>
                 </div>
             </div>
         </div>

From 9840310f02586c4869f0027c3f96048ea4dc5003 Mon Sep 17 00:00:00 2001
From: thusithakalugamage <thusitha32@yahoo.com>
Date: Thu, 15 Sep 2016 13:47:24 +0530
Subject: [PATCH 02/22] [EMM-1571] Add policies page wizard styling and layout
 defects

---
 .../templates/hidden-operations-android.hbs   | 108 ++++-----
 .../templates/hidden-operations-ios.hbs       | 221 +++++++++---------
 .../templates/hidden-operations-windows.hbs   |  50 ++--
 .../public/less/theme-variables.less          |   2 +-
 4 files changed, 180 insertions(+), 201 deletions(-)

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 bc5c26c46..66ee188cf 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
@@ -3,10 +3,8 @@
         <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>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>
@@ -24,11 +22,9 @@
                     <i class="fw fw-security fw-stack-2x"></i>
                 </span>
             Encryption Settings
-            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
-                    class="fw fw-error"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
@@ -74,8 +70,7 @@
                     <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-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>
@@ -95,18 +90,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>
@@ -250,17 +244,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>
@@ -689,18 +683,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>
@@ -735,17 +729,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>
@@ -899,14 +893,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>
@@ -1006,17 +999,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>
@@ -1188,16 +1181,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>
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-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.create/public/templates/hidden-operations-ios.hbs
index 0c021e2a5..c0fcd1c10 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-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.create/public/templates/hidden-operations-ios.hbs
@@ -175,18 +175,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 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">
-
+                    <hr/>
                     <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden"
                          role="alert">
                         <i class="icon fw fw-error"></i><span></span>
@@ -396,17 +395,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>
@@ -1200,18 +1199,18 @@
                             <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>
@@ -1319,16 +1318,16 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <div class="panel-title-description">
-                            This configuration can be used to configure app-to-per-app VPN mappings.
-                            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 app-to-per-app VPN mappings.
+                        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="app-to-per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="app-to-per-app-vpn-body">
+                    <hr/>
                     Please note that * sign represents required fields of data.
                     <br>
                     <br>
@@ -1418,18 +1417,18 @@
                             <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>
@@ -2281,18 +2280,17 @@
                             <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>
@@ -2648,19 +2646,18 @@
                             <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>
@@ -2828,15 +2825,14 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr/>
-                        <div class="panel-title-description">
-                            This payload defines web domains that are under an enterprise’s management.
-                        </div>
                     </h2>
+                    <div class="panel-title-description">
+                        This payload defines web domains that are under an enterprise’s management.
+                    </div>
                 </div>
                 <div id="domain-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="domain-body">
-
+                    <hr/>
                     <div id="DOMAIN-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
@@ -2990,18 +2986,17 @@
                             <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>
@@ -3176,18 +3171,17 @@
                             <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>
@@ -3301,17 +3295,16 @@
                             <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>
@@ -3400,19 +3393,18 @@
                             <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>
@@ -3527,21 +3519,20 @@
                             <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>
@@ -3713,18 +3704,17 @@
                             <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>
@@ -4768,16 +4758,15 @@
                             <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>
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-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.create/public/templates/hidden-operations-windows.hbs
index 2547a69ce..9b900c633 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-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.create/public/templates/hidden-operations-windows.hbs
@@ -3,8 +3,7 @@
         <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>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>
@@ -78,16 +77,16 @@
                             <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>
@@ -302,14 +301,13 @@
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
-                        <hr>
-                        <div class="panel-title-description">
-                            This configuration can be used to create a black list or white list of applications.
-                        </div>
                     </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to create a black list or white list of applications.
+                    </div>
                 </div>
                 <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
-
+                    <hr/>
                     <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less
index 5dcd3c3ce..809545168 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less
@@ -6,7 +6,7 @@
 @base-dark-color: #11375B;
 @base-light-color: #ffffff;
 @base-success-color: #5cb85c;
-@base-info-color: #009DA7;
+@base-info-color: #526A84;
 @base-warning-color: #f0ad4e;
 @base-danger-color: #d9534f;
 

From d33fbc99b1550a0f25dc643b43c041d9cf6c2720 Mon Sep 17 00:00:00 2001
From: thusithakalugamage <thusitha32@yahoo.com>
Date: Thu, 15 Sep 2016 15:07:14 +0530
Subject: [PATCH 03/22] [EMM-1571] Add policies page wizard styling and layout
 defects - edit pages

---
 .../templates/hidden-operations-android.hbs   | 1927 ++---
 .../templates/hidden-operations-ios.hbs       | 6590 ++++++++---------
 .../templates/hidden-operations-windows.hbs   |   46 +-
 3 files changed, 4308 insertions(+), 4255 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
index 4736d8ec3..987a24deb 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
@@ -1,1225 +1,1290 @@
 <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('install-apps', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-application fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--App Installations-->
-    <!--</a>-->
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('blacklist-apps', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-block fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--App Blacklisting-->
-    <!--</a>-->
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('web-clips', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-website fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--Web clips-->
-    <!--</a>-->
-</div>
+            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('install-apps', this)">-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-application fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--App Installations-->
+        <!--</a>-->
+        <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('blacklist-apps', this)">-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-block fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--App Blacklisting-->
+        <!--</a>-->
+        <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('web-clips', this)">-->
+        <!--<span class="wr-hidden-operations-icon fw-stack">-->
+        <!--<i class="fw fw-website fw-stack-2x"></i>-->
+        <!--</span>-->
+        <!--Web clips-->
+        <!--</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" 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" 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-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 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" />
-                            <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"/>
+                            <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" />
+                    <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"/>
                             <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">
-                    <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">
+                            <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">
-                    <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">
+                            <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 ]">
-            </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 ]">
+                    </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 ]">
-            </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 ]">
+                    </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">
-                    <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">
+                            <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 -->
+        <!-- /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>
-<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.">
+        <!-- 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"/>
+                            <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>
-    Below 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>
+                    Below 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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-bluetooth-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigBluetooth"/>
+                        </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"/>
                             <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>
-<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"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-credentials-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigCredentials"/>
+                        </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"/>
                             <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>
-<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.">
+                        </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"/>
+                            <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-tethering-enabled" type="checkbox"
-               class="operationDataKeys"
-               data-key="disallowConfigTethering"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-VPN-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigVpn"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowConfigWifi"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-create-window-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowCreateWindows"/>
+                        </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"/>
                             <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>
-<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"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-debugging-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowDebugging"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-factory-reset-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowFactoryReset"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-add-user-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowAddUser"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-install-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowInstallApps"/>
+                        </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"/>
                             <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>
-<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"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-modify-accounts-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowModifyAccounts"/>
+                        </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"/>
                             <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>
-<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"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-network-reset-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowNetworkReset"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-outgoing-beam-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowOutgoingBeam"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowOutgoingCalls"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-remove-user-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowRemoveUser"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-safe-boot-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowSafeBoot"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-location-sharing-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowLocationSharing"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowSMS"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-uninstall-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUninstallApps"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUnmuteMicrophone"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disallow-USB-transfer-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disallowUSBFileTransfer"/>
+                        </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"/>
                             <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>
-<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"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
-               data-key="ensureVerifyApps"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
-               data-key="enableAutoTime"/>
+                        </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"/>
                             <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>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-               data-key="diableScreenCapture"/>
+                        </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="diableScreenCapture"/>
                             <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" 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" />
-                            <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" 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"/>
+                            <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 -->
+        <!-- /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" 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.
+        <!-- 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" 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 ]"/>
-            </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 ]"/>
+                    </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. 802.1x EAP works with Android 4.3 and above devices only.">
                                         <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">
-                    <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">
+                            <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">
-                    <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">
+                            <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">
-                    <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">
+                            <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">
-                    <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">
+                            <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 ]"/>
-            </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 ]"/>
+                    </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 ]"/>
-            </div>
-            <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
-                <label class="wr-input-label" for="wifi-password">
-                    CA Certificate
+                        </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 ]"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            CA Certificate
                                 <span class="helper" title="CA Certificate for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-                </label>
-                <input id="wifi-cacert-upload" type="file" class="form-control"
-                       onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'), document.getElementById('wifi-cacert-name'))"/>
-                <input id="wifi-cacert" type="text" class="form-control operationDataKeys"
-                       data-key="wifiCaCert" style="display:none;"/>
-                <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
-                       data-key="wifiCaCertName" />
-            </div>
-            <div class="wr-input-control" id="control-wifi-password" style="display:none;">
-                <label class="wr-input-label" for="wifi-password">
-                    Password
+                        </label>
+                        <input id="wifi-cacert-upload" type="file" class="form-control"
+                               onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'), document.getElementById('wifi-cacert-name'))"/>
+                        <input id="wifi-cacert" type="text" class="form-control operationDataKeys"
+                               data-key="wifiCaCert" style="display:none;"/>
+                        <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
+                               data-key="wifiCaCertName"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-password" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            Password
                                 <span class="helper" title="Password for the wireless network.">
                                     <span class="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"/>
+                        </label>
+                        <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                               data-key="wifiPassword" maxlength="100"/>
+                    </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" 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" 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-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>
 
-            <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">
-                <option value="" selected="selected">
-                    None
-                </option>
-                <option value="black-list">Black List</option>
-                <option value="white-list">White List</option>
-            </select>
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
+                    <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>
-                    <a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#restricted-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="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 ]" />
-                            </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 ]" />
-                            </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 ]"/>
+                                    </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 ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
-                                                <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-->
+        <!--/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" 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.
+        <!-- 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" 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 ]"/>
-            </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 ]"/>
+                    </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 ]"/>
-            </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 ]"/>
+                    </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 ]"/>
-            </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 ]"/>
+                    </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 ]"/>
+                        </label>
+                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer"
+                               maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-<!-- /VPN -->
+        <!-- /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>-->
+        <!-- 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="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 -->
+        <!--<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 -->
+        <!-- /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 -->
+        <!-- /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.
+        <!--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>
-</div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/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.edit/public/templates/hidden-operations-ios.hbs
index 612b913d6..25bc972fa 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-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.edit/public/templates/hidden-operations-ios.hbs
@@ -1,504 +1,503 @@
 <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
+            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('restrictions', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('restrictions', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-block fw-stack-2x"></i>
             </span>
-        Restrictions
+            Restrictions
         <span id="restrictions-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="restrictions-ok" class="has-success status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="restrictions-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
+        </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
+            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-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('email', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('email', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-invitation fw-stack-2x"></i>
             </span>
-        Email Settings
+            Email Settings
         <span id="email-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
-        <span id="email-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="email-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="email-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('airplay', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('airplay', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-airplay fw-stack-2x"></i>
             </span>
-        AirPlay Settings
+            AirPlay Settings
         <span id="airplay-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
-        <span id="airplay-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="airplay-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="airplay-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('domain', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('domain', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-mail fw-stack-2x"></i>
             </span>
-        Manage Domains
+            Manage Domains
         <span id="domain-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
-        <span id="domain-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="domain-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="domain-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('ldap', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('ldap', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-ldap fw-stack-2x"></i>
             </span>
-        LDAP Settings
+            LDAP Settings
         <span id="ldap-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
-        <span id="ldap-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="ldap-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
         <span id="ldap-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('calendar', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('calendar', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-calendar fw-stack-2x"></i>
             </span>
-        Calendar
+            Calendar
         <span id="calendar-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="calendar-ok" class="has-success status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="calendar-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('calendar-subscription', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('calendar-subscription', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-subscribed-calendar fw-stack-2x"></i>
             </span>
-        Calendar Subscription
+            Calendar Subscription
         <span id="calendar-subscription-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="calendar-subscription-ok" class="has-success status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="calendar-subscription-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('apn', this)">
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('apn', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-service-provider fw-stack-2x"></i>
             </span>
-        Access Point Names
-        <span id="apn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="apn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="apn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('cellular', this)">
+            Access Point Names
+            <span id="apn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="apn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="apn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cellular', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-service-provider fw-stack-2x"></i>
             </span>
-        Cellular Network Settings
+            Cellular Network Settings
         <span id="cellular-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="cellular-ok" class="has-success status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="cellular-error" class="has-error status-icon hidden"><i
                 class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
+        </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="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('per-app-vpn', this)">
+            Virtual Private Network
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('per-app-vpn', this)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-vpn fw-stack-2x"></i>
             </span>
-        Per Application VPN
+            Per Application VPN
         <span id="per-app-vpn-configured" class="has-configured status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="per-app-vpn-ok" class="has-success status-icon hidden"><i
                 class="fw fw-ok"></i></span>
         <span id="per-app-vpn-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)">
+        </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
+            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>
-</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"
-               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 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>
-<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>
+        </a>
     </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="passcode-policy-force-pin" type="checkbox"
-                   class="form-control operationDataKeys" data-key="passcodePolicyForcePIN"
-                   checked="checked"/>
+    <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"
+                               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 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">
+                    <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-force-pin" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyForcePIN"
+                                   checked="checked"/>
                             <span class="helper"
                                   title="Determines whether the user is forced to set a passcode.">
                                 &nbsp;&nbsp;&nbsp;Force Passcode
                                 <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-allow-simple" type="checkbox"
-                   class="form-control operationDataKeys"
-                   data-key="passcodePolicyAllowSimple" checked="checked"/>
+                    <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"/>
                             <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"/>
+                    <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"/>
                             <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">
-            <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>
-            <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>
-            <option value="16">16</option>
-        </select>
-    </div>
+                        </label>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
+                            <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>
+                            <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>
+                            <option value="16">16</option>
+                        </select>
+                    </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="passcode-policy-min-complex-chars">
-            Minimum number of complex characters
+                    <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">
-            <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>
-        </select>
-    </div>
+                        </label>
+                        <select id="passcode-policy-min-complex-chars"
+                                class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
+                            <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>
+                        </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 <br>
-            ( Should be in between 1-to-730 days or none )
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Maximum passcode age in days <br>
+                            ( Should be in between 1-to-730 days or none )
                             <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>
-        </label>
-        <input id="passcode-policy-max-passcode-age-in-days" type="text"
-               class="form-control operationDataKeys"
-               data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" data-default=""
-               placeholder="[ Requires Number Input ]"/>
-    </div>
+                        </label>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys"
+                               data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" data-default=""
+                               placeholder="[ Requires Number Input ]"/>
+                    </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="passcode-policy-passcode-history">
-            Passcode history <br>
-            ( Should be in between 1-to-50 passcodes or none )
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-passcode-history">
+                            Passcode history <br>
+                            ( Should be in between 1-to-50 passcodes or none )
                             <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>
-        </label>
-        <input id="passcode-policy-passcode-history" type="text"
-               class="form-control operationDataKeys"
-               data-key="passcodePolicyPasscodeHistory" maxlength="2" data-default=""
-               placeholder="[ Requires Number Input ]">
-    </div>
+                        </label>
+                        <input id="passcode-policy-passcode-history" type="text"
+                               class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2" data-default=""
+                               placeholder="[ Requires Number Input ]">
+                    </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="passcode-policy-max-auto-lock">
-            Auto Lock Time in minutes
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-auto-lock">
+                            Auto Lock Time in minutes
                             <span class="helper"
                                   title="A device will be automatically locked when this time period elapses">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="passcode-policy-max-auto-lock" class="form-control operationDataKeys"
-                data-key="passcodePolicyMaxAutoLock" data-default="0">
-            <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-max-auto-lock" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxAutoLock" data-default="0">
+                            <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-grace-period">
-            Grace period in minutes for device lock
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-grace-period">
+                            Grace period in minutes for device lock
                             <span class="helper"
                                   title="Amount of time the device will be locked without prompting for passcode on unlock">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="passcode-policy-grace-period" class="form-control operationDataKeys"
-                data-key="passcodePolicyGracePeriod" data-default="0">
-            <option value="" selected="selected">
-                None
-            </option>
-            <option value="0">Immediately</option>
-            <option value="1">01</option>
-            <option value="5">05</option>
-            <option value="10">10</option>
-            <option value="15">15</option>
-            <option value="30">30</option>
-            <option value="60">60</option>
-        </select>
-    </div>
+                        </label>
+                        <select id="passcode-policy-grace-period" class="form-control operationDataKeys"
+                                data-key="passcodePolicyGracePeriod" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="0">Immediately</option>
+                            <option value="1">01</option>
+                            <option value="5">05</option>
+                            <option value="10">10</option>
+                            <option value="15">15</option>
+                            <option value="30">30</option>
+                            <option value="60">60</option>
+                        </select>
+                    </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="passcode-policy-max-failed-attempts">
-            Maximum number of failed attempts
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-failed-attempts">
+                            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">
-            <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>
-<!-- End of Passcode policy -->
-
-<!-- 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" 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 iOS device.
-            Once this configuration profile is installed on a device, corresponding users will not
-            be able
-            to modify these settings on their devices.
+                        </label>
+                        <select id="passcode-policy-max-failed-attempts"
+                                class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
+                            <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>
-    </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-connection-name">
-        Connection Name*
+        <!-- End of Passcode policy -->
+
+        <!-- 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" 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 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>
+
+                    <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-connection-name">
+                            Connection Name*
                                 <span class="helper" title="Display name of the connection.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-    </label>
-    <input id="vpn-connection-name" type="text" class="form-control operationDataKeys"
-           data-key="userDefinedName" maxlength="200"/>
-</div>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="vpn-override-primary" type="checkbox" class="form-control operationDataKeys"
-               data-key="overridePrimary" data-default="true"/>
+                        </label>
+                        <input id="vpn-connection-name" type="text" class="form-control operationDataKeys"
+                               data-key="userDefinedName" maxlength="200"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="vpn-override-primary" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="overridePrimary" data-default="true"/>
                             <span class="helper"
                                   title="Specifies whether to send all traffic through the VPN interface. If true, all network traffic is sent over VPN.">
                                 &nbsp;&nbsp;&nbsp;Override Primary
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="vpn-ondemand-enabled" type="checkbox" class="form-control operationDataKeys"
-               data-key="onDemandEnabled" data-default="false"
-               onchange="slideDownPaneAgainstValueSet(this, 'vpn-ondemand-config', ['true'])"/>
+                        </label>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="vpn-ondemand-enabled" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="onDemandEnabled" data-default="false"
+                                   onchange="slideDownPaneAgainstValueSet(this, 'vpn-ondemand-config', ['true'])"/>
                             <span class="helper"
                                   title="Check if the VPN connection should be brought up on demand, else leave un-checked.">
                                 &nbsp;&nbsp;&nbsp;On-demand Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-<div id="vpn-ondemand-config" class="slidable-pane" style="display:none;">
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ondemand-domains-always">
-            On-demand match domains (Always)
+                        </label>
+                    </div>
+                    <div id="vpn-ondemand-config" class="slidable-pane" style="display:none;">
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ondemand-domains-always">
+                                On-demand match domains (Always)
                             <span class="helper" title="A list of domain names. In versions of iOS prior to iOS 7, if the hostname ends with one of these domain names, the VPN is started automatically.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-            <br>
-            <a href="#on-demand-match-domains-grid" class="grid-input-add" data-click-event="add-form">
+                                <br>
+                                <a href="#on-demand-match-domains-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 Domain
-            </a>
-        </label>
-        <div id="vpn-ondemand-domains-always"
-             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-             data-key="onDemandMatchDomainsAlways" data-column-count="2">
-            <table class="table table-responsive table-striped">
-                <thead>
-                <tr>
-                    <th>No:</th>
-                    <th>Domain</th>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody data-add-form-container="#on-demand-match-domains-grid">
-                <tr data-help-text="add-form">
-                    <td colspan="3">
-                        No entries added yet .
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-            <table class="template hidden">
-                <tbody data-add-form="#on-demand-match-domains-grid">
-                <tr data-add-form-element="clone">
-                    <td data-title="No:">
-                        <span class="index"></span>
-                    </td>
-                    <td data-title="Domain">
-                        <input type="text" class="form-control grid-input-text" data-child-key="domain"
-                               maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
-                    </td>
-                    <td class="hidden">
-                        <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
-                    </td>
-                    <td>
+                                    &nbsp;
+                                    Add Domain
+                                </a>
+                            </label>
+                            <div id="vpn-ondemand-domains-always"
+                                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                                 data-key="onDemandMatchDomainsAlways" data-column-count="2">
+                                <table class="table table-responsive table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>No:</th>
+                                        <th>Domain</th>
+                                        <th></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody data-add-form-container="#on-demand-match-domains-grid">
+                                    <tr data-help-text="add-form">
+                                        <td colspan="3">
+                                            No entries added yet .
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table class="template hidden">
+                                    <tbody data-add-form="#on-demand-match-domains-grid">
+                                    <tr data-add-form-element="clone">
+                                        <td data-title="No:">
+                                            <span class="index"></span>
+                                        </td>
+                                        <td data-title="Domain">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="domain"
+                                                   maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
+                                        </td>
+                                        <td class="hidden">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
+                                        </td>
+                                        <td>
                         <span class="list-group-item-actions">
                             <a href="#on-demand-match-domains-grid" class="grid-input-remove"
                                data-click-event="remove-form">
@@ -508,61 +507,61 @@ Please note that * sign represents required fields of data.
                                 </span>
                             </a>
                         </span>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ondemand-domains-never">
-            On-demand match domains (Never)
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ondemand-domains-never">
+                                On-demand match domains (Never)
                                 <span class="helper" title="A list of domain names. In versions of iOS prior to iOS 7, if the hostname ends with one of these domain names, the VPN is not started automatically. This might be used to exclude a subdomain within an included domain.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            <br>
-            <a href="#on-demand-match-domains-never-grid" class="grid-input-add" data-click-event="add-form">
+                                <br>
+                                <a href="#on-demand-match-domains-never-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 Domain
-            </a>
-        </label>
-        <div id="vpn-ondemand-domains-never"
-             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-             data-key="onDemandMatchDomainsNever" data-column-count="2">
-            <table class="table table-responsive table-striped">
-                <thead>
-                <tr>
-                    <th>No:</th>
-                    <th>Domain</th>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody data-add-form-container="#on-demand-match-domains-never-grid">
-                <tr data-help-text="add-form">
-                    <td colspan="3">
-                        No entries added yet .
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-            <table class="template hidden">
-                <tbody data-add-form="#on-demand-match-domains-never-grid">
-                <tr data-add-form-element="clone">
-                    <td data-title="No:">
-                        <span class="index"></span>
-                    </td>
-                    <td data-title="Domain">
-                        <input type="text" class="form-control grid-input-text" data-child-key="domain"
-                               maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
-                    </td>
-                    <td class="hidden">
-                        <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
-                    </td>
-                    <td>
+                                    &nbsp;
+                                    Add Domain
+                                </a>
+                            </label>
+                            <div id="vpn-ondemand-domains-never"
+                                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                                 data-key="onDemandMatchDomainsNever" data-column-count="2">
+                                <table class="table table-responsive table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>No:</th>
+                                        <th>Domain</th>
+                                        <th></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody data-add-form-container="#on-demand-match-domains-never-grid">
+                                    <tr data-help-text="add-form">
+                                        <td colspan="3">
+                                            No entries added yet .
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table class="template hidden">
+                                    <tbody data-add-form="#on-demand-match-domains-never-grid">
+                                    <tr data-add-form-element="clone">
+                                        <td data-title="No:">
+                                            <span class="index"></span>
+                                        </td>
+                                        <td data-title="Domain">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="domain"
+                                                   maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
+                                        </td>
+                                        <td class="hidden">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
+                                        </td>
+                                        <td>
                             <span class="list-group-item-actions">
                                 <a href="#on-demand-match-domains-never-grid" class="grid-input-remove"
                                    data-click-event="remove-form">
@@ -572,61 +571,61 @@ Please note that * sign represents required fields of data.
                                     </span>
                                 </a>
                             </span>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ondemand-domains-retry">
-            On-demand match domains (On Retry)
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ondemand-domains-retry">
+                                On-demand match domains (On Retry)
                             <span class="helper" title="A list of domain names. In versions of iOS prior to iOS 7, if the hostname ends with one of these domain names, if a DNS query for that domain name fails, the VPN is started automatically.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-            <br>
-            <a href="#on-demand-match-domains-retry-grid" class="grid-input-add" data-click-event="add-form">
+                                <br>
+                                <a href="#on-demand-match-domains-retry-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 Domain
-            </a>
-        </label>
-        <div id="vpn-ondemand-domains-retry"
-             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-             data-key="onDemandMatchDomainsOnRetry" data-column-count="2">
-            <table class="table table-responsive table-striped">
-                <thead>
-                <tr>
-                    <th>No:</th>
-                    <th>Domain</th>
-                    <th></th>
-                </tr>
-                </thead>
-                <tbody data-add-form-container="#on-demand-match-domains-retry-grid">
-                <tr data-help-text="add-form">
-                    <td colspan="3">
-                        No entries added yet .
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-            <table class="template hidden">
-                <tbody data-add-form="#on-demand-match-domains-retry-grid">
-                <tr data-add-form-element="clone">
-                    <td data-title="No:">
-                        <span class="index"></span>
-                    </td>
-                    <td data-title="Domain">
-                        <input type="text" class="form-control grid-input-text" data-child-key="domain"
-                               maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
-                    </td>
-                    <td class="hidden">
-                        <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
-                    </td>
-                    <td>
+                                    &nbsp;
+                                    Add Domain
+                                </a>
+                            </label>
+                            <div id="vpn-ondemand-domains-retry"
+                                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                                 data-key="onDemandMatchDomainsOnRetry" data-column-count="2">
+                                <table class="table table-responsive table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>No:</th>
+                                        <th>Domain</th>
+                                        <th></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody data-add-form-container="#on-demand-match-domains-retry-grid">
+                                    <tr data-help-text="add-form">
+                                        <td colspan="3">
+                                            No entries added yet .
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table class="template hidden">
+                                    <tbody data-add-form="#on-demand-match-domains-retry-grid">
+                                    <tr data-add-form-element="clone">
+                                        <td data-title="No:">
+                                            <span class="index"></span>
+                                        </td>
+                                        <td data-title="Domain">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="domain"
+                                                   maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
+                                        </td>
+                                        <td class="hidden">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
+                                        </td>
+                                        <td>
                         <span class="list-group-item-actions">
                             <a href="#on-demand-match-domains-retry-grid" class="grid-input-remove"
                                data-click-event="remove-form">
@@ -636,66 +635,66 @@ Please note that * sign represents required fields of data.
                                 </span>
                             </a>
                         </span>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <input id="vpn-ondemand-rules" type="hidden" class="form-control operationDataKeys"
-               data-key="onDemandRules"/>
-    </div>
-</div>
-<div class="wr-input-control">
-    <label class="wr-input-label" for="vpn-vendor-configs">
-        Vendor Configurations
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <input id="vpn-ondemand-rules" type="hidden" class="form-control operationDataKeys"
+                                   data-key="onDemandRules"/>
+                        </div>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-vendor-configs">
+                            Vendor Configurations
                             <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="#vpn-vendor-configs-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#vpn-vendor-configs-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 Configuration
-        </a>
-    </label>
-    <div id="vpn-vendor-configs"
-         class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-         data-key="vendorConfigs" data-column-count="2">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>Key</th>
-                <th>Value</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#vpn-vendor-configs-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="#vpn-vendor-configs-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="Key">
-                    <input type="text" class="form-control grid-input-text" data-child-key="key"
-                           maxlength="100" data-default="" placeholder="[ Configuration Key ]"/>
-                </td>
-                <td data-title="Value">
-                    <input type="text" class="form-control grid-input-text" data-child-key="value"
-                           maxlength="100" data-default="" placeholder="[ Configuration Value ]"/>
-                </td>
-                <td>
+                                &nbsp;
+                                Add Configuration
+                            </a>
+                        </label>
+                        <div id="vpn-vendor-configs"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="vendorConfigs" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Key</th>
+                                    <th>Value</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#vpn-vendor-configs-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="#vpn-vendor-configs-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Key">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="key"
+                                               maxlength="100" data-default="" placeholder="[ Configuration Key ]"/>
+                                    </td>
+                                    <td data-title="Value">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="value"
+                                               maxlength="100" data-default="" placeholder="[ Configuration Value ]"/>
+                                    </td>
+                                    <td>
                                 <span class="list-group-item-actions">
                                     <a href="#vpn-vendor-configs-grid" class="grid-input-remove"
                                        data-click-event="remove-form">
@@ -705,554 +704,554 @@ Please note that * sign represents required fields of data.
                                         </span>
                                     </a>
                                 </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-<div class="wr-input-control">
-    <label class="wr-input-label" for="vpn-type">
-        VPN Type*
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-type">
+                            VPN Type*
                             <span class="helper" title="Type of the VPN connection enabled.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="vpn-type" class="form-control operationDataKeys" data-key="vpnType" data-default="0"
-            onchange="slideDownPaneAgainstValueSet(this, 'pptp-config', ['PPTP']); slideDownPaneAgainstValueSet(this, 'l2tp-config', ['L2TP']); slideDownPaneAgainstValueSet(this, 'ipsec-config', ['IPSec']); slideDownPaneAgainstValueSet(this, 'ikev2-config', ['IKEv2']);">
-        <option value="PPTP" selected="selected">PPTP</option>
-        <option value="L2TP">L2TP</option>
-        <option value="IPSec">IPSec</option>
-        <option value="IKEv2">IKEv2</option>
-    </select>
-</div>
-<div id="pptp-config" class="slidable-pane" style="display:none;">
-    For PPTP Configuration :
-    <br>
-    <br>
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-pptp-username">
-            VPN Account Username*
+                        </label>
+                        <select id="vpn-type" class="form-control operationDataKeys" data-key="vpnType" data-default="0"
+                                onchange="slideDownPaneAgainstValueSet(this, 'pptp-config', ['PPTP']); slideDownPaneAgainstValueSet(this, 'l2tp-config', ['L2TP']); slideDownPaneAgainstValueSet(this, 'ipsec-config', ['IPSec']); slideDownPaneAgainstValueSet(this, 'ikev2-config', ['IKEv2']);">
+                            <option value="PPTP" selected="selected">PPTP</option>
+                            <option value="L2TP">L2TP</option>
+                            <option value="IPSec">IPSec</option>
+                            <option value="IKEv2">IKEv2</option>
+                        </select>
+                    </div>
+                    <div id="pptp-config" class="slidable-pane" style="display:none;">
+                        For PPTP Configuration :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-pptp-username">
+                                VPN Account Username*
                                 <span class="helper" title="The VPN account username.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-pptp-username" type="text" class="form-control operationDataKeys"
-               data-key="pptpAuthName" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-pptp-token-card" type="checkbox" class="form-control operationDataKeys"
-                   data-key="pptpTokenCard" data-default="true"
-                   onchange="slideDownPaneAgainstValueSet(this, 'pptp-card-config', ['false'])"/>
+                            </label>
+                            <input id="vpn-pptp-username" type="text" class="form-control operationDataKeys"
+                                   data-key="pptpAuthName" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-pptp-token-card" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="pptpTokenCard" data-default="true"
+                                       onchange="slideDownPaneAgainstValueSet(this, 'pptp-card-config', ['false'])"/>
                             <span class="helper"
                                   title="Whether to use a token card such as an RSA SecurID card for connecting.">
                                 &nbsp;&nbsp;&nbsp;Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div id="pptp-card-config" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-pptp-password">
-                VPN Account Password
+                            </label>
+                        </div>
+                        <div id="pptp-card-config" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-pptp-password">
+                                    VPN Account Password
                                     <span class="helper" title="The VPN account password.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-            </label>
-            <input id="vpn-pptp-password" type="text" class="form-control operationDataKeys"
-                   data-key="pptpAuthPassword" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-pptp-comm-remote">
-            Comm Remote Address*
+                                </label>
+                                <input id="vpn-pptp-password" type="text" class="form-control operationDataKeys"
+                                       data-key="pptpAuthPassword" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-pptp-comm-remote">
+                                Comm Remote Address*
                                 <span class="helper" title="IP address or host name of VPN server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-pptp-comm-remote" type="text" class="form-control operationDataKeys"
-               data-key="pptpCommRemoteAddress" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-pptp-rsa" type="checkbox" class="form-control operationDataKeys"
-                   data-key="pptpRSASecureID" data-default="false"/>
+                            </label>
+                            <input id="vpn-pptp-comm-remote" type="text" class="form-control operationDataKeys"
+                                   data-key="pptpCommRemoteAddress" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-pptp-rsa" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="pptpRSASecureID" data-default="false"/>
                             <span class="helper" title="Whether RSA Secure ID is enabled.">
                                 &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-pptp-ccp" type="checkbox" class="form-control operationDataKeys"
-                   data-key="pptpCCPEnabled" data-default="false"
-                   onchange="slideDownPaneAgainstValueSet(this, 'pptp-encryption-config', ['true'])"/>
+                            </label>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-pptp-ccp" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="pptpCCPEnabled" data-default="false"
+                                       onchange="slideDownPaneAgainstValueSet(this, 'pptp-encryption-config', ['true'])"/>
                             <span class="helper" title="Enables encryption on the connection.">
                                 &nbsp;&nbsp;&nbsp;CCP Encryption Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div id="pptp-encryption-config" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-control checkbox">
-                <input id="vpn-pptp-ccpmppe-fourty" type="checkbox"
-                       class="form-control operationDataKeys" data-key="pptpCCPMPPE40Enabled"
-                       data-default="false"/>
+                            </label>
+                        </div>
+                        <div id="pptp-encryption-config" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-control checkbox">
+                                    <input id="vpn-pptp-ccpmppe-fourty" type="checkbox"
+                                           class="form-control operationDataKeys" data-key="pptpCCPMPPE40Enabled"
+                                           data-default="false"/>
                                 <span class="helper"
                                       title="Enables encryption on the connection. Using automatic encryption level.">
                                     &nbsp;&nbsp;&nbsp;Automatic (CCPMPPE40) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-        </div>
-        <div class="wr-input-control">
-            <label class="wr-input-control checkbox">
-                <input id="vpn-pptp-ccpmppe-one-two-eight" type="checkbox"
-                       class="form-control operationDataKeys" data-key="pptpCCPMPPE128Enabled"
-                       data-default="false"/>
+                                </label>
+                            </div>
+                            <div class="wr-input-control">
+                                <label class="wr-input-control checkbox">
+                                    <input id="vpn-pptp-ccpmppe-one-two-eight" type="checkbox"
+                                           class="form-control operationDataKeys" data-key="pptpCCPMPPE128Enabled"
+                                           data-default="false"/>
                                 <span class="helper"
                                       title="Enables encryption on the connection. Using maximum encryption level.">
                                     &nbsp;&nbsp;&nbsp;Maximum (CCPMPPE128) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-        </div>
-    </div>
-</div>
-<div id="l2tp-config" class="slidable-pane" style="display:none;">
-    For L2TP Configuration :
-    <br>
-    <br>
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-l2tp-username">
-            VPN Account Username*
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="l2tp-config" class="slidable-pane" style="display:none;">
+                        For L2TP Configuration :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-l2tp-username">
+                                VPN Account Username*
                                 <span class="helper" title="The VPN account username.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-l2tp-username" type="text" class="form-control operationDataKeys"
-               data-key="l2tpAuthName" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-l2tp-token-card" type="checkbox" class="form-control operationDataKeys"
-                   data-key="l2tpTokenCard" data-default="true"
-                   onchange="slideDownPaneAgainstValueSet(this, 'l2tp-card-config', ['false'])"/>
+                            </label>
+                            <input id="vpn-l2tp-username" type="text" class="form-control operationDataKeys"
+                                   data-key="l2tpAuthName" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-l2tp-token-card" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="l2tpTokenCard" data-default="true"
+                                       onchange="slideDownPaneAgainstValueSet(this, 'l2tp-card-config', ['false'])"/>
                             <span class="helper"
                                   title="Whether to use a token card such as an RSA SecurID card for connecting.">
                                 &nbsp;&nbsp;&nbsp;Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div id="l2tp-card-config" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-l2tp-password">
-                VPN Account Password
+                            </label>
+                        </div>
+                        <div id="l2tp-card-config" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-l2tp-password">
+                                    VPN Account Password
                                     <span class="helper" title="The VPN account password.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-            </label>
-            <input id="vpn-l2tp-password" type="text" class="form-control operationDataKeys"
-                   data-key="l2tpAuthPassword" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-l2tp-comm-remote">
-            Comm Remote Address*
+                                </label>
+                                <input id="vpn-l2tp-password" type="text" class="form-control operationDataKeys"
+                                       data-key="l2tpAuthPassword" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-l2tp-comm-remote">
+                                Comm Remote Address*
                                 <span class="helper" title="IP address or host name of VPN server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-l2tp-comm-remote" type="text" class="form-control operationDataKeys"
-               data-key="l2tpCommRemoteAddress" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-l2tp-rsa" type="checkbox" class="form-control operationDataKeys"
-                   data-key="l2tpRSASecureID" data-default="false"/>
+                            </label>
+                            <input id="vpn-l2tp-comm-remote" type="text" class="form-control operationDataKeys"
+                                   data-key="l2tpCommRemoteAddress" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-l2tp-rsa" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="l2tpRSASecureID" data-default="false"/>
                             <span class="helper" title="Whether RSA Secure ID is enabled.">
                                 &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-</div>
-<div id="ipsec-config" class="slidable-pane" style="display:none;">
-    For IPSec Configuration :
-    <br>
-    <br>
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ipsec-address">
-            Remote Address*
+                            </label>
+                        </div>
+                    </div>
+                    <div id="ipsec-config" class="slidable-pane" style="display:none;">
+                        For IPSec Configuration :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ipsec-address">
+                                Remote Address*
                                 <span class="helper"
                                       title="IP address or host name of the VPN server. Used for Cisco IPSec.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-ipsec-address" type="text" class="form-control operationDataKeys"
-               data-key="ipsecRemoteAddress" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ipsec-auth-method">
-            Authentication Method*
+                            </label>
+                            <input id="vpn-ipsec-address" type="text" class="form-control operationDataKeys"
+                                   data-key="ipsecRemoteAddress" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ipsec-auth-method">
+                                Authentication Method*
                             <span class="helper" title="Authentication method.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="vpn-ipsec-auth-method" class="form-control operationDataKeys"
-                data-key="ipsecAuthenticationMethod" data-default="0"
-                onchange="slideDownPaneAgainstValueSet(this, 'ipsec-auth-mode-config-secret', ['SharedSecret']); slideDownPaneAgainstValueSet(this, 'ipsec-auth-mode-config-certificate', ['Certificate']);">
-            <option value="SharedSecret" selected="selected">Shared Secret</option>
-            <option value="Certificate">Certificate</option>
-        </select>
-    </div>
-    <div id="ipsec-auth-mode-config-secret" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ipsec-local-id">
-                Local Identifier*
+                            </label>
+                            <select id="vpn-ipsec-auth-method" class="form-control operationDataKeys"
+                                    data-key="ipsecAuthenticationMethod" data-default="0"
+                                    onchange="slideDownPaneAgainstValueSet(this, 'ipsec-auth-mode-config-secret', ['SharedSecret']); slideDownPaneAgainstValueSet(this, 'ipsec-auth-mode-config-certificate', ['Certificate']);">
+                                <option value="SharedSecret" selected="selected">Shared Secret</option>
+                                <option value="Certificate">Certificate</option>
+                            </select>
+                        </div>
+                        <div id="ipsec-auth-mode-config-secret" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ipsec-local-id">
+                                    Local Identifier*
                                 <span class="helper" title="The name of the group to use.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ipsec-local-id" type="text" class="form-control operationDataKeys"
-                   data-key="ipsecLocalIdentifier" maxlength="100" data-default=""/>
-        </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ipsec-secret">
-                Shared Secret*
+                                </label>
+                                <input id="vpn-ipsec-local-id" type="text" class="form-control operationDataKeys"
+                                       data-key="ipsecLocalIdentifier" maxlength="100" data-default=""/>
+                            </div>
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ipsec-secret">
+                                    Shared Secret*
                                 <span class="helper"
                                       title="The shared secret for this VPN account.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ipsec-secret" type="password" class="form-control operationDataKeys"
-                   data-key="ipsecSharedSecret" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div id="ipsec-auth-mode-config-certificate" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ipsec-payload-uuid">
-                Payload Certificate UUID*
+                                </label>
+                                <input id="vpn-ipsec-secret" type="password" class="form-control operationDataKeys"
+                                       data-key="ipsecSharedSecret" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div id="ipsec-auth-mode-config-certificate" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ipsec-payload-uuid">
+                                    Payload Certificate UUID*
                                 <span class="helper"
                                       title="The UUID of the certificate to use for the account credentials.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ipsec-payload-uuid" type="text" class="form-control operationDataKeys"
-                   data-key="ipsecPayloadCertificateUUID" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-ipsec-xauth-enabled" type="checkbox"
-                   class="form-control operationDataKeys" data-key="ipsecXAuthEnabled"
-                   data-default="false"
-                   onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/>
+                                </label>
+                                <input id="vpn-ipsec-payload-uuid" type="text" class="form-control operationDataKeys"
+                                       data-key="ipsecPayloadCertificateUUID" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-ipsec-xauth-enabled" type="checkbox"
+                                       class="form-control operationDataKeys" data-key="ipsecXAuthEnabled"
+                                       data-default="false"
+                                       onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/>
                             <span class="helper" title="Whether XAuth is enabled.">
                                 &nbsp;&nbsp;&nbsp;XAuth Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div id="ipsec-xauth" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ipsec-xauth-name">
-                XAuth Name*
+                            </label>
+                        </div>
+                        <div id="ipsec-xauth" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ipsec-xauth-name">
+                                    XAuth Name*
                                     <span class="helper"
                                           title="User name for VPN account. Used for Cisco IPSec.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-            </label>
-            <input id="vpn-ipsec-xauth-name" type="text" class="form-control operationDataKeys"
-                   data-key="ipsecXAuthName" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-ipsec-prompt-pin" type="checkbox" class="form-control operationDataKeys"
-                   data-key="ipsecPromptForVPNPIN" data-default="false"/>
+                                </label>
+                                <input id="vpn-ipsec-xauth-name" type="text" class="form-control operationDataKeys"
+                                       data-key="ipsecXAuthName" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-ipsec-prompt-pin" type="checkbox" class="form-control operationDataKeys"
+                                       data-key="ipsecPromptForVPNPIN" data-default="false"/>
                             <span class="helper"
                                   title="Tells whether to prompt for a PIN when connecting. Used for Cisco IPSec.">
                                 &nbsp;&nbsp;&nbsp;Prompt for VPN PIN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-</div>
-<div id="ikev2-config" class="slidable-pane" style="display:none;">
-    For IKEv2 Configuration :
-    <br>
-    <br>
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-address">
-            Remote Address*
+                            </label>
+                        </div>
+                    </div>
+                    <div id="ikev2-config" class="slidable-pane" style="display:none;">
+                        For IKEv2 Configuration :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-address">
+                                Remote Address*
                                 <span class="helper"
                                       title="IP address or host name of the VPN server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-ikev2-address" type="text" class="form-control operationDataKeys"
-               data-key="ikev2RemoteAddress" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-local-id">
-            Local Identifier*
+                            </label>
+                            <input id="vpn-ikev2-address" type="text" class="form-control operationDataKeys"
+                                   data-key="ikev2RemoteAddress" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-local-id">
+                                Local Identifier*
                             <span class="helper" title="Identifier of the IKEv2 client.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="vpn-ikev2-local-id" class="form-control operationDataKeys"
-                data-key="ikev2LocalIdentifier" data-default="0">
-            <option value="FQDN" selected="selected">FQDN</option>
-            <option value="UserFQDN">User FQDN</option>
-            <option value="Address">Address</option>
-            <option value="ASN1DN">ASN1DN</option>
-        </select>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-remote-id">
-            Remote Identifier*
+                            </label>
+                            <select id="vpn-ikev2-local-id" class="form-control operationDataKeys"
+                                    data-key="ikev2LocalIdentifier" data-default="0">
+                                <option value="FQDN" selected="selected">FQDN</option>
+                                <option value="UserFQDN">User FQDN</option>
+                                <option value="Address">Address</option>
+                                <option value="ASN1DN">ASN1DN</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-remote-id">
+                                Remote Identifier*
                             <span class="helper" title="Remote identifier.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="vpn-ikev2-remote-id" class="form-control operationDataKeys"
-                data-key="ikev2RemoteIdentifier" data-default="0">
-            <option value="FQDN" selected="selected">FQDN</option>
-            <option value="UserFQDN">User FQDN</option>
-            <option value="Address">Address</option>
-            <option value="ASN1DN">ASN1DN</option>
-        </select>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-auth-method">
-            Authentication Method*
+                            </label>
+                            <select id="vpn-ikev2-remote-id" class="form-control operationDataKeys"
+                                    data-key="ikev2RemoteIdentifier" data-default="0">
+                                <option value="FQDN" selected="selected">FQDN</option>
+                                <option value="UserFQDN">User FQDN</option>
+                                <option value="Address">Address</option>
+                                <option value="ASN1DN">ASN1DN</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-auth-method">
+                                Authentication Method*
                             <span class="helper" title="Authentication method.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="vpn-ikev2-auth-method" class="form-control operationDataKeys"
-                data-key="ikev2AuthenticationMethod" data-default="0"
-                onchange="slideDownPaneAgainstValueSet(this, 'ikev2-auth-mode-config-secret', ['SharedSecret']); slideDownPaneAgainstValueSet(this, 'ikev2-auth-mode-config-certificate', ['Certificate']);">
-            <option value="SharedSecret" selected="selected">Shared Secret</option>
-            <option value="Certificate">Certificate</option>
-        </select>
-    </div>
-    <div id="ikev2-auth-mode-config-secret" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ikev2-secret">
-                Shared Secret*
+                            </label>
+                            <select id="vpn-ikev2-auth-method" class="form-control operationDataKeys"
+                                    data-key="ikev2AuthenticationMethod" data-default="0"
+                                    onchange="slideDownPaneAgainstValueSet(this, 'ikev2-auth-mode-config-secret', ['SharedSecret']); slideDownPaneAgainstValueSet(this, 'ikev2-auth-mode-config-certificate', ['Certificate']);">
+                                <option value="SharedSecret" selected="selected">Shared Secret</option>
+                                <option value="Certificate">Certificate</option>
+                            </select>
+                        </div>
+                        <div id="ikev2-auth-mode-config-secret" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ikev2-secret">
+                                    Shared Secret*
                                 <span class="helper"
                                       title="The shared secret for this VPN account.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ikev2-secret" type="password" class="form-control operationDataKeys"
-                   data-key="ikev2SharedSecret" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div id="ikev2-auth-mode-config-certificate" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ikev2-payload-uuid">
-                Payload Certificate UUID*
+                                </label>
+                                <input id="vpn-ikev2-secret" type="password" class="form-control operationDataKeys"
+                                       data-key="ikev2SharedSecret" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div id="ikev2-auth-mode-config-certificate" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ikev2-payload-uuid">
+                                    Payload Certificate UUID*
                                 <span class="helper"
                                       title="The UUID of the certificate to use for the account credentials.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ikev2-payload-uuid" type="text" class="form-control operationDataKeys"
-                   data-key="ikev2PayloadCertificateUUID" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="vpn-ikev2-exauth-enabled" type="checkbox"
-                   class="form-control operationDataKeys" data-key="ikev2ExtendedAuthEnabled"
-                   data-default="false"
-                   onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/>
+                                </label>
+                                <input id="vpn-ikev2-payload-uuid" type="text" class="form-control operationDataKeys"
+                                       data-key="ikev2PayloadCertificateUUID" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="vpn-ikev2-exauth-enabled" type="checkbox"
+                                       class="form-control operationDataKeys" data-key="ikev2ExtendedAuthEnabled"
+                                       data-default="false"
+                                       onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/>
                             <span class="helper" title="Whether XAuth is enabled.">
                                 &nbsp;&nbsp;&nbsp;Extended Authentication Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-    </div>
-    <div id="ikev2-exauth" class="slidable-pane" style="display:none;">
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ikev2-ex-username">
-                Username*
+                            </label>
+                        </div>
+                        <div id="ikev2-exauth" class="slidable-pane" style="display:none;">
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ikev2-ex-username">
+                                    Username*
                                 <span class="helper" title="Username used for authentication.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ikev2-ex-username" type="text" class="form-control operationDataKeys"
-                   data-key="ikev2AuthName" maxlength="100" data-default=""/>
-        </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="vpn-ikev2-ex-pass">
-                Password*
+                                </label>
+                                <input id="vpn-ikev2-ex-username" type="text" class="form-control operationDataKeys"
+                                       data-key="ikev2AuthName" maxlength="100" data-default=""/>
+                            </div>
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="vpn-ikev2-ex-pass">
+                                    Password*
                                 <span class="helper" title="Password used for authentication.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-            </label>
-            <input id="vpn-ikev2-ex-pass" type="password" class="form-control operationDataKeys"
-                   data-key="ikev2AuthPassword" maxlength="100" data-default=""/>
-        </div>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-dead-peer">
-            Dead Peer Detection Interval
+                                </label>
+                                <input id="vpn-ikev2-ex-pass" type="password" class="form-control operationDataKeys"
+                                       data-key="ikev2AuthPassword" maxlength="100" data-default=""/>
+                            </div>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-dead-peer">
+                                Dead Peer Detection Interval
                             <span class="helper" title="Dead Peer Detection Interval.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        </label>
-        <select id="vpn-ikev2-dead-peer" class="form-control operationDataKeys"
-                data-key="ikev2DeadPeerDetectionInterval" data-default="0">
-            <option value="None" selected="selected">None</option>
-            <option value="Low">Low</option>
-            <option value="Medium">Medium</option>
-            <option value="High">High</option>
-        </select>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-scicn">
-            Server Certificate Issuer Common Name
+                            </label>
+                            <select id="vpn-ikev2-dead-peer" class="form-control operationDataKeys"
+                                    data-key="ikev2DeadPeerDetectionInterval" data-default="0">
+                                <option value="None" selected="selected">None</option>
+                                <option value="Low">Low</option>
+                                <option value="Medium">Medium</option>
+                                <option value="High">High</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-scicn">
+                                Server Certificate Issuer Common Name
                                 <span class="helper"
                                       title="Common Name of the server certificate issuer. If set, this will cause IKE to send a certificate request based on this certificate issuer to the server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-ikev2-scicn" type="text" class="form-control operationDataKeys"
-               data-key="ikev2ServerCertificateIssuerCommonName" maxlength="100" data-default=""/>
-    </div>
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="vpn-ikev2-sccn">
-            Server Certificate Common Name
+                            </label>
+                            <input id="vpn-ikev2-scicn" type="text" class="form-control operationDataKeys"
+                                   data-key="ikev2ServerCertificateIssuerCommonName" maxlength="100" data-default=""/>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="vpn-ikev2-sccn">
+                                Server Certificate Common Name
                                 <span class="helper"
                                       title="Common Name of the server certificate. This name is used to validate the certificate sent by the IKE server. If not set, the Remote Identifier will be used to validate the certificate.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="vpn-ikev2-sccn" type="text" class="form-control operationDataKeys"
-               data-key="ikev2ServerCertificateCommonName" maxlength="100" data-default=""/>
-    </div>
-</div>
-</div>
-</div>
-</div>
-<!-- /VPN -->
-
-<!-- PER APP VPN -->
-<div class="wr-hidden-operation" data-operation="per-app-vpn">
-<div class="panel panel-default operation-data" data-operation="per-app-vpn"
-     data-operation-code="PER_APP_VPN">
-    <div id="per-app-vpn-heading" class="panel-heading" role="tab">
-        <h2 class="sub-title panel-title">
-            Per App VPN Settings
-            <label class="wr-input-control switch" data-toggle="collapse"
-                   data-target="#per-app-vpn-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 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.
+                            </label>
+                            <input id="vpn-ikev2-sccn" type="text" class="form-control operationDataKeys"
+                                   data-key="ikev2ServerCertificateCommonName" maxlength="100" data-default=""/>
+                        </div>
+                    </div>
+                </div>
             </div>
-        </h2>
-    </div>
-    <div id="per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
-         aria-labelledby="per-app-vpn-body">
-        Please note that * sign represents required fields of data.
-        <br>
-        <br>
-
-        <div id="per-app-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="per-app-vpn-uuid">
-                VPNUUID*
+        <!-- /VPN -->
+
+        <!-- PER APP VPN -->
+        <div class="wr-hidden-operation" data-operation="per-app-vpn">
+            <div class="panel panel-default operation-data" data-operation="per-app-vpn"
+                 data-operation-code="PER_APP_VPN">
+                <div id="per-app-vpn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Per App VPN Settings
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#per-app-vpn-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 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>
+
+                    <div id="per-app-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="per-app-vpn-uuid">
+                            VPNUUID*
                 <span class="helper"
                       title="A globally-unique identifier for the VPN configuration. This identifier is used to configure apps so that they use the Per-App VPN service for all of their network communications.">
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
-            </label>
-            <input id="per-app-vpn-uuid" type="text" class="form-control operationDataKeys"
-                   data-key="VPNUUID" maxlength="200"/>
-        </div>
-        <div class="wr-input-control">
-            <label class="wr-input-control checkbox">
-                <input id="per-app-vpn-in-demand-match-app" type="checkbox"
-                       class="form-control operationDataKeys" data-key="onDemandMatchAppEnabled"
-                       data-default="true"/>
+                        </label>
+                        <input id="per-app-vpn-uuid" type="text" class="form-control operationDataKeys"
+                               data-key="VPNUUID" maxlength="200"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="per-app-vpn-in-demand-match-app" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="onDemandMatchAppEnabled"
+                                   data-default="true"/>
                 <span class="helper"
                       title="The Per-App VPN connection starts automatically when the apps linked to this Per-App VPN service initiate network communication, if the value is set to true.">
                     &nbsp;&nbsp;&nbsp;On Demand Match App Enabled
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
-            </label>
-        </div>
-        <div class="wr-input-control">
-            <label class="wr-input-label" for="per-app-vpn-safari-domains">
-                Safari Domains
+                        </label>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="per-app-vpn-safari-domains">
+                            Safari Domains
                             <span class="helper" title="Sets up the app mapping for the Safari (Webkit) with a specific identifier and a designated requirement.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                <br>
-                <a href="#safari-domains-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#safari-domains-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 Safari Domain
-                </a>
-            </label>
-            <div id="per-app-vpn-safari-domains"
-                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                 data-key="safariDomains" data-column-count="2">
-                <table class="table table-responsive table-striped">
-                    <thead>
-                    <tr>
-                        <th>No:</th>
-                        <th>Safari Domain</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tbody data-add-form-container="#safari-domains-grid">
-                    <tr data-help-text="add-form">
-                        <td colspan="3">
-                            No entries added yet .
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                <table class="template hidden">
-                    <tbody data-add-form="#safari-domains-grid">
-                    <tr data-add-form-element="clone">
-                        <td data-title="No:">
-                            <span class="index"></span>
-                        </td>
-                        <td data-title="Safari Domain">
-                            <input type="text" class="form-control grid-input-text" data-child-key="domain"
-                                   maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
-                        </td>
-                        <td class="hidden">
-                            <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
-                        </td>
-                        <td>
+                                &nbsp;
+                                Add Safari Domain
+                            </a>
+                        </label>
+                        <div id="per-app-vpn-safari-domains"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="safariDomains" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Safari Domain</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#safari-domains-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="3">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#safari-domains-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Safari Domain">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="domain"
+                                               maxlength="100" data-default="" placeholder="[ www.example.com ]"/>
+                                    </td>
+                                    <td class="hidden">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="extra" data-default=""/>
+                                    </td>
+                                    <td>
                                 <span class="list-group-item-actions">
                                     <a href="#safari-domains-grid" class="grid-input-remove"
                                        data-click-event="remove-form">
@@ -1262,93 +1261,93 @@ Please note that * sign represents required fields of data.
                                         </span>
                                     </a>
                                 </span>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="panel panel-default operation-data" data-operation="app-to-per-app-vpn-mapping"
-     data-operation-code="APP_TO_PER_APP_VPN_MAPPING">
-    <div id="per-app-vpn-heading" class="panel-heading" role="tab">
-        <h2 class="sub-title panel-title">
-            App-to-Per-App VPN Mapping
-            <label class="wr-input-control switch" data-toggle="collapse"
-                   data-target="#app-to-per-app-vpn-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 configure app-to-per-app VPN mappings.
-                Once this configuration profile is installed on a device, corresponding users will not be able
-                to modify these settings on their devices.
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
             </div>
-        </h2>
-    </div>
-    <div id="app-to-per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
-         aria-labelledby="app-to-per-app-vpn-body">
-        Please note that * sign represents required fields of data.
-        <br>
-        <br>
-
-        <div id="app-to-per-app-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="app-to-per-app-vpn-mappings">
-                Mappings
+            <div class="panel panel-default operation-data" data-operation="app-to-per-app-vpn-mapping"
+                 data-operation-code="APP_TO_PER_APP_VPN_MAPPING">
+                <div id="per-app-vpn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        App-to-Per-App VPN Mapping
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#app-to-per-app-vpn-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 configure app-to-per-app VPN mappings.
+                        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="app-to-per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="app-to-per-app-vpn-body">
+                    <hr/>
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+
+                    <div id="app-to-per-app-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="app-to-per-app-vpn-mappings">
+                            Mappings
                             <span class="helper" title="The App-to-Per-App mapping payload is designated by specifying com.apple.vpn.managed.appmapping as the PayloadType value.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                <br>
-                <a href="#app-vpn-mappings-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#app-vpn-mappings-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 Mapping
-                </a>
-            </label>
-            <div id="app-to-per-app-vpn-mappings"
-                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                 data-key="appLayerVPNMappings" data-column-count="2">
-                <table class="table table-responsive table-striped">
-                    <thead>
-                    <tr>
-                        <th>No:</th>
-                        <th>App Identifier</th>
-                        <th>VPN UUID</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tbody data-add-form-container="#app-vpn-mappings-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="#app-vpn-mappings-grid">
-                    <tr data-add-form-element="clone">
-                        <td data-title="No:">
-                            <span class="index"></span>
-                        </td>
-                        <td data-title="App Identifier">
-                            <input type="text" class="form-control grid-input-text" data-child-key="identifier"
-                                   maxlength="100" data-default="" placeholder="[ App Bundle ID ]"/>
-                        </td>
-                        <td data-title="VPN UUID">
-                            <input type="text" class="form-control grid-input-text" data-child-key="VPNUUID"
-                                   maxlength="100" data-default="" placeholder="[ VPNUUID ]"/>
-                        </td>
-                        <td>
+                                &nbsp;
+                                Add Mapping
+                            </a>
+                        </label>
+                        <div id="app-to-per-app-vpn-mappings"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="appLayerVPNMappings" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>App Identifier</th>
+                                    <th>VPN UUID</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#app-vpn-mappings-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="#app-vpn-mappings-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="App Identifier">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="identifier"
+                                               maxlength="100" data-default="" placeholder="[ App Bundle ID ]"/>
+                                    </td>
+                                    <td data-title="VPN UUID">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="VPNUUID"
+                                               maxlength="100" data-default="" placeholder="[ VPNUUID ]"/>
+                                    </td>
+                                    <td>
                                 <span class="list-group-item-actions">
                                     <a href="#app-vpn-mappings-grid" class="grid-input-remove"
                                        data-click-event="remove-form">
@@ -1358,441 +1357,441 @@ Please note that * sign represents required fields of data.
                                         </span>
                                     </a>
                                 </span>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-</div>
-<!-- /PER APP VPN -->
-
-<!-- Wifi -->
-<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" 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">
-            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>
-<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
-     aria-labelledby="wifi-body">
-<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)
+        <!-- /PER APP VPN -->
+
+        <!-- Wifi -->
+        <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" 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">
+                        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>
+
+                    <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 connect">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
-           maxlength="100" data-default=""
-           placeholder="[ Required field if no domain name is given ]">
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-domain-name">
-        Domain Name
+                        </label>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" data-default=""
+                               placeholder="[ Required field if no domain name is given ]">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-domain-name">
+                            Domain Name
                             <span class="helper"
                                   title="Domain Name used for Wi-Fi Hotspot 2.0 negotiation. This field can be provided instead of SSID. Available in iOS 7.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        ( For Wi-Fi Hotspot 2.0 negotiation )
-    </label>
-    <input id="wifi-domain-name" type="text" class="form-control operationDataKeys"
-           data-key="wifiDomainName" maxlength="100" data-default=""
-           placeholder="[ Required field if no SSID is given ]">
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="wifi-hidden-network" type="checkbox" class="form-control operationDataKeys"
-               data-key="wifiHiddenNetwork" data-default="false"/>
+                            <br>
+                            ( For Wi-Fi Hotspot 2.0 negotiation )
+                        </label>
+                        <input id="wifi-domain-name" type="text" class="form-control operationDataKeys"
+                               data-key="wifiDomainName" maxlength="100" data-default=""
+                               placeholder="[ Required field if no SSID is given ]">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="wifi-hidden-network" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="wifiHiddenNetwork" data-default="false"/>
                             <span class="helper"
                                   title="Enable this if target network is not open or broadcasting">
                                 &nbsp;&nbsp;&nbsp;Hidden Network
                                 <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="wifi-is-hot-spot" type="checkbox" class="form-control operationDataKeys"
-               data-key="wifiIsHotSpot" data-default="false"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="wifi-is-hot-spot" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="wifiIsHotSpot" data-default="false"/>
                             <span class="helper"
                                   title="If checked, the network is treated as a hotspot. Available in iOS 7.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Hot Spot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="wifi-service-provider-roaming-enabled" type="checkbox"
-               class="form-control operationDataKeys" data-key="wifiServiceProviderRoamingEnabled"
-               data-default="false"/>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="wifi-service-provider-roaming-enabled" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="wifiServiceProviderRoamingEnabled"
+                                   data-default="false"/>
                             <span class="helper"
                                   title="Indicates if connecting to roaming service providers is allowed. Available in iOS 7.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Enable Service Provider Roaming
                                 <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="wifi-auto-join" type="checkbox" class="form-control operationDataKeys"
-               data-key="wifiAutoJoin" data-default="true" checked="checked"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="wifi-auto-join" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="wifiAutoJoin" data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="If unchecked, user has to tap the network name to join it. Available in iOS 5.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Auto Join
                                 <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="wifi-displayed-operator-name">
-        Displayed Operator Name
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-displayed-operator-name">
+                            Displayed Operator Name
                             <span class="helper"
                                   title="Operator name to display. Available in iOS 7.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="wifi-displayed-operator-name" type="text" class="form-control operationDataKeys"
-           data-key="wifiDisplayedOperatorName" maxlength="100" data-default=""
-           placeholder="[ Optional field ]">
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-proxy-type">
-        Proxy Setup
+                        </label>
+                        <input id="wifi-displayed-operator-name" type="text" class="form-control operationDataKeys"
+                               data-key="wifiDisplayedOperatorName" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-proxy-type">
+                            Proxy Setup
                             <span class="helper"
                                   title="Configures type of proxy setup to be used with this network. Available in iOS 5.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="wifi-proxy-type" class="form-control operationDataKeys" data-key="wifiProxyType"
-            data-default="0"
-            onchange="slideDownPaneAgainstValueSet(this, 'manual-proxy-setup', ['Manual'])">
-        <option value="None" selected="selected">
-            None
-        </option>
-        <option value="Manual">Manual</option>
-        <option value="Auto">Automatic</option>
-    </select>
-</div>
-
-<div id="manual-proxy-setup" class="slidable-pane" style="display:none;">
-
-    For Manual Proxy Setup :
-    <br>
-    <br>
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="wifi-proxy-server">
-            Proxy Server <br>
-            ( Server URL or IP Address )
+                        </label>
+                        <select id="wifi-proxy-type" class="form-control operationDataKeys" data-key="wifiProxyType"
+                                data-default="0"
+                                onchange="slideDownPaneAgainstValueSet(this, 'manual-proxy-setup', ['Manual'])">
+                            <option value="None" selected="selected">
+                                None
+                            </option>
+                            <option value="Manual">Manual</option>
+                            <option value="Auto">Automatic</option>
+                        </select>
+                    </div>
+
+                    <div id="manual-proxy-setup" class="slidable-pane" style="display:none;">
+
+                        For Manual Proxy Setup :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-proxy-server">
+                                Proxy Server <br>
+                                ( Server URL or IP Address )
                                 <span class="helper" title="Proxy server URL or network IP address">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="wifi-proxy-server" type="text" class="form-control operationDataKeys"
-               data-key="wifiProxyServer" maxlength="100" data-default=""
-               placeholder="[ Required field ]"/>
-    </div>
+                            </label>
+                            <input id="wifi-proxy-server" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyServer" maxlength="100" data-default=""
+                                   placeholder="[ Required field ]"/>
+                        </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="wifi-proxy-port">
-            Proxy Server Port
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-proxy-port">
+                                Proxy Server Port
                                 <span class="helper" title="Proxy server port">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="wifi-proxy-port" type="text" class="form-control operationDataKeys"
-               data-key="wifiProxyPort" maxlength="5" data-default=""
-               placeholder="[ Required field which requires Number Input ]"/>
-    </div>
+                            </label>
+                            <input id="wifi-proxy-port" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyPort" maxlength="5" data-default=""
+                                   placeholder="[ Required field which requires Number Input ]"/>
+                        </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="wifi-proxy-username">
-            Proxy Username
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-proxy-username">
+                                Proxy Username
                                 <span class="helper"
                                       title="Username used to authenticate to the proxy server">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="wifi-proxy-username" type="text" class="form-control operationDataKeys"
-               data-key="wifiProxyUsername" maxlength="100" data-default=""
-               placeholder="[ Optional field ]"/>
-    </div>
+                            </label>
+                            <input id="wifi-proxy-username" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyUsername" maxlength="100" data-default=""
+                                   placeholder="[ Optional field ]"/>
+                        </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="wifi-proxy-password">
-            Proxy Password
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-proxy-password">
+                                Proxy Password
                                 <span class="helper"
                                       title="Password used to authenticate to the proxy server">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="wifi-proxy-password" type="password" class="form-control operationDataKeys"
-               data-key="wifiProxyPassword" maxlength="100" data-default=""
-               placeholder="[ Optional field ]"/>
-    </div>
+                            </label>
+                            <input id="wifi-proxy-password" type="password" class="form-control operationDataKeys"
+                                   data-key="wifiProxyPassword" maxlength="100" data-default=""
+                                   placeholder="[ Optional field ]"/>
+                        </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="wifi-proxy-pac-url">
-            Proxy PAC URL
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-proxy-pac-url">
+                                Proxy PAC URL
                                 <span class="helper"
                                       title="URL of the PAC file that defines the proxy configuration">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-        <input id="wifi-proxy-pac-url" type="text" class="form-control operationDataKeys"
-               data-key="wifiProxyPACURL" maxlength="100" data-default=""
-               placeholder="[ Optional field ]">
-    </div>
+                            </label>
+                            <input id="wifi-proxy-pac-url" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyPACURL" maxlength="100" data-default=""
+                                   placeholder="[ Optional field ]">
+                        </div>
 
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="wifi-proxy-pac-fallback-allowed" type="checkbox"
-                   class="form-control operationDataKeys" data-key="wifiProxyPACFallbackAllowed"
-                   data-default="true" checked="checked"/>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control checkbox">
+                                <input id="wifi-proxy-pac-fallback-allowed" type="checkbox"
+                                       class="form-control operationDataKeys" data-key="wifiProxyPACFallbackAllowed"
+                                       data-default="true" checked="checked"/>
                                 <span class="helper"
                                       title="If unchecked, prevents a device from connecting directly to the destination if the PAC file is unreachable. Available in iOS 7 and later.">
                                     &nbsp;&nbsp;&nbsp;Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-        </label>
-    </div>
+                            </label>
+                        </div>
 
-</div>
+                    </div>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-encryption-type">
-        Encryption Security Type
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-encryption-type">
+                            Encryption Security Type
                             <span class="helper"
                                   title="Wireless network encryption to use when connecting. Available in iOS 4.0 and later. The None value is available in iOS 5.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="wifi-encryption-type" class="form-control operationDataKeys"
-            data-key="wifiEncryptionType" data-default="0"
-            onchange="slideDownPaneAgainstValueSet(this, 'advanced-security-config', ['WEP', 'WPA', 'Any'])">
-        <option value="None" selected="selected">None</option>
-        <option value="WEP">WEP</option>
-        <option value="WPA">WPA</option>
-        <option value="Any">ANY</option>
-    </select>
-</div>
-
-<div id="advanced-security-config" class="slidable-pane" style="display:none;">
-
-For WEP, WPA or ANY Encryption Security Type :
-<br>
-<br>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-password">
-        Wi-Fi Password
+                        </label>
+                        <select id="wifi-encryption-type" class="form-control operationDataKeys"
+                                data-key="wifiEncryptionType" data-default="0"
+                                onchange="slideDownPaneAgainstValueSet(this, 'advanced-security-config', ['WEP', 'WPA', 'Any'])">
+                            <option value="None" selected="selected">None</option>
+                            <option value="WEP">WEP</option>
+                            <option value="WPA">WPA</option>
+                            <option value="Any">ANY</option>
+                        </select>
+                    </div>
+
+                    <div id="advanced-security-config" class="slidable-pane" style="display:none;">
+
+                        For WEP, WPA or ANY Encryption Security Type :
+                        <br>
+                        <br>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-password">
+                                Wi-Fi Password
                             <span class="helper"
                                   title="Password used for encryption security. Absence of a password does not prevent a network from being added to the list of known networks. The user is eventually prompted to provide the password when connecting to that 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" placeholder="[ Optional field ]">
-</div>
+                            </label>
+                            <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                                   data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]">
+                        </div>
 
-<div class="eap-client-config">
+                        <div class="eap-client-config">
 
-EAP Client Configuration ( Optional ) :
-<br>
-<br>
+                            EAP Client Configuration ( Optional ) :
+                            <br>
+                            <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-accepted-eap-types">
-        Accepted EAP Types
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-accepted-eap-types">
+                                    Accepted EAP Types
                             <span class="helper"
                                   title="Authentication protocols supported on target network.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <br>
-    </label>
-
-    <div id="wifi-accepted-eap-types"
-         class="operationDataKeys grouped-array-input valued-check-box-array"
-         data-key="wifiAcceptedEAPTypes">
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="13"/>
+                                    <br>
+                                    <br>
+                                </label>
+
+                                <div id="wifi-accepted-eap-types"
+                                     class="operationDataKeys grouped-array-input valued-check-box-array"
+                                     data-key="wifiAcceptedEAPTypes">
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="13"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;TLS
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="17"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="17"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;LEAP
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="18"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="18"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;EAP-SIM
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="21"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="21"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;TTLS
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="23"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="23"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;EAP-AKA
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="25"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="25"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;PEAP
                                 </span>
-        </label>
-        <br/><br/>
-        <label class="wr-input-control checkbox">
-            <input type="checkbox" class="form-control child-input" data-default="false"
-                   data-value="43"/>
+                                    </label>
+                                    <br/><br/>
+                                    <label class="wr-input-control checkbox">
+                                        <input type="checkbox" class="form-control child-input" data-default="false"
+                                               data-value="43"/>
                                 <span class="helper" title="">
                                     &nbsp;&nbsp;&nbsp;EAP-FAST
                                 </span>
-        </label>
-    </div>
-</div>
+                                    </label>
+                                </div>
+                            </div>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-eap-username">
-        Username
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-eap-username">
+                                    Username
                             <span class="helper"
                                   title="Unless you enter a user name, this property won't appear in an imported configuration. Users can enter this information by themselves when they authenticate.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="wifi-eap-username" type="text" class="form-control operationDataKeys"
-           data-key="wifiEAPUsername" maxlength="100" data-default=""
-           placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-eap-password">
-        Password
+                                </label>
+                                <input id="wifi-eap-username" type="text" class="form-control operationDataKeys"
+                                       data-key="wifiEAPUsername" maxlength="100" data-default=""
+                                       placeholder="[ Optional field ]"/>
+                            </div>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-eap-password">
+                                    Password
                             <span class="helper"
                                   title="If not provided, the user will be prompted during login.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="wifi-eap-password" type="password" class="form-control operationDataKeys"
-           data-key="wifiEAPPassword" maxlength="100" placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="wifi-eap-one-time-password" type="checkbox"
-               class="form-control operationDataKeys" data-key="wifiEAPOneTimePassword"
-               data-default="false"/>
+                                </label>
+                                <input id="wifi-eap-password" type="password" class="form-control operationDataKeys"
+                                       data-key="wifiEAPPassword" maxlength="100" placeholder="[ Optional field ]"/>
+                            </div>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-control checkbox">
+                                    <input id="wifi-eap-one-time-password" type="checkbox"
+                                           class="form-control operationDataKeys" data-key="wifiEAPOneTimePassword"
+                                           data-default="false"/>
                             <span class="helper"
                                   title="If checked, the user will be prompted for a password each time they connect to the network.">
                                 &nbsp;&nbsp;&nbsp;One Time Password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
+                                </label>
+                            </div>
 
-<br>
+                            <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-payload-certificate-anchor-uuids">
-        Certificate Payload Anchor UUIDs
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-payload-certificate-anchor-uuids">
+                                    Certificate Payload Anchor UUIDs
                             <span class="helper"
                                   title="Identifies the certificates to be trusted for this authentication. Each entry must contain the UUID of a certificate payload. Use this key to prevent the device from asking the user if the listed certificates are trusted.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <a href="#wifi-payload-certificate-anchor-uuids-grid" class="grid-input-add"
-           data-click-event="add-form">
+                                    <br>
+                                    <a href="#wifi-payload-certificate-anchor-uuids-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 Certificate Payload Anchor UUID
-        </a>
-    </label>
-
-    <div id="wifi-payload-certificate-anchor-uuids"
-         class="operationDataKeys grouped-array-input one-column-input-array"
-         data-key="wifiPayloadCertificateAnchorUUIDs">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>Certificate Payload Anchor UUID</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#wifi-payload-certificate-anchor-uuids-grid">
-            <tr data-help-text="add-form">
-                <td colspan="3">
-                    No entries added yet .
-                </td>
-            </tr>
-            </tbody>
-        </table>
-        <table class="template hidden">
-            <tbody data-add-form="#wifi-payload-certificate-anchor-uuids-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="Certificate Payload Anchor UUID">
-                    <input type="text" class="form-control grid-input-text" maxlength="100"
-                           data-default="" placeholder="[ Requires a Certificate Payload UUID ]"/>
-                </td>
-                <td>
+                                        &nbsp;
+                                        Add Certificate Payload Anchor UUID
+                                    </a>
+                                </label>
+
+                                <div id="wifi-payload-certificate-anchor-uuids"
+                                     class="operationDataKeys grouped-array-input one-column-input-array"
+                                     data-key="wifiPayloadCertificateAnchorUUIDs">
+                                    <table class="table table-responsive table-striped">
+                                        <thead>
+                                        <tr>
+                                            <th>No:</th>
+                                            <th>Certificate Payload Anchor UUID</th>
+                                            <th></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody data-add-form-container="#wifi-payload-certificate-anchor-uuids-grid">
+                                        <tr data-help-text="add-form">
+                                            <td colspan="3">
+                                                No entries added yet .
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table class="template hidden">
+                                        <tbody data-add-form="#wifi-payload-certificate-anchor-uuids-grid">
+                                        <tr data-add-form-element="clone">
+                                            <td data-title="No:">
+                                                <span class="index"></span>
+                                            </td>
+                                            <td data-title="Certificate Payload Anchor UUID">
+                                                <input type="text" class="form-control grid-input-text" maxlength="100"
+                                                       data-default="" placeholder="[ Requires a Certificate Payload UUID ]"/>
+                                            </td>
+                                            <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#wifi-payload-certificate-anchor-uuids-grid"
                                                    class="grid-input-remove"
@@ -1804,64 +1803,64 @@ EAP Client Configuration ( Optional ) :
                                                     </span>
                                                 </a>
                                             </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-
-<br>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-tls-trusted-server-names">
-        TLS Trusted Server Certificate Names
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+                            <br>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-tls-trusted-server-names">
+                                    TLS Trusted Server Certificate Names
                             <span class="helper"
                                   title="This is the list of server certificate common names that will be accepted. You can use wildcards to specify the name, such as wpa.*.example.com. If a server presents a certificate that isn't in this list, it won't be trusted. Used alone or in combination with TLSTrustedCertificates, the property allows someone to carefully craft which certificates to trust for the given network, and avoid dynamically trusted certificates.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <a href="#wifi-tls-trusted-server-names-grid" class="grid-input-add"
-           data-click-event="add-form">
+                                    <br>
+                                    <a href="#wifi-tls-trusted-server-names-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 TLS Trusted Server Certificate Name
-        </a>
-    </label>
-
-    <div id="wifi-tls-trusted-server-names"
-         class="operationDataKeys grouped-array-input one-column-input-array"
-         data-key="wifiTLSTrustedServerNames">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>TLS Trusted Server Certificate Name</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#wifi-tls-trusted-server-names-grid">
-            <tr data-help-text="add-form">
-                <td colspan="3">
-                    No entries added yet .
-                </td>
-            </tr>
-            </tbody>
-        </table>
-        <table class="template hidden">
-            <tbody data-add-form="#wifi-tls-trusted-server-names-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="TLS Trusted Server Certificate Name">
-                    <input type="text" class="form-control grid-input-text" maxlength="100"
-                           data-default="" placeholder="[ Requires a Certificate Common Name ]"/>
-                </td>
-                <td>
+                                        &nbsp;
+                                        Add TLS Trusted Server Certificate Name
+                                    </a>
+                                </label>
+
+                                <div id="wifi-tls-trusted-server-names"
+                                     class="operationDataKeys grouped-array-input one-column-input-array"
+                                     data-key="wifiTLSTrustedServerNames">
+                                    <table class="table table-responsive table-striped">
+                                        <thead>
+                                        <tr>
+                                            <th>No:</th>
+                                            <th>TLS Trusted Server Certificate Name</th>
+                                            <th></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody data-add-form-container="#wifi-tls-trusted-server-names-grid">
+                                        <tr data-help-text="add-form">
+                                            <td colspan="3">
+                                                No entries added yet .
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <table class="template hidden">
+                                        <tbody data-add-form="#wifi-tls-trusted-server-names-grid">
+                                        <tr data-add-form-element="clone">
+                                            <td data-title="No:">
+                                                <span class="index"></span>
+                                            </td>
+                                            <td data-title="TLS Trusted Server Certificate Name">
+                                                <input type="text" class="form-control grid-input-text" maxlength="100"
+                                                       data-default="" placeholder="[ Requires a Certificate Common Name ]"/>
+                                            </td>
+                                            <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#wifi-tls-trusted-server-names-grid"
                                                    class="grid-input-remove"
@@ -1873,208 +1872,208 @@ EAP Client Configuration ( Optional ) :
                                                     </span>
                                                 </a>
                                             </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-
-<br>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="wifi-eap-tls-allow-trust-exceptions" type="checkbox"
-               class="form-control operationDataKeys" data-key="wifiEAPTLSAllowTrustExceptions"
-               data-default="true" checked="checked"/>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+                            <br>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-control checkbox">
+                                    <input id="wifi-eap-tls-allow-trust-exceptions" type="checkbox"
+                                           class="form-control operationDataKeys" data-key="wifiEAPTLSAllowTrustExceptions"
+                                           data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="Allows / disallows a dynamic trust decision by the user. The dynamic trust is the certificate dialogue that appears when a certificate isn't trusted. If this is unchecked, the authentication fails if the certificate isn't already trusted.">
                                 &nbsp;&nbsp;&nbsp;Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
-    </label>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="wifi-eap-tls-cert-is-required" type="checkbox"
-               class="form-control operationDataKeys" data-key="wifiEAPTLSCertIsRequired"
-               data-default="true" checked="checked"/>
+                                </label>
+                            </div>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-control checkbox">
+                                    <input id="wifi-eap-tls-cert-is-required" type="checkbox"
+                                           class="form-control operationDataKeys" data-key="wifiEAPTLSCertIsRequired"
+                                           data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="If checked, allows for two-factor authentication for EAP-TTLS, PEAP or EAP-FAST. If unchecked, allows for zero factor authentication for EAP-TLS. By default this is enabled for EAP-TLS and disabled for other EAP types. Available in iOS 7.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Require TLS Certificate
                                 <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="wifi-eap-tls-inner-auth-type">
-        TTLS Inner Authentication Type
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-eap-tls-inner-auth-type">
+                                    TTLS Inner Authentication Type
                             <span class="helper"
                                   title="This is the inner authentication used by the TTLS module.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="wifi-eap-tls-inner-auth-type" class="form-control operationDataKeys"
-            data-key="wifiEAPTLSInnerAuthType" data-default="3">
-        <option value="PAP">PAP</option>
-        <option value="CHAP">CHAP</option>
-        <option value="MSCHAP">MSCHAP</option>
-        <option value="MSCHAPv2" selected="selected">MSCHAPv2</option>
-    </select>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-eap-outer-identity">
-        Outer Identity
+                                </label>
+                                <select id="wifi-eap-tls-inner-auth-type" class="form-control operationDataKeys"
+                                        data-key="wifiEAPTLSInnerAuthType" data-default="3">
+                                    <option value="PAP">PAP</option>
+                                    <option value="CHAP">CHAP</option>
+                                    <option value="MSCHAP">MSCHAP</option>
+                                    <option value="MSCHAPv2" selected="selected">MSCHAPv2</option>
+                                </select>
+                            </div>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-eap-outer-identity">
+                                    Outer Identity
                             <span class="helper"
                                   title="This allows the user to hide his or her identity. The user's actual name appears only inside the encrypted tunnel. For example, it could be set to 'anonymous' or 'anon', or 'anon@my-company.net'. It can increase security because an attacker can't see the authenticating user's name in the clear.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        ( Only relevant to TTLS, PEAP and EAP-FAST )
-    </label>
-    <input id="wifi-eap-outer-identity" type="text" class="form-control operationDataKeys"
-           data-key="wifiEAPOuterIdentity" maxlength="100" data-default=""
-           placeholder="[ Optional field ]"/>
-</div>
-
-EAP-Fast Support :
-<br>
-<br>
-
-<ul class="listing">
-    <li class="grouped-input">
-        <div class="wr-input-control">
-            <label class="wr-input-control checkbox">
-                <input id="wifi-eap-fast-use-pac" type="checkbox"
-                       class="parent-input form-control operationDataKeys"
-                       data-key="wifiEAPFastUsePAC" data-default="false"/>
+                                    <br>
+                                    ( Only relevant to TTLS, PEAP and EAP-FAST )
+                                </label>
+                                <input id="wifi-eap-outer-identity" type="text" class="form-control operationDataKeys"
+                                       data-key="wifiEAPOuterIdentity" maxlength="100" data-default=""
+                                       placeholder="[ Optional field ]"/>
+                            </div>
+
+                            EAP-Fast Support :
+                            <br>
+                            <br>
+
+                            <ul class="listing">
+                                <li class="grouped-input">
+                                    <div class="wr-input-control">
+                                        <label class="wr-input-control checkbox">
+                                            <input id="wifi-eap-fast-use-pac" type="checkbox"
+                                                   class="parent-input form-control operationDataKeys"
+                                                   data-key="wifiEAPFastUsePAC" data-default="false"/>
                                     <span class="helper"
                                           title="If checked, the device will use an existing PAC. Otherwise, the server must present its identity using a certificate.">
                                         &nbsp;&nbsp;&nbsp;Use existing PAC for EAP-FAST
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
-            </label>
-        </div>
-        <ul class="grouped-child-input">
-            <li class="grouped-input">
-                <div class="wr-input-control">
-                    <label class="wr-input-control checkbox">
-                        <input id="wifi-eap-fast-provision-pac" type="checkbox"
-                               class="parent-input child-input form-control operationDataKeys"
-                               data-key="wifiEAPFastProvisionPAC" data-default="false"/>
+                                        </label>
+                                    </div>
+                                    <ul class="grouped-child-input">
+                                        <li class="grouped-input">
+                                            <div class="wr-input-control">
+                                                <label class="wr-input-control checkbox">
+                                                    <input id="wifi-eap-fast-provision-pac" type="checkbox"
+                                                           class="parent-input child-input form-control operationDataKeys"
+                                                           data-key="wifiEAPFastProvisionPAC" data-default="false"/>
                                             <span class="helper"
                                                   title="Used only if above is enabled. If checked, allows PAC provisioning. This particular attribute must be enabled for EAP-FAST PAC usage to succeed, because there is no other way to provision a PAC.">
                                                 &nbsp;&nbsp;&nbsp;Allow PAC Provisioning
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
-                    </label>
-                </div>
-                <ul class="grouped-child-input">
-                    <li>
-                        <div class="wr-input-control">
-                            <label class="wr-input-control checkbox">
-                                <input id="wifi-eap-fast-provision-pac-anonymously" type="checkbox"
-                                       class="child-input form-control operationDataKeys"
-                                       data-key="wifiEAPFastProvisionPACAnonymously"
-                                       data-default="false"/>
+                                                </label>
+                                            </div>
+                                            <ul class="grouped-child-input">
+                                                <li>
+                                                    <div class="wr-input-control">
+                                                        <label class="wr-input-control checkbox">
+                                                            <input id="wifi-eap-fast-provision-pac-anonymously" type="checkbox"
+                                                                   class="child-input form-control operationDataKeys"
+                                                                   data-key="wifiEAPFastProvisionPACAnonymously"
+                                                                   data-default="false"/>
                                                     <span class="helper"
                                                           title="Used only if above is enabled. If checked, provisions the device anonymously. Note that there are known man-in-the-middle attacks for anonymous provisioning.">
                                                         &nbsp;&nbsp;&nbsp;Allow Anonymous PAC Provisioning
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
-                            </label>
-                        </div>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </li>
-</ul>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-eap-sim-no-of-rands">
-        Number of expected RANDs for EAP-SIM
+                                                        </label>
+                                                    </div>
+                                                </li>
+                                            </ul>
+                                        </li>
+                                    </ul>
+                                </li>
+                            </ul>
+
+                            <div class="wr-input-control">
+                                <label class="wr-input-label" for="wifi-eap-sim-no-of-rands">
+                                    Number of expected RANDs for EAP-SIM
                             <span class="helper" title="Valid values are 2 and 3. Default is 3">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="wifi-eap-sim-no-of-rands" class="form-control operationDataKeys"
-            data-key="wifiEAPSIMNoOfRands" data-default="1">
-        <option value="2">2</option>
-        <option value="3" selected="selected">3</option>
-    </select>
-</div>
-
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-payload-cert-uuid">
-        Certificate Payload UUID
+                                </label>
+                                <select id="wifi-eap-sim-no-of-rands" class="form-control operationDataKeys"
+                                        data-key="wifiEAPSIMNoOfRands" data-default="1">
+                                    <option value="2">2</option>
+                                    <option value="3" selected="selected">3</option>
+                                </select>
+                            </div>
+
+                        </div>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wifi-payload-cert-uuid">
+                                Certificate Payload UUID
                             <span class="helper"
                                   title="UUID of the certificate payload to use for the identity credential. As with VPN configurations, it is possible to associate a certificate identity configuration with a Wi-Fi configuration. This is useful when defining credentials for a secure enterprise network.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="wifi-payload-cert-uuid" type="text" class="form-control operationDataKeys"
-           data-key="wifiPayloadCertUUID" maxlength="100" data-default=""
-           placeholder="[ Optional field ]"/>
-</div>
+                            </label>
+                            <input id="wifi-payload-cert-uuid" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiPayloadCertUUID" maxlength="100" data-default=""
+                                   placeholder="[ Optional field ]"/>
+                        </div>
 
-</div>
+                    </div>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-roaming-consortium-ois">
-        Roaming Consortium OIs
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-roaming-consortium-ois">
+                            Roaming Consortium OIs
                             <span class="helper"
                                   title="Roaming Consortium Organization Identifiers used for Wi-Fi Hotspot 2.0 negotiation. Available in iOS 7.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <a href="#wifi-roaming-consortium-ois-grid" class="grid-input-add"
-           data-click-event="add-form">
+                            <br>
+                            <a href="#wifi-roaming-consortium-ois-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 Roaming Consortium OI
-        </a>
-    </label>
-
-    <div id="wifi-roaming-consortium-ois"
-         class="operationDataKeys grouped-array-input one-column-input-array"
-         data-key="wifiRoamingConsortiumOIs">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>Roaming Consortium OI</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#wifi-roaming-consortium-ois-grid">
-            <tr data-help-text="add-form">
-                <td colspan="3">
-                    No entries added yet .
-                </td>
-            </tr>
-            </tbody>
-        </table>
-        <table class="template hidden">
-            <tbody data-add-form="#wifi-roaming-consortium-ois-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="Roaming Consortium OI">
-                    <input type="text" class="form-control grid-input-text" maxlength="10"
-                           data-default=""
-                           placeholder="[ Requires 6 or 10 hexadecimal characters ]"/>
-                </td>
-                <td>
+                                &nbsp;
+                                Add Roaming Consortium OI
+                            </a>
+                        </label>
+
+                        <div id="wifi-roaming-consortium-ois"
+                             class="operationDataKeys grouped-array-input one-column-input-array"
+                             data-key="wifiRoamingConsortiumOIs">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Roaming Consortium OI</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#wifi-roaming-consortium-ois-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="3">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#wifi-roaming-consortium-ois-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Roaming Consortium OI">
+                                        <input type="text" class="form-control grid-input-text" maxlength="10"
+                                               data-default=""
+                                               placeholder="[ Requires 6 or 10 hexadecimal characters ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#wifi-roaming-consortium-ois-grid"
                                                    class="grid-input-remove"
@@ -2086,63 +2085,63 @@ EAP-Fast Support :
                                                     </span>
                                                 </a>
                                             </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-<br>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-nai-realm-names">
-        Network Access Identifier ( NAI ) Realm Names
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-nai-realm-names">
+                            Network Access Identifier ( NAI ) Realm Names
                             <span class="helper"
                                   title="List of Network Access Identifier Realm names used for Wi-Fi Hotspot 2.0 negotiation. Available in iOS 7.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <a href="#wifi-nai-realm-names-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#wifi-nai-realm-names-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 NAI Realm Name
-        </a>
-    </label>
-
-    <div id="wifi-nai-realm-names"
-         class="operationDataKeys grouped-array-input one-column-input-array"
-         data-key="wifiNAIRealmNames">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>NAI Realm Name</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#wifi-nai-realm-names-grid">
-            <tr data-help-text="add-form">
-                <td colspan="3">
-                    No entries added yet .
-                </td>
-            </tr>
-            </tbody>
-        </table>
-        <table class="template hidden">
-            <tbody data-add-form="#wifi-nai-realm-names-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="NAI Realm Name">
-                    <input type="text" class="form-control grid-input-text" maxlength="100"
-                           data-default="" placeholder="[ Requires unique name ]"/>
-                </td>
-                <td>
+                                &nbsp;
+                                Add NAI Realm Name
+                            </a>
+                        </label>
+
+                        <div id="wifi-nai-realm-names"
+                             class="operationDataKeys grouped-array-input one-column-input-array"
+                             data-key="wifiNAIRealmNames">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>NAI Realm Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#wifi-nai-realm-names-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="3">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#wifi-nai-realm-names-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="NAI Realm Name">
+                                        <input type="text" class="form-control grid-input-text" maxlength="100"
+                                               data-default="" placeholder="[ Requires unique name ]"/>
+                                    </td>
+                                    <td>
                                         <span class="list-group-item-actions">
                                             <a href="#wifi-nai-realm-names-grid"
                                                class="grid-input-remove"
@@ -2153,68 +2152,68 @@ EAP-Fast Support :
                                                 </span>
                                             </a>
                                         </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-<br>
+                    <br>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="wifi-mcc-and-mncs">
-        Mobile Country Code ( MCC ) / Mobile Network Code ( MNC ) Configuration
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-mcc-and-mncs">
+                            Mobile Country Code ( MCC ) / Mobile Network Code ( MNC ) Configuration
                             <span class="helper"
                                   title="List of Mobile Country Code (MCC)/Mobile Network Code (MNC) pairs used for Wi-Fi Hotspot 2.0 negotiation. Each string must contain exactly six digits. Available in iOS 7.0 and later. This feature is not supported in OS X.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-        <br>
-        <a href="#wifi-mcc-and-mncs-grid" class="grid-input-add" data-click-event="add-form">
+                            <br>
+                            <a href="#wifi-mcc-and-mncs-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 MCC/MNC Pair
-        </a>
-    </label>
-
-    <div id="wifi-mcc-and-mncs"
-         class="operationDataKeys grouped-array-input multi-column-joined-input-array"
-         data-key="wifiMCCAndMNCs" data-column-count="2">
-        <table class="table table-responsive table-striped">
-            <thead>
-            <tr>
-                <th>No:</th>
-                <th>Mobile Country Code ( MCC )</th>
-                <th>Mobile Network Code ( MNC )</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody data-add-form-container="#wifi-mcc-and-mncs-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="#wifi-mcc-and-mncs-grid">
-            <tr data-add-form-element="clone">
-                <td data-title="No:">
-                    <span class="index"></span>
-                </td>
-                <td data-title="Mobile Country Code ( MCC )">
-                    <input type="text" class="form-control grid-input-text" data-input="1"
-                           maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]"/>
-                </td>
-                <td data-title="Mobile Network Code ( MNC )">
-                    <input type="text" class="form-control grid-input-text" data-input="2"
-                           maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]"/>
-                </td>
-                <td>
+                                &nbsp;
+                                Add MCC/MNC Pair
+                            </a>
+                        </label>
+
+                        <div id="wifi-mcc-and-mncs"
+                             class="operationDataKeys grouped-array-input multi-column-joined-input-array"
+                             data-key="wifiMCCAndMNCs" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Mobile Country Code ( MCC )</th>
+                                    <th>Mobile Network Code ( MNC )</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#wifi-mcc-and-mncs-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="#wifi-mcc-and-mncs-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Mobile Country Code ( MCC )">
+                                        <input type="text" class="form-control grid-input-text" data-input="1"
+                                               maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]"/>
+                                    </td>
+                                    <td data-title="Mobile Network Code ( MNC )">
+                                        <input type="text" class="form-control grid-input-text" data-input="2"
+                                               maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]"/>
+                                    </td>
+                                    <td>
                                         <span class="list-group-item-actions">
                                             <a href="#wifi-mcc-and-mncs-grid"
                                                class="grid-input-remove"
@@ -2225,109 +2224,108 @@ EAP-Fast Support :
                                                 </span>
                                             </a>
                                         </span>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-</div>
-</div>
-</div>
-<!-- End of Wifi -->
-
-<!--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" 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.
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
-            </h2>
+            </div>
         </div>
-        <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="app-restriction-body">
+        <!-- End of Wifi -->
+
+        <!--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" 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>
+                <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>
 
-            <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">
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
 
-            <select id="app-restriction-type" class="form-control operationDataKeys"
-                    data-key="restrictionType">
-                <option value="" selected="selected">
-                    None
-                </option>
-                <option value="black-list">Black List</option>
-                <option value="white-list">White List</option>
-            </select>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
+                    <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>
-                    <a href="#restricted-applications-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#restricted-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="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="[ Application Name or Description ]"/>
-                            </td>
-                            <td data-title="Package Name">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="packageName" maxlength="100" data-default=""
-                                       placeholder="[ Package Name of Application ]"/>
-                            </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="[ Application Name or Description ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ Package Name of Application ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#restricted-applications-grid"
                                                    class="grid-input-remove"
@@ -2339,470 +2337,468 @@ EAP-Fast Support :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</div>
-<!--/app-restriction-->
-
-
-<!-- Email -->
-<div class="wr-hidden-operation" data-operation="email">
-<div class="panel panel-default operation-data" data-operation="email" data-operation-code="EMAIL">
-<div id="email-heading" class="panel-heading" role="tab">
-    <h2 class="sub-title panel-title">
-        Email Settings
-        <label id="email-lbl" class="wr-input-control switch" data-toggle="collapse"
-               data-target="#email-body">
-            <input type="checkbox"/>
-            <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>
-<div id="email-body" class="panel-collapse panel-body collapse" role="tabpanel"
-     aria-labelledby="email-body">
-
-<div id="email-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="email-account-description">
-        Account Description
+        <!--/app-restriction-->
+
+
+        <!-- Email -->
+        <div class="wr-hidden-operation" data-operation="email">
+            <div class="panel panel-default operation-data" data-operation="email" data-operation-code="EMAIL">
+                <div id="email-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Email Settings
+                        <label id="email-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#email-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-account-description">
+                            Account Description
                             <span class="helper"
                                   title="Display name of the account. ( e.g. Company Mail Account )">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-account-description" type="text" class="form-control operationDataKeys"
-           data-key="emailAccountDescription" maxlength="100" data-default=""
-           placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-account-type">
-        Account Type
+                        </label>
+                        <input id="email-account-description" type="text" class="form-control operationDataKeys"
+                               data-key="emailAccountDescription" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-account-type">
+                            Account Type
                             <span class="helper" title="Protocol for accessing the email account.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="email-account-type" class="form-control operationDataKeys"
-            data-key="emailAccountType" data-default="0"
-            onchange="slideDownPaneAgainstValueSet(this, 'imap-account-type', ['EmailTypeIMAP'])">
-        <option value="EmailTypeIMAP" selected="selected">IMAP</option>
-        <option value="EmailTypePOP">POP</option>
-    </select>
-</div>
-
-<div id="imap-account-type" class="slidable-pane">
-
-    <div class="wr-input-control">
-        <label class="wr-input-label" for="email-incoming-mail-server-imap-path-prefix">
-            Path Prefix
-        </label>
-        <input id="email-incoming-mail-server-imap-path-prefix" type="text"
-               class="form-control operationDataKeys"
-               data-key="emailIncomingMailServerIMAPPathPrefix" maxlength="100" data-default=""
-               placeholder="[ Optional field ]"/>
-    </div>
+                        </label>
+                        <select id="email-account-type" class="form-control operationDataKeys"
+                                data-key="emailAccountType" data-default="0"
+                                onchange="slideDownPaneAgainstValueSet(this, 'imap-account-type', ['EmailTypeIMAP'])">
+                            <option value="EmailTypeIMAP" selected="selected">IMAP</option>
+                            <option value="EmailTypePOP">POP</option>
+                        </select>
+                    </div>
+
+                    <div id="imap-account-type" class="slidable-pane">
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="email-incoming-mail-server-imap-path-prefix">
+                                Path Prefix
+                            </label>
+                            <input id="email-incoming-mail-server-imap-path-prefix" type="text"
+                                   class="form-control operationDataKeys"
+                                   data-key="emailIncomingMailServerIMAPPathPrefix" maxlength="100" data-default=""
+                                   placeholder="[ Optional field ]"/>
+                        </div>
 
-</div>
+                    </div>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-account-name">
-        Email Account Name
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-account-name">
+                            Email Account Name
                             <span class="helper"
                                   title="Display name of the user. This is the user name in sent messages, etc.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-account-name" type="text" class="form-control operationDataKeys"
-           data-key="emailAccountName" maxlength="100" data-default=""
-           placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-address">
-        Email Address
+                        </label>
+                        <input id="email-account-name" type="text" class="form-control operationDataKeys"
+                               data-key="emailAccountName" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-address">
+                            Email Address
                             <span class="helper"
                                   title="Address of the account. Designates the full email address for the account. If not present in the payload, the device prompts for this string during profile installation.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-address" type="text" class="form-control operationDataKeys"
-           data-key="emailAddress" maxlength="100" data-default=""
-           placeholder="[ Optional field. Set On Device ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-prevent-move" type="checkbox" class="form-control operationDataKeys"
-               data-key="emailPreventMove" data-default="false"/>
+                        </label>
+                        <input id="email-address" type="text" class="form-control operationDataKeys"
+                               data-key="emailAddress" maxlength="100" data-default=""
+                               placeholder="[ Optional field. Set On Device ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-prevent-move" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="emailPreventMove" data-default="false"/>
                             <span class="helper"
                                   title="When checked, messages may not be moved out of this email account into another account. Also prevents forwarding or replying from a different account than the message was originated from. Available only in iOS 5.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Prevent Move
                                 <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="email-prevent-app-sheet" type="checkbox" class="form-control operationDataKeys"
-               data-key="emailPreventAppSheet" data-default="false"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-prevent-app-sheet" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="emailPreventAppSheet" data-default="false"/>
                             <span class="helper"
                                   title="When checked, this account is not available for sending mail in third-party applications. Available only in iOS 5.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Prevent App Sheet
                                 <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="email-smime-enabled" type="checkbox" class="form-control operationDataKeys"
-               data-key="emailSMIMEEnabled" data-default="false"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-smime-enabled" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="emailSMIMEEnabled" data-default="false"/>
                             <span class="helper"
                                   title="When checked, this account supports S/MIME. Available only in iOS 5.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Enable S/MIME
                                 <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="email-smime-signing-certificate-uuid">
-        S/MIME Signing Certificate UUID
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-smime-signing-certificate-uuid">
+                            S/MIME Signing Certificate UUID
                             <span class="helper"
                                   title="Payload UUID of the identity certificate used to sign messages sent from this account. Available only in iOS 5.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-smime-signing-certificate-uuid" type="text"
-           class="form-control operationDataKeys" data-key="emailSMIMESigningCertificateUUID"
-           maxlength="100" data-default="" placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-smime-encryption-certificate-uuid">
-        S/MIME Encryption Certificate UUID
+                        </label>
+                        <input id="email-smime-signing-certificate-uuid" type="text"
+                               class="form-control operationDataKeys" data-key="emailSMIMESigningCertificateUUID"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-smime-encryption-certificate-uuid">
+                            S/MIME Encryption Certificate UUID
                             <span class="helper"
                                   title="PayloadUUID of the identity certificate used to decrypt messages coming into this account. Available only in iOS 5.0 and later.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-smime-encryption-certificate-uuid" type="text"
-           class="form-control operationDataKeys" data-key="emailSMIMEEncryptionCertificateUUID"
-           maxlength="100" data-default="" placeholder="[ Optional field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-smime-enable-per-message-switch" type="checkbox"
-               class="form-control operationDataKeys" data-key="emailSMIMEEnablePerMessageSwitch"
-               data-default="false"/>
+                        </label>
+                        <input id="email-smime-encryption-certificate-uuid" type="text"
+                               class="form-control operationDataKeys" data-key="emailSMIMEEncryptionCertificateUUID"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-smime-enable-per-message-switch" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="emailSMIMEEnablePerMessageSwitch"
+                                   data-default="false"/>
                             <span class="helper"
                                   title="When checked, enable per-message signing and encryption switch.">
                                 &nbsp;&nbsp;&nbsp;Enable Per-Message Signing and Encryption Switch
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-disable-mail-recent-syncing" type="checkbox"
-               class="form-control operationDataKeys" data-key="emailDisableMailRecentsSyncing"
-               data-default="false"/>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-disable-mail-recent-syncing" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="emailDisableMailRecentsSyncing"
+                                   data-default="false"/>
                             <span class="helper"
                                   title="When checked, this account is excluded from recent address syncing. Available only in iOS 6.0 and later.">
                                 &nbsp;&nbsp;&nbsp;Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-</div>
+                        </label>
+                    </div>
 
-<br>
-Incoming Mail Settings :
-<hr>
+                    <br>
+                    Incoming Mail Settings :
+                    <hr>
 
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-incoming-mail-server-hostname">
-        Mail Server Hostname
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-incoming-mail-server-hostname">
+                            Mail Server Hostname
                             <span class="helper"
                                   title="Designates the incoming mail server host name ( or IP address ).">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-incoming-mail-server-hostname" type="text"
-           class="form-control operationDataKeys" data-key="emailIncomingMailServerHostname"
-           maxlength="100" data-default="" placeholder="[ Required field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-incoming-use-ssl" type="checkbox" class="form-control operationDataKeys"
-               data-key="emailIncomingUseSSL" data-default="true" checked="checked"/>
+                        </label>
+                        <input id="email-incoming-mail-server-hostname" type="text"
+                               class="form-control operationDataKeys" data-key="emailIncomingMailServerHostname"
+                               maxlength="100" data-default="" placeholder="[ Required field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-incoming-use-ssl" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="emailIncomingUseSSL" data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="Designates whether the incoming mail server uses SSL for authentication.">
                                 &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
                                 <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="email-incoming-mail-server-port">
-        Mail Server Port
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-incoming-mail-server-port">
+                            Mail Server Port
                             <span class="helper"
                                   title="Designates the incoming mail server port number. If no port number is specified, the default port for a given protocol is used.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-incoming-mail-server-port" type="text" class="form-control operationDataKeys"
-           data-key="emailIncomingMailServerPort" maxlength="5" data-default=""/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-incoming-mail-server-authentication">
-        Authentication Type
+                        </label>
+                        <input id="email-incoming-mail-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="emailIncomingMailServerPort" maxlength="5" data-default=""/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-incoming-mail-server-authentication">
+                            Authentication Type
                             <span class="helper"
                                   title="Designates the authentication scheme for incoming mail.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="email-incoming-mail-server-authentication" class="form-control operationDataKeys"
-            data-key="emailIncomingMailServerAuthentication" data-default="0">
-        <option value="EmailAuthNone" selected="selected">None</option>
-        <option value="EmailAuthPassword">Password</option>
-    </select>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-incoming-mail-server-username">
-        Username
+                        </label>
+                        <select id="email-incoming-mail-server-authentication" class="form-control operationDataKeys"
+                                data-key="emailIncomingMailServerAuthentication" data-default="0">
+                            <option value="EmailAuthNone" selected="selected">None</option>
+                            <option value="EmailAuthPassword">Password</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-incoming-mail-server-username">
+                            Username
                             <span class="helper"
                                   title="Designates the user name for the email account, usually the same as the email address up to the @ character. If not present in the payload, and the account is set up to require authentication for incoming email, the device will prompt for this string during profile installation.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-incoming-mail-server-username" type="text"
-           class="form-control operationDataKeys" data-key="emailIncomingMailServerUsername"
-           maxlength="100" data-default="" placeholder="[ Optional field ]">
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-incoming-mail-server-password">
-        Password
+                        </label>
+                        <input id="email-incoming-mail-server-username" type="text"
+                               class="form-control operationDataKeys" data-key="emailIncomingMailServerUsername"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-incoming-mail-server-password">
+                            Password
                             <span class="helper"
                                   title="Password for the Incoming Mail Server. Use only with encrypted profiles.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-incoming-mail-server-password" type="password"
-           class="form-control operationDataKeys" data-key="emailIncomingMailServerPassword"
-           maxlength="100" data-default="" placeholder="[ Optional field ]">
-</div>
-
-<br>
-Outgoing Mail Settings :
-<hr>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-outgoing-mail-server-hostname">
-        Mail Server Hostname
+                        </label>
+                        <input id="email-incoming-mail-server-password" type="password"
+                               class="form-control operationDataKeys" data-key="emailIncomingMailServerPassword"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]">
+                    </div>
+
+                    <br>
+                    Outgoing Mail Settings :
+                    <hr>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-outgoing-mail-server-hostname">
+                            Mail Server Hostname
                             <span class="helper"
                                   title="Designates the outgoing mail server host name ( or IP address ).">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-outgoing-mail-server-hostname" type="text"
-           class="form-control operationDataKeys" data-key="emailOutgoingMailServerHostname"
-           maxlength="100" data-default="" placeholder="[ Required field ]"/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-outgoing-use-ssl" type="checkbox" class="form-control operationDataKeys"
-               data-key="emailOutgoingUseSSL" data-default="true" checked="checked"/>
+                        </label>
+                        <input id="email-outgoing-mail-server-hostname" type="text"
+                               class="form-control operationDataKeys" data-key="emailOutgoingMailServerHostname"
+                               maxlength="100" data-default="" placeholder="[ Required field ]"/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-outgoing-use-ssl" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="emailOutgoingUseSSL" data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="Designates whether the outgoing mail server uses SSL for authentication.">
                                 &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
                                 <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="email-outgoing-mail-server-port">
-        Mail Server Port
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-outgoing-mail-server-port">
+                            Mail Server Port
                             <span class="helper"
                                   title="Designates the outgoing mail server port number. If no port number is specified, the default port for a given protocol is used.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-outgoing-mail-server-port" type="text" class="form-control operationDataKeys"
-           data-key="emailOutgoingMailServerPort" maxlength="5" data-default=""/>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-outgoing-mail-server-authentication">
-        Authentication Type
+                        </label>
+                        <input id="email-outgoing-mail-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="emailOutgoingMailServerPort" maxlength="5" data-default=""/>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-outgoing-mail-server-authentication">
+                            Authentication Type
                             <span class="helper"
                                   title="Designates the authentication scheme for outgoing mail.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <select id="email-outgoing-mail-server-authentication" class="form-control operationDataKeys"
-            data-key="emailOutgoingMailServerAuthentication" data-default="0">
-        <option value="EmailAuthNone" selected="selected">None</option>
-        <option value="EmailAuthPassword">Password</option>
-    </select>
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-label" for="email-outgoing-mail-server-username">
-        Username
+                        </label>
+                        <select id="email-outgoing-mail-server-authentication" class="form-control operationDataKeys"
+                                data-key="emailOutgoingMailServerAuthentication" data-default="0">
+                            <option value="EmailAuthNone" selected="selected">None</option>
+                            <option value="EmailAuthPassword">Password</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-outgoing-mail-server-username">
+                            Username
                             <span class="helper"
                                   title="Designates the user name for the email account, usually the same as the email address up to the @ character. If not present in the payload, and the account is set up to require authentication for outgoing email, the device will prompt for this string during profile installation.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-outgoing-mail-server-username" type="text"
-           class="form-control operationDataKeys" data-key="emailOutgoingMailServerUsername"
-           maxlength="100" data-default="" placeholder="[ Optional field ]">
-</div>
-
-<div class="wr-input-control">
-    <label class="wr-input-control checkbox">
-        <input id="email-outgoing-password-same-as-incoming-password" type="checkbox"
-               class="form-control operationDataKeys"
-               data-key="emailOutgoingPasswordSameAsIncomingPassword" data-default="false"/>
+                        </label>
+                        <input id="email-outgoing-mail-server-username" type="text"
+                               class="form-control operationDataKeys" data-key="emailOutgoingMailServerUsername"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="email-outgoing-password-same-as-incoming-password" type="checkbox"
+                                   class="form-control operationDataKeys"
+                                   data-key="emailOutgoingPasswordSameAsIncomingPassword" data-default="false"/>
                             <span class="helper"
                                   title="When checked, the user will be prompted for the password only once and it will be used for both outgoing and incoming mail.">
                                 &nbsp;&nbsp;&nbsp;Outgoing password same as incoming password
                                 <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="email-outgoing-mail-server-password">
-        Password
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="email-outgoing-mail-server-password">
+                            Password
                             <span class="helper"
                                   title="Password for the Outgoing Mail Server. Use only with encrypted profiles.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-    </label>
-    <input id="email-outgoing-mail-server-password" type="password"
-           class="form-control operationDataKeys" data-key="emailOutgoingMailServerPassword"
-           maxlength="100" data-default="" placeholder="[ Optional field ]">
-</div>
-
-</div>
-</div>
-</div>
-<!-- End of Email -->
-
-<!-- AirPlay -->
-<div class="wr-hidden-operation" data-operation="airplay">
-    <div class="panel panel-default operation-data" data-operation="airplay"
-         data-operation-code="AIR_PLAY">
-        <div id="airplay-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                AirPlay Settings
-                <label id="airplay-lbl" class="wr-input-control switch" data-toggle="collapse"
-                       data-target="#airplay-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 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>
-        <div id="airplay-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="airplay-body">
+                        </label>
+                        <input id="email-outgoing-mail-server-password" type="password"
+                               class="form-control operationDataKeys" data-key="emailOutgoingMailServerPassword"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]">
+                    </div>
 
-            <div id="airplay-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
+                </div>
             </div>
+        </div>
+        <!-- End of Email -->
+
+        <!-- AirPlay -->
+        <div class="wr-hidden-operation" data-operation="airplay">
+            <div class="panel panel-default operation-data" data-operation="airplay"
+                 data-operation-code="AIR_PLAY">
+                <div id="airplay-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        AirPlay Settings
+                        <label id="airplay-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#airplay-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 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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="airplay-credentials">
-                    AirPlay Credentials
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="airplay-credentials">
+                            AirPlay Credentials
                             <span class="helper"
                                   title="If present, sets passwords for known AirPlay destinations.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <a href="#airplay-credentials-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#airplay-credentials-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 Credential
-                    </a>
-                </label>
-
-                <div id="airplay-credentials"
-                     class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                     data-key="airplayCredentials" data-column-count="2">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Device Name</th>
-                            <th>Password</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#airplay-credentials-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="#airplay-credentials-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="Device Name">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="deviceName" maxlength="100" data-default=""
-                                       placeholder="[ Requires AirPlay destination name ]"/>
-                            </td>
-                            <td data-title="Password">
-                                <input type="password" class="form-control grid-input-text"
-                                       data-child-key="password" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add Credential
+                            </a>
+                        </label>
+
+                        <div id="airplay-credentials"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="airplayCredentials" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Device Name</th>
+                                    <th>Password</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#airplay-credentials-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="#airplay-credentials-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Device Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="deviceName" maxlength="100" data-default=""
+                                               placeholder="[ Requires AirPlay destination name ]"/>
+                                    </td>
+                                    <td data-title="Password">
+                                        <input type="password" class="form-control grid-input-text"
+                                               data-child-key="password" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#airplay-credentials-grid"
                                                    class="grid-input-remove"
@@ -2814,66 +2810,66 @@ Outgoing Mail Settings :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-            <br>
+                    <br>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="airplay-destinations">
-                    AirPlay Destinations Whitelist
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="airplay-destinations">
+                            AirPlay Destinations Whitelist
                             <span class="helper"
                                   title="Supervised only (ignored otherwise). If present, only AirPlay destinations present in this list are available to the device.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <a href="#airplay-destinations-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#airplay-destinations-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 Destination
-                    </a>
-                </label>
-
-                <div id="airplay-destinations"
-                     class="operationDataKeys grouped-array-input one-column-input-array"
-                     data-key="airplayDestinations">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Destination</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#airplay-destinations-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="3">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#airplay-destinations-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="Destination">
-                                <input type="text" class="form-control grid-input-text"
-                                       maxlength="17" data-default="00:00:00:00:00:00"
-                                       value="00:00:00:00:00:00"
-                                       placeholder="[ Requires Device ID of AirPlay destination ]"/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add Destination
+                            </a>
+                        </label>
+
+                        <div id="airplay-destinations"
+                             class="operationDataKeys grouped-array-input one-column-input-array"
+                             data-key="airplayDestinations">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Destination</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#airplay-destinations-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="3">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#airplay-destinations-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Destination">
+                                        <input type="text" class="form-control grid-input-text"
+                                               maxlength="17" data-default="00:00:00:00:00:00"
+                                               value="00:00:00:00:00:00"
+                                               placeholder="[ Requires Device ID of AirPlay destination ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#airplay-destinations-grid"
                                                    class="grid-input-remove"
@@ -2885,181 +2881,180 @@ Outgoing Mail Settings :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-        </div>
-    </div>
-</div>
-<!-- End of AirPlay -->
-
-<!-- LDAP -->
-<div class="wr-hidden-operation" data-operation="ldap">
-    <div class="panel panel-default operation-data" data-operation="ldap"
-         data-operation-code="LDAP">
-        <div id="ldap-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                LDAP Settings
-                <label id="ldap-lbl" class="wr-input-control switch" data-toggle="collapse"
-                       data-target="#ldap-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 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>
-        <div id="ldap-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="ldap-body">
-
-            <div id="ldap-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
             </div>
+        </div>
+        <!-- End of AirPlay -->
+
+        <!-- LDAP -->
+        <div class="wr-hidden-operation" data-operation="ldap">
+            <div class="panel panel-default operation-data" data-operation="ldap"
+                 data-operation-code="LDAP">
+                <div id="ldap-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        LDAP Settings
+                        <label id="ldap-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#ldap-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 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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="ldap-account-description">
-                    Account Description
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="ldap-account-description">
+                            Account Description
                             <span class="helper"
                                   title="Display name of the account ( e.g. Company LDAP Account ).">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="ldap-account-description" type="text"
-                       class="form-control operationDataKeys" data-key="ldapAccountDescription"
-                       maxlength="100" data-default="Company LDAP Account"
-                       value="Company LDAP Account" placeholder="[ Optional field ]"/>
-            </div>
+                        </label>
+                        <input id="ldap-account-description" type="text"
+                               class="form-control operationDataKeys" data-key="ldapAccountDescription"
+                               maxlength="100" data-default="Company LDAP Account"
+                               value="Company LDAP Account" placeholder="[ Optional field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="ldap-account-hostname">
-                    Account Hostname
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="ldap-account-hostname">
+                            Account Hostname
                             <span class="helper"
                                   title="LDAP hostname or IP address is required here.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="ldap-account-hostname" type="text" class="form-control operationDataKeys"
-                       data-key="ldapAccountHostname" maxlength="100" data-default=""
-                       placeholder="[ Required field ]"/>
-            </div>
+                        </label>
+                        <input id="ldap-account-hostname" type="text" class="form-control operationDataKeys"
+                               data-key="ldapAccountHostname" maxlength="100" data-default=""
+                               placeholder="[ Required field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="ldap-use-ssl" type="checkbox" class="form-control operationDataKeys"
-                           data-key="ldapUseSSL" data-default="true" checked="checked"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="ldap-use-ssl" type="checkbox" class="form-control operationDataKeys"
+                                   data-key="ldapUseSSL" data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication.">
                                 &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
                                 <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="ldap-account-username">
-                    Account Username
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="ldap-account-username">
+                            Account Username
                             <span class="helper" title="Username for this LDAP account.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="ldap-account-username" type="text" class="form-control operationDataKeys"
-                       data-key="ldapAccountUsername" maxlength="100" data-default=""
-                       placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="ldap-account-username" type="text" class="form-control operationDataKeys"
+                               data-key="ldapAccountUsername" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="ldap-account-password">
-                    Account Password
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="ldap-account-password">
+                            Account Password
                             <span class="helper" title="Password for this LDAP account.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="ldap-account-password" type="password"
-                       class="form-control operationDataKeys" data-key="ldapAccountPassword"
-                       maxlength="100" placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="ldap-account-password" type="password"
+                               class="form-control operationDataKeys" data-key="ldapAccountPassword"
+                               maxlength="100" placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="ldap-search-settings">
-                    Search Settings
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="ldap-search-settings">
+                            Search Settings
                             <span class="helper"
                                   title="Search settings for this LDAP server. Can have many of these for one account. Should have at least one for the account to be useful.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <a href="#ldap-search-settings-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#ldap-search-settings-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 Search Setting
-                    </a>
-                </label>
-
-                <div id="ldap-search-settings"
-                     class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                     data-key="ldapSearchSettings" data-column-count="3">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Description</th>
-                            <th>Search Base</th>
-                            <th>Scope</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#ldap-search-settings-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="5">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#ldap-search-settings-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="Description">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="searchSettingDescription" maxlength="100"
-                                       data-default="LDAP Search" value="LDAP Search"
-                                       placeholder="[ Optional field ]"/>
-                            </td>
-                            <td data-title="Search Base">
-                                <select class="form-control grid-input-select"
-                                        data-child-key="searchSettingSearchBase" data-default="0">
-                                    <option value="LDAPSearchSettingScopeBase" selected="selected">
-                                        Base
-                                    </option>
-                                    <option value="LDAPSearchSettingScopeOneLevel">One Level
-                                    </option>
-                                    <option value="LDAPSearchSettingScopeSubtree">Subtree</option>
-                                </select>
-                            </td>
-                            <td data-title="Scope">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="searchSettingScope" maxlength="100"
-                                       data-default="ou=department, o=company"
-                                       value="ou=department, o=company"
-                                       placeholder="[ Requires path to node where a search should start. ]"/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add Search Setting
+                            </a>
+                        </label>
+
+                        <div id="ldap-search-settings"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="ldapSearchSettings" data-column-count="3">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Description</th>
+                                    <th>Search Base</th>
+                                    <th>Scope</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#ldap-search-settings-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="5">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#ldap-search-settings-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Description">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="searchSettingDescription" maxlength="100"
+                                               data-default="LDAP Search" value="LDAP Search"
+                                               placeholder="[ Optional field ]"/>
+                                    </td>
+                                    <td data-title="Search Base">
+                                        <select class="form-control grid-input-select"
+                                                data-child-key="searchSettingSearchBase" data-default="0">
+                                            <option value="LDAPSearchSettingScopeBase" selected="selected">
+                                                Base
+                                            </option>
+                                            <option value="LDAPSearchSettingScopeOneLevel">One Level
+                                            </option>
+                                            <option value="LDAPSearchSettingScopeSubtree">Subtree</option>
+                                        </select>
+                                    </td>
+                                    <td data-title="Scope">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="searchSettingScope" maxlength="100"
+                                               data-default="ou=department, o=company"
+                                               value="ou=department, o=company"
+                                               placeholder="[ Requires path to node where a search should start. ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#ldap-search-settings-grid"
                                                    class="grid-input-remove"
@@ -3071,346 +3066,343 @@ Outgoing Mail Settings :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
                 </div>
             </div>
-
         </div>
-    </div>
-</div>
-<!-- End of LDAP -->
-
-<!-- Calendar (calDAV) -->
-<div class="wr-hidden-operation" data-operation="calendar">
-    <div class="panel panel-default operation-data" data-operation="calendar"
-         data-operation-code="CALDAV">
-        <div id="calendar-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Calendar
-                <label id="calendar-lbl" class="wr-input-control switch" data-toggle="collapse"
-                       data-target="#calendar-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 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.
+        <!-- End of LDAP -->
+
+        <!-- Calendar (calDAV) -->
+        <div class="wr-hidden-operation" data-operation="calendar">
+            <div class="panel panel-default operation-data" data-operation="calendar"
+                 data-operation-code="CALDAV">
+                <div id="calendar-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Calendar
+                        <label id="calendar-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#calendar-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 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>
-            </h2>
-        </div>
-        <div id="calendar-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="calendar-body">
-
-            <div id="calendar-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-account-description">
-                    Account Description
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-account-description">
+                            Account Description
                             <span class="helper"
                                   title="Display name of the account (e.g. Company CalDAV Account )">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-account-description" type="text"
-                       class="form-control operationDataKeys" data-key="calendarAccountDescription"
-                       maxlength="100" data-default="Company CalDAV Account"
-                       value="Company CalDAV Account" placeholder="[ Optional field ]"/>
-            </div>
+                        </label>
+                        <input id="calendar-account-description" type="text"
+                               class="form-control operationDataKeys" data-key="calendarAccountDescription"
+                               maxlength="100" data-default="Company CalDAV Account"
+                               value="Company CalDAV Account" placeholder="[ Optional field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-account-hostname">
-                    Account Hostname
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-account-hostname">
+                            Account Hostname
                             <span class="helper"
                                   title="CalDAV account hostname or IP address is required here.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-account-hostname" type="text"
-                       class="form-control operationDataKeys" data-key="calendarAccountHostname"
-                       maxlength="100" data-default="" placeholder="[ Required field ]"/>
-            </div>
+                        </label>
+                        <input id="calendar-account-hostname" type="text"
+                               class="form-control operationDataKeys" data-key="calendarAccountHostname"
+                               maxlength="100" data-default="" placeholder="[ Required field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="calendar-use-ssl" type="checkbox"
-                           class="form-control operationDataKeys" data-key="calendarUseSSL"
-                           checked="checked"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="calendar-use-ssl" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="calendarUseSSL"
+                                   checked="checked"/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication with CalDAV server.">
                                 &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
                                 <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="calendar-account-port">
-                    Account Port
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-account-port">
+                            Account Port
                             <span class="helper"
                                   title="CalDAV account host port number is required here.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-account-port" type="text" class="form-control operationDataKeys"
-                       data-key="calendarAccountPort" maxlength="5" data-default=""
-                       placeholder="[ Required field which requires Number Input ]"/>
-            </div>
+                        </label>
+                        <input id="calendar-account-port" type="text" class="form-control operationDataKeys"
+                               data-key="calendarAccountPort" maxlength="5" data-default=""
+                               placeholder="[ Required field which requires Number Input ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-principal-url">
-                    Principal URL
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-principal-url">
+                            Principal URL
                             <span class="helper" title="Principal URL for the CalDAV account.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-principal-url" type="text"
-                       class="form-control operationDataKeys" data-key="calendarPrincipalURL"
-                       maxlength="100" data-default="" placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="calendar-principal-url" type="text"
+                               class="form-control operationDataKeys" data-key="calendarPrincipalURL"
+                               maxlength="100" data-default="" placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-account-username">
-                    Account Username
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-account-username">
+                            Account Username
                             <span class="helper"
                                   title="CalDAV account username is required for devices being prepared or supervised.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-account-username" type="text"
-                       class="form-control operationDataKeys" data-key="calendarAccountUsername"
-                       maxlength="100" data-default=""
-                       placeholder="[ Optional field. Set On Device ]">
-            </div>
+                        </label>
+                        <input id="calendar-account-username" type="text"
+                               class="form-control operationDataKeys" data-key="calendarAccountUsername"
+                               maxlength="100" data-default=""
+                               placeholder="[ Optional field. Set On Device ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-account-password">
-                    Account Password
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-account-password">
+                            Account Password
                             <span class="helper" title="Password for CalDAV account.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-account-password" type="password"
-                       class="form-control operationDataKeys" data-key="calendarAccountPassword"
-                       maxlength="100" placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="calendar-account-password" type="password"
+                               class="form-control operationDataKeys" data-key="calendarAccountPassword"
+                               maxlength="100" placeholder="[ Optional field ]">
+                    </div>
 
-        </div>
-    </div>
-</div>
-<!-- End of Calendar (calDAV) -->
-
-<!-- Calendar subscription -->
-<div class="wr-hidden-operation" data-operation="calendar-subscription">
-    <div class="panel panel-default operation-data" data-operation="calendar-subscription"
-         data-operation-code="CALENDAR_SUBSCRIPTION">
-        <div id="calendar-subscription-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Calendar Subscription
-                <label id="subscribed-calendars-lbl" class="wr-input-control switch"
-                       data-toggle="collapse" data-target="#calendar-subscription-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 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>
-        <div id="calendar-subscription-body" class="panel-collapse panel-body collapse"
-             role="tabpanel" aria-labelledby="calendar-subscription-body">
-
-            <div id="calendar-subscription-feature-error-msg" class="alert alert-danger hidden"
-                 role="alert">
-                <i class="icon fw fw-error"></i><span></span>
             </div>
+        </div>
+        <!-- End of Calendar (calDAV) -->
+
+        <!-- Calendar subscription -->
+        <div class="wr-hidden-operation" data-operation="calendar-subscription">
+            <div class="panel panel-default operation-data" data-operation="calendar-subscription"
+                 data-operation-code="CALENDAR_SUBSCRIPTION">
+                <div id="calendar-subscription-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Calendar Subscription
+                        <label id="subscribed-calendars-lbl" class="wr-input-control switch"
+                               data-toggle="collapse" data-target="#calendar-subscription-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 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>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-subscription-description">
-                    Description
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-subscription-description">
+                            Description
                             <span class="helper" title="Description of the calendar subscription.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-subscription-description" type="text"
-                       class="form-control operationDataKeys"
-                       data-key="calendarSubscriptionDescription" maxlength="100"
-                       data-default="Subscribed Calendar" value="Company Subscribed Calendar"
-                       placeholder="[ Optional field ]"/>
-            </div>
+                        </label>
+                        <input id="calendar-subscription-description" type="text"
+                               class="form-control operationDataKeys"
+                               data-key="calendarSubscriptionDescription" maxlength="100"
+                               data-default="Subscribed Calendar" value="Company Subscribed Calendar"
+                               placeholder="[ Optional field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-subscription-hostname">
-                    Account Hostname URL
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-subscription-hostname">
+                            Account Hostname URL
                             <span class="helper" title="URL of the calendar file is required here.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-subscription-hostname" type="text"
-                       class="form-control operationDataKeys"
-                       data-key="calendarSubscriptionHostname" maxlength="100" data-default=""
-                       placeholder="[ Required field ]"/>
-            </div>
+                        </label>
+                        <input id="calendar-subscription-hostname" type="text"
+                               class="form-control operationDataKeys"
+                               data-key="calendarSubscriptionHostname" maxlength="100" data-default=""
+                               placeholder="[ Required field ]"/>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="calendar-subscription-use-ssl" type="checkbox"
-                           class="form-control operationDataKeys"
-                           data-key="calendarSubscriptionUseSSL" checked="checked"/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="calendar-subscription-use-ssl" type="checkbox"
+                                   class="form-control operationDataKeys"
+                                   data-key="calendarSubscriptionUseSSL" checked="checked"/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication.">
                                 &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
                                 <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="calendar-subscription-username">
-                    Username
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-subscription-username">
+                            Username
                             <span class="helper" title="Username for this calendar subscription.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-subscription-username" type="text"
-                       class="form-control operationDataKeys"
-                       data-key="calendarSubscriptionUsername" maxlength="100" data-default=""
-                       placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="calendar-subscription-username" type="text"
+                               class="form-control operationDataKeys"
+                               data-key="calendarSubscriptionUsername" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="calendar-subscription-password">
-                    Password
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="calendar-subscription-password">
+                            Password
                             <span class="helper" title="Password for this calendar subscription.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="calendar-subscription-password" type="password"
-                       class="form-control operationDataKeys"
-                       data-key="calendarSubscriptionPassword" maxlength="100"
-                       placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="calendar-subscription-password" type="password"
+                               class="form-control operationDataKeys"
+                               data-key="calendarSubscriptionPassword" maxlength="100"
+                               placeholder="[ Optional field ]">
+                    </div>
 
-        </div>
-    </div>
-</div>
-<!-- End of Calendar subscription -->
-
-<!-- APN -->
-<div class="wr-hidden-operation" data-operation="apn">
-    <div class="panel panel-default operation-data" data-operation="apn" data-operation-code="APN">
-        <div id="apn-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Access Point Names ( APN )
-                <label id="apn-lbl" class="wr-input-control switch" data-toggle="collapse"
-                       data-target="#apn-body">
-                    <input type="checkbox"/>
-                    <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>
-        <div id="apn-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="apn-body">
-
-            <div id="apn-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
             </div>
+        </div>
+        <!-- End of Calendar subscription -->
+
+        <!-- APN -->
+        <div class="wr-hidden-operation" data-operation="apn">
+            <div class="panel panel-default operation-data" data-operation="apn" data-operation-code="APN">
+                <div id="apn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Access Point Names ( APN )
+                        <label id="apn-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#apn-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="apn-configurations">
-                    APN Configurations
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="apn-configurations">
+                            APN Configurations
                             <span class="helper"
                                   title="Can contain an arbitrary number of entries, each describing an APN configuration.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <a href="#apn-configurations-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#apn-configurations-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 APN Configuration
-                    </a>
-                </label>
-
-                <div id="apn-configurations"
-                     class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                     data-key="apnConfigurations" data-column-count="5">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>APN</th>
-                            <th>Username</th>
-                            <th>Password</th>
-                            <th>Proxy</th>
-                            <th>Port</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#apn-configurations-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="7">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#apn-configurations-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="APN">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="apn" maxlength="100" data-default=""
-                                       placeholder="[ Required ]"/>
-                            </td>
-                            <td data-title="Username">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="username" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Password">
-                                <input type="password" class="form-control grid-input-text"
-                                       data-child-key="password" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Proxy">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="proxyServer" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Port">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="proxyPort" maxlength="5" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add APN Configuration
+                            </a>
+                        </label>
+
+                        <div id="apn-configurations"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="apnConfigurations" data-column-count="5">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>APN</th>
+                                    <th>Username</th>
+                                    <th>Password</th>
+                                    <th>Proxy</th>
+                                    <th>Port</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#apn-configurations-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="7">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#apn-configurations-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="APN">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="apn" maxlength="100" data-default=""
+                                               placeholder="[ Required ]"/>
+                                    </td>
+                                    <td data-title="Username">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="username" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Password">
+                                        <input type="password" class="form-control grid-input-text"
+                                               data-child-key="password" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Proxy">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="proxyServer" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Port">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="proxyPort" maxlength="5" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#apn-configurations-grid"
                                                    class="grid-input-remove"
@@ -3422,181 +3414,180 @@ Outgoing Mail Settings :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
                 </div>
             </div>
-
         </div>
-    </div>
-</div>
-<!-- End of APN -->
-
-<!-- Cellular Network Settings -->
-<div class="wr-hidden-operation" data-operation="cellular">
-    <div class="panel panel-default operation-data" data-operation="cellular"
-         data-operation-code="CELLULAR">
-        <div id="cellular-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Cellular Network Settings
-                <label id="cellular-lbl" class="wr-input-control switch" data-toggle="collapse"
-                       data-target="#cellular-body">
-                    <input type="checkbox"/>
-                    <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.)
+        <!-- End of APN -->
+
+        <!-- Cellular Network Settings -->
+        <div class="wr-hidden-operation" data-operation="cellular">
+            <div class="panel panel-default operation-data" data-operation="cellular"
+                 data-operation-code="CELLULAR">
+                <div id="cellular-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Cellular Network Settings
+                        <label id="cellular-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#cellular-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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>
-            </h2>
-        </div>
-        <div id="cellular-body" class="panel-collapse panel-body collapse" role="tabpanel"
-             aria-labelledby="cellular-body">
-
-            <div id="cellular-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="cellular-attach-apn-name">
-                    Cellular Configuration Name
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cellular-attach-apn-name">
+                            Cellular Configuration Name
                             <span class="helper" title="Name for this configuration.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="cellular-attach-apn-name" type="text"
-                       class="form-control operationDataKeys" data-key="cellularAttachAPNName"
-                       maxlength="100" data-default="" placeholder="[ Required field ]">
-            </div>
+                        </label>
+                        <input id="cellular-attach-apn-name" type="text"
+                               class="form-control operationDataKeys" data-key="cellularAttachAPNName"
+                               maxlength="100" data-default="" placeholder="[ Required field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="cellular-authentication-type">
-                    Authentication Type
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cellular-authentication-type">
+                            Authentication Type
                             <span class="helper" title="Cellular Settings Authentication Type.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="cellular-authentication-type" class="form-control operationDataKeys"
-                        data-key="cellularAuthenticationType" data-default="0">
-                    <option value="PAP" selected="selected">PAP</option>
-                    <option value="CHAP">CHAP</option>
-                </select>
-            </div>
+                        </label>
+                        <select id="cellular-authentication-type" class="form-control operationDataKeys"
+                                data-key="cellularAuthenticationType" data-default="0">
+                            <option value="PAP" selected="selected">PAP</option>
+                            <option value="CHAP">CHAP</option>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="cellular-username">
-                    Username
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cellular-username">
+                            Username
                             <span class="helper" title="Username used for authentication.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="cellular-username" type="text" class="form-control operationDataKeys"
-                       data-key="cellularUsername" maxlength="100" data-default=""
-                       placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="cellular-username" type="text" class="form-control operationDataKeys"
+                               data-key="cellularUsername" maxlength="100" data-default=""
+                               placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="cellular-password">
-                    Password
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cellular-password">
+                            Password
                             <span class="helper" title="Password used for authentication.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <input id="cellular-password" type="password" class="form-control operationDataKeys"
-                       data-key="cellularPassword" maxlength="100" placeholder="[ Optional field ]">
-            </div>
+                        </label>
+                        <input id="cellular-password" type="password" class="form-control operationDataKeys"
+                               data-key="cellularPassword" maxlength="100" placeholder="[ Optional field ]">
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="cellular-apn-configurations">
-                    APN Configurations
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cellular-apn-configurations">
+                            APN Configurations
                             <span class="helper"
                                   title="Can contain an arbitrary number of entries, each describing an APN configuration.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <a href="#cellular-apn-configurations-grid" class="grid-input-add"
-                       data-click-event="add-form">
+                            <br>
+                            <a href="#cellular-apn-configurations-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 APN Configuration
-                    </a>
-                </label>
-
-                <div id="cellular-apn-configurations"
-                     class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                     data-key="cellularAPNConfigurations" data-column-count="6">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>APN</th>
-                            <th>Auth.Type</th>
-                            <th>Username</th>
-                            <th>Password</th>
-                            <th>Proxy</th>
-                            <th>Port</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#cellular-apn-configurations-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="8">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#cellular-apn-configurations-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="APN">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="configurationName" maxlength="100"
-                                       data-default="" placeholder="[ Required ]"/>
-                            </td>
-                            <td data-title="Auth.Type">
-                                <select class="form-control grid-input-select"
-                                        data-child-key="authenticationType" data-default="0">
-                                    <option value="PAP" selected="selected">PAP</option>
-                                    <option value="CHAP">CHAP</option>
-                                </select>
-                            </td>
-                            <td data-title="Username">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="username" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Password">
-                                <input type="password" class="form-control grid-input-text"
-                                       data-child-key="password" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Proxy">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="proxyServer" maxlength="100" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td data-title="Port">
-                                <input type="text" class="form-control grid-input-text"
-                                       data-child-key="proxyPort" maxlength="5" data-default=""
-                                       placeholder="[ Optional ]"/>
-                            </td>
-                            <td>
+                                &nbsp;
+                                Add APN Configuration
+                            </a>
+                        </label>
+
+                        <div id="cellular-apn-configurations"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="cellularAPNConfigurations" data-column-count="6">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>APN</th>
+                                    <th>Auth.Type</th>
+                                    <th>Username</th>
+                                    <th>Password</th>
+                                    <th>Proxy</th>
+                                    <th>Port</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#cellular-apn-configurations-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="8">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#cellular-apn-configurations-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="APN">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="configurationName" maxlength="100"
+                                               data-default="" placeholder="[ Required ]"/>
+                                    </td>
+                                    <td data-title="Auth.Type">
+                                        <select class="form-control grid-input-select"
+                                                data-child-key="authenticationType" data-default="0">
+                                            <option value="PAP" selected="selected">PAP</option>
+                                            <option value="CHAP">CHAP</option>
+                                        </select>
+                                    </td>
+                                    <td data-title="Username">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="username" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Password">
+                                        <input type="password" class="form-control grid-input-text"
+                                               data-child-key="password" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Proxy">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="proxyServer" maxlength="100" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td data-title="Port">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="proxyPort" maxlength="5" data-default=""
+                                               placeholder="[ Optional ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#cellular-apn-configurations-grid"
                                                    class="grid-input-remove"
@@ -3608,1048 +3599,1047 @@ Outgoing Mail Settings :
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+
                 </div>
             </div>
-
-        </div>
-    </div>
-</div>
-<!-- End of Cellular Network Settings -->
-
-<!-- Restrictions -->
-<div class="wr-hidden-operation" data-operation="restrictions">
-<div class="panel panel-default operation-data" data-operation="restrictions"
-     data-operation-code="RESTRICTION">
-<div id="restrictions-heading" class="panel-heading" role="tab">
-    <h2 class="sub-title panel-title">
-        Restrictions
-        <label class="wr-input-control switch" data-toggle="collapse"
-               data-target="#restrictions-body">
-            <input type="checkbox"/>
-            <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>
-<div id="restrictions-body" class="panel-collapse panel-body collapse" role="tabpanel"
-     aria-labelledby="restrictions-body">
-
-<div id="restrictions-feature-error-msg" class="alert alert-danger hidden" role="alert">
-    <i class="icon fw fw-error"></i><span></span>
-</div>
-
-Restrictions on Device Functionality :
-<hr>
-<div id="restrictions-device-functionality">
-<ul class="listing">
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-camera" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowCamera" data-default="true" checked="checked"/>
+        <!-- End of Cellular Network Settings -->
+
+        <!-- Restrictions -->
+        <div class="wr-hidden-operation" data-operation="restrictions">
+            <div class="panel panel-default operation-data" data-operation="restrictions"
+                 data-operation-code="RESTRICTION">
+                <div id="restrictions-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Restrictions
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#restrictions-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </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">
+
+                    <div id="restrictions-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    Restrictions on Device Functionality :
+                    <hr>
+                    <div id="restrictions-device-functionality">
+                        <ul class="listing">
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-camera" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowCamera" data-default="true" 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>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-Chat" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowChat" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-Chat" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowChat" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable use of Messages app with supervised devices. Available in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-screen-shot" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowScreenShot" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-screen-shot" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowScreenShot" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow taking screenshots in the device">
                                             &nbsp;&nbsp;&nbsp;Allow screenshots
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-air-drop" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowAirDrop" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-air-drop" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowAirDrop" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow AirDrop feature in the device. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-voice-dialing" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-voice-dialing" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow voice dialing feature in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li class="grouped-input">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-assistant" type="checkbox"
-                   class="parent-input operationDataKeys" data-key="restrictionsAllowAssistant"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li class="grouped-input">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-assistant" type="checkbox"
+                                               class="parent-input operationDataKeys" data-key="restrictionsAllowAssistant"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable Siri as assistant in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow Siri
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-    <ul class="grouped-child-input">
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-assistant-while-locked" type="checkbox"
-                           class="child-input operationDataKeys"
-                           data-key="restrictionsAllowAssistantWhileLocked" data-default="true"
-                           checked="checked"/>
+                                    </label>
+                                </div>
+                                <ul class="grouped-child-input">
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-allow-assistant-while-locked" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsAllowAssistantWhileLocked" data-default="true"
+                                                       checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would allow Siri as assistant while device is locked. Available only in iOS 5.1 and later.">
                                                     &nbsp;&nbsp;&nbsp;Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                </label>
-            </div>
-        </li>
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-force-assistant-profanity-filter" type="checkbox"
-                           class="child-input operationDataKeys"
-                           data-key="restrictionsForceAssistantProfanityFilter" data-default="true"
-                           checked="checked"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-force-assistant-profanity-filter" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsForceAssistantProfanityFilter" data-default="true"
+                                                       checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would force use of Siri profanity filter.">
                                                     &nbsp;&nbsp;&nbsp;Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                </label>
-            </div>
-        </li>
-        <li style="visibility:hidden; position:absolute">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-assistant-user-generated-content" type="checkbox"
-                           class="child-input operationDataKeys"
-                           data-key="restrictionsAllowAssistantUserGeneratedContent"
-                           data-default="true" checked="checked"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li style="visibility:hidden; position:absolute">
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-allow-assistant-user-generated-content" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsAllowAssistantUserGeneratedContent"
+                                                       data-default="true" checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would allow Siri to query user-generated content from web in the device. Available in iOS 7 and later.">
                                                     &nbsp;&nbsp;&nbsp;Allow Siri to query user-generated content from web ( Supervised only )
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                </label>
-            </div>
-        </li>
-    </ul>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-account-modification" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowAccountModification"
-                   data-default="true" checked="checked"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-account-modification" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowAccountModification"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow modifying account settings in the device. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-app-cellular-data-modification" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowAppCellularDataModification"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-app-cellular-data-modification" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowAppCellularDataModification"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow changes to cellular data usage for apps in the device. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-bookstore" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowBookstore" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-bookstore" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowBookstore" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iBookStore in the device. Available in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-bookstore-erotica" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowBookstoreErotica"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-bookstore-erotica" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowBookstoreErotica"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iBookStore tagged as Erotica in the device. Available in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-app-installation" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowAppInstallation"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-app-installation" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowAppInstallation"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow installing apps in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow installing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-app-removal" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowAppRemoval" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-app-removal" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowAppRemoval" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow removal of apps in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-in-app-purchases" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowInAppPurchases"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-in-app-purchases" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowInAppPurchases"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow in-app purchase in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow in-app purchase
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-force-itunes-store-password-entry" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsForceITunesStorePasswordEntry"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-force-itunes-store-password-entry" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsForceITunesStorePasswordEntry"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would force iTunes store password in the device.">
                                             &nbsp;&nbsp;&nbsp;Require iTunes store password for all purchases
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-cloud-backup" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowCloudBackup" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-cloud-backup" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowCloudBackup" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iCloud backup in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-cloud-document-sync" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowCloudDocumentSync"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-cloud-document-sync" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowCloudDocumentSync"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable syncing iCloud documents and data in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-cloud-keychain-sync" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowCloudKeychainSync"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-cloud-keychain-sync" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowCloudKeychainSync"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable syncing iCloud keychain in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow iCloud keychain
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-managed-apps-cloud-sync" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowManagedAppsCloudSync"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-managed-apps-cloud-sync" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowManagedAppsCloudSync"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow managed apps in the device to store data in iCloud.">
                                             &nbsp;&nbsp;&nbsp;Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-enterprise-book-backup" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowEnterpriseBookBackup"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-enterprise-book-backup" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowEnterpriseBookBackup"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow backup of enterprise books in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-enterprise-book-metadata-sync" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowEnterpriseBookMetadataSync"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-enterprise-book-metadata-sync" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowEnterpriseBookMetadataSync"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Enterprise books notes and highlights will not be synced.">
                                             &nbsp;&nbsp;&nbsp;Allow enterprise books data sync
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-diagnostic-submission" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowDiagnosticSubmission"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-diagnostic-submission" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowDiagnosticSubmission"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would automatically submit diagnostic reports to Apple.">
                                             &nbsp;&nbsp;&nbsp;Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-explicit-content" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowExplicitContent"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-explicit-content" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowExplicitContent"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would hide explicit music or video content purchased from the iTunes Store. Explicit content is marked as such by content providers, such as record labels, when sold through the iTunes Store.">
                                             &nbsp;&nbsp;&nbsp;Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-find-my-friends-modification" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowFindMyFriendsModification"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-find-my-friends-modification" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowFindMyFriendsModification"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, changes to Find My Friends are disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow Find My Friends modification
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-fingerprint-for-unlock" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowFingerprintForUnlock"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-fingerprint-for-unlock" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowFingerprintForUnlock"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would prevent Touch ID from unlocking a device.">
                                             &nbsp;&nbsp;&nbsp;Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-global-background-fetch-when-roaming" type="checkbox"
-                   class="operationDataKeys"
-                   data-key="restrictionsAllowGlobalBackgroundFetchWhenRoaming" data-default="true"
-                   checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-global-background-fetch-when-roaming" type="checkbox"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowGlobalBackgroundFetchWhenRoaming" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would disable global background fetch activity when an iOS phone is roaming.">
                                             &nbsp;&nbsp;&nbsp;Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-lock-screen-control-center" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowLockScreenControlCenter"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-lock-screen-control-center" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowLockScreenControlCenter"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would prevent Control Center from appearing on the Lock screen. Available in iOS 7 and later.">
                                             &nbsp;&nbsp;&nbsp;Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-lock-screen-notifications-view" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowLockScreenNotificationsView"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-lock-screen-notifications-view" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowLockScreenNotificationsView"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would disable Notifications view in Notification Center on the lock screen. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-lock-screen-today-view" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowLockScreenTodayView"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-lock-screen-today-view" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowLockScreenTodayView"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would disable Today view in Notification Center on the lock screen. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Show Today view in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-host-pairing" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowHostPairing" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-host-pairing" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowHostPairing" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would disable host pairing with the exception of the supervision host. If no supervision host certificate has been configured, all pairing is disabled. Host pairing lets the administrator control which devices an iOS 7 device can pair with. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-open-from-managed-to-unmanaged" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowOpenFromManagedToUnmanaged"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-open-from-managed-to-unmanaged" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowOpenFromManagedToUnmanaged"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, documents in managed apps and accounts only open in other managed apps and accounts. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-open-from-unmanaged-to-managed" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowOpenFromUnmanagedToManaged"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-open-from-unmanaged-to-managed" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowOpenFromUnmanagedToManaged"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, documents in unmanaged apps and accounts will only open in other unmanaged apps and accounts. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-ota-pki-updates" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowOTAPKIUpdates" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-ota-pki-updates" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowOTAPKIUpdates" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, over-the-air PKI updates are disabled. Setting this restriction to false does not disable CRL and OCSP checks. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictionsAllowPassbookWhileLocked" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowPassbookWhileLocked"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictionsAllowPassbookWhileLocked" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowPassbookWhileLocked"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Passbook notifications will not be shown on the lock screen. Available only in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Show Passbook notifications in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-photo-stream" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowPhotoStream" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-photo-stream" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowPhotoStream" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-shared-stream" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowSharedStream" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-shared-stream" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowSharedStream" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Shared Photo Stream will be disabled. Available only in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow Shared Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-ui-configuration-profile-installation" type="checkbox"
-                   class="operationDataKeys"
-                   data-key="restrictionsAllowUIConfigurationProfileInstallation"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-ui-configuration-profile-installation" type="checkbox"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowUIConfigurationProfileInstallation"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, the user is prohibited from installing configuration profiles and certificates interactively. Available only in iOS 6.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow user prompted profile installation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-untrusted-tls-prompt" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowUntrustedTLSPrompt"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-untrusted-tls-prompt" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowUntrustedTLSPrompt"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, automatically rejects untrusted HTTPS certificates without prompting the user. Available only in iOS 5.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow untrusted TLS prompt
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-video-conferencing" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowVideoConferencing"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-video-conferencing" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowVideoConferencing"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, video conferencing is disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow video conferencing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-voice-dialing" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-voice-dialing" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, voice dialing is disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow voice dialing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-force-encrypted-backup" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsForceEncryptedBackup"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-force-encrypted-backup" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsForceEncryptedBackup"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would force encrypting all backups.">
                                             &nbsp;&nbsp;&nbsp;Force encrypting all backups
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-force-limit-ad-tracking" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsForceLimitAdTracking"
-                   data-default="false"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-force-limit-ad-tracking" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsForceLimitAdTracking"
+                                               data-default="false"/>
                                         <span class="helper"
                                               title="Having this checked would limit ad tracking. Available only in iOS 7.0 and later.">
                                             &nbsp;&nbsp;&nbsp;Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-force-airplay-outgoing-requests-pairing-password"
-                   type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsForceAirPlayOutgoingRequestsPairingPassword"
-                   data-default="false"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-force-airplay-outgoing-requests-pairing-password"
+                                               type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsForceAirPlayOutgoingRequestsPairingPassword"
+                                               data-default="false"/>
                                         <span class="helper"
                                               title="Having this checked would force all devices receiving AirPlay requests from this device to use a pairing password. Available only in iOS 7.1 and later.">
                                             &nbsp;&nbsp;&nbsp;Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-force-airplay-incoming-requests-pairing-password"
-                   type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsForceAirPlayIncomingRequestsPairingPassword"
-                   data-default="false"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-force-airplay-incoming-requests-pairing-password"
+                                               type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsForceAirPlayIncomingRequestsPairingPassword"
+                                               data-default="false"/>
                                         <span class="helper"
                                               title="Having this checked would force all devices sending AirPlay requests to this device to use a pairing password. Available only in Apple TV 6.1 and later.">
                                             &nbsp;&nbsp;&nbsp;Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-erase-content-and-settings" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowEraseContentAndSettings"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-erase-content-and-settings" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowEraseContentAndSettings"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, “Erase All Content And Settings” option in the Reset UI is disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-spotlight-internet-results" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowSpotlightInternetResults"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-spotlight-internet-results" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowSpotlightInternetResults"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Spotlight will not return Internet search results.">
                                             &nbsp;&nbsp;&nbsp;Allow Spotlight Internet results ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictionsAllowEnablingRestrictions" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowEnablingRestrictions"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictionsAllowEnablingRestrictions" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowEnablingRestrictions"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, “Enable Restrictions” option in the Restrictions UI in Settings is disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li>
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-activity-continuation" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowActivityContinuation"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-activity-continuation" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowActivityContinuation"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Activity Continuation will be disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow Activity Continuation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-definition-lookup" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowDefinitionLookup"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-definition-lookup" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowDefinitionLookup"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, definition lookup is disabled.">
                                             &nbsp;&nbsp;&nbsp;Allow definition lookup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-predictive-keyboard" type="checkbox"
-                   class="operationDataKeys" data-key="restrictionsAllowPredictiveKeyboard"
-                   data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-predictive-keyboard" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowPredictiveKeyboard"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, predictive keyboards are disabled. Available in iOS 8.1.3 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-auto-correction" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowAutoCorrection" data-default="true"
-                   checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-auto-correction" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowAutoCorrection" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, keyboard auto-correction is disabled. Available in iOS 8.1.3 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-<li style="visibility:hidden; position:absolute">
-    <div class="wr-input-control">
-        <label class="wr-input-control checkbox">
-            <input id="restrictions-allow-spell-check" type="checkbox" class="operationDataKeys"
-                   data-key="restrictionsAllowSpellCheck" data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-spell-check" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowSpellCheck" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, keyboard spell-check is disabled. Available in iOS 8.1.3 and later.">
                                             &nbsp;&nbsp;&nbsp;Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-        </label>
-    </div>
-</li>
-</ul>
-</div>
-<br>
-Restrictions on Applications :
-<hr>
-<div id="restrictions-applications">
-    <ul class="listing">
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-itunes" type="checkbox" class="operationDataKeys"
-                           data-key="restrictionsAllowITunes" data-default="true"
-                           checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                    <br>
+                    Restrictions on Applications :
+                    <hr>
+                    <div id="restrictions-applications">
+                        <ul class="listing">
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-itunes" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowITunes" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow use of iTunes store in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow use of iTunes Store
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-        <li style="visibility:hidden; position:absolute">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-podcasts" type="checkbox"
-                           class="operationDataKeys" data-key="restrictionsAllowPodcasts"
-                           data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-podcasts" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowPodcasts"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow use of Podcasts in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow use of Podcasts ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-        <li class="grouped-input">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-safari" type="checkbox"
-                           class="parent-input operationDataKeys" data-key="restrictionsAllowSafari"
-                           data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li class="grouped-input">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-safari" type="checkbox"
+                                               class="parent-input operationDataKeys" data-key="restrictionsAllowSafari"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow use of Safari in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow Safari
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-            <ul class="grouped-child-input">
-                <li>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="restrictions-safari-allow-auto-fill" type="checkbox"
-                                   class="child-input operationDataKeys"
-                                   data-key="restrictionsSafariAllowAutoFill" data-default="true"
-                                   checked="checked"/>
+                                    </label>
+                                </div>
+                                <ul class="grouped-child-input">
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-safari-allow-auto-fill" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsSafariAllowAutoFill" data-default="true"
+                                                       checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Safari AutoFill feature in the device.">
                                                     &nbsp;&nbsp;&nbsp;Enable AutoFill
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                        </label>
-                    </div>
-                </li>
-                <li>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="restrictions-safari-force-fraud-warning" type="checkbox"
-                                   class="child-input operationDataKeys"
-                                   data-key="restrictionsSafariForceFraudWarning"
-                                   data-default="false"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-safari-force-fraud-warning" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsSafariForceFraudWarning"
+                                                       data-default="false"/>
                                                 <span class="helper"
                                                       title="Having this checked would force Safari Fraud warning feature in the device.">
                                                     &nbsp;&nbsp;&nbsp;Force Fraud warning
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                        </label>
-                    </div>
-                </li>
-                <li>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="restrictions-safari-allow-javaScript" type="checkbox"
-                                   class="child-input operationDataKeys"
-                                   data-key="restrictionsSafariAllowJavaScript" data-default="true"
-                                   checked="checked"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-safari-allow-javaScript" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsSafariAllowJavaScript" data-default="true"
+                                                       checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Javascript on Safari in the device.">
                                                     &nbsp;&nbsp;&nbsp;Enable Javascript
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                        </label>
-                    </div>
-                </li>
-                <li>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input id="restrictions-safari-allow-popups" type="checkbox"
-                                   class="child-input operationDataKeys"
-                                   data-key="restrictionsSafariAllowPopups" data-default="true"
-                                   checked="checked"/>
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-control checkbox">
+                                                <input id="restrictions-safari-allow-popups" type="checkbox"
+                                                       class="child-input operationDataKeys"
+                                                       data-key="restrictionsSafariAllowPopups" data-default="true"
+                                                       checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Pop-ups on Safari in the device.">
                                                     &nbsp;&nbsp;&nbsp;Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                        </label>
-                    </div>
-                </li>
-                <li>
-                    <div class="wr-input-control">
-                        <label class="wr-input-label" for="restrictions-safari-accept-cookies">
-                            Accept cookies
+                                            </label>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="wr-input-control">
+                                            <label class="wr-input-label" for="restrictions-safari-accept-cookies">
+                                                Accept cookies
                                                 <span class="helper"
                                                       title="Determines conditions under which the device will accept cookies.">
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
-                        </label>
-                        <select id="restrictions-safari-accept-cookies"
-                                class="form-control child-input operationDataKeys"
-                                data-key="restrictionsSafariAcceptCookies" data-default="2">
-                            <option value="0">Never</option>
-                            <option value="1">From visited sites only</option>
-                            <option value="2" selected="selected">Always</option>
-                        </select>
-                    </div>
-                </li>
-            </ul>
-        </li>
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-youtube" type="checkbox" class="operationDataKeys"
-                           data-key="restrictionsAllowYouTube" data-default="true"
-                           checked="checked"/>
+                                            </label>
+                                            <select id="restrictions-safari-accept-cookies"
+                                                    class="form-control child-input operationDataKeys"
+                                                    data-key="restrictionsSafariAcceptCookies" data-default="2">
+                                                <option value="0">Never</option>
+                                                <option value="1">From visited sites only</option>
+                                                <option value="2" selected="selected">Always</option>
+                                            </select>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-youtube" type="checkbox" class="operationDataKeys"
+                                               data-key="restrictionsAllowYouTube" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, YouTube application is disabled and its icon is removed from the Home screen. This key is ignored in iOS 6 and later because the YouTube app is not provided.">
                                             &nbsp;&nbsp;&nbsp;Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-        <li style="visibility:hidden; position:absolute">
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-game-center" type="checkbox"
-                           class="operationDataKeys" data-key="restrictionsAllowGameCenter"
-                           data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li style="visibility:hidden; position:absolute">
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-game-center" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowGameCenter"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow use of Game Center in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow use of Game Center ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-multiplayer-gaming" type="checkbox"
-                           class="operationDataKeys" data-key="restrictionsAllowMultiplayerGaming"
-                           data-default="true" checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-multiplayer-gaming" type="checkbox"
+                                               class="operationDataKeys" data-key="restrictionsAllowMultiplayerGaming"
+                                               data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow multiplayer gaming in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow multiplayer gaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="restrictions-allow-adding-game-center-friends" type="checkbox"
-                           class="operationDataKeys"
-                           data-key="restrictionsAllowAddingGameCenterFriends" data-default="true"
-                           checked="checked"/>
+                                    </label>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-control checkbox">
+                                        <input id="restrictions-allow-adding-game-center-friends" type="checkbox"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowAddingGameCenterFriends" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow adding Game Center friends in the device.">
                                             &nbsp;&nbsp;&nbsp;Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                </label>
-            </div>
-        </li>
-    </ul>
-</div>
-
-<div id="restrictions-other" style="visibility:hidden; position:absolute">
-    <br>
-    Other Restrictions :
-    <hr>
-    <ul class="listing">
-        <li>
-            <div class="wr-input-control">
-                <label class="wr-input-label"
-                       for="restrictions-autonomous-single-app-mode-permitted-app-ids">
-                    Permitted Applications in Autonomous Single App Mode
+                                    </label>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <div id="restrictions-other" style="visibility:hidden; position:absolute">
+                        <br>
+                        Other Restrictions :
+                        <hr>
+                        <ul class="listing">
+                            <li>
+                                <div class="wr-input-control">
+                                    <label class="wr-input-label"
+                                           for="restrictions-autonomous-single-app-mode-permitted-app-ids">
+                                        Permitted Applications in Autonomous Single App Mode
                                         <span class="helper"
                                               title="Supervised only. If present, allows apps identified by the bundle IDs listed to autonomously enter Single App Mode. Available only in iOS 7.0 and later.">
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
-                    <br>
-                    <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid"
-                       class="grid-input-add" data-click-event="add-form">
+                                        <br>
+                                        <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-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 Bundle ID
-                    </a>
-                </label>
-
-                <div id="restrictions-autonomous-single-app-mode-permitted-app-ids"
-                     class="operationDataKeys grouped-array-input one-column-input-array"
-                     data-key="restrictionsAutonomousSingleAppModePermittedAppIDs">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Application Bundle ID</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="3">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="Application Bundle ID">
-                                <input type="text" class="form-control grid-input-text"
-                                       maxlength="100" data-default=""
-                                       placeholder="[ Requires an Application Bundle ID ]"/>
-                            </td>
-                            <td>
+                                            &nbsp;
+                                            Add Application Bundle ID
+                                        </a>
+                                    </label>
+
+                                    <div id="restrictions-autonomous-single-app-mode-permitted-app-ids"
+                                         class="operationDataKeys grouped-array-input one-column-input-array"
+                                         data-key="restrictionsAutonomousSingleAppModePermittedAppIDs">
+                                        <table class="table table-responsive table-striped">
+                                            <thead>
+                                            <tr>
+                                                <th>No:</th>
+                                                <th>Application Bundle ID</th>
+                                                <th></th>
+                                            </tr>
+                                            </thead>
+                                            <tbody data-add-form-container="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid">
+                                            <tr data-help-text="add-form">
+                                                <td colspan="3">
+                                                    No entries added yet .
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                        <table class="template hidden">
+                                            <tbody data-add-form="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid">
+                                            <tr data-add-form-element="clone">
+                                                <td data-title="No:">
+                                                    <span class="index"></span>
+                                                </td>
+                                                <td data-title="Application Bundle ID">
+                                                    <input type="text" class="form-control grid-input-text"
+                                                           maxlength="100" data-default=""
+                                                           placeholder="[ Requires an Application Bundle ID ]"/>
+                                                </td>
+                                                <td>
                                                         <span class="list-group-item-actions">
                                                             <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid"
                                                                class="grid-input-remove"
@@ -4661,19 +4651,19 @@ Restrictions on Applications :
                                                                 </span>
                                                             </a>
                                                         </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                                </td>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+
                 </div>
             </div>
-        </li>
-    </ul>
-</div>
-
-</div>
-</div>
-</div>
-<!-- End of Restrictions -->
-</div>
+        </div>
+        <!-- End of Restrictions -->
+    </div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/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.edit/public/templates/hidden-operations-windows.hbs
index 16f244845..8f7528f1a 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-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.edit/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>

From 0160bf5feebbd55148355b8e28864c3bd57ca2d5 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 15 Sep 2016 19:26:48 +0530
Subject: [PATCH 04/22] Fix for EMM-1546

---
 .../app/pages/mdm.page.devices/public/js/device-listing.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index 98b2ab00d..03cdd769e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -76,8 +76,10 @@ function loadDevices() {
         return {};
     }
 
-    var fnCreatedRow = function (nRow) {
+    var fnCreatedRow = function (nRow, aData, dataIndex) {
         $(nRow).attr('data-type', 'selectable');
+        $(nRow).attr('data-deviceid', aData.deviceIdentifier);
+        $(nRow).attr('data-devicetype', aData.deviceType);
     };
 
 

From d2cdb388b0e0102862e7a847ac425a778ccb2d68 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saad.sahibjan@gmail.com>
Date: Thu, 15 Sep 2016 19:49:25 +0530
Subject: [PATCH 05/22] Added edit COSU policy configurations

---
 .../public/js/operation-mod.js                |  25 +-
 .../templates/hidden-operations-android.hbs   | 152 ++++++-----
 .../mdm.unit.policy.edit/public/js/edit.js    |  18 ++
 .../templates/hidden-operations-android.hbs   | 255 ++++++++++++++++++
 4 files changed, 374 insertions(+), 76 deletions(-)

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.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index a7002bb7f..a41270d32 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -851,6 +851,18 @@ var operationModule = function () {
                     "restrictedApplications": operationPayload["restricted-applications"]
                 };
                 break;
+            case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
+                payload = {
+                    "cosuSystemUpdateType": operationPayload["type"],
+                    "cosuWindowStartTime": operationPayload["startTime"],
+                    "cosuWindowEndTime": operationPayload["endTime"]
+                };
+                break;
+            case androidOperationConstants["KIOSK_APPS_CODE"]:
+                payload = {
+                    "cosuWhitelistedApplications": operationPayload["whitelistedApplications"]
+                };
+                break;
         }
         return payload;
     };
@@ -1290,6 +1302,7 @@ var operationModule = function () {
             function () {
                 var operationDataObj = $(this);
                 var key = operationDataObj.data("key");
+                var validValue = true;
                 var value;
                 if (operationDataObj.is(":text") || operationDataObj.is("textarea") ||
                     operationDataObj.is(":password") || operationDataObj.is(":hidden")) {
@@ -1297,7 +1310,9 @@ var operationModule = function () {
                 } else if (operationDataObj.is(":checkbox")) {
                     value = operationDataObj.is(":checked");
                 } else if (operationDataObj.is(":radio") && operationDataObj.is(":checked")) {
-                        value = operationDataObj.val();
+                    value = operationDataObj.val();
+                } else if (operationDataObj.is(":radio") && !(operationDataObj.is(":checked"))) {
+                    validValue = false;
                 } else if (operationDataObj.is("select")) {
                     value = operationDataObj.find("option:selected").attr("value");
                 } else if (operationDataObj.hasClass("grouped-array-input")) {
@@ -1392,7 +1407,9 @@ var operationModule = function () {
                         });
                     }
                 }
-                operationData[key] = value;
+                if (validValue) {
+                    operationData[key] = value;
+                }
             }
         );
 
@@ -1447,6 +1464,10 @@ var operationModule = function () {
                     operationDataObj.val(value);
                 } else if (operationDataObj.is(":checkbox")) {
                     operationDataObj.prop("checked", value);
+                } else if (operationDataObj.is(":radio")) {
+                    if (operationDataObj.val() == uiPayload[key]) {
+                        operationDataObj.attr("checked", true);
+                    }
                 } else if (operationDataObj.is("select")) {
                     operationDataObj.val(value);
                     /* trigger a change of value, so that if slidable panes exist,
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 66ee188cf..bb87139e7 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
@@ -3,8 +3,10 @@
         <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>
+            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>
@@ -22,9 +24,11 @@
                     <i class="fw fw-security fw-stack-2x"></i>
                 </span>
             Encryption Settings
-            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
             <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
                 <span class="wr-hidden-operations-icon fw-stack">
@@ -70,7 +74,8 @@
                     <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-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>
@@ -90,17 +95,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="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>
@@ -244,17 +250,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>
@@ -651,7 +657,7 @@
                         <ul class="message message-info">
                             <i class="icon fw fw-info"></i>
                             <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
-                                version 6.0 Marshmallow onwards only.</a>
+                                                              version 6.0 Marshmallow onwards only.</a>
                         </ul>
                     </div>
                     <div class="wr-input-control">
@@ -683,18 +689,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>
@@ -729,17 +735,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>
@@ -859,7 +865,7 @@
                                 </span>
                         </label>
                         <input id="wifi-cacert-upload" type="file" class="form-control"
-                                onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'), document.getElementById('wifi-cacert-name'))"/>
+                               onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'), document.getElementById('wifi-cacert-name'))"/>
                         <input id="wifi-cacert" type="hidden" class="form-control operationDataKeys"
                                data-key="wifiCaCert" />
                         <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
@@ -893,13 +899,14 @@
                             <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>
@@ -999,17 +1006,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>
@@ -1181,15 +1188,16 @@
                             <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>
@@ -1274,7 +1282,7 @@
         <!--android-for-work-cosu-->
         <div class="wr-hidden-operation" data-operation="android-for-work-cosu">
             <!--system-update-policy-->
-            <div class="panel panel-default operation-data" data-operation="system-update-policy"
+            <div class="panel panel-default operation-data" data-operation="android-for-work-cosu"
                  data-operation-code="SYSTEM_UPDATE_POLICY">
                 <div id="system-update-policy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
@@ -1331,8 +1339,6 @@
                             </label>
                         </div>
                     </div>
-
-
                     <div id="android-for-work-cosu-window-select" class="hidden">
                         <div>
                             <ul class="message message-info">
@@ -1440,9 +1446,8 @@
                     <div id="whitelisted-applications-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="whitelisted-application">
+                        <label class="wr-input-label" for="whitelisted-applications">
                             <br><br>Whitelisted Application List to enter Lock Task Mode
                             <span class="helper" title="Add an application to whitelist.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
@@ -1479,20 +1484,20 @@
                             </table>
                             <table class="template hidden">
                                 <tbody data-add-form="#whitelisted-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 ]"/>
-                                    </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 ]"/>
-                                    </td>
-                                    <td>
+                                    <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 ]"/>
+                                        </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 ]"/>
+                                        </td>
+                                        <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#whitelisted-applications-grid" class="grid-input-remove"
                                                    data-click-event="remove-form">
@@ -1502,8 +1507,8 @@
                                                     </span>
                                                 </a>
                                             </span>
-                                    </td>
-                                </tr>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1514,6 +1519,5 @@
             <!--/whitelisted-applications-->
         </div>
         <!--/android-for-work-cosu-->
-
     </div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
index d347446a3..9b5370de6 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
@@ -2219,6 +2219,24 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
         );
     }
 };
+
+var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
+    var selectedValueOnChange = selectElement.value;
+
+    var i, slideDownVotes = 0;
+    for (i = 0; i < valueSet.length; i++) {
+        if (selectedValueOnChange == valueSet[i]) {
+            slideDownVotes++;
+        }
+    }
+
+    var paneSelector = "#" + paneID;
+    if(slideDownVotes > 0) {
+        $(paneSelector).removeClass("hidden");
+    } else {
+        $(paneSelector).addClass("hidden");
+    }
+};
 // End of HTML embedded invoke methods
 
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
index 987a24deb..4ba3839b0 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
@@ -57,6 +57,17 @@
             <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>
+        <!--COSU-->
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('android-for-work-cosu', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-service fw-stack-2x"></i>
+            </span>
+            &nbsp;&nbsp;COSU Configuration
+            <span id="android-for-work-cosu-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="android-for-work-cosu-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="android-for-work-cosu-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <!--/COSU-->
         <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>
@@ -1286,5 +1297,249 @@
                 </div>
             </div>
         </div>
+
+        <!--android-for-work-cosu-->
+        <div class="wr-hidden-operation" data-operation="android-for-work-cosu">
+            <!--system-update-policy-->
+            <div class="panel panel-default operation-data" data-operation="android-for-work-cosu"
+                 data-operation-code="SYSTEM_UPDATE_POLICY">
+                <div id="system-update-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        System Update Policy
+                        <label id="system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#system-update-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                </div>
+                <div id="system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="android-for-work-cosu-policy-body">
+
+                    <div id="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" for="android-for-work-cosu-policy-system-update">
+                            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>
+                            <br>
+                        </label>
+                        <br>
+                        <div class="wr-input-control">
+                            <label class="wr-input-control radio light">
+                                <input id="automatic-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
+                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
+                                       value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])" checked/>
+                                <span class="helper" title="Installs system update automatically as soon as one is available">
+                                    &nbsp;Automatic
+                                </span>
+                                </span>
+                            </label>
+                            <label class="wr-input-control radio light">
+                                <input id="postpone-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
+                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
+                                       value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
+                                <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                                    &nbsp;Postpone
+                                </span>
+                            </label>
+                            <label class="wr-input-control radio light">
+                                <input id="window-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
+                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
+                                       value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
+                                <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                                    &nbsp;Window
+                                </span>
+                            </label>
+                        </div>
+                    </div>
+
+
+                    <div id="android-for-work-cosu-window-select" class="hidden">
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a id="android-for-work-cosu-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="android-for-work-cosu-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="android-for-work-cosu-start-time" class="form-control operationDataKeys"
+                                    data-key="cosuWindowStartTime" 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="android-for-work-cosu-window-end-time">
+                                Start 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="android-for-work-cosu-end-time" class="form-control operationDataKeys"
+                                    data-key="cosuWindowEndTime" 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>
+            <!--system-update-policy-->
+
+            <!--whitelisted-applications-->
+            <div class="panel panel-default operation-data" data-operation="whitelisted-applications"
+                 data-operation-code="KIOSK_APPS">
+                <div id="whitelisted-applications-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Whitelisted Applications
+                        <label id="whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#whitelisted-applications-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                </div>
+                <div id="whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="whitelisted-applications-body">
+
+                    <div id="whitelisted-applications-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="whitelisted-applications">
+                            <br><br>Whitelisted Applications List to enter Lock Task Mode
+                            <span class="helper" title="Add an application to whitelist.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            <a href="#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="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="#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="#whitelisted-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 ]"/>
+                                    </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 ]"/>
+                                    </td>
+                                    <td>
+                                    <span class="list-group-item-actions">
+                                        <a href="#whitelisted-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>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+            <!--/whitelisted-applications-->
+        </div>
+        <!--/android-for-work-cosu-->
     </div>
 </div>
\ No newline at end of file

From a717c7effbd82bd2c7bf361cbe6c91a2c4fe6fd8 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Sep 2016 09:38:34 +0530
Subject: [PATCH 06/22] Adding deviceName into notifications

---
 .../public/templates/notifications.hbs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.ui.navbar.nav-menu/public/templates/notifications.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/templates/notifications.hbs
index 91205c376..783fc8157 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/templates/notifications.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/templates/notifications.hbs
@@ -5,8 +5,8 @@
             <a href="{{../appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
                data-id="{{operationId}}"
                data-url="device/{{deviceType}}?id={{deviceIdentifier}}#event_log_tab"
-               class="new-notification" data-click-event="remove-form">
-               {{deviceType}}
+               class="new-notification text-capitalize" data-click-event="remove-form">
+                {{deviceType}} {{deviceName}}
             </a>
         </h4>
         <p>{{description}}</p>

From ac6d0eda8496e8e506872ec8a730fa799927c0af Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sat, 17 Sep 2016 16:02:27 +0530
Subject: [PATCH 07/22] Adding COSU Policy Configs - Android EMM UI

---
 .../public/js/operation-mod.js                |  60 ++-
 .../templates/hidden-operations-android.hbs   | 358 +++++++-----------
 2 files changed, 163 insertions(+), 255 deletions(-)

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.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index a41270d32..53d5d614b 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -851,18 +851,6 @@ var operationModule = function () {
                     "restrictedApplications": operationPayload["restricted-applications"]
                 };
                 break;
-            case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
-                payload = {
-                    "cosuSystemUpdateType": operationPayload["type"],
-                    "cosuWindowStartTime": operationPayload["startTime"],
-                    "cosuWindowEndTime": operationPayload["endTime"]
-                };
-                break;
-            case androidOperationConstants["KIOSK_APPS_CODE"]:
-                payload = {
-                    "cosuWhitelistedApplications": operationPayload["whitelistedApplications"]
-                };
-                break;
         }
         return payload;
     };
@@ -1028,13 +1016,21 @@ var operationModule = function () {
                 break;
             case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
                 operationType = operationTypeConstants["PROFILE"];
-                payload = {
-                    "operation": {
-                        "type": operationData["cosuSystemUpdateType"],
-                        "startTime": operationData["cosuWindowStartTime"],
-                        "endTime": operationData["cosuWindowEndTime"]
-                    }
-                };
+                if (operationData["cosuSystemUpdatePolicyType"] != "window") {
+                    payload = {
+                        "operation": {
+                            "type": operationData["cosuSystemUpdatePolicyType"]
+                        }
+                    };
+                } else {
+                    payload = {
+                        "operation": {
+                            "type": operationData["cosuSystemUpdatePolicyType"],
+                            "startTime": operationData["cosuSystemUpdatePolicyWindowStartTime"],
+                            "endTime": operationData["cosuSystemUpdatePolicyWindowEndTime"]
+                        }
+                    };
+                }
                 break;
             case androidOperationConstants["KIOSK_APPS_CODE"]:
                 operationType = operationTypeConstants["PROFILE"];
@@ -1302,19 +1298,20 @@ var operationModule = function () {
             function () {
                 var operationDataObj = $(this);
                 var key = operationDataObj.data("key");
-                var validValue = true;
                 var value;
                 if (operationDataObj.is(":text") || operationDataObj.is("textarea") ||
-                    operationDataObj.is(":password") || operationDataObj.is(":hidden")) {
+                    operationDataObj.is(":password") || operationDataObj.is("input[type=hidden]")) {
                     value = operationDataObj.val();
+                    operationData[key] = value;
                 } else if (operationDataObj.is(":checkbox")) {
                     value = operationDataObj.is(":checked");
+                    operationData[key] = value;
                 } else if (operationDataObj.is(":radio") && operationDataObj.is(":checked")) {
                     value = operationDataObj.val();
-                } else if (operationDataObj.is(":radio") && !(operationDataObj.is(":checked"))) {
-                    validValue = false;
+                    operationData[key] = value;
                 } else if (operationDataObj.is("select")) {
                     value = operationDataObj.find("option:selected").attr("value");
+                    operationData[key] = value;
                 } else if (operationDataObj.hasClass("grouped-array-input")) {
                     value = [];
                     var childInput;
@@ -1323,7 +1320,7 @@ var operationModule = function () {
                         $(".child-input", this).each(function () {
                             childInput = $(this);
                             if (childInput.is(":text") || childInput.is("textarea") || childInput.is(":password")
-                                || childInput.is(":hidden")) {
+                                || childInput.is("input[type=hidden]")) {
                                 childInputValue = childInput.val();
                             } else if (childInput.is(":checkbox")) {
                                 childInputValue = childInput.is(":checked");
@@ -1350,7 +1347,7 @@ var operationModule = function () {
                         $(".child-input", this).each(function () {
                             childInput = $(this);
                             if (childInput.is(":text") || childInput.is("textarea") || childInput.is(":password")
-                                || childInput.is(":hidden")) {
+                                || childInput.is("input[type=hidden]")) {
                                 childInputValue = childInput.val();
                             } else if (childInput.is(":checkbox")) {
                                 childInputValue = childInput.is(":checked");
@@ -1382,7 +1379,7 @@ var operationModule = function () {
                             childInput = $(this);
                             childInputKey = childInput.data("child-key");
                             if (childInput.is(":text") || childInput.is("textarea") || childInput.is(":password")
-                                || childInput.is(":hidden")) {
+                                || childInput.is("input[type=hidden]")) {
                                 childInputValue = childInput.val();
                             } else if (childInput.is(":checkbox")) {
                                 childInputValue = childInput.is(":checked");
@@ -1406,8 +1403,6 @@ var operationModule = function () {
                             }
                         });
                     }
-                }
-                if (validValue) {
                     operationData[key] = value;
                 }
             }
@@ -1460,7 +1455,8 @@ var operationModule = function () {
                 // populating input value according to the type of input
                 if (operationDataObj.is(":text") ||
                     operationDataObj.is("textarea") ||
-                    operationDataObj.is(":password")) {
+                    operationDataObj.is(":password") ||
+                    operationDataObj.is("input[type=hidden]")) {
                     operationDataObj.val(value);
                 } else if (operationDataObj.is(":checkbox")) {
                     operationDataObj.prop("checked", value);
@@ -1490,9 +1486,9 @@ var operationModule = function () {
                                 var childInputValue = value[childInputIndex];
                                 // populating extracted value in the UI according to the input type
                                 if (childInput.is(":text") ||
-                                    childInput.is(":hidden") ||
                                     childInput.is("textarea") ||
                                     childInput.is(":password") ||
+                                    childInput.is("input[type=hidden]") ||
                                     childInput.is("select")) {
                                     childInput.val(childInputValue);
                                 } else if (childInput.is(":checkbox")) {
@@ -1538,9 +1534,9 @@ var operationModule = function () {
                                     }
                                     // populating extracted value in the UI according to the input type
                                     if (childInput.is(":text") ||
-                                        childInput.is(":hidden") ||
                                         childInput.is("textarea") ||
                                         childInput.is(":password") ||
+                                        childInput.is("input[type=hidden]") ||
                                         childInput.is("select")) {
                                         childInput.val(childInputValue);
                                     } else if (childInput.is(":checkbox")) {
@@ -1567,9 +1563,9 @@ var operationModule = function () {
                                 var childInputValue = multiColumnKeyValuePair[childInputKey];
                                 // populating extracted value in the UI according to the input type
                                 if (childInput.is(":text") ||
-                                    childInput.is(":hidden") ||
                                     childInput.is("textarea") ||
                                     childInput.is(":password") ||
+                                    childInput.is("input[type=hidden]") ||
                                     childInput.is("select")) {
                                     childInput.val(childInputValue);
                                 } else if (childInput.is(":checkbox")) {
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 bb87139e7..df226cafd 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
@@ -57,28 +57,35 @@
             <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>
-        <!--COSU-->
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('android-for-work-cosu', this)">
-            <span class="wr-hidden-operation-icon fw-stack">
-                <i class="fw fw-service fw-stack-2x"></i>
-            </span>
-            &nbsp;&nbsp;COSU Configuration
-            <span id="android-for-work-cosu-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="android-for-work-cosu-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="android-for-work-cosu-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-        </a>
-        <!--/COSU-->
         <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>
+            <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)">
+            <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)">
+            <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>
 
     <div class="wr-hidden-operations-content col-lg-8">
@@ -657,7 +664,7 @@
                         <ul class="message message-info">
                             <i class="icon fw fw-info"></i>
                             <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
-                                                              version 6.0 Marshmallow onwards only.</a>
+                                version 6.0 Marshmallow onwards only.</a>
                         </ul>
                     </div>
                     <div class="wr-input-control">
@@ -886,6 +893,7 @@
             </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"
@@ -1068,113 +1076,6 @@
         </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"
@@ -1262,7 +1163,7 @@
                                   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">
+                        <label class="wr-input-label" for="work-profile-policy-install-playstore-apps">
                             Enable Google Play Store Apps
                             <span class="helper"
                                   title="The set of apps needed to be installed from Google Playstore to work-profile">
@@ -1279,86 +1180,91 @@
             </div>
         </div>
 
-        <!--android-for-work-cosu-->
-        <div class="wr-hidden-operation" data-operation="android-for-work-cosu">
-            <!--system-update-policy-->
-            <div class="panel panel-default operation-data" data-operation="android-for-work-cosu"
-                 data-operation-code="SYSTEM_UPDATE_POLICY">
-                <div id="system-update-policy-heading" class="panel-heading" role="tab">
+        <!-- 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
-                        <label id="system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
-                               data-target="#system-update-policy-body">
+                        System Update Policy (COSU)
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch" 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="system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="android-for-work-cosu-policy-body">
 
-                    <div id="system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                <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 class="wr-input-control">
-                        <label class="wr-input-label" for="android-for-work-cosu-policy-system-update">
+                        <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>
-                            <br>
                         </label>
-                        <br>
-                        <div class="wr-input-control">
-                            <label class="wr-input-control radio light">
-                                <input id="automatic-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])" checked/>
-                                <span class="helper" title="Installs system update automatically as soon as one is available">
-                                    &nbsp;Automatic
-                                </span>
-                                </span>
-                            </label>
-                            <label class="wr-input-control radio light">
-                                <input id="postpone-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
-                                <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
-                                    &nbsp;Postpone
-                                </span>
-                            </label>
-                            <label class="wr-input-control radio light">
-                                <input id="window-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update"
-                                       class="form-control operationDataKeys" data-key="cosuSystemUpdateType"
-                                       value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/>
-                                <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
-                                    &nbsp;Window
-                                </span>
-                            </label>
-                        </div>
+                        <br><br>
+                        <label class="wr-input-control radio light">
+                            <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" checked/>
+                            <span class="helper" title="Installs system update automatically as soon as one is available">
+                                &nbsp;Automatic
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                                &nbsp;Postpone
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                                &nbsp;Window
+                            </span>
+                        </label>
                     </div>
-                    <div id="android-for-work-cosu-window-select" class="hidden">
+
+                    <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="android-for-work-cosu-window-select-msg"> Below configuration of start time and end time are valid only when
-                                    <b>window</b> option is selected.</a>
+                                <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="android-for-work-cosu-window-start-time">
+                            <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="android-for-work-cosu-start-time" class="form-control operationDataKeys"
-                                    data-key="cosuWindowStartTime" data-default="0">
-                                <option value="1440" selected="selected">
-                                    12 AM
-                                </option>
+                            <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>
@@ -1385,17 +1291,16 @@
                             </select>
                         </div>
                         <div class="wr-input-control">
-                            <label class="wr-input-label" for="android-for-work-cosu-window-end-time">
-                                Start Time
+                            <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="android-for-work-cosu-end-time" class="form-control operationDataKeys"
-                                    data-key="cosuWindowEndTime" data-default="0">
-                                <option value="1440" selected="selected">
-                                    12 AM
-                                </option>
+                            <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>
@@ -1407,7 +1312,7 @@
                                 <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="720">12 Noon</option>
                                 <option value="780">1 PM</option>
                                 <option value="840">2 PM</option>
                                 <option value="900">3 PM</option>
@@ -1422,38 +1327,49 @@
                             </select>
                         </div>
                     </div>
+
                 </div>
             </div>
-            <!--system-update-policy-->
+        </div>
 
-            <!--whitelisted-applications-->
-            <div class="panel panel-default operation-data" data-operation="whitelisted-applications"
-                 data-operation-code="KIOSK_APPS">
-                <div id="whitelisted-applications-heading" class="panel-heading" role="tab">
+        <!-- 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">
-                        Whitelisted Applications
-                        <label id="whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
-                               data-target="#whitelisted-applications-body">
+                        Whitelist Applications (COSU)
+                        <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" 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="whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="whitelisted-applications-body">
 
-                    <div id="whitelisted-applications-error-msg" class="alert alert-danger hidden" role="alert">
+                <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 class="wr-input-control">
-                        <label class="wr-input-label" for="whitelisted-applications">
-                            <br><br>Whitelisted Application List to enter Lock Task Mode
-                            <span class="helper" title="Add an application to whitelist.">
+                        <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="#whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1462,44 +1378,43 @@
                                 Add Application
                             </a>
                         </label>
-                        <div id="whitelisted-applications"
-                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                             data-key="cosuWhitelistedApplications" data-column-count="2">
+                        <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>
+                                    <tr>
+                                        <th>No:</th>
+                                        <th>Application Name / Description</th>
+                                        <th>Package Name</th>
+                                        <th></th>
+                                    </tr>
                                 </thead>
-                                <tbody data-add-form-container="#whitelisted-applications-grid">
-                                <tr data-help-text="add-form">
-                                    <td colspan="4">
-                                        No entries added yet.
-                                    </td>
-                                </tr>
+                                <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="#whitelisted-applications-grid">
+                                <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="App Name">
+                                        <td data-title="Application Name / Description">
                                             <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                                   maxlength="100" data-default="" placeholder="[ Gmail ]"/>
+                                                   maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
                                         </td>
                                         <td data-title="Package Name">
-                                            <input type="text" class="form-control grid-input-text"
-                                                   data-child-key="packageName" maxlength="100" data-default=""
-                                                   placeholder="[ com.google.android.gm ]"/>
+                                            <input type="text" class="form-control grid-input-text" data-child-key="packageName"
+                                                   maxlength="100" data-default="" placeholder="[ Package Name ]"/>
                                         </td>
                                         <td>
                                             <span class="list-group-item-actions">
-                                                <a href="#whitelisted-applications-grid" class="grid-input-remove"
+                                                <a href="#cosu-whitelisted-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>
@@ -1513,11 +1428,8 @@
                             </table>
                         </div>
                     </div>
-
                 </div>
             </div>
-            <!--/whitelisted-applications-->
         </div>
-        <!--/android-for-work-cosu-->
     </div>
 </div>
\ No newline at end of file

From 8d338a584b21d9818a84590dcaa04138d5ff0633 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sat, 17 Sep 2016 17:23:21 +0530
Subject: [PATCH 08/22] Changing permissions - /devices/owning to
 /devices/owning-device

---
 .../DeviceManagementAdminService.java         | 51 +++++++++----------
 .../app/pages/mdm.page.dashboard/dashboard.js |  2 +-
 .../app/pages/mdm.page.device.view/view.js    |  2 +-
 .../app/pages/mdm.page.devices/devices.js     |  4 +-
 .../operation-bar.js                          | 24 ++++-----
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.js   |  2 +-
 .../DeviceManagementAdminService.java         |  8 +--
 7 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
index ac46bbc1f..641c399d0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
@@ -21,7 +21,6 @@ package org.wso2.carbon.mdm.services.android.services;
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.mdm.services.android.bean.wrapper.*;
 
@@ -93,7 +92,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new lock operation.")
     })
-    @Permission(name = "Lock Device", permission = "/device-mgt/devices/owning/operations/android/lock")
+    @Permission(name = "Lock Device", permission = "/device-mgt/devices/owning-device/operations/android/lock")
     Response configureDeviceLock(
             @ApiParam(name = "deviceLockBeanWrapper",
                     value = "Device lock configurations with device IDs") DeviceLockBeanWrapper deviceLockBeanWrapper);
@@ -147,7 +146,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new un-lock operation.")
     })
-    @Permission(name = "Unlock Device", permission = "/device-mgt/devices/owning/operations/android/unlock")
+    @Permission(name = "Unlock Device", permission = "/device-mgt/devices/owning-device/operations/android/unlock")
     Response configureDeviceUnlock(
             @ApiParam(name = "deviceIDs", value = "DeviceIds to be enable device unlock operation")
             List<String> deviceIDs);
@@ -200,7 +199,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new get-location operation.")})
-    @Permission(name = "Get Device Location", permission = "/device-mgt/devices/owning/operations/android/location")
+    @Permission(name = "Get Device Location", permission = "/device-mgt/devices/owning-device/operations/android/location")
     Response getDeviceLocation(
             @ApiParam(name = "deviceIDs", value = "DeviceIDs to be requested to get device location")
             List<String> deviceIDs);
@@ -253,7 +252,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new clear password operation.")
     })
-    @Permission(name = "Clear Password of Device", permission = "/device-mgt/devices/owning/operations/android/clear-password")
+    @Permission(name = "Clear Password of Device", permission = "/device-mgt/devices/owning-device/operations/android/clear-password")
     Response removePassword(
             @ApiParam(name = "deviceIDs",
                     value = "DeviceIds to be requested to remove password")  List<String> deviceIDs);
@@ -306,7 +305,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new control camera operation.")
     })
-    @Permission(name = "Manage Camera", permission = "/device-mgt/devices/owning/operations/android/camera")
+    @Permission(name = "Manage Camera", permission = "/device-mgt/devices/owning-device/operations/android/camera")
     Response configureCamera(
             @ApiParam(name = "cameraBeanWrapper", value = "Camera enable/disable configurations with device IDs")
             CameraBeanWrapper cameraBeanWrapper);
@@ -362,7 +361,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device info operation.")
     })
-    @Permission(name = "Get Device Information", permission = "/device-mgt/devices/owning/operations/android/info")
+    @Permission(name = "Get Device Information", permission = "/device-mgt/devices/owning-device/operations/android/info")
     Response getDeviceInformation(
             @ApiParam(name = "deviceIds", value = "Device IDs to be requested to get device information")
             List<String> deviceIDs);
@@ -418,7 +417,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                               "Server error occurred while adding a new device logcat operation.")
     })
-    @Permission(name = "Get Logs", permission = "/device-mgt/devices/owning/operations/android/logcat")
+    @Permission(name = "Get Logs", permission = "/device-mgt/devices/owning-device/operations/android/logcat")
     Response getDeviceLogcat(
             @ApiParam(name = "deviceIds", value = "Device IDs to be requested to get device logcat")
                     List<String> deviceIDs);
@@ -472,7 +471,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a enterprise wipe operation.")})
-    @Permission(name = "Enterprise Wipe", permission = "/device-mgt/devices/owning/operations/android/enterprise-wipe")
+    @Permission(name = "Enterprise Wipe", permission = "/device-mgt/devices/owning-device/operations/android/enterprise-wipe")
     Response wipeDevice(@ApiParam(name = "deviceIDs", value = "Device IDs to be requested to do enterprise-wipe")
                         List<String> deviceIDs);
 
@@ -524,7 +523,7 @@ public interface DeviceManagementAdminService {
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a device wipe operation.")})
-    @Permission(name = "Factory Reset", permission = "/device-mgt/devices/owning/operations/android/wipe")
+    @Permission(name = "Factory Reset", permission = "/device-mgt/devices/owning-device/operations/android/wipe")
     Response wipeData(
             @ApiParam(name = "wipeDataBeanWrapper", value = "Configurations and DeviceIds needed to do wipe-data")
             WipeDataBeanWrapper wipeDataBeanWrapper);
@@ -581,7 +580,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new get-applications operation.")
     })
-    @Permission(name = "Get Installed Application", permission = "/device-mgt/devices/owning/operations/android/applications")
+    @Permission(name = "Get Installed Application", permission = "/device-mgt/devices/owning-device/operations/android/applications")
     Response getApplications(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed to get applications that are already installed")
             List<String> deviceIDs);
@@ -634,7 +633,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device ring operation.")
     })
-    @Permission(name = "Ring Device", permission = "/device-mgt/devices/owning/operations/android/ring")
+    @Permission(name = "Ring Device", permission = "/device-mgt/devices/owning-device/operations/android/ring")
     Response ringDevice(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed for ring")
             List<String> deviceIDs);
@@ -687,7 +686,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device reboot operation.")
     })
-    @Permission(name = "Reboot Device", permission = "/device-mgt/devices/owning/operations/android/reboot")
+    @Permission(name = "Reboot Device", permission = "/device-mgt/devices/owning-device/operations/android/reboot")
     Response rebootDevice(
             @ApiParam(name = "deviceIDs", value = "Device Ids needed for reboot.")
             List<String> deviceIDs);
@@ -740,7 +739,7 @@ public interface DeviceManagementAdminService {
                             "Server error occurred while adding a new device mute operation.")
     })
     @Path("/mute")
-    @Permission(name = "Mute Device", permission = "/device-mgt/devices/owning/operations/android/mute")
+    @Permission(name = "Mute Device", permission = "/device-mgt/devices/owning-device/operations/android/mute")
     Response muteDevice(
             @ApiParam(name = "deviceIDs", value = "DeviceIDs need to be muted")
             List<String> deviceIDs);
@@ -796,7 +795,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new install-application operation.")
     })
-    @Permission(name = "Install Applications", permission = "/device-mgt/devices/owning/operations/android/install-app")
+    @Permission(name = "Install Applications", permission = "/device-mgt/devices/owning-device/operations/android/install-app")
     Response installApplication(
             @ApiParam(name = "applicationInstallationBeanWrapper", value = "Properties of installed apps and device IDs")
             ApplicationInstallationBeanWrapper applicationInstallationBeanWrapper);
@@ -852,7 +851,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new update-application operation.")
     })
-    @Permission(name = "Update installed applications", permission = "/device-mgt/devices/owning/operations/android/update-app")
+    @Permission(name = "Update installed applications", permission = "/device-mgt/devices/owning-device/operations/android/update-app")
     Response updateApplication(
             @ApiParam(name = "applicationUpdateBeanWrapper", value = "Properties of updated apps and device IDs")
             ApplicationUpdateBeanWrapper applicationUpdateBeanWrapper);
@@ -905,7 +904,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new uninstall-application operation.")
     })
-    @Permission(name = "Uninstall Applications", permission = "/device-mgt/devices/owning/operations/android/uninstall-app")
+    @Permission(name = "Uninstall Applications", permission = "/device-mgt/devices/owning-device/operations/android/uninstall-app")
     Response uninstallApplication(
             @ApiParam(name = "applicationUninstallationBeanWrapper",
                     value = "applicationUninstallationConfigs and Device Ids")
@@ -960,7 +959,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new blacklist-applications operation.")
     })
-    @Permission(name = "Blacklist Applications", permission = "/device-mgt/devices/owning/operations/android/blacklist-app")
+    @Permission(name = "Blacklist Applications", permission = "/device-mgt/devices/owning-device/operations/android/blacklist-app")
     Response blacklistApplications(
             @ApiParam(name = "blacklistApplicationsBeanWrapper", value = "BlacklistApplications " +
                     "Configuration and DeviceIds")
@@ -1015,7 +1014,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new upgrade firmware operation.")
     })
-    @Permission(name = "Upgrade Firmware", permission = "/device-mgt/devices/owning/operations/android/upgrade")
+    @Permission(name = "Upgrade Firmware", permission = "/device-mgt/devices/owning-device/operations/android/upgrade")
     Response upgradeFirmware(
             @ApiParam(name = "upgradeFirmwareBeanWrapper",
                     value = "Firmware upgrade configuration and DeviceIds")
@@ -1070,7 +1069,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new configure VPN operation.")
     })
-    @Permission(name = "Add VPN", permission = "/device-mgt/devices/owning/operations/android/vpn")
+    @Permission(name = "Add VPN", permission = "/device-mgt/devices/owning-device/operations/android/vpn")
     Response configureVPN(
             @ApiParam(name = "vpnBeanWrapper",
                     value = "VPN configuration and DeviceIds")
@@ -1124,7 +1123,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new send notification operation.")
     })
-    @Permission(name = "Send Notifications", permission = "/device-mgt/devices/owning/operations/android/notification")
+    @Permission(name = "Send Notifications", permission = "/device-mgt/devices/owning-device/operations/android/notification")
     Response sendNotification(
             @ApiParam(name = "notificationBeanWrapper",
                     value = "Notification Configurations and device Ids")
@@ -1178,7 +1177,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new configure wifi operation.")
     })
-    @Permission(name = "Add Wifi Configuration", permission = "/device-mgt/devices/owning/operations/android/wifi")
+    @Permission(name = "Add Wifi Configuration", permission = "/device-mgt/devices/owning-device/operations/android/wifi")
     Response configureWifi(
             @ApiParam(name = "wifiBeanWrapper",
                     value = "WifiConfigurations and Device Ids") WifiBeanWrapper wifiBeanWrapper);
@@ -1231,7 +1230,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new encrypt storage operation.")
     })
-    @Permission(name = "Encrypt Device", permission = "/device-mgt/devices/owning/operations/android/encrypt")
+    @Permission(name = "Encrypt Device", permission = "/device-mgt/devices/owning-device/operations/android/encrypt")
     Response encryptStorage(
             @ApiParam(name = "encryptionBeanWrapper",
                     value = "Configurations and deviceIds need to be done data encryption")
@@ -1285,7 +1284,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new change lock code operation.")
     })
-    @Permission(name = "Change Password of Device", permission = "/device-mgt/devices/owning/operations/android/change-lock")
+    @Permission(name = "Change Password of Device", permission = "/device-mgt/devices/owning-device/operations/android/change-lock")
     Response changeLockCode(
             @ApiParam(name = "lockCodeBeanWrapper",
                     value = "Configurations and device Ids need to be done change lock code")
@@ -1339,7 +1338,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new set password policy operation.")
     })
-    @Permission(name = "Set Password Policy", permission = "/device-mgt/devices/owning/operations/android/password-policy")
+    @Permission(name = "Set Password Policy", permission = "/device-mgt/devices/owning-device/operations/android/password-policy")
     Response setPasswordPolicy(
             @ApiParam(name = "passwordPolicyBeanWrapper",
                     value = "Password Policy Configurations and Device Ids")
@@ -1393,7 +1392,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new set webclip operation.")
     })
-    @Permission(name = "Add Webclips", permission = "/device-mgt/devices/owning/operations/android/webclip")
+    @Permission(name = "Add Webclips", permission = "/device-mgt/devices/owning-device/operations/android/webclip")
     Response setWebClip(
             @ApiParam(name = "webClipBeanWrapper",
                     value = "Configurations to need set web clip on device and device Ids")
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
index e1480d31c..adc0c3779 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
@@ -22,7 +22,7 @@ function onRequest(context) {
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
     var viewModel = {};
     var permissions = {};
-    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
     permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
     permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
     permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
index 1f7e9c088..35c71cbd9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.device.view/view.js
@@ -22,7 +22,7 @@ function onRequest(context){
 
     // permission checks
     // [1] checking viewing devices permission
-    viewModel["isAuthorized"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    viewModel["isAuthorized"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
 
     if (viewModel["isAuthorized"]) {
         context.handlebars.registerHelper('equal', function (lvalue, rvalue, options) {
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.js
index 6cfeebd7e..794382c67 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.js
@@ -29,10 +29,10 @@ function onRequest() {
         userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows");
 
     // [2] checking advanced device search permissions
-    permissions["ADVANCED_SEARCH"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions["ADVANCED_SEARCH"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
 
     // [3] checking device viewing permission
-    permissions["VIEW_DEVICES"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions["VIEW_DEVICES"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
 
     var currentUser = session.get(constants["USER_SESSION_KEY"]);
 
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.device.operation-bar/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
index d8e8b8405..9d6b19fb5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
@@ -24,40 +24,40 @@ function onRequest(context) {
 
     // adding android operations related permission checks
     permissions["android"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/ring")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/ring")) {
         permissions["android"].push("DEVICE_RING");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/lock-devices")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock-devices")) {
         permissions["android"].push("DEVICE_LOCK");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/unlock-devices")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock-devices")) {
         permissions["android"].push("DEVICE_UNLOCK");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/location")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/location")) {
         permissions["android"].push("DEVICE_LOCATION");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/clear-password")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/clear-password")) {
         permissions["android"].push("CLEAR_PASSWORD");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/reboot")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/reboot")) {
         permissions["android"].push("DEVICE_REBOOT");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/upgrade-firmware")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/upgrade-firmware")) {
         permissions["android"].push("UPGRADE_FIRMWARE");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/mute")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/mute")) {
         permissions["android"].push("DEVICE_MUTE");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/send-notification")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/send-notification")) {
         permissions["android"].push("NOTIFICATION");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/change-lock-code")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/change-lock-code")) {
         permissions["android"].push("CHANGE_LOCK_CODE");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/enterprise-wipe")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/enterprise-wipe")) {
         permissions["android"].push("ENTERPRISE_WIPE");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/wipe")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/wipe")) {
         permissions["android"].push("WIPE_DATA");
     }
 
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.ui.navbar.nav-menu/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
index 320e0394d..b22983330 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
@@ -45,7 +45,7 @@ function onRequest(context) {
     viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
     var currentUser = session.get(constants["USER_SESSION_KEY"]);
     var permissions = {};
-    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/view");
+    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
     permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
     permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
     permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index c53d91417..51f0d3bd8 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -49,7 +49,7 @@ public interface DeviceManagementAdminService {
 
     @POST
     @Path("/lock-devices")
-    @Permission(name = "Lock Device", permission = "/device-mgt/devices/owning/operations/windows/lock")
+    @Permission(name = "Lock Device", permission = "/device-mgt/devices/owning-device/operations/windows/lock")
     Response lock(@HeaderParam("Accept") String headerParam, List<String> deviceIds) throws
                                                                                      WindowsDeviceEnrolmentException;
 
@@ -61,19 +61,19 @@ public interface DeviceManagementAdminService {
 
     @POST
     @Path("/wipe-devices")
-    @Permission(name = "Wipe Device", permission = "/device-mgt/devices/owning/operations/windows/wipe")
+    @Permission(name = "Wipe Device", permission = "/device-mgt/devices/owning-device/operations/windows/wipe")
     Response wipe(@HeaderParam("Accept") String headerParam, List<String> deviceIds) throws
                                                                                      WindowsDeviceEnrolmentException;
 
     @POST
     @Path("/ring-devices")
-    @Permission(name = "Ring Device", permission = "/device-mgt/devices/owning/operations/windows/ring")
+    @Permission(name = "Ring Device", permission = "/device-mgt/devices/owning-device/operations/windows/ring")
     Response ring(@HeaderParam("Accept") String headerParam, List<String> deviceIds) throws
                                                                                      WindowsDeviceEnrolmentException;
 
     @POST
     @Path("/lockreset-devices")
-    @Permission(name = "Lock-Reset Device", permission = "/device-mgt/devices/owning/operations/windows/lockreset")
+    @Permission(name = "Lock-Reset Device", permission = "/device-mgt/devices/owning-device/operations/windows/lock-reset")
     Response lockReset(@HeaderParam("Accept") String acceptHeader, List<String> deviceIds)
             throws WindowsDeviceEnrolmentException;
 }

From 08c6ba061712f249962f97868a5f0e0795349509 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sat, 17 Sep 2016 20:06:18 +0530
Subject: [PATCH 09/22] Correcting typo: diableScreenCapture to
 disableScreenCapture - Operation-mod & Policy UI

---
 .../mdm.unit.device.operation-mod/public/js/operation-mod.js  | 4 ++--
 .../public/templates/hidden-operations-android.hbs            | 2 +-
 .../public/templates/hidden-operations-android.hbs            | 2 +-
 .../public/templates/hidden-operations-android.hbs            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 53d5d614b..8a7824910 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -895,7 +895,7 @@ var operationModule = function () {
                         "ALLOW_PARENT_PROFILE_APP_LINKING" : operationData["disallowParentProfileAppLinking"],
                         "ENSURE_VERIFY_APPS" : operationData["ensureVerifyApps"],
                         "AUTO_TIME" : operationData["enableAutoTime"],
-                        "SET_SCREEN_CAPTURE_DISABLED" : operationData["diableScreenCapture"],
+                        "SET_SCREEN_CAPTURE_DISABLED" : operationData["disableScreenCapture"],
                         "SET_STATUS_BAR_DISABLED" : operationData["disableStatusBar"]
                     }
                 };
@@ -1736,7 +1736,7 @@ var operationModule = function () {
                     restrictions["enableAutoTime"] = restriction["enabled"];
                     continue;
                 } else if (featureCode == androidOperationConstants["SET_SCREEN_CAPTURE_DISABLED"]){
-                    restrictions["diableScreenCapture"] = restriction["enabled"];
+                    restrictions["disableScreenCapture"] = restriction["enabled"];
                     continue;
                 } else if (featureCode == androidOperationConstants["SET_STATUS_BAR_DISABLED"]){
                     restrictions["disableStatusBar"] = restriction["enabled"];
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 df226cafd..cc8318d0d 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
@@ -455,7 +455,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
                             <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-                                   data-key="diableScreenCapture"/>
+                                   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>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
index 4ba3839b0..e33d995ea 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs
@@ -654,7 +654,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
                             <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-                                   data-key="diableScreenCapture"/>
+                                   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>
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 15c3e5f5c..f6c51ffe9 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
@@ -633,7 +633,7 @@
 <div class="wr-input-control">
     <label class="wr-input-control checkbox">
         <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-               data-key="diableScreenCapture"/>
+               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>

From 19b6a334ad59acad3e8b4cc42caa431df2b35e40 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 07:34:44 +0530
Subject: [PATCH 10/22] Changing permissions - /device-mgt/configurations to
 /device-mgt/platform-configurations

---
 .../android/services/DeviceTypeConfigurationService.java   | 5 ++---
 .../app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js      | 2 +-
 .../windows/api/services/ConfigurationMgtService.java      | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java
index 5b24c62be..e5e42f31f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java
@@ -21,7 +21,6 @@ package org.wso2.carbon.mdm.services.android.services;
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.exception.AndroidAgentException;
@@ -82,7 +81,7 @@ public interface DeviceTypeConfigurationService {
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching Android platform configuration.")
     })
-    @Permission(name = "View Configurations", permission = "/device-mgt/configurations/view")
+    @Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
     Response getConfiguration(
             @ApiParam(
                     name = "If-Modified-Since",
@@ -132,7 +131,7 @@ public interface DeviceTypeConfigurationService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while modifying Android platform configuration.")
     })
-    @Permission(name = "Manage Configurations", permission = "/device-mgt/configurations/manage")
+    @Permission(name = "Manage Configurations", permission = "/device-mgt/platform-configurations/manage")
     Response updateConfiguration(
             @ApiParam(name = "configuration",
                     value = "AndroidPlatformConfiguration")
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.ui.navbar.nav-menu/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
index b22983330..6111547e5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
@@ -50,7 +50,7 @@ function onRequest(context) {
     permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
     permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
     permissions.LIST_NOTIFICATIONS = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
-    permissions.LIST_CONFIGURATION = userModule.isAuthorized("/permission/admin/device-mgt/configurations/view");
+    permissions.LIST_CONFIGURATION = userModule.isAuthorized("/permission/admin/device-mgt/platform-configurations/view");
     viewModel.permissions = permissions;
     viewModel["currentUser"] = currentUser;
     viewModel["appContext"] = mdmProps["appContext"];
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
index b5428ba07..8c3129d7b 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
@@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 import io.swagger.annotations.Api;
 import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.annotations.api.Permission;
-import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsConfigurationException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.util.Message;
@@ -52,7 +51,7 @@ public interface ConfigurationMgtService {
      * @throws WindowsConfigurationException
      */
     @POST
-    @Permission(name = "Manage Configurations", permission = "/device-mgt/configurations/manage")
+    @Permission(name = "Manage Configurations", permission = "/device-mgt/platform-configurations/manage")
     Message ConfigureSettings(PlatformConfiguration configuration) throws WindowsConfigurationException;
 
     /**
@@ -62,7 +61,7 @@ public interface ConfigurationMgtService {
      * @throws WindowsConfigurationException
      */
     @GET
-    @Permission(name = "View Configurations", permission = "/device-mgt/configurations/view")
+    @Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
     PlatformConfiguration getConfiguration() throws WindowsConfigurationException;
 
     /**
@@ -73,6 +72,6 @@ public interface ConfigurationMgtService {
      * @throws WindowsConfigurationException
      */
     @PUT
-    @Permission(name = "Manage Configurations", permission = "/device-mgt/configurations/manage")
+    @Permission(name = "Manage Configurations", permission = "/device-mgt/platform-configurations/manage")
     Message updateConfiguration(PlatformConfiguration configuration) throws WindowsConfigurationException;
 }

From 7911e0cce6e1047ff6c6302fd1936794df17df0f Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 08:51:05 +0530
Subject: [PATCH 11/22] Updating EMM dashboard - UI

---
 .../app/pages/mdm.page.dashboard/dashboard.js | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
index adc0c3779..da2c2b46d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
@@ -16,24 +16,25 @@
  * under the License.
  */
 
-function onRequest(context) {
+function onRequest() {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-    var generalConfig = context.app.conf["generalConfig"];
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+
     var viewModel = {};
     var permissions = {};
-    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
-    permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
-    permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
-    permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
-    permissions.ADD_POLICY = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
-    permissions.ADD_ROLE = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
-    permissions.ADD_USER = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") | userModule.isAuthorized("/permission/admin/devices/enroll/android") | userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows") ){
-        permissions.ENROLL_DEVICE = true;
-    }
-    viewModel.permissions = permissions;
+    permissions["LIST_DEVICES"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
+    permissions["ENROLL_DEVICE"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/ios") ||
+        userModule.isAuthorized("/permission/admin/devices/enroll/android") ||
+        userModule.isAuthorized("/permission/admin/device-mgt/devices/enroll/windows");
+    permissions["LIST_POLICIES"] = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
+    permissions["ADD_POLICY"] = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
+    permissions["LIST_USERS"] = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    permissions["ADD_USER"] = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
+    permissions["LIST_ROLES"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
+    permissions["ADD_ROLE"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
+
+    viewModel["permissions"] = permissions;
     //TODO: Move enrollment URL into app-conf.json
-    viewModel.enrollmentURL = mdmProps.generalConfig.host +  mdmProps.enrollmentDir;
+    viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] +  mdmProps["enrollmentDir"];
     return viewModel;
 }
\ No newline at end of file

From 2c22feec20a23d4a8913faff43ff851b8c6637ac Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 09:59:43 +0530
Subject: [PATCH 12/22] Updating Add Device Modal - UI

---
 .../mdm.unit.device.qr-modal/qr-modal.hbs     | 38 ++++++++++++++-----
 .../mdm.unit.device.qr-modal/qr-modal.js      |  5 +--
 2 files changed, 31 insertions(+), 12 deletions(-)

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.device.qr-modal/qr-modal.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
index 5da7c3427..67e3e7d9e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
@@ -18,25 +18,45 @@
 {{#zone "content"}}
     <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
         <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Scan QR code to start enrollment
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+            <h4 class="pull-left modal-title">
+                <span class="fw-stack">
+                    <i class="fw fw-mobile fw-stack-2x"></i>
+                    <span class="fw-stack fw-move-right fw-move-bottom">
+                      <i class="fw fw-ring fw-stack-2x"></i>
+                      <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                      <i class="fw fw-add fw-stack-1x fw-inverse"></i>
+                   </span>
+                </span>
+                &nbsp;&nbsp;Add your new mobile device to {{@app.conf.appName}}
+            </h4>
         </div>
+        <hr>
         <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <div>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
+            <div class="panel-body col-centered text-center">
+                <h5>
+                    Please scan the following QR code using your new <b>Android</b>, <b>iPhone</b> or <b>Windows</b> mobile device.
+                </h5>
+                <br>
                 <div class="panel panel-default">
-                    <div class="panel-body col-centered text-center">
+                    <div class="panel-body">
                         <div class="qr-code"></div>
                     </div>
                 </div>
+                <br>
+                <h5>
+                    Not having a QR code scanner in your device?
+                    <br><br>
+                    Try following link
+                    <br><br>
+                    <b>{{enrollmentURL}}</b>
+                    <br><br>
+                    on your device's Internet browser instead.
+                </h5>
             </div>
         </div>
         <div class="modal-footer">
             <div class="buttons">
+                <a href="javascript:hidePopup()" class="btn-operations btn-default">Ok</a>
             </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.device.qr-modal/qr-modal.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.js
index 0f9b584f6..c876152fd 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.js
@@ -14,11 +14,10 @@
  *  limitations under the License.
  */
 
-function onRequest(context) {
+function onRequest() {
     var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
-
     var viewModel = {};
     //TODO: Move enrollment URL into app-conf.json
-    viewModel.enrollmentURL = mdmProps.generalConfig.host + mdmProps.enrollmentDir;
+    viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
     return viewModel;
 }
\ No newline at end of file

From a4ef821dc1f675ba1e3cf2758fad59d2573b7b75 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 10:05:24 +0530
Subject: [PATCH 13/22] Updating Add Device Modal - UI

---
 .../devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs    | 1 +
 1 file changed, 1 insertion(+)

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.device.qr-modal/qr-modal.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
index 67e3e7d9e..887bad097 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
@@ -29,6 +29,7 @@
                 </span>
                 &nbsp;&nbsp;Add your new mobile device to {{@app.conf.appName}}
             </h4>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
         </div>
         <hr>
         <div class="modal-body add-margin-top-2x add-margin-bottom-2x">

From 9d486a5a0a0f9395ffe05cadcc2084c761e81f28 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 10:27:17 +0530
Subject: [PATCH 14/22] Updating Device Listing - EMM UI

---
 .../devicemgt/app/pages/mdm.page.devices/devices.hbs  | 11 +++++------
 .../mdm.page.devices/public/js/device-listing.js      |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index b56d066f1..748d8b9d4 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -138,20 +138,19 @@
         </div>
         <div id="no-device-view" class="ast-container list-view hidden">
             <div class="ctrl-info-panel col-centered text-center wr-login">
-                <h2>You don't have any device registered at the moment.</h2>
-                <br/>
+                <h2>You do not have any device enrolled at the moment.</h2>
                 <p class="text-center">
                     <a href="javascript:toggleEnrollment()" class="wr-btn">
                                     <span class="fw-stack">
                                        <i class="fw fw-ring fw-stack-2x"></i>
                                        <i class="fw fw-mobile fw-stack-1x"></i>
                                        <span class="fw-stack fw-move-right fw-move-bottom">
-                                          <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
-                                           <i class="fw fw-circle fw-stack-2x"></i>
-                                          <i class="fw fw-add fw-stack-1x"></i>
+                                          <i class="fw fw-ring fw-stack-2x"></i>
+                                          <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                                          <i class="fw fw-add fw-stack-1x fw-inverse"></i>
                                        </span>
                                     </span>
-                        Enroll New Device
+                        &nbsp;&nbsp;Enroll New Device
                     </a>
                 </p>
             </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index 03cdd769e..db25e3447 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -228,7 +228,7 @@ function initPage() {
         function (data) {
             if (data) {
                 data = JSON.parse(data);
-                if (data.devices.length > 0) {
+                if (data["count"] > 0) {
                     $(".bulk-action-row").removeClass('hidden');
                     loadDevices();
                 } else {

From d8ce43fe04f35f75a4a17a97e637a00ff8147dd4 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 15:57:07 +0530
Subject: [PATCH 15/22] Updating windows api path lockreset-devices to
 lock-reset-devices

---
 .../windows/api/services/DeviceManagementAdminService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index 51f0d3bd8..730171da7 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -72,7 +72,7 @@ public interface DeviceManagementAdminService {
                                                                                      WindowsDeviceEnrolmentException;
 
     @POST
-    @Path("/lockreset-devices")
+    @Path("/lock-reset-devices")
     @Permission(name = "Lock-Reset Device", permission = "/device-mgt/devices/owning-device/operations/windows/lock-reset")
     Response lockReset(@HeaderParam("Accept") String acceptHeader, List<String> deviceIds)
             throws WindowsDeviceEnrolmentException;

From 69efc7ada7a0c936c435ec1a2df07076b1582835 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 16:07:10 +0530
Subject: [PATCH 16/22] Updating operation-mod with windows operation apis

---
 .../public/js/operation-mod.js                | 38 ++++---------------
 1 file changed, 8 insertions(+), 30 deletions(-)

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.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 8a7824910..98b3e2ad9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -1186,29 +1186,13 @@ var operationModule = function () {
 
     publicMethods.getWindowsServiceEndpoint = function (operationCode) {
         var featureMap = {
-            "CAMERA": "camera",
-            "DEVICE_LOCK": "lock",
-            "DEVICE_LOCATION": "location",
-            "CLEAR_PASSWORD": "clear-password",
-            "APPLICATION_LIST": "get-application-list",
-            "DEVICE_RING": "ring-device",
-            "DEVICE_REBOOT": "reboot-device",
-            "UPGRADE_FIRMWARE": "upgrade-firmware",
-            "DEVICE_MUTE": "mute",
-            "LOCK_RESET": "lock-reset",
-            "NOTIFICATION": "notification",
-            "ENCRYPT_STORAGE": "encrypt",
-            "CHANGE_LOCK_CODE": "change-lock-code",
-            "WEBCLIP": "webclip",
-            "INSTALL_APPLICATION": "install-application",
-            "UNINSTALL_APPLICATION": "uninstall-application",
-            "BLACKLIST_APPLICATIONS": "blacklist-applications",
-            "PASSCODE_POLICY": "password-policy",
-            "ENTERPRISE_WIPE": "enterprise-wipe",
-            "WIPE_DATA": "wipe-data",
-            "DISENROLL": "disenroll"
+            "DEVICE_LOCK": "lock-devices",
+            "DEVICE_RING": "ring-devices",
+            "LOCK_RESET": "lock-reset-devices",
+            "WIPE_DATA": "wipe-devices"
         };
-        return "/mdm-windows-agent/services/windows/operation/" + featureMap[operationCode];
+        //return "/mdm-windows-agent/services/windows/operation/" + featureMap[operationCode];
+        return "/api/device-mgt/windows/v1.0/admin/devices/" + featureMap[operationCode];
     };
     /**
      * Get the icon for the featureCode
@@ -1241,15 +1225,9 @@ var operationModule = function () {
     publicMethods.getWindowsIconForFeature = function (operationCode) {
         var featureMap = {
             "DEVICE_LOCK": "fw-lock",
-            "DEVICE_LOCATION": "fw-map-location",
-            "DISENROLL": "fw-delete",
-            "WIPE_DATA": "fw-clear",
             "DEVICE_RING": "fw-dial-up",
-            "DEVICE_REBOOT": "fw-refresh",
-            "UPGRADE_FIRMWARE": "fw-up-arrow",
-            "DEVICE_MUTE": "fw-incoming-call",
-            "NOTIFICATION": "fw-message",
-            "LOCK_RESET": "fw-key"
+            "LOCK_RESET": "fw-key",
+            "WIPE_DATA": "fw-clear"
         };
         return featureMap[operationCode];
     };

From 9925a20964153405f412bc56b56ff8aa183705c9 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 16:31:17 +0530
Subject: [PATCH 17/22] Fixing JIRA: https://wso2.org/jira/browse/EMM-1576

---
 .../app/pages/mdm.page.dashboard/dashboard.hbs        | 11 +++++++++--
 .../app/pages/mdm.page.dashboard/dashboard.js         |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
index 2026ed97a..8439db378 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.hbs
@@ -19,8 +19,8 @@
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "mdm.unit.device.qr-modal"}}
 {{#zone "content"}}
+    <div class="row ">
     {{#if permissions.LIST_DEVICES}}
-        <div class="row ">
             <div class="col-md-3 wr-stats-board">
                 <div class="wr-stats-board-tile">
                     <div class="tile-name">Devices</div>
@@ -150,8 +150,15 @@
                     </div>
                 </div>
             </div>
-        </div>
     {{/if}}
+    {{# if permissions.PERMITTED_NONE}}
+        <h1 class="page-sub-title">
+            Permitted None
+        </h1>
+        <br>
+        You are not authorized to view any of the dashboard listed resources.
+    {{/if}}
+    </div>
 {{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/dashboard.js"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
index da2c2b46d..9a7fa6c1a 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js
@@ -32,6 +32,8 @@ function onRequest() {
     permissions["ADD_USER"] = userModule.isAuthorized("/permission/admin/device-mgt/users/manage");
     permissions["LIST_ROLES"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
     permissions["ADD_ROLE"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/manage");
+    permissions["PERMITTED_NONE"] = !(permissions["LIST_DEVICES"] || permissions["LIST_POLICIES"] ||
+        permissions["LIST_USERS"] || permissions["LIST_ROLES"]);
 
     viewModel["permissions"] = permissions;
     //TODO: Move enrollment URL into app-conf.json

From 42a5493a89a743c66118856a91c1fe95fbd232bd Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Sun, 18 Sep 2016 17:02:12 +0530
Subject: [PATCH 18/22] Fixing JIRA: https://wso2.org/jira/browse/EMM-1577

---
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.hbs  | 73 +++++++++++--------
 .../mdm.unit.ui.navbar.nav-menu/nav-menu.js   | 22 +++---
 .../public/js/jquery.qrcode.min.js            |  0
 3 files changed, 55 insertions(+), 40 deletions(-)
 mode change 100755 => 100644 components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/jquery.qrcode.min.js

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.ui.navbar.nav-menu/nav-menu.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
index 9d24059a2..1e9135d6b 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -22,15 +22,16 @@
 {{/zone}}
 
 {{#zone "navMenu-items"}}
-        <li>
-            <a href="{{@app.context}}">
-                <i class="fw fw-dashboard"></i>
-                Admin Dashboard
-            </a>
-        </li>
+    <li>
+        <a href="{{@app.context}}">
+            <i class="fw fw-dashboard"></i>
+            Resource Dashboard
+        </a>
+    </li>
 
     {{#if permissions.LIST_DEVICES}}
         <li>
+            <!--suppress HtmlUnknownTarget -->
             <a href="{{@app.context}}/devices">
                 <i class="fw fw-mobile"></i>
                 Device Management
@@ -38,33 +39,41 @@
         </li>
     {{/if}}
 
-    <li><a><i class="fw fw-user"></i>User Management</a>
-        <ul>
-            {{#if permissions.LIST_USERS}}
-                <li><a href="{{@app.context}}/users"><i class="fw fw-user"></i>Users</a></li>
-            {{/if}}
-
-            {{#if permissions.LIST_ROLES}}
-                <li><a href="{{@app.context}}/roles"><i class="fw fw-bookmark"></i>Roles</a></li>
-            {{/if}}
-        </ul>
-    </li>
+    {{#if permissions.USER_MGT_PERMITTED}}
+        <li><a><i class="fw fw-user"></i>User Management</a>
+            <ul>
+                {{#if permissions.LIST_USERS}}
+                    <li><!--suppress HtmlUnknownTarget -->
+                        <a href="{{@app.context}}/users"><i class="fw fw-user"></i>Users</a></li>
+                {{/if}}
+                {{#if permissions.LIST_ROLES}}
+                    <li><!--suppress HtmlUnknownTarget -->
+                        <a href="{{@app.context}}/roles"><i class="fw fw-bookmark"></i>Roles</a></li>
+                {{/if}}
+            </ul>
+        </li>
+    {{/if}}
     {{#if permissions.LIST_POLICIES}}
-        <li><a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
+        <li><!--suppress HtmlUnknownTarget -->
+            <a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
+    {{/if}}
+    {{#if permissions.CONFIG_MGT_PERMITTED}}
+        <li><a><i class="fw fw-settings"></i>Configuration Management</a>
+            <ul>
+                {{#if permissions.LIST_PLATFORM_CONFIGURATIONS}}
+                    <li><!--suppress HtmlUnknownTarget -->
+                        <a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>Platform Configurations</a>
+                    </li>
+                {{/if}}
+                <!-- todo change the permission and get the related permission -->
+                {{#if permissions.LIST_CERTIFICATES}}
+                    <li><!--suppress HtmlUnknownTarget -->
+                        <a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>Certificate Configurations</a>
+                    </li>
+                {{/if}}
+            </ul>
+        </li>
     {{/if}}
-    <li><a><i class="fw fw-settings"></i>Configuration Management</a>
-        <ul>
-            {{#if permissions.LIST_CONFIGURATION}}
-                <li><a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>Platform Configurations</a>
-                </li>
-            {{/if}}
-            <!-- todo change the permission and get the related permission -->
-            {{#if permissions.LIST_CONFIGURATION}}
-                <li><a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>Certificate Configurations</a>
-                </li>
-            {{/if}}
-        </ul>
-    </li>
 {{/zone}}
 
 {{#zone "navbarCollapsableRightItems"}}
@@ -83,6 +92,7 @@
     </ul>
 {{/zone}}
 {{#zone "sidePanes"}}
+    <!--suppress HtmlUnknownAttribute -->
     <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{permissions.LIST_NOTIFICATIONS}}"
          data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="50" data-spy="affix"
          data-offset-top="80">
@@ -92,6 +102,7 @@
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
+    <!--suppress HtmlUnknownTarget -->
     <script id="notifications" data-current-user="{{currentUser.username}}"
             data-image-resource="{{@unit.publicUri}}/images/" src="{{@unit.publicUri}}/templates/notifications.hbs"
             type="text/x-handlebars-template"></script>
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.ui.navbar.nav-menu/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
index 6111547e5..cfb664ad5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/nav-menu.js
@@ -43,16 +43,20 @@ function onRequest(context) {
     // eg: {{unit "appbar" pageLink="users" title="User Management"}}
     viewModel["currentActions"] = links[viewModel["pageLink"]];
     viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["enrollmentDir"];
-    var currentUser = session.get(constants["USER_SESSION_KEY"]);
+    viewModel["currentUser"] = session.get(constants["USER_SESSION_KEY"]);
+
     var permissions = {};
-    permissions.LIST_DEVICES = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
-    permissions.LIST_POLICIES = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
-    permissions.LIST_ROLES = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
-    permissions.LIST_USERS = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
-    permissions.LIST_NOTIFICATIONS = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
-    permissions.LIST_CONFIGURATION = userModule.isAuthorized("/permission/admin/device-mgt/platform-configurations/view");
-    viewModel.permissions = permissions;
-    viewModel["currentUser"] = currentUser;
+    permissions["LIST_DEVICES"] = userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/view");
+    permissions["LIST_POLICIES"] = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
+    permissions["LIST_USERS"] = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
+    permissions["LIST_ROLES"] = userModule.isAuthorized("/permission/admin/device-mgt/roles/view");
+    permissions["USER_MGT_PERMITTED"] = (permissions["LIST_USERS"] || permissions["LIST_ROLES"]);
+    permissions["LIST_PLATFORM_CONFIGURATIONS"] = userModule.isAuthorized("/permission/admin/device-mgt/platform-configurations/view");
+    permissions["LIST_CERTIFICATES"] = userModule.isAuthorized("/permission/admin/device-mgt/certificates/view");
+    permissions["CONFIG_MGT_PERMITTED"] = (permissions["LIST_PLATFORM_CONFIGURATIONS"] || permissions["LIST_CERTIFICATES"]);
+    permissions["LIST_NOTIFICATIONS"] = userModule.isAuthorized("/permission/admin/device-mgt/notifications/view");
+
+    viewModel["permissions"] = permissions;
     viewModel["appContext"] = mdmProps["appContext"];
 
     return viewModel;
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.ui.navbar.nav-menu/public/js/jquery.qrcode.min.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/jquery.qrcode.min.js
old mode 100755
new mode 100644

From 35d96780750e17b45009f71eebc45be5e1a245df Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 19 Sep 2016 10:08:26 +0530
Subject: [PATCH 19/22] Updating permissions on operation bar for windows and
 iOS

---
 .../operation-bar.js                          | 33 ++++++++++++++++++-
 .../public/js/operation-mod.js                | 19 +++--------
 2 files changed, 37 insertions(+), 15 deletions(-)

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.device.operation-bar/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
index 9d6b19fb5..584b2ce0d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
@@ -62,10 +62,41 @@ function onRequest(context) {
     }
 
     // adding ios operations related permission checks
+    permissions["ios"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/lock")) {
+        permissions["ios"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/location")) {
+        permissions["ios"].push("LOCATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/enterprise-wipe")) {
+        permissions["ios"].push("ENTERPRISE_WIPE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/notification")) {
+        permissions["ios"].push("NOTIFICATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/ring")) {
+        permissions["ios"].push("RING");
+    }
 
     // adding windows operations related permission checks
+    permissions["windows"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock")) {
+        permissions["windows"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/disenroll/windows")) {
+        permissions["windows"].push("DISENROLL");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/wipe")) {
+        permissions["windows"].push("WIPE_DATA");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/ring")) {
+        permissions["windows"].push("DEVICE_RING");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lockreset")) {
+        permissions["windows"].push("LOCK_RESET");
+    }
 
     viewModel["permissions"] = stringify(permissions);
-
     return viewModel;
 }
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 98b3e2ad9..b0d588f2e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -107,7 +107,6 @@ var operationModule = function () {
         "NOTIFICATION_OPERATION_CODE": "NOTIFICATION",
         "CALENDAR_SUBSCRIPTION_OPERATION_CODE": "CALENDAR_SUBSCRIPTION",
         "APN_OPERATION_CODE": "APN",
-        "DOMAIN_CODE": "DOMAIN",
         "CELLULAR_OPERATION_CODE": "CELLULAR",
         "PER_APP_VPN_OPERATION_CODE": "PER_APP_VPN",
         "APP_TO_PER_APP_VPN_MAPPING_OPERATION_CODE": "APP_TO_PER_APP_VPN_MAPPING"
@@ -116,20 +115,10 @@ var operationModule = function () {
     publicMethods.getIOSServiceEndpoint = function (operationCode) {
         var featureMap = {
             "DEVICE_LOCK": "lock",
-            "VPN": "vpn",
-            "PER_APP_VPN": "per-app-vpn",
-            "APP_TO_PER_APP_VPN_MAPPING": "app-to-per-app-vpn-mapping",
-            "RING": "ring",
             "LOCATION": "location",
+            "ENTERPRISE_WIPE": "enterprise-wipe",
             "NOTIFICATION": "notification",
-            "AIR_PLAY": "airplay",
-            "RESTRICTION": "restriction",
-            "CELLULAR": "cellular",
-            "WIFI": "wifi",
-            "INSTALL_STORE_APPLICATION": "store-application",
-            "INSTALL_ENTERPRISE_APPLICATION": "enterprise-application",
-            "REMOVE_APPLICATION": "remove-application",
-            "ENTERPRISE_WIPE": "enterprise-wipe"
+            "RING": "ring"
         };
         return "/api/device-mgt/ios/v1.0/admin/devices/" + featureMap[operationCode];
     };
@@ -1187,6 +1176,7 @@ var operationModule = function () {
     publicMethods.getWindowsServiceEndpoint = function (operationCode) {
         var featureMap = {
             "DEVICE_LOCK": "lock-devices",
+            "DISENROLL": "disenroll",
             "DEVICE_RING": "ring-devices",
             "LOCK_RESET": "lock-reset-devices",
             "WIPE_DATA": "wipe-devices"
@@ -1226,6 +1216,7 @@ var operationModule = function () {
         var featureMap = {
             "DEVICE_LOCK": "fw-lock",
             "DEVICE_RING": "fw-dial-up",
+            "DISENROLL": "fw-delete",
             "LOCK_RESET": "fw-key",
             "WIPE_DATA": "fw-clear"
         };
@@ -1577,7 +1568,7 @@ var operationModule = function () {
             var payload = publicMethods.generatePayload(platformType, operationCode, null);
 
             if(platformType == platformTypeConstants["ANDROID"] &&
-                operationCodes[i] == androidOperationConstants["CAMERA_OPERATION_CODE"]){
+               operationCodes[i] == androidOperationConstants["CAMERA_OPERATION_CODE"]){
                 var operations = payload["operation"];
                 for (var key in operations){
                     operationCode = key;

From 4a78cd6eced1d9f90b6d0004d217357119782660 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Mon, 19 Sep 2016 14:09:39 +0530
Subject: [PATCH 20/22] Updating android permissions

---
 .../android/services/DeviceManagementAdminService.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
index 641c399d0..30dcb4704 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
@@ -1123,7 +1123,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new send notification operation.")
     })
-    @Permission(name = "Send Notifications", permission = "/device-mgt/devices/owning-device/operations/android/notification")
+    @Permission(name = "Send Notifications", permission = "/device-mgt/devices/owning-device/operations/android/send-notification")
     Response sendNotification(
             @ApiParam(name = "notificationBeanWrapper",
                     value = "Notification Configurations and device Ids")
@@ -1284,7 +1284,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new change lock code operation.")
     })
-    @Permission(name = "Change Password of Device", permission = "/device-mgt/devices/owning-device/operations/android/change-lock")
+    @Permission(name = "Change Password of Device", permission = "/device-mgt/devices/owning-device/operations/android/change-lock-code")
     Response changeLockCode(
             @ApiParam(name = "lockCodeBeanWrapper",
                     value = "Configurations and device Ids need to be done change lock code")

From 4e9b19f3a5ab4374396effb5f71a8000b1ae4cba Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Mon, 19 Sep 2016 14:20:49 +0530
Subject: [PATCH 21/22] Updating android permissions - operation-bar

---
 .../units/mdm.unit.device.operation-bar/operation-bar.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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.device.operation-bar/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
index 584b2ce0d..b6ac6b5f8 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-function onRequest(context) {
+function onRequest() {
     // var log = new Log("mdm.unit.device.operation-bar");
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var viewModel = {};
@@ -27,10 +27,10 @@ function onRequest(context) {
     if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/ring")) {
         permissions["android"].push("DEVICE_RING");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock-devices")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock")) {
         permissions["android"].push("DEVICE_LOCK");
     }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock-devices")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock")) {
         permissions["android"].push("DEVICE_UNLOCK");
     }
     if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/location")) {

From 245ea2b0d6d0dde46d24878e072e0292889f6c11 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 19 Sep 2016 14:35:19 +0530
Subject: [PATCH 22/22] Fixing incorrect text formatting

---
 .../app/units/mdm.unit.device.view/public/js/device-detail.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
index 87d902e44..155c2568e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
@@ -44,7 +44,7 @@ var InitiateViewOption = null;
             // error-callback
             function () {
                 var defaultInnerHTML =
-                    "<br><p class='fw-warning'>Device data may not have been updated. Please refresh to try again.<p>";
+                    "<br><p class='small'><i class='fw-warning'></i>&nbsp;Device data may not have been updated. Please refresh to try again.<p>";
                 $(".panel-body").append(defaultInnerHTML);
             }
         );