diff --git a/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml b/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
index 9e93253aa..0e84e67d6 100644
--- a/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
+++ b/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
@@ -18,11 +18,11 @@
      <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - App Manager WSO2 MDM OSGI Connector Component</name>
diff --git a/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/mdmmgt/util/IOSApplicationOperationUtil.java b/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/mdmmgt/util/IOSApplicationOperationUtil.java
index 3167ed8d3..5b2dec4eb 100644
--- a/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/mdmmgt/util/IOSApplicationOperationUtil.java
+++ b/components/extensions/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/mdmmgt/util/IOSApplicationOperationUtil.java
@@ -68,8 +68,8 @@ public class IOSApplicationOperationUtil {
 				appStoreApplication.setPreventBackupOfAppData((Boolean) application.getProperties().
 						get(MDMAppConstants.IOSConstants.IS_PREVENT_BACKUP));
 				appStoreApplication.setBundleId(application.getId());
-				appStoreApplication.setiTunesStoreID((Integer) application.getProperties().
-						get(MDMAppConstants.IOSConstants.I_TUNES_ID));
+				appStoreApplication.setiTunesStoreID(Integer.parseInt((String)application.getProperties().
+						get(MDMAppConstants.IOSConstants.I_TUNES_ID)));
 				operation.setCode(MDMAppConstants.IOSConstants.OPCODE_INSTALL_STORE_APPLICATION);
 				operation.setType(Operation.Type.COMMAND);
 				operation.setPayLoad(appStoreApplication.toJSON());
@@ -106,7 +106,7 @@ public class IOSApplicationOperationUtil {
 		operation.setCode(MDMAppConstants.IOSConstants.OPCODE_REMOVE_APPLICATION);
 		operation.setType(Operation.Type.PROFILE);
 		RemoveApplication removeApplication = new RemoveApplication();
-		removeApplication.setBundleId(application.getIdentifier());
+		removeApplication.setBundleId(application.getPackageName());
 		operation.setPayLoad(removeApplication.toJSON());
 		return operation;
 	}
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index 1a01e0208..53d341112 100644
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
index d32f4574f..0fb0d2c92 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
index a5834da96..89d2bcd71 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.plugin/pom.xml b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.plugin/pom.xml
index 0c5b804a4..1ddfb9f88 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.plugin/pom.xml
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>androidsense-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
index 22b954dd9..24c109ffc 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index 89059bcd6..06019e1b8 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -74,9 +74,9 @@
                     <div class="panel-body">
                         <div id="operations-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Operations Log . . .
                             <br>
                             <br>
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/configuration.hbs b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/configuration.hbs
index 1ea53b191..1f9b95d49 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/configuration.hbs
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/configuration.hbs
@@ -41,7 +41,7 @@
         </div>
         <div class="wr-input-control wr-btn-grp">
             <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        Save
             </button>
         </div>
     </div>
diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
index fc96f1cbb..64d528722 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
@@ -42,18 +42,18 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">STEP 01</span>
-            &nbsp;&nbsp;&nbsp;Go ahead and click [Enroll Device].
+               Go ahead and click [Enroll Device].
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 02</span>
-            &nbsp;&nbsp;&nbsp;You can either scan the QR code or directly download Android agent.
+               You can either scan the QR code or directly download Android agent.
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 03</span>
-            &nbsp;&nbsp;&nbsp;Install Android agent into your Android Device.
+               Install Android agent into your Android Device.
         </li>
         <li class="padding-top-double"><span class="circle">STEP 04</span>
-            &nbsp;&nbsp;&nbsp;Proceed to [Prepare] section.
+               Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="#" class="download-link btn-operations">
@@ -84,7 +84,7 @@
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
                             Goto Login Page
-                        </a>&nbsp;&nbsp;
+                        </a>
                         <a href="#" onclick="hidePopup();" class="btn-operations">
                             Cancel
                         </a>
@@ -147,17 +147,17 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;Connect Android device to network.
+               Connect Android device to network.
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Start Android Sense app in your device.
+               Start Android Sense app in your device.
         </li>
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;Fill login form with the credentials.
-            <i>(Use server URL as [&nbsp;https://&lt;WSO2_IoT_SERVER_HOST&gt;:&lt;
-               HTTPS_SERVER_PORT&gt;&nbsp;] and click on
+               Fill login form with the credentials.
+            <i>(Use server URL as [ https://&lt;WSO2_IoT_SERVER_HOST&gt;:&lt;
+               HTTPS_SERVER_PORT&gt; ] and click on
                 <strong>Register Device</strong> button.)</i>
         </li>
         <li>
@@ -169,7 +169,7 @@
 
         <li class="padding-top-double">
             <span class="circle">04</span>
-            &nbsp;&nbsp;&nbsp;Once the device is enrolled, click on <strong>[+]</strong> button to
+               Once the device is enrolled, click on <strong>[+]</strong> button to
             select the sensors.
             <a href="{{@unit.publicUri}}/images/selectSensorView.png" target="_blank"
                class="padding-top-double">
@@ -178,7 +178,7 @@
         </li>
         <li class="padding-top-double">
             <span class="circle">05</span>
-            &nbsp;&nbsp;&nbsp;Click on <i>[Publish data]</i> button to publish sensor readings to
+               Click on <i>[Publish data]</i> button to publish sensor readings to
             IoT server.
             <a href="{{@unit.publicUri}}/images/publishDataView.png" target="_blank"
                class="padding-top-double">
@@ -198,7 +198,7 @@
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;You can view all your connected devices
+               You can view all your connected devices
             <a href="{{@app.context}}/devices">[Device Management]</a> page.
         </li>
         <li class="padding-top-double">
@@ -206,14 +206,14 @@
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;You can select any one of your connected devices for available
+               You can select any one of your connected devices for available
             operations and Real-Time data monitoring.
         </li>
         <li class="padding-top-double">
             <span class="fw-stack fw-lg margin-right">
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
-            </span>&nbsp;&nbsp;&nbsp;For historical analytics of sensor data navigate to device
+            </span>   For historical analytics of sensor data navigate to device
                    analytics page.
         </li>
     </ul>
@@ -237,7 +237,7 @@
                       <i class="fw fw-add fw-stack-1x fw-inverse"></i>
                    </span>
                 </span>
-            &nbsp;&nbsp;Add your new mobile device to {{@app.conf.appName}}
+              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>
diff --git a/components/iot-plugins/androidsense-plugin/pom.xml b/components/iot-plugins/androidsense-plugin/pom.xml
index 4438378f0..8a61f1d2b 100644
--- a/components/iot-plugins/androidsense-plugin/pom.xml
+++ b/components/iot-plugins/androidsense-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
index 17e0fed26..fc3dce0ce 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
index 3186c36b6..be7372dc2 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.plugin/pom.xml b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.plugin/pom.xml
index 9ae3274b3..797d450c4 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.plugin/pom.xml
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.plugin/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>arduino-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
index 4fc2b5a3c..0a49c190e 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
index 2f94c0533..f626daf84 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.device-view/device-view.hbs
@@ -64,9 +64,9 @@
                     <div class="panel-body">
                         <div id="operations-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Operations Log . . .
                             <br>
                             <br>
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/configuration.hbs b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/configuration.hbs
index a3ff058d7..212288497 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/configuration.hbs
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/configuration.hbs
@@ -52,7 +52,7 @@
         </div>
         <div class="wr-input-control wr-btn-grp">
             <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        Save
             </button>
         </div>
     </div>
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
index 921db639f..120ff4950 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
@@ -41,24 +41,24 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">ITEM 01</span>
-            &nbsp;&nbsp;&nbsp;Arduino UNO Board.
+               Arduino UNO Board.
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 02</span>
-            &nbsp;&nbsp;&nbsp;Adafruit Wifi Shield for Arduino.
+               Adafruit Wifi Shield for Arduino.
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 03</span>
-            &nbsp;&nbsp;&nbsp;LED bulb connected to Pin 13.
+               LED bulb connected to Pin 13.
             <i>(If not available, will use the one on the board.)</i>
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 04</span>
-            &nbsp;&nbsp;&nbsp;Resister( e.g 330 ohms )
+               Resister( e.g 330 ohms )
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 05</span>
-            &nbsp;&nbsp;&nbsp;Proceed to [Prepare] section.
+               Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
@@ -90,7 +90,7 @@
                                 <input type="hidden" class="deviceType" name="deviceType"
                                        value="{{@uriParams.deviceType}}"/>
                                 <input type="hidden" class="sketchType" name="sketchType"
-                                       value="{{@uriParams.deviceType}}"/> &nbsp;&nbsp;
+                                       value="{{@uriParams.deviceType}}"/>
                             </div>
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
@@ -134,7 +134,7 @@
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
                             Goto Login Page
-                        </a>&nbsp;&nbsp;
+                        </a>
                         <a href="#" onclick="hidePopup();" class="btn-operations">
                             Cancel
                         </a>
@@ -196,11 +196,11 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;Wifi-Shield mounted onto the Arduino-UNO board
+               Wifi-Shield mounted onto the Arduino-UNO board
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Connect LED bulb to arduino as follows
+               Connect LED bulb to arduino as follows
             <br/><br/>
             <a href="{{@unit.publicUri}}/images/schematicsGuide.png" target="_blank">
                 <img src="{{@unit.publicUri}}/images/schematicsGuide.png" class="img-responsive">
@@ -210,20 +210,20 @@
 
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;Download Arduino-Sketch from [Download Sketch] link above.
+               Download Arduino-Sketch from [Download Sketch] link above.
         </li>
         <li class="padding-top-double">
             <span class="circle">04</span>
-            &nbsp;&nbsp;&nbsp;Unzip the downloaded Arduino Agent
+               Unzip the downloaded Arduino Agent
         </li>
         <li class="padding-top-double">
             <span class="circle">05</span>
-            &nbsp;&nbsp;&nbsp;Create a folder called "ArduinoBoardSketch" and move all source files
+               Create a folder called "ArduinoBoardSketch" and move all source files
             inside
         </li>
         <li class="padding-top-double">
             <span class="circle">06</span>
-            &nbsp;&nbsp;&nbsp;Open ArduinoBoardSketch.h and provide appropriate values for
+               Open ArduinoBoardSketch.h and provide appropriate values for
             <i>[WLAN_SSID]</i>,
             <i>[WLAN_PASS]</i>,
             <i>[SERVICE_PORT]</i>,
@@ -233,22 +233,22 @@
         </li>
         <li class="padding-top-double">
             <span class="circle">07</span>
-            &nbsp;&nbsp;&nbsp;Burn the sketch onto your Arduino board and let the program run.
+               Burn the sketch onto your Arduino board and let the program run.
         </li>
         <li class="padding-top-double">
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
             <span class="fw-stack fw-lg margin-right">
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;Arduino will publish it's internal temperature to WSO2-IoT-Server
+               Arduino will publish it's internal temperature to WSO2-IoT-Server
             <br/><br/>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
             <span class="fw-stack fw-lg margin-right">
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;LED on <i>PIN 13</i> can be controlled from Device Management page.
+               LED on <i>PIN 13</i> can be controlled from Device Management page.
         </li>
     </ul>
     <br>
@@ -261,17 +261,17 @@
         <ul class="list-unstyled">
             <li class="padding-top-double">
                 <span class="circle">01</span>
-                &nbsp;&nbsp;&nbsp;You can view all your connected devices at
+                   You can view all your connected devices at
                 <a href="{{@app.context}}/devices">[Device Management]</a> page.
             </li>
             <li class="padding-top-double">
                 <span class="circle">02</span>
-                &nbsp;&nbsp;&nbsp;Select one of connected devices and check for available control
+                   Select one of connected devices and check for available control
                 operations and monitor Real-Time data.
             </li>
             <li class="padding-top-double">
                 <span class="circle">03</span>
-                &nbsp;&nbsp;&nbsp;You can also view analytics of the data published to IoT-Server by
+                   You can also view analytics of the data published to IoT-Server by
                 navigating to Device Analytics page.
             </li>
         </ul>
diff --git a/components/iot-plugins/arduino-plugin/pom.xml b/components/iot-plugins/arduino-plugin/pom.xml
index 1c202c5c4..b9d22e601 100644
--- a/components/iot-plugins/arduino-plugin/pom.xml
+++ b/components/iot-plugins/arduino-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
index 640aeea2b..aa5bc9863 100644
--- a/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
+++ b/components/iot-plugins/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-analytics/pom.xml b/components/iot-plugins/iot-analytics/pom.xml
index 4ed9a06fd..279bf6454 100644
--- a/components/iot-plugins/iot-analytics/pom.xml
+++ b/components/iot-plugins/iot-analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
index 318a64766..cc0c3367c 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.http/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.http/pom.xml
index 17707c022..99c1fcdfe 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.http/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.http/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/pom.xml
index 7e2eea4c2..4f0213a9d 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.mqtt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/pom.xml
index 085d98c8d..6db6b72c7 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.xmpp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.mqtt/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.mqtt/pom.xml
index d25457a9d..9e273c163 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.mqtt/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.mqtt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint/pom.xml
index 558860a88..7430d4503 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui.endpoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui/pom.xml
index a5c8b0d0b..c622ed3db 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.xmpp/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.xmpp/pom.xml
index a5d1035ba..aaa34766f 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.xmpp/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.xmpp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/pom.xml
index 23f2221e5..8717fc117 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.hbs b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.hbs
index ca52690eb..f73c15c70 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.hbs
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.device.operation-bar/operation-bar.hbs
@@ -74,8 +74,8 @@
                                     <input type="{{type}}" id="{{name}}" placeholder="{{name}}" class="form-control" data-param-type="query" value="{{value}}" />
                                     <br />
                                 {{/each}}
-                                <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')" class="btn btn-default">&nbsp;&nbsp;&nbsp;&nbsp;Send
-                                                       to Device&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')" class="btn btn-default">    Send
+                                                       to Device    </button>
                                 <label id="lblSending" class="wr-input-label hidden"><i
                                         class="fw fw-lifecycle fw-spin fw-2x"></i> Sending..</label>
                                 <label id="lblSent" class="wr-input-label hidden"><i
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
index 41d832331..67ba193b1 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
@@ -157,7 +157,7 @@
                                         <input id="user-roles-radio-btn" type="radio"
                                                name="select-users-radio-btn" class="select-users-radio"
                                                checked/>
-                                        <span class="helper">&nbsp;Set user role(s)</span>
+                                        <span class="helper"> Set user role(s)</span>
                                     </label>
                                 {{/if}}
                                 {{#if permissions.LIST_USERS}}
@@ -165,7 +165,7 @@
                                         <input id="users-radio-btn" type="radio"
                                                name="select-users-radio-btn"
                                                class="select-users-radio"/>
-                                        <span class="helper">&nbsp;Set user(s)</span>
+                                        <span class="helper"> Set user(s)</span>
                                     </label>
                                 {{/if}}
                                 <!--
@@ -174,7 +174,7 @@
                                         <input id="groups-radio-btn" type="radio"
                                                name="select-users-radio-btn"
                                                class="select-users-radio"/>
-                                        <span class="helper">&nbsp;Set groups(s)</span>
+                                        <span class="helper"> Set groups(s)</span>
                                     </label>
                                 {{/if}}
                                 -->
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot/pom.xml
index 3e2a8cc02..cc7620641 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>iot-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/iot-base-plugin/pom.xml b/components/iot-plugins/iot-base-plugin/pom.xml
index 31ae28209..bb256b858 100644
--- a/components/iot-plugins/iot-base-plugin/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/pom.xml b/components/iot-plugins/pom.xml
index 2a1a3ed14..ea223d344 100644
--- a/components/iot-plugins/pom.xml
+++ b/components/iot-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
index 78a3cd5b1..87b869c23 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
index e0cfde124..23bc6f151 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>raspberrypi-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.plugin/pom.xml b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.plugin/pom.xml
index 189e2de7d..18aad14c6 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.plugin/pom.xml
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
 		<artifactId>raspberrypi-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
index 7651ff38d..f045606c1 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
index 9b6cf69dc..d881228b8 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view/device-view.hbs
@@ -64,9 +64,9 @@
                     <div class="panel-body">
                         <div id="operations-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Operations Log . . .
                             <br>
                             <br>
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.hbs b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.hbs
index 0d8131939..8fc564c75 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.hbs
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/configuration.hbs
@@ -62,7 +62,7 @@
         </div>
         <div class="wr-input-control wr-btn-grp">
             <button id="save-general-btn" class="wr-btn" onclick="addConfiguration();">
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        Save
             </button>
         </div>
     </div>
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
index 52bc44c84..0a49db9ae 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
@@ -40,28 +40,28 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">ITEM 01</span>
-            &nbsp;&nbsp;&nbsp;Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
+               Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 02</span>
-            &nbsp;&nbsp;&nbsp;Adafruit DHT11 Temperature Sensor.
+               Adafruit DHT11 Temperature Sensor.
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 03</span>
-            &nbsp;&nbsp;&nbsp;LED Bulb.
+               LED Bulb.
         </li>
         <li class="padding-top-double">
             <span class="circle">ITEM 04</span>
-            &nbsp;&nbsp;&nbsp;Resister (eg : 470 ohm).
+               Resister (eg : 470 ohm).
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 05</span>
-            &nbsp;&nbsp;&nbsp;Proceed to [Prepare] section.
+               Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
        class="btn-operations"
-       target="_blank"><i class="fw fw-api"></i> View API</i> &nbsp;
+       target="_blank"><i class="fw fw-api"></i> View API</i>
     </a>
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download"></i>Download Agent
@@ -93,11 +93,11 @@
                         </div>
                         <div class="buttons" style="padding-bottom: 0px">
                             <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
-                            &nbsp;&nbsp;
+
                             <a href="#" id="download-device-download-link"
                                class="btn btn-operations"> Copy Link
                             </a>
-                            &nbsp;&nbsp;
+
                         </div>
                     </form>
                 </div>
@@ -135,7 +135,7 @@
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
                             Goto Login Page
-                        </a>&nbsp;&nbsp;
+                        </a>
                         <a href="#" onclick="hidePopup();" class="btn-operations">
                             Cancel
                         </a>
@@ -195,43 +195,43 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;Connect RaspberryPi, DHT11 Temperature sensor and LED as per the
+               Connect RaspberryPi, DHT11 Temperature sensor and LED as per the
             schematic below.
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Ensure your RaspberryPi Board can connect to Internet.
+               Ensure your RaspberryPi Board can connect to Internet.
         </li>
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;Download RaspberryPi Agent via [Download Agent] button above.
+               Download RaspberryPi Agent via [Download Agent] button above.
             (Alternatively you can use the "curl" command to directly download the Agent to your
             RaspberryPi.)
         </li>
         <li class="padding-top-double">
             <span class="circle">04</span>
-            &nbsp;&nbsp;&nbsp;Copy downloaded Agent into your RaspberryPi.
+               Copy downloaded Agent into your RaspberryPi.
         </li>
         <li class="padding-top-double">
             <span class="circle">05</span>
-            &nbsp;&nbsp;&nbsp;Unzip the downloaded Agent and start terminal to run below commands.
+               Unzip the downloaded Agent and start terminal to run below commands.
         </li>
         <li class="padding-top-double">
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
             <span class="fw-stack fw-lg margin-right">
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;[sudo ./testAgent.sh] &nbsp;&nbsp; - &nbsp;&nbsp; Script to test agent
+               [sudo ./testAgent.sh]    -    Script to test agent
             functionality.
         </li>
         <li class="padding-top-double">
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
             <span class="fw-stack fw-lg margin-right">
                 <i class="fw fw-ring fw-stack-2x"></i>
                 <i class="fw fw-right-arrow fw-stack-1x"></i>
             </span>
-            &nbsp;&nbsp;&nbsp;[sudo ./startService.sh] &nbsp;&nbsp; - &nbsp;&nbsp; Use this to start
+               [sudo ./startService.sh]    -    Use this to start
             agent as Daemon.
         </li>
     </ul>
@@ -254,17 +254,17 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;You can view all your connected devices at
+               You can view all your connected devices at
             <a href="{{@app.context}}/devices">[Device Management]</a> page.
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Select one of connected devices and check for available control
+               Select one of connected devices and check for available control
             operations and monitor Real-Time data.
         </li>
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;You can also view analytics of the data published to IoT-Server by
+               You can also view analytics of the data published to IoT-Server by
             navigating to Device Analytics page.
         </li>
     </ul>
diff --git a/components/iot-plugins/raspberrypi-plugin/pom.xml b/components/iot-plugins/raspberrypi-plugin/pom.xml
index 468a3f157..cad2802a3 100644
--- a/components/iot-plugins/raspberrypi-plugin/pom.xml
+++ b/components/iot-plugins/raspberrypi-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
index fcaa97701..49852083b 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
index 53cd03c0d..edcaf1c5e 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
index da6ec336b..f880d7248 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/pom.xml
index 586307aad..9e2d7e97c 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.scep.api/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.scep.api/pom.xml
index 9b91291a4..c9bef4a5f 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.scep.api/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.scep.api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
index 7b5398616..f8a4b7445 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
index 01fd58063..bc4a3f42c 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
@@ -66,9 +66,9 @@
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Policies . . .
                             <br>
                             <br>
@@ -95,9 +95,9 @@
                     <div class="panel-body">
                         <div id="operations-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Operations Log . . .
                             <br>
                             <br>
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.hbs
index b810eb399..583e332f7 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/configuration.hbs
@@ -63,7 +63,7 @@
         </div>
         <div class="wr-input-control wr-btn-grp">
             <button id="save-general-btn-virtualfirealarm" class="wr-btn" onclick="addConfiguration();">
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        Save
             </button>
         </div>
     </div>
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index dc3b01e3d..1b026619e 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -41,21 +41,21 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">STEP 01</span>
-            &nbsp;&nbsp;&nbsp;Go ahead and [Download] the Device.
+               Go ahead and [Download] the Device.
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 02</span>
-            &nbsp;&nbsp;&nbsp;Proceed to [Prepare] section.
+               Proceed to [Prepare] section.
         </li>
         <li class="padding-top-double">
             <span class="circle">STEP 03</span>
-            &nbsp;&nbsp;&nbsp;Read [Try Out] section to further experiment with the device.
+               Read [Try Out] section to further experiment with the device.
         </li>
     </ul>
     <br>
     <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
        class="btn-operations"
-       target="_blank"><i class="fw fw-api"></i> View API</i> &nbsp;
+       target="_blank"><i class="fw fw-api"></i> View API</i>
     </a>
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download"></i>Download Agent</a>
@@ -71,7 +71,7 @@
                       <i class="fw fw-add fw-stack-1x fw-inverse"></i>
                    </span>
                 </span>
-                &nbsp;&nbsp;Add your new firealarm device to {{@app.conf.appName}}
+                  Add your new firealarm device to {{@app.conf.appName}}
             </h4>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
             </button>
@@ -99,7 +99,7 @@
                             <input type="radio" name="sketchType" value="virtual_firealarm"
                                    id="virtual_firealarm"
                                    checked>
-                            <label for="simple_agent">Simple Agent</label> &nbsp;&nbsp;
+                            <label for="simple_agent">Simple Agent</label>
                             <input type="radio" name="sketchType"
                                    value="virtual_firealarm_advanced"
                                    id="virtual_firealarm_advanced">
@@ -148,7 +148,7 @@
                     <div class="buttons">
                         <a href="#" id="device-401-link" class="blue-button">
                             Goto Login Page
-                        </a>&nbsp;&nbsp;
+                        </a>
                         <a href="#" onclick="hidePopup();" class="btn-operations">
                             Cancel
                         </a>
@@ -209,19 +209,19 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;Download your VirtualFireAlarm using [Download Agent] button above.
+               Download your VirtualFireAlarm using [Download Agent] button above.
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Unzip the downloaded Agent.
+               Unzip the downloaded Agent.
         </li>
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;Move into the unzipped Agent folder in the terminal.
+               Move into the unzipped Agent folder in the terminal.
         </li>
         <li class="padding-top-double">
             <span class="circle">04</span>
-            &nbsp;&nbsp;&nbsp;Unzip the downloaded Agent and start terminal to run this command: [sh
+               Unzip the downloaded Agent and start terminal to run this command: [sh
             start-device.sh]
         </li>
     </ul>
@@ -244,17 +244,17 @@
     <ul class="list-unstyled">
         <li class="padding-top-double">
             <span class="circle">01</span>
-            &nbsp;&nbsp;&nbsp;You can view all your connected devices at
+               You can view all your connected devices at
             <a href="{{@app.context}}/devices">[Device Management]</a> page.
         </li>
         <li class="padding-top-double">
             <span class="circle">02</span>
-            &nbsp;&nbsp;&nbsp;Select one of connected devices and check for available control
+               Select one of connected devices and check for available control
             operations and monitor Real-Time data.
         </li>
         <li class="padding-top-double">
             <span class="circle">03</span>
-            &nbsp;&nbsp;&nbsp;You can also view analytics of the data published to IoT-Server by
+               You can also view analytics of the data published to IoT-Server by
             navigating to Device Analytics page.
         </li>
     </ul>
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/pom.xml b/components/iot-plugins/virtual-fire-alarm-plugin/pom.xml
index cb8636148..b26da2cca 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/pom.xml
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
index d427b89bd..997876edc 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
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/bean/AndroidPlatformConfiguration.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java
index cf40ad506..9832c3f03 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/AndroidPlatformConfiguration.java
@@ -36,7 +36,7 @@ import java.util.List;
 @XmlAccessorType(XmlAccessType.NONE)
 @ApiModel(
         value = "PlatformConfiguration",
-        description = "This class carries all information related to a Tenant configuration"
+        description = "This class carries all the information related to Android platform configurations."
 )
 public class AndroidPlatformConfiguration implements Serializable {
     public static final int INVALID_NOTIFIER_FREQUENCY = -1;
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 30dcb4704..d45f466b0 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,6 +21,7 @@ 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.*;
 
@@ -48,16 +49,16 @@ public interface DeviceManagementAdminService {
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Adds a Device Lock on Android Devices",
+            value = "Adding a Screen Lock on Android devices",
             notes = "Using this API you have the option of hard locking an Android device, where the Administrator " +
-                    "permanently locks the device or screen locking an Android device",
+                    "permanently locks the device or screen locking an Android device.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device lock operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device lock operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -72,11 +73,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified. \n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -86,37 +87,41 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new lock operation.")
+                            "Server error occurred while locking the device.")
     })
     @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);
+            @ApiParam(
+                    name = "deviceLock",
+                    value = "Provide the ID of the Android device, the message that needs to be sent out when locking the device, " +
+                            "and define true as the value if you need to hard lock the device or define false as the value to " +
+                            "screen lock the device." +
+                            "Multiple device IDs can be added by using comma separated values. ",
+                    required = true) DeviceLockBeanWrapper deviceLockBeanWrapper);
 
     @POST
     @Path("/unlock-devices")
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Adding a Device Unlock on Android Devices",
+            value = "Unlocking Android Devices",
             responseContainer = "List",
-            notes = "Using this API you have the option of unlocking an Android device, where the Administrator " +
-                    "unlocks the device",
+            notes = "Unlock devices that were locked permanently using the hard lock operation. Devices that are hard locked can only be unlocked by the EMM administrator.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device un-lock operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device unlock operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
-                                    description = "URL of the activity instance that refers to the scheduled operation."),
+                                    description = "The URL of the activity instance that refers to the scheduled operation."),
                             @ResponseHeader(
                                     name = "Content-Type",
                                     description = "Content type of the body"),
@@ -126,11 +131,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -140,15 +145,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new un-lock operation.")
+                            "Server error occurred while unlocking the device.")
     })
     @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")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
             List<String> deviceIDs);
 
 
@@ -157,9 +165,10 @@ public interface DeviceManagementAdminService {
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Requesting Location Coordinates of Android Devices",
+            value = "Requesting Location Coordinates",
             responseContainer = "List",
-            notes = "Request location coordinates of Android devices",
+            notes = "Request location coordinates of Android devices. \n" +
+                    "Example: In situations where you have lost your device and need to find out where it is, you can use this REST API to get the location of the device.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service")
     @ApiResponses(value = {
@@ -180,11 +189,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -194,14 +203,17 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     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-device/operations/android/location")
     Response getDeviceLocation(
-            @ApiParam(name = "deviceIDs", value = "DeviceIDs to be requested to get device location")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -212,12 +224,12 @@ public interface DeviceManagementAdminService {
             value = "Clearing the Password on Android Devices",
             notes = "Clear the password on Android devices",
             response = Activity.class,
-            tags = "Android Device Management Administrative Service"
+            tags = "Android Device Management Administrative Service."
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Clear password operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the clear password operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -232,11 +244,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified the last time.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.\n",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -246,7 +258,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -255,7 +267,8 @@ public interface DeviceManagementAdminService {
     @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);
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)  List<String> deviceIDs);
 
     @POST
     @Path("/control-camera")
@@ -263,14 +276,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Enabling or Disabling the Camera on Android Devices",
-            notes = "Enable or disable the camera on Android devices",
+            notes = "Enable or disable the camera on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Control camera operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the camera control operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -285,11 +298,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -299,15 +312,21 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new control camera operation.")
+                            "Server error occurred while adding the new camera control operation.")
     })
     @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")
+            @ApiParam(
+                    name = "cameraControl",
+                    value = "Define the properties to enable/disable the camera. " +
+                            "Disable the camera on the device by assigning true as the value or enable the " +
+                            "camera on the device to function by defining false as the value and the ID of the Android device. " +
+                            "Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
             CameraBeanWrapper cameraBeanWrapper);
 
     @POST
@@ -326,7 +345,7 @@ public interface DeviceManagementAdminService {
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device info operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device info operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -341,11 +360,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -355,7 +374,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -363,7 +382,10 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "deviceIds",
+                    value = "Provide the device ID of the Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -372,17 +394,17 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Requesting logcat from Android Devices",
+            value = "Requesting Logcat Details from Android Devices",
             notes = "Using this REST API you are able to request for Android device log details. Once this REST API is" +
                     " executed it will be in the Android operation queue until the device calls the server to retrieve " +
-                    "the list of operations that needs to be executed on the device",
+                    "the list of operations that needs to be executed on the device.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device logcat operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the operation to get the logcat details.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -397,11 +419,11 @@ public interface DeviceManagementAdminService {
                                                   "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                                   "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -411,7 +433,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -419,7 +441,10 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "deviceIds",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
                     List<String> deviceIDs);
 
     @POST
@@ -430,14 +455,14 @@ public interface DeviceManagementAdminService {
             httpMethod = "POST",
             value = "Enterprise Wiping Android Devices",
             notes = "Enterprise wipe is the process of deleting enterprise related data on a device while keeping the " +
-                    "personal data intact. You are able to enterprise wipe Android devices using this REST API",
+                    "personal data intact. You are able to enterprise wipe Android devices using this REST API.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Enterprise wipe operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the enterprise wipe operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -452,11 +477,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified." +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.\n",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -466,14 +491,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a enterprise wipe operation.")})
+                            "Server error occurred while adding the enterprise wipe operation.")})
     @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);
+    Response wipeDevice(
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
+            List<String> deviceIDs);
 
     @POST
     @Path("/wipe")
@@ -481,15 +510,15 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Factory Resetting an Android Device",
-            notes = "Factory rest or erases all the data stored in the Android devices " +
-                    "to restore them back to the original system",
+            notes = "Factory rest or erase all the data stored on the Android devices " +
+                    "to restore them back to the original system.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device wipe operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device wipe/factory reset operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -504,11 +533,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -518,14 +547,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a device wipe operation.")})
+                            "Server error occurred while adding the device wipe operation.")})
     @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")
+            @ApiParam(
+                    name = "wipeData",
+                    value = "Provide the the passcode, which is the passcode that the Android agent prompts the device owner to set at the time of device enrollment, " +
+                            "to enable the factory reset operation, and the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
             WipeDataBeanWrapper wipeDataBeanWrapper);
 
     @POST
@@ -534,18 +567,18 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Requesting the List of Installed Applications on Android Devices",
+            value = "Getting the List of Installed Applications on Android Devices",
             notes = "Using this REST API the server requests for the list of applications that are installed on" +
                     " the Android devices. Once this REST API is executed it will be in the Android operation queue " +
                     "until the device calls the server to retrieve the list of operations that needs to be executed " +
-                    "on the device",
+                    "on the device.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Get-applications operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the get-applications operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -560,11 +593,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -574,15 +607,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new get-applications operation.")
+                            "Server error occurred while adding the new get-applications operation.")
     })
     @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")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added using comma separated values." ,
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -591,14 +627,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Ringing Android Devices",
-            notes = "Ring Android devices",
+            notes = "Ring Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device ring operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device ring operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -613,11 +649,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -627,7 +663,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -635,7 +671,10 @@ public interface DeviceManagementAdminService {
     })
     @Permission(name = "Ring Device", permission = "/device-mgt/devices/owning-device/operations/android/ring")
     Response ringDevice(
-            @ApiParam(name = "deviceIDs", value = "Device Ids needed for ring")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added using comma separated values.",
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -644,14 +683,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Rebooting Android Devices",
-            notes = "Reboot Android devices",
+            notes = "Reboot or restart your Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device reboot operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device reboot operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -666,11 +705,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.\n",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -680,15 +719,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new device reboot operation.")
+                            "Server error occurred while adding the new device reboot operation.")
     })
     @Permission(name = "Reboot Device", permission = "/device-mgt/devices/owning-device/operations/android/reboot")
     Response rebootDevice(
-            @ApiParam(name = "deviceIDs", value = "Device Ids needed for reboot.")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added using comma separated values. ",
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -696,14 +738,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Muting Android Devices",
-            notes = "Mute Android devices",
+            notes = "Mute or enable a silent profile for Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device mute operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the device mute operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -718,11 +760,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -732,7 +774,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -741,7 +783,10 @@ public interface DeviceManagementAdminService {
     @Path("/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")
+            @ApiParam(
+                    name = "deviceIDs",
+                    value = "Provide the ID of the Android device. Multiple device IDs can be added using comma separated values. ",
+                    required = true)
             List<String> deviceIDs);
 
     @POST
@@ -751,16 +796,15 @@ public interface DeviceManagementAdminService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Installing an Application on Android Devices",
-            notes = "Install an application on an Android device. If the device you are installing the application" +
-                    " on has the WSO2 system service installed, the application installation will happen in silent " +
-                    "mode, else the device user's consent will be required",
+            notes = "Install an application on an Android device. If the device you are installing the application has the WSO2 system service application installed," +
+                    " the application installation will happen in silent mode, else the device user's consent will be required.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Install application operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the install application operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -775,11 +819,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -789,7 +833,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -797,7 +841,12 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "applicationInstallation",
+                    value = "Properties required to install an application on Android devices. Provide the the package name, type," +
+                            " URL and name of the application, the date and time for the scheduled installation, and the ID of the " +
+                            "Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             ApplicationInstallationBeanWrapper applicationInstallationBeanWrapper);
 
     @POST
@@ -807,16 +856,16 @@ public interface DeviceManagementAdminService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Updating an Application on Android Devices",
-            notes = "Update an application on an Android device. If the device you are updating the application" +
-                    " has the WSO2 system service installed, the application update will happen in silent " +
-                    "mode, else the device user's consent will be required",
+            notes = "Update an application on an Android device. If the device" +
+                    " has the WSO2 system service application installed, the application update will happen in silent " +
+                    "mode, else the device user's consent is required.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Update-application operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the update-application operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -831,11 +880,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -845,15 +894,20 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new update-application operation.")
+                            "Server error occurred while adding the new update-application operation.")
     })
     @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")
+            @ApiParam(
+                    name = "applicationUpdate",
+                    value = "Properties required to update an application on Android devices. Provide the the package name, type," +
+                            "URL and name of the application, the date and time for the scheduled installation, and the ID of the" +
+                            "Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             ApplicationUpdateBeanWrapper applicationUpdateBeanWrapper);
 
     @POST
@@ -862,14 +916,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Uninstalling an Application from Android Devices",
-            notes = "Uninstall an application from Android devices",
+            notes = "Uninstall an application from Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Uninstall-application operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the uninstall-application operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -884,11 +938,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -898,7 +952,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -906,8 +960,12 @@ public interface DeviceManagementAdminService {
     })
     @Permission(name = "Uninstall Applications", permission = "/device-mgt/devices/owning-device/operations/android/uninstall-app")
     Response uninstallApplication(
-            @ApiParam(name = "applicationUninstallationBeanWrapper",
-                    value = "applicationUninstallationConfigs and Device Ids")
+            @ApiParam(
+                    name = "applicationUninstallation",
+                    value = "Properties required to uninstall an application. Provide the the package name, type," +
+                            "URL and name of the application, the date and time for the scheduled installation, and the ID of the" +
+                            "Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             ApplicationUninstallationBeanWrapper applicationUninstallationBeanWrapper);
 
     @POST
@@ -916,15 +974,18 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Get BlackListed Applications",
-            notes = "Getting BlackListed Applications",
+            value = "BlackListing Applications for Android Devices",
+            notes = "Prevents you from using specific applications. For Android operation systems before Lollipop," +
+                    " when a blacklisted application is clicked a screen is displayed to prevent you from using the app. For the Lollipop" +
+                    " Android operating systems and after, the blacklisted apps will be hidden. Blacklisting can be used on both BYOD and " +
+                    "COPE devices. Applications can be blacklisted via the application restriction policy too.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Blacklist-applications operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the application blacklist operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -939,11 +1000,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -953,16 +1014,19 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new blacklist-applications operation.")
+                            "Server error occurred while adding the new blacklist-applications operation.")
     })
     @Permission(name = "Blacklist Applications", permission = "/device-mgt/devices/owning-device/operations/android/blacklist-app")
     Response blacklistApplications(
-            @ApiParam(name = "blacklistApplicationsBeanWrapper", value = "BlacklistApplications " +
-                    "Configuration and DeviceIds")
+            @ApiParam(
+                    name = "blacklistApplications",
+                    value = "The properties required to blacklist applications. Provide the package name of the application to be blacklisted," +
+                            " and the ID of the Android device. Multiple device IDs can be added by using comma separated values. ",
+                    required = true)
             @Valid BlacklistApplicationsBeanWrapper blacklistApplicationsBeanWrapper);
 
     @POST
@@ -971,15 +1035,15 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Upgrading device firmware",
-            notes = "Device firmware upgrade",
+            value = "UUpgrading Firmware of Android Devices",
+            notes = "Upgrade the firmware of Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Upgrade firmware operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the firmware upgrade operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -994,11 +1058,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1008,7 +1072,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -1016,8 +1080,13 @@ public interface DeviceManagementAdminService {
     })
     @Permission(name = "Upgrade Firmware", permission = "/device-mgt/devices/owning-device/operations/android/upgrade")
     Response upgradeFirmware(
-            @ApiParam(name = "upgradeFirmwareBeanWrapper",
-                    value = "Firmware upgrade configuration and DeviceIds")
+            @ApiParam(
+                    name = "upgradeFirmware",
+                    value = "Properties required to upgrade the firmware. Provide the date and time to schedule the firmware update in the " +
+                            "yyyy-MM-dd'T'HH:mm:ss.SSSXXX format, the OTA upgrade server URL in one of the following formats " +
+                            "(example: http//abc.com, http://abc.com/ota), " +
+                            "and the ID of the Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             UpgradeFirmwareBeanWrapper upgradeFirmwareBeanWrapper);
 
     @POST
@@ -1027,19 +1096,19 @@ public interface DeviceManagementAdminService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Configuring VPN on Android devices",
-            notes = "Configure VPN on Android devices",
+            notes = "Configure VPN on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Configure VPN operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the configure VPN operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
-                                    description = "URL of the activity instance that refers to the scheduled operation."),
+                                    description = "The URL of the activity instance that refers to the scheduled operation."),
                             @ResponseHeader(
                                     name = "Content-Type",
                                     description = "Content type of the body"),
@@ -1049,11 +1118,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified." +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1063,16 +1132,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new configure VPN operation.")
+                            "Server error occurred while configuring the VPN.")
     })
     @Permission(name = "Add VPN", permission = "/device-mgt/devices/owning-device/operations/android/vpn")
     Response configureVPN(
-            @ApiParam(name = "vpnBeanWrapper",
-                    value = "VPN configuration and DeviceIds")
+            @ApiParam(
+                    name = "vpnBean",
+                    value = "VPN configuration and DeviceIds",
+                    required = true)
             VpnBeanWrapper vpnBeanWrapper);
 
     @POST
@@ -1081,14 +1152,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Sending a Notification to Android Devices",
-            notes = "Send a notification to Android devices",
+            notes = "Send a notification or message to Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Send notification operation has successfully been scheduled",
+                    message = "Created. \n Successfully sent the notification.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1103,11 +1174,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1117,7 +1188,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -1125,8 +1196,11 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "notification",
+                    value = "The properties required to send a notification. Provide the message you wish to send and the ID of the " +
+                            "Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             NotificationBeanWrapper notificationBeanWrapper);
 
     @POST
@@ -1135,14 +1209,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Configuring Wi-Fi on Android Devices",
-            notes = "Configure Wi-Fi on Android devices",
+            notes = "Configure Wi-Fi on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Configure wifi operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the configure Wi-Fi operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1157,11 +1231,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified." +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1171,16 +1245,21 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new configure wifi operation.")
+                            "Server error occurred while configuring Wi-Fi.")
     })
     @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);
+            @ApiParam(
+                    name = "wifi",
+                    value = "The properties required to configure Wi-Fi. Provide the password to connect to the specified Wi-Fi network," +
+                            "the ssid or the name of the Wi-Fi network that you wish to configure and the ID of the Android device." +
+                            " Multiple device IDs can be added by using comma separated values.",
+                    required = true)
+            WifiBeanWrapper wifiBeanWrapper);
 
     @POST
     @Path("/encrypt-storage")
@@ -1188,14 +1267,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Encrypting Storage on Android Devices",
-            notes = "Encrypt the data stored on Android devices",
+            notes = "Encrypt the data stored on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Encrypt storage operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the encrypt storage operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1210,11 +1289,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified." +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.\n",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1224,7 +1303,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -1232,8 +1311,12 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "encryption",
+                    value = "Properties required to encrypt the storage. Encrypt the storage on the device by assigning " +
+                            "true as the value or do not encrypt the storage on the device by assigning false as the value and " +
+                            "provide the ID of the Android device. Multiple device IDs can be added by using comma separated values.",
+                    required = true)
             EncryptionBeanWrapper encryptionBeanWrapper);
 
     @POST
@@ -1242,14 +1325,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Changing the Lock Code on Android Devices",
-            notes = "Change the lock code on Android devices",
+            notes = "Change the lock code on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Change lock code operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the change lock code operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1264,11 +1347,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1278,7 +1361,7 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -1286,8 +1369,12 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "lockCode",
+                    value = "The properties to change th lock code. Provide the lock code that will replace the current lock code on Android devices and " +
+                            "the ID of the Android device. Multiple device IDs can be added by using comma separated values. " +
+                            "If a passcode policy has been set in EMM, the lock code should comply to the passcode policy.\t",
+                    required = true)
             LockCodeBeanWrapper lockCodeBeanWrapper);
 
     @POST
@@ -1295,15 +1382,15 @@ public interface DeviceManagementAdminService {
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Setting a Passcode Policy on Android Devices",
-            notes = "Set a password policy on Android devices",
+            value = "Setting a Password Policy on Android Devices",
+            notes = "Set a password policy on Android devices.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Set password policy operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the set password policy operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1318,11 +1405,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1340,8 +1427,10 @@ public interface DeviceManagementAdminService {
     })
     @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")
+            @ApiParam(
+                    name = "passwordPolicy",
+                    value = "The properties required to set a password policy.",
+                    required = true)
             PasswordPolicyBeanWrapper passwordPolicyBeanWrapper);
 
     @POST
@@ -1350,14 +1439,14 @@ public interface DeviceManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
             value = "Setting a Web Clip on Android Devices",
-            notes = "Set a web clip on Android devices. A web clip is used to add a bookmark to a web application",
+            notes = "Set a web clip on Android devices. A web clip is used to add a bookmark to a web application.",
             response = Activity.class,
             tags = "Android Device Management Administrative Service"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Set webclip operation has successfully been scheduled",
+                    message = "Created. \n Successfully scheduled the set web clip operation.",
                     response = Activity.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -1372,11 +1461,11 @@ public interface DeviceManagementAdminService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.\n",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -1386,16 +1475,18 @@ public interface DeviceManagementAdminService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while adding a new set webclip operation.")
+                            "Server error occurred while adding adding a the set web clip operation.")
     })
     @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")
+            @ApiParam(
+                    name = "webClip",
+                    value = "The properties to set the web clip.",
+                    required = true)
             WebClipBeanWrapper webClipBeanWrapper);
 
 
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/DeviceManagementService.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/DeviceManagementService.java
index 66b84a875..e7731778e 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/DeviceManagementService.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/DeviceManagementService.java
@@ -39,7 +39,7 @@ import java.util.List;
         tags = {"devicemgt_android"})
 
 @Api(value = "Android Device Management",
-        description = "This carries all the resources related to Android device management functionalities")
+        description = "This carries all the resources related to the Android device management functionalities.")
 @Path("/devices")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -51,13 +51,14 @@ public interface DeviceManagementService {
             produces = MediaType.APPLICATION_JSON,
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Update the application list of a device",
+            value = "Updating the Application Details on Android Devices",
+            notes = "Update the details of the applications that are installed on Android devices.",
             tags = "Android Device Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Application list has been updated successfully",
+                    message = "OK. \n Successfully updated the application details.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -71,17 +72,17 @@ public interface DeviceManagementService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 400,
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -91,14 +92,14 @@ public interface DeviceManagementService {
     Response updateApplicationList(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier")
+                    value = "The unique device identifier.")
             @NotNull
             @Size(min = 2 , max = 45)
             @Pattern(regexp = "^[A-Za-z0-9]*$")
             @PathParam("id") String id,
             @ApiParam(
                     name = "applications",
-                    value = "List of applications that need to be persisted against the device")
+                    value = "The properties to update application details. Multiple applications can be updated using comma separated values.")
             List<AndroidApplication> androidApplications);
 
     @PUT
@@ -106,16 +107,18 @@ public interface DeviceManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Get the operation list pending for the device",
+            value = "Getting the Pending Operation List",
             responseContainer = "List",
             notes = "The Android agent communicates with the server to get the operations that are queued up " +
-                    "at the server end for a given device using via this particular resource",
+                    "at the server end via this REST API." +
+                    " While getting the pending operations the details of the operations executed at the device end is shared with the server. " +
+                    "The server then updates the status of the operations that were carried out on the device.",
             response = Operation.class,
             tags = "Android Device Management")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Successfully fetched the pending application list of the Android device.",
+                    message = "OK. \n Successfully fetched the pending operations of the Android device.",
                     response = Operation.class,
                     responseContainer = "List",
                     responseHeaders = {
@@ -128,33 +131,36 @@ public interface DeviceManagementService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
             @ApiResponse(
                     code = 406,
                     message = "Not Acceptable.\n The requested media type is not supported"),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n Server error occurred while fetching policies.")
+                    message = "Internal Server Error. \n Server error occurred while fetching the list of pending operations.")
     })
     @Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
     Response getPendingOperations(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier")
+                    value = "The unique device identifier.",
+                    required = true)
             @PathParam("id") String id,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200.",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @ApiParam(
                     name = "resultOperations",
-                    value = "Device Operation Status")
+                    value = "Properties to update the device operations and their status.")
             List<? extends Operation> resultOperations);
 
     @POST
@@ -162,17 +168,17 @@ public interface DeviceManagementService {
             produces = MediaType.APPLICATION_JSON,
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Register an Android Device",
-            notes = "When carrying out device registration via an Android device, you need to initially install" +
-                    " an Android Agent on the device, before being able to register the device with WSO2 EMM. Instead," +
+            value = "Registering an Android Device",
+            notes = "When registering an Android device, you need to install" +
+                    " the Android Agent on the device, before being able to register the device with WSO2 EMM. Instead," +
                     " you can use this REST API to register an Android device with WSO2 EMM, without having to install" +
-                    " an Android Agent on the respective device",
+                    " an Android Agent. This API can be mainly used to test the device enrollment process.",
             tags = "Android Device Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Device enrollment has successfully been created",
+                    message = "Created. \n Successfully created an instance of the device.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -186,11 +192,11 @@ public interface DeviceManagementService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -200,14 +206,16 @@ public interface DeviceManagementService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n"),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding a new device.")
     })
     @Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
-    Response enrollDevice(@ApiParam(name = "device", value = "Device Information to be enroll")
+    Response enrollDevice(@ApiParam(
+            name = "device",
+            value = "The properties required to enroll a device.")
                           @Valid AndroidDevice device);
 
     @GET
@@ -215,7 +223,7 @@ public interface DeviceManagementService {
     @ApiOperation(
             httpMethod = "GET",
             value = "Getting the Registration Status of an Android Device",
-            notes = "Use this REST API to retrieve the registration status of an Android device",
+            notes = "Use this REST API to retrieve the registration status of an Android device.",
             tags = "Android Device Management"
     )
     @ApiResponses(value = {
@@ -232,12 +240,12 @@ public interface DeviceManagementService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests."),
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
             @ApiResponse(
                     code = 406,
                     message = "Not Acceptable.\n The requested media type is not supported"),
@@ -249,11 +257,13 @@ public interface DeviceManagementService {
     Response isEnrolled(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier")
+                    value = "The unique device identifier")
             @PathParam("id") String id,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
@@ -262,14 +272,14 @@ public interface DeviceManagementService {
     @ApiOperation(
             httpMethod = "PUT",
             value = "Updating the Registration Details of an Android Device",
-            notes = "Use this REST API to update the registration details of an Android device",
+            notes = "Use this REST API to update the registration details of an Android device.",
             tags = "Android Device Management"
     )
     @ApiResponses(
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Device enrollment has been updated successfully",
+                            message = "OK. \n Successfully updated the device enrollment details.",
                             responseHeaders = {
                                     @ResponseHeader(
                                             name = "Content-Location",
@@ -283,17 +293,17 @@ public interface DeviceManagementService {
                                                     "Used by caches, or in conditional requests."),
                                     @ResponseHeader(
                                             name = "Last-Modified",
-                                            description = "Date and time the resource has been modified the last time.\n" +
+                                            description = "Date and time the resource was last modified.\n" +
                                                     "Used by caches, or in conditional requests.")}),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error."),
                     @ApiResponse(
                             code = 404,
-                            message = "Not Found. \n Resource to be deleted does not exist."),
+                            message = "Not Found. \n The specified resource does not exist."),
                     @ApiResponse(
                             code = 415,
-                            message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                            message = "Unsupported media type. \n The format of the requested entity was not supported."),
                     @ApiResponse(
                             code = 500,
                             message = "Internal Server Error. \n " +
@@ -303,27 +313,27 @@ public interface DeviceManagementService {
     Response modifyEnrollment(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier")
+                    value = "The unique device identifier.")
             @PathParam("id") String id,
             @ApiParam(
                     name = "device",
-                    value = "Device information to be modify") @Valid AndroidDevice androidDevice);
+                    value = "The properties of required to update device enrollment details.") @Valid AndroidDevice androidDevice);
 
     @DELETE
     @Path("/{id}")
     @ApiOperation(
             httpMethod = "DELETE",
-            value = "Un-register an Android Device",
-            notes = "Use this REST API to un-register a specific Android device",
+            value = "Unregistering an Android Device",
+            notes = "Use this REST API to unregister an Android device.",
             tags = "Android Device Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Device has successfully been dis-enrolled"),
+                    message = "OK. \n Successfully disenrolled the device."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
@@ -333,7 +343,7 @@ public interface DeviceManagementService {
     Response disEnrollDevice(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier")
+                    value = "The unique device identifier.")
             @PathParam("id") String id);
 
 }
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 e5e42f31f..dba8b4afd 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
@@ -34,8 +34,7 @@ import javax.ws.rs.core.Response;
         context = "api/device-mgt/android/v1.0/configuration",
         tags = {"devicemgt_android"})
 
-@Api(value = "Android Configuration Management", description = "This API carries all resource associated with " +
-        "manipulating the general configurations of Android platform")
+@Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")
 @Path("/configuration")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -46,14 +45,14 @@ public interface DeviceTypeConfigurationService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
             value = "Getting Android Platform Configurations",
-            notes = "Get the Android platform configuration details using this REST API",
+            notes = "Get the Android platform configuration details using this REST API.",
             response = PlatformConfiguration.class,
             tags = "Android Configuration Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Successfully fetched Android platform configuration.",
+                    message = "OK. \n Successfully fetched the Android platform configurations.",
                     response = PlatformConfiguration.class,
                     responseHeaders = {
                             @ResponseHeader(
@@ -65,27 +64,29 @@ public interface DeviceTypeConfigurationService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests."),
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 406,
                     message = "Not Acceptable.\n The requested media type is not supported"),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n Server error occurred while fetching Android platform configuration.")
+                    message = "Internal Server Error. \n Server error occurred while fetching the Android platform configuration.")
     })
     @Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
     Response getConfiguration(
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
@@ -94,14 +95,14 @@ public interface DeviceTypeConfigurationService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Updating Android Platform Configuration.",
+            value = "Updating Android Platform Configurations",
             notes = "Update the Android platform configurations using this REST API.",
             tags = "Android Configuration Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Android platform configuration has been updated successfully",
+                    message = "OK. \n Successfully updated the Android platform configurations.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -115,26 +116,26 @@ public interface DeviceTypeConfigurationService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 400,
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while modifying Android platform configuration.")
+                            "Server error occurred while modifying the Android platform configuration.")
     })
     @Permission(name = "Manage Configurations", permission = "/device-mgt/platform-configurations/manage")
     Response updateConfiguration(
             @ApiParam(name = "configuration",
-                    value = "AndroidPlatformConfiguration")
+                    value = "The properties to update the Android platform configurations.")
             @Valid AndroidPlatformConfiguration androidPlatformConfiguration);
 
     @GET
@@ -143,9 +144,9 @@ public interface DeviceTypeConfigurationService {
     @ApiOperation(
             produces = MediaType.TEXT_PLAIN,
             httpMethod = "GET",
-            value = "Getting the License Agreement for Android Device Registration",
+            value = "Getting the License Agreement for the Android Device Registration",
             notes = "Use this REST API to retrieve the license agreement that is used for the Android device " +
-                    "registration process",
+                    "registration process.",
             response = String.class,
             tags = "Android Configuration Management")
     @ApiResponses(value = {
@@ -163,27 +164,29 @@ public interface DeviceTypeConfigurationService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests."),
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 406,
                     message = "Not Acceptable.\n The requested media type is not supported"),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n Server error occurred while fetching Android license configuration.")
+                    message = "Internal Server Error. \n Server error occurred while fetching the Android license configuration.")
     })
     @Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/android")
     Response getLicense(
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200.",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince) throws AndroidAgentException;
 
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/EventReceiverService.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/EventReceiverService.java
index 2b2dd0d1e..c5a607b3a 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/EventReceiverService.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/EventReceiverService.java
@@ -35,9 +35,9 @@ import javax.ws.rs.core.Response;
         context = "api/device-mgt/android/v1.0/events",
         tags = {"devicemgt_android"})
 
-@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs.To enable Eventing need to" +
-        " configure as ref-https://docs.wso2.com/display/EMM210/Managing+Event+Publishing+with+WSO2+Data+Analytics+Server, " +
-        "https://docs.wso2.com/display/EMM210/Creating+a+New+Event+Stream+and+Receiver")
+@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +
+        " configure WSO2 EMM as explained in https://docs.wso2.com/display/EMM220/Managing+Event+Publishing+with+WSO2+Data+Analytics+Server, " +
+        "https://docs.wso2.com/display/EMM220/Creating+a+New+Event+Stream+and+Receiver")
 @Path("/events")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -49,13 +49,13 @@ public interface EventReceiverService {
             produces = MediaType.APPLICATION_JSON,
             consumes = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Event publishing via REST API.",
-            notes = "Publish events received by the EMM Android client to WSO2 DAS using this API.",
+            value = "Publishing Events",
+            notes = "Publish events received by the WSO2 EMM Android client to the WSO2 Data Analytics Server (DAS) using this API.",
             tags = "Event Receiver"
     )
     @ApiResponses(
             value = {
-                    @ApiResponse(code = 201, message = "Created. \n Event is published successfully. Location header " +
+                    @ApiResponse(code = 201, message = "Created. \n Successfully published the event. Location header " +
                             "contains URL of newly enrolled device",
                             responseHeaders = {
                                     @ResponseHeader(
@@ -70,12 +70,12 @@ public interface EventReceiverService {
                                                     "Used by caches, or in conditional requests."),
                                     @ResponseHeader(
                                             name = "Last-Modified",
-                                            description = "Date and time the resource has been modified the last time.\n" +
+                                            description = "Date and time the resource was last modified.\n" +
                                                     "Used by caches, or in conditional requests.")
                             }),
                     @ApiResponse(
                             code = 303,
-                            message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                            message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                             responseHeaders = {
                                     @ResponseHeader(
                                             name = "Content-Location",
@@ -85,7 +85,7 @@ public interface EventReceiverService {
                             message = "Bad Request. \n Invalid request or validation error."),
                     @ApiResponse(
                             code = 415,
-                            message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                            message = "Unsupported media type. \n The format of the requested entity was not supported."),
                     @ApiResponse(
                             code = 500,
                             message = "Internal Server Error. \n " +
@@ -104,10 +104,10 @@ public interface EventReceiverService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
             value = "Getting event details for a given time period.",
-            notes = "Get the event details of a device for a given time duration using this API.Request must contain " +
-                    "the device identifier. Optionally, both, date from and date to value should be present to get " +
-                    "alerts between times. Based on device type and the device identifier also filtering can be done" +
-                    "(This cannot be combined with to and from parameters).",
+            notes = "Get the event details of a device for a given time duration using this API. The request must contain " +
+                    "the device identifier. Optionally, both date from and date to value should be present to get " +
+                    "alerts between a specified time. Filtering can also be done based on the device type and the device identifier." +
+                    "(This cannot be combined with the to and from parameters).",
             response = DeviceState.class,
             responseContainer = "List",
             tags = "Event Receiver"
@@ -116,12 +116,11 @@ public interface EventReceiverService {
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Event details of a device for a given time duration have been successfully fetched",
+                            message = "OK. \n Successfully fetched the event details of the specified device for a given time duration.",
                             response = DeviceState.class, responseContainer = "List"),
                     @ApiResponse(
                             code = 303,
-                            message = "See Other. \n Source can be retrieved from the URL specified at" +
-                                    " the Location header.",
+                            message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                             responseHeaders = {
                                     @ResponseHeader(name = "Content-Location", description = "Source URL of the document.")
                             }),
@@ -132,39 +131,44 @@ public interface EventReceiverService {
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error. You must provide" +
-                                    " the device identifier. Additionally, the device identifier can be combined with either the type" +
-                                    " OR date from and to."),
+                                    " the device identifier. Additionally, the device identifier can be combined with either the device type" +
+                                    " OR the from and to date."),
                     @ApiResponse(
                             code = 404,
-                            message = "Not Found. \n Resource requested does not exist."),
+                            message = "Not Found. \n The specified resource does not exist."),
                     @ApiResponse(
                             code = 500,
-                            message = "Error occurred while getting published events for specific device.")
+                            message = "Error occurred while getting the published events for the specified device.")
             })
     @Permission(name = "Publish Events to DAS", permission = "/device-mgt/devices/enroll/android")
     Response retrieveAlerts(
             @ApiParam(
                     name = "id",
-                    value = "Device Identifier to be need to retrieve events.",
+                    value = "The unique device identifier.",
                     required = true)
             @Size(min = 2, max = 45)
             @QueryParam("id") String deviceId,
             @ApiParam(
                     name = "from",
-                    value = "From Date.")
+                    value = "Specify the time and date from when you want to get the data." +
+                            "Provide the time and date format in the unix/epoch format as the value for {unixTimestamp}. Use a Epoch convertor, to convert the time and date to this format.")
             @QueryParam("from") long from,
             @ApiParam(
                     name = "to",
-                    value = "To Date.")
+                    value = "Specify the time and date up to when you require the data." +
+                            "Provide the time and date format in the unix/epoch format as the value for {unixTimestamp}. Use a Epoch convertor, to convert the time and date to this format.")
             @QueryParam("to") long to,
             @ApiParam(
                     name = "type",
-                    value = "Type of the Alert to be need to retrieve events.")
+                    value = "The alert type to retrieve the events." +
+                            "Provide APPLICATION_STATE or RUNTIME_STATE as the value.")
             @Size(min = 2, max = 45)
             @QueryParam("type") String type,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
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/impl/DeviceManagementAdminServiceImpl.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/impl/DeviceManagementAdminServiceImpl.java
index b7fcd5f92..2349aa3ef 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/impl/DeviceManagementAdminServiceImpl.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/impl/DeviceManagementAdminServiceImpl.java
@@ -1072,7 +1072,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
 
     private static void validateScheduleDate(String dateString){
         try {
-            if (dateString != null) {
+            if (dateString != null && !dateString.isEmpty()) {
                 SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
                 sdf.setLenient(false);
                 sdf.parse(dateString);
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 7c07ebd28..4f0e65511 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -51,7 +51,7 @@
         <property name="version" value="1.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https" />
-        <property name="basePath" value="/api-device-mgt-android-v1.0"/>
+        <property name="basePath" value="/api/device-mgt/android/v1.0"/>
         <property name="title" value="Android Device Management API Definitions"/>
         <property name="contact" value="dev@wso2.org"/>
         <property name="license" value="Apache 2.0"/>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
index 0edf76351..05b1a0479 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>
 
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index bba71218c..d607d3875 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -55,9 +55,9 @@
                     <div class="panel-body">
                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Policies . . .
                             <br>
                             <br>
@@ -85,9 +85,9 @@
                         <div id="policy-spinner"
                              class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Policy Compliance . . .
                             <br>
                             <br>
@@ -123,9 +123,9 @@
                     <div class="panel-body">
                         <div id="apps-spinner" class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading App List . . .
                             <br>
                             <br>
@@ -147,9 +147,9 @@
                         <div id="operations-spinner"
                              class="wr-advance-operations-init hidden">
                             <br>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                            &nbsp;&nbsp;&nbsp;
+
                             Loading Operations Log . . .
                             <br>
                             <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
index fe04c3ce6..8d2cbf4d5 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
@@ -14,8 +14,8 @@
                 <div class="wr-advance-operations">
                     <div class="wr-advance-operations-init">
                         <br>
-                        &nbsp;&nbsp;&nbsp;&nbsp;<i class="fw fw-settings fw-spin fw-2x"></i>
-                        &nbsp;&nbsp;&nbsp;Loading platform features . . .
+                            <i class="fw fw-settings fw-spin fw-2x"></i>
+                           Loading platform features . . .
                         <br><br>
                     </div>
                 </div>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
index 93e2e0a2f..164d42e14 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
@@ -21,13 +21,13 @@
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">STEP 01</span>&nbsp;&nbsp;&nbsp;Android
+        <li class="padding-top-double"><span class="circle">STEP 01</span>   Android
                                                                           Mobile.
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;Go ahead
+        <li class="padding-top-double"><span class="circle">STEP 02</span>   Go ahead
                                                                           and click [Enroll Device].
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed
+        <li class="padding-top-double"><span class="circle">STEP 03</span>   Proceed
                                                                           to the [Prepare] section.
         </li>
     </ul>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
index 9f85c6424..a7eb17846 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index c23e1e5ff..3735f8eab 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/pom.xml
index f8bd11fff..19454f44f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>mobile-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
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 3662eb6b1..30b859b1a 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
@@ -44,7 +44,7 @@
                     <i class="fw fw-ring fw-stroke fw-stack-2x"></i>
                     <i class="fw fw-add fw-stack-1x"></i>
                 </span>
-                &nbsp;&nbsp;Add New Device
+                  Add New Device
             </a>
         </li>
     {{/if}}
@@ -55,7 +55,7 @@
                     <i class="fw fw-ring fw-stroke fw-stack-2x"></i>
                     <i class="fw fw-search fw-stack-1x"></i>
                 </span>
-                &nbsp;&nbsp;Advanced Search
+                  Advanced Search
             </a>
         </li>
     {{/if}}
@@ -75,7 +75,7 @@
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
                         </span>
-                        &nbsp;&nbsp;Add New Device
+                          Add New Device
                     </a>
                 </h3>
             </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.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 e5d83caef..39d88a717 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
@@ -17,6 +17,7 @@
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="Policy Management"}}
 {{unit "cdmf.unit.data-tables-extended"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "topCss"}}
     <style>
@@ -50,7 +51,7 @@
                         <i class="fw fw-add fw-stack-1x"></i>
                         <i class="fw fw-ring fw-stack-2x"></i>
                     </span>
-                    &nbsp;Add New Policy
+                     Add New Policy
                 </a>
             </li>
         {{/equal}}
@@ -64,7 +65,7 @@
                         <i class="fw fw-throttling-policy fw-stack-1x"></i>
                         <i class="fw fw-ring fw-stack-2x"></i>
                     </span>
-                    &nbsp;Policy Priority
+                     Policy Priority
                 </a>
             </li>
         {{/equal}}
@@ -75,7 +76,7 @@
                 <i class="fw fw-check fw-stack-1x"></i>
                 <i class="fw fw-ring fw-stack-2x"></i>
             </span>
-            &nbsp;Apply Changes To Devices
+             Apply Changes To Devices
         </a>
     </li>
 {{/zone}}
@@ -99,7 +100,7 @@
                                 <i class="fw fw-ring fw-stack-2x"></i>
                                 <i class="fw fw-add fw-stack-1x"></i>
                             </span>
-                            &nbsp;&nbsp;Add New Policy
+                              Add New Policy
                         </a>
                     </h3>
                 {{/if}}
@@ -268,393 +269,6 @@
             <a href="#">By Status</a>
         </div>
     </div>
-
-    <div id="remove-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Do you really want to remove the selected policy(s)?
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <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 btn-default">Cancel</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Done. Selected policy was successfully removed.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-success-link" class="btn-operations">Ok</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                An unexpected error occurred. Please try again later
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-error-link" class="btn-operations">Ok</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-active-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Please Try again.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot remove policies that have been already applied to devices.
-                Please deselect active policies from your selection and try again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-active-policy-error-link" class="btn-operations">Ok</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Do you really want to publish the selected policy(s)?
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <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 btn-default">No</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Done. Selected policy was successfully published.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="publish-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                An unexpected error occurred. Please try again later.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="publish-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Do you really want to unpublish the selected policy(s)?
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-yes-link" class="btn-operations">
-                    Yes
-                </a>
-
-                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations btn-default">
-                    No
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Done. Selected policy was successfully unpublished.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                An unexpected error occurred. Please try again later.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Done. New Policy priorities were successfully updated.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="save-policy-priorities-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                An unexpected error occurred. Please try again later.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="save-policy-priorities-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Do you really want to apply changes to all policies?
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-yes-link" class="btn-operations">
-                    Yes
-                </a>
-
-                <a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">
-                    No
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                Done. Changes applied successfully.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                An unexpected error occurred. Please try again later.
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="errorPolicyUnPublish" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Action cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to un-publish.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="errorPolicyUnPublishSelection" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Action cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot select already inactive policies to be unpublished.
-                Please deselect inactive policies and try again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="active-policy-selection-error" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Action cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot select already active policies. Please deselect active policies and try again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="policy-publish-error" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Action cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to publish.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="policy-remove-error" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Action cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to remove.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
 {{/zone}}
 
 {{#zone "bottomJs"}}
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/public/js/policy-list.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
index 1338ace7e..253be844f 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/public/js/policy-list.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
@@ -163,8 +163,10 @@ $(document).ready(function () {
     // click-event function for applyChangesButton
     $(applyChangesButtonId).click(function () {
         var serviceURL = "/api/device-mgt/v1.0/policies/apply-changes";
-        $(modalPopupContent).html($('#change-policy-modal-content').html());
-        showPopup();
+        modalDialog.header('Do you really want to apply changes to all policies?');
+        modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-yes-link" class="btn-operations">Yes' +
+            '</a><a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">No</a></div>');
+        modalDialog.show();
 
         $("a#change-policy-yes-link").click(function () {
             invokerUtil.put(
@@ -173,10 +175,11 @@ $(document).ready(function () {
                 // on success
                 function (data, textStatus, jqXHR) {
                     if (jqXHR.status == 200) {
-                        $(modalPopupContent).html($('#change-policy-success-content').html());
-                        showPopup();
+                        modalDialog.header('Done. Changes applied successfully.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-success-link" ' +
+                            'class="btn-operations">Ok</a></div>');
                         $("a#change-policy-success-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                             location.reload();
                         });
                     }
@@ -184,17 +187,19 @@ $(document).ready(function () {
                 // on error
                 function (jqXHR) {
                     console.log(stringify(jqXHR.data));
-                    $(modalPopupContent).html($("#change-policy-error-content").html());
-                    showPopup();
+                    modalDialog.header('An unexpected error occurred. Please try again later.');
+                    modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-error-link" ' +
+                        'class="btn-operations">Ok</a></div>');
+                    modalDialog.showAsError();
                     $("a#change-policy-error-link").click(function () {
-                        hidePopup();
+                        modalDialog.hide();
                     });
                 }
             );
         });
 
         $("a#change-policy-cancel-link").click(function () {
-            hidePopup();
+            modalDialog.hide();
         });
     });
 
@@ -207,16 +212,27 @@ $(document).ready(function () {
             // if policies found in Inactive or Inactive/Updated states with in the selection,
             // pop-up an error saying
             // "You cannot select already inactive policies. Please deselect inactive policies and try again."
-            $(modalPopupContent).html($("#errorPolicyUnPublishSelection").html());
-            showPopup();
+            modalDialog.header('Action cannot be performed !');
+            modalDialog.content('You cannot select already inactive policies to be unpublished. Please deselect ' +
+                'inactive policies and try again.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">Ok</a>' +
+                '</div>');
+            modalDialog.showAsAWarning();
         } else {
             var serviceURL = "/api/device-mgt/v1.0/policies/deactivate-policy";
             if (policyList.length == 0) {
-                $(modalPopupContent).html($("#errorPolicyUnPublish").html());
+                modalDialog.header('Action cannot be performed !');
+                modalDialog.content('Please select a policy or a list of policies to un-publish.');
+                modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsAWarning();
             } else {
-                $(modalPopupContent).html($("#unpublish-policy-modal-content").html());
+                modalDialog.header('Do you really want to unpublish the selected policy(s)?');
+                modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-yes-link" ' +
+                    'class="btn-operations">Yes</a><a href="#" id="unpublish-policy-cancel-link" ' +
+                    'class="btn-operations btn-default">No</a></div>');
+                modalDialog.show();
             }
-            showPopup();
 
             // on-click function for policy un-publishing "yes" button
             $("a#unpublish-policy-yes-link").click(function () {
@@ -226,9 +242,11 @@ $(document).ready(function () {
                     // on success
                     function (data, textStatus, jqXHR) {
                         if (jqXHR.status == 200 && data) {
-                            $(modalPopupContent).html($("#unpublish-policy-success-content").html());
+                            modalDialog.header('Done. Selected policy was successfully unpublished.');
+                            modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-success-link" ' +
+                                'class="btn-operations">Ok</a></div>');
                             $("a#unpublish-policy-success-link").click(function () {
-                                hidePopup();
+                                modalDialog.hide();
                                 location.reload();
                             });
                         }
@@ -236,9 +254,12 @@ $(document).ready(function () {
                     // on error
                     function (jqXHR) {
                         console.log(stringify(jqXHR.data));
-                        $(modalPopupContent).html($("#unpublish-policy-error-content").html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#unpublish-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 );
@@ -246,7 +267,7 @@ $(document).ready(function () {
 
             // on-click function for policy un-publishing "cancel" button
             $("a#unpublish-policy-cancel-link").click(function () {
-                hidePopup();
+                modalDialog.hide();
             });
         }
     });
@@ -260,17 +281,27 @@ $(document).ready(function () {
             // if policies found in Active or Active/Updated states with in the selection,
             // pop-up an error saying
             // "You cannot select already active policies. Please deselect active policies and try again."
-            $(modalPopupContent).html($("#active-policy-selection-error").html());
-            showPopup();
+            modalDialog.header('Action cannot be performed !');
+            modalDialog.content('You cannot select already active policies. Please deselect active policies and try ' +
+                'again.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">' +
+                'Ok</a></div>');
+            modalDialog.showAsAWarning();
         } else {
             var serviceURL = "/api/device-mgt/v1.0/policies/activate-policy";
             if (policyList.length == 0) {
-                $(modalPopupContent).html($("#policy-publish-error").html());
+                modalDialog.header('Action cannot be performed !');
+                modalDialog.content('Please select a policy or a list of policies to publish.');
+                modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsAWarning();
             } else {
-                $(modalPopupContent).html($("#publish-policy-modal-content").html());
+                modalDialog.header('Do you really want to publish the selected policy(s)?');
+                modalDialog.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 btn-default">No</a></div>');
+                modalDialog.show();
             }
-            showPopup();
-
             // on-click function for policy removing "yes" button
             $("a#publish-policy-yes-link").click(function () {
                 invokerUtil.post(
@@ -279,9 +310,11 @@ $(document).ready(function () {
                     // on success
                     function (data, textStatus, jqXHR) {
                         if (jqXHR.status == 200 && data) {
-                            $(modalPopupContent).html($("#publish-policy-success-content").html());
+                            modalDialog.header('Done. Selected policy was successfully published.');
+                            modalDialog.footer('<div class="buttons"><a href="#" id="publish-policy-success-link" ' +
+                                'class="btn-operations">Ok</a></div>');
                             $("a#publish-policy-success-link").click(function () {
-                                hidePopup();
+                                modalDialog.hide();
                                 location.reload();
                             });
                         }
@@ -289,9 +322,12 @@ $(document).ready(function () {
                     // on error
                     function (jqXHR) {
                         console.log(stringify(jqXHR.data));
-                        $(modalPopupContent).html($("#publish-policy-error-content").html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="publish-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#publish-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 );
@@ -299,7 +335,7 @@ $(document).ready(function () {
 
             // on-click function for policy removing "cancel" button
             $("a#publish-policy-cancel-link").click(function () {
-                hidePopup();
+                modalDialog.hide();
             });
         }
     });
@@ -313,16 +349,27 @@ $(document).ready(function () {
             // if policies found in Active or Active/Updated states with in the selection,
             // pop-up an error saying
             // "You cannot remove already active policies. Please deselect active policies and try again."
-            $(modalPopupContent).html($("#active-policy-selection-error").html());
-            showPopup();
+            modalDialog.header('Action cannot be performed !');
+            modalDialog.content('You cannot select already active policies. Please deselect active policies and try ' +
+                'again.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">' +
+                'Ok</a></div>');
+            modalDialog.showAsAWarning();
         } else {
             var serviceURL = "/api/device-mgt/v1.0/policies/remove-policy";
             if (policyList.length == 0) {
-                $(modalPopupContent).html($("#policy-remove-error").html());
+                modalDialog.header('Action cannot be performed !');
+                modalDialog.content('Please select a policy or a list of policies to remove.');
+                modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsAWarning();
             } else {
-                $(modalPopupContent).html($("#remove-policy-modal-content").html());
+                modalDialog.header('Do you really want to remove the selected policy(s)?');
+                modalDialog.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 btn-default">Cancel</a></div>');
+                modalDialog.show();
             }
-            showPopup();
 
             // on-click function for policy removing "yes" button
             $("a#remove-policy-yes-link").click(function () {
@@ -332,9 +379,11 @@ $(document).ready(function () {
                     // on success
                     function (data, textStatus, jqXHR) {
                         if (jqXHR.status == 200 && data) {
-                            $(modalPopupContent).html($("#remove-policy-success-content").html());
+                            modalDialog.header('Done. Selected policy was successfully removed.');
+                            modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-success-link" ' +
+                                'class="btn-operations">Ok</a></div>');
                             $("a#remove-policy-success-link").click(function () {
-                                hidePopup();
+                                modalDialog.hide();
                                 location.reload();
                             });
                         }
@@ -342,9 +391,12 @@ $(document).ready(function () {
                     // on error
                     function (jqXHR) {
                         console.log(stringify(jqXHR.data));
-                        $(modalPopupContent).html($("#remove-policy-error-content").html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#remove-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 );
@@ -352,7 +404,7 @@ $(document).ready(function () {
 
             // on-click function for policy removing "cancel" button
             $("a#remove-policy-cancel-link").click(function () {
-                hidePopup();
+                modalDialog.hide();
             });
         }
     });
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 0b94ae088..b53403347 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
@@ -149,7 +149,7 @@
                                     <input id="hard-lock" type="checkbox" class="form-control operationDataKeys"
                                            data-key="hard-lock"/>
                                     <span class="helper" title="Once it enables, device will be blocked permanently.">
-                                            &nbsp;&nbsp;&nbsp;Enable Permanent Lock
+                                               Enable Permanent Lock
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                 </label>
@@ -172,7 +172,7 @@
                                        data-key="instant-upgrade"/>
                                     <span class="helper"
                                           title="Once enabled, device firmware upgrade process will start instantly.">
-                                            &nbsp;&nbsp;&nbsp;Instant Upgrade
+                                               Instant Upgrade
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                             </label>
@@ -205,7 +205,7 @@
                                         showDropdowns: true,
                                         timePickerIncrement: 1,
                                         locale: {
-                                            format: 'MM-DD-YYYY hh:mm a'
+                                            format: "YYYY-MM-DDTHH:mm:ssZZ"
                                         }
                                     });
                                 });
@@ -222,7 +222,7 @@
                                             showDropdowns: true,
                                             timePickerIncrement: 1,
                                             locale: {
-                                                format: 'MM-DD-YYYY hh:mm a'
+                                                format: "YYYY-MM-DDTHH:mm:ssZZ"
                                             }
                                         });
                                     }
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 4c4f57fc5..b6b0795ca 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
@@ -48,41 +48,41 @@ var operationModule = function () {
         "LOCK_OPERATION_CODE": "DEVICE_LOCK",
         "UPGRADE_FIRMWARE": "UPGRADE_FIRMWARE",
         "DISALLOW_ADJUST_VOLUME": "DISALLOW_ADJUST_VOLUME",
-        "DISALLOW_CONFIG_BLUETOOTH" : "DISALLOW_CONFIG_BLUETOOTH",
-        "DISALLOW_CONFIG_CELL_BROADCASTS" : "DISALLOW_CONFIG_CELL_BROADCASTS",
-        "DISALLOW_CONFIG_CREDENTIALS" : "DISALLOW_CONFIG_CREDENTIALS",
-        "DISALLOW_CONFIG_MOBILE_NETWORKS" : "DISALLOW_CONFIG_MOBILE_NETWORKS",
-        "DISALLOW_CONFIG_TETHERING" : "DISALLOW_CONFIG_TETHERING",
-        "DISALLOW_CONFIG_VPN" : "DISALLOW_CONFIG_VPN",
-        "DISALLOW_CONFIG_WIFI" : "DISALLOW_CONFIG_WIFI",
-        "DISALLOW_APPS_CONTROL" : "DISALLOW_APPS_CONTROL",
-        "DISALLOW_CREATE_WINDOWS" : "DISALLOW_CREATE_WINDOWS",
-        "DISALLOW_CROSS_PROFILE_COPY_PASTE" : "DISALLOW_CROSS_PROFILE_COPY_PASTE",
-        "DISALLOW_DEBUGGING_FEATURES" : "DISALLOW_DEBUGGING_FEATURES",
-        "DISALLOW_FACTORY_RESET" : "DISALLOW_FACTORY_RESET",
-        "DISALLOW_ADD_USER" : "DISALLOW_ADD_USER",
-        "DISALLOW_INSTALL_APPS" : "DISALLOW_INSTALL_APPS",
-        "DISALLOW_INSTALL_UNKNOWN_SOURCES" : "DISALLOW_INSTALL_UNKNOWN_SOURCES",
-        "DISALLOW_MODIFY_ACCOUNTS" : "DISALLOW_MODIFY_ACCOUNTS",
-        "DISALLOW_MOUNT_PHYSICAL_MEDIA" : "DISALLOW_MOUNT_PHYSICAL_MEDIA",
-        "DISALLOW_NETWORK_RESET" : "DISALLOW_NETWORK_RESET",
-        "DISALLOW_OUTGOING_BEAM" : "DISALLOW_OUTGOING_BEAM",
-        "DISALLOW_OUTGOING_CALLS" : "DISALLOW_OUTGOING_CALLS",
-        "DISALLOW_REMOVE_USER" : "DISALLOW_REMOVE_USER",
-        "DISALLOW_SAFE_BOOT" : "DISALLOW_SAFE_BOOT",
-        "DISALLOW_SHARE_LOCATION" : "DISALLOW_SHARE_LOCATION",
-        "DISALLOW_SMS" : "DISALLOW_SMS",
-        "DISALLOW_UNINSTALL_APPS" : "DISALLOW_UNINSTALL_APPS",
-        "DISALLOW_UNMUTE_MICROPHONE" : "DISALLOW_UNMUTE_MICROPHONE",
-        "DISALLOW_USB_FILE_TRANSFER" : "DISALLOW_USB_FILE_TRANSFER",
-        "ALLOW_PARENT_PROFILE_APP_LINKING" : "ALLOW_PARENT_PROFILE_APP_LINKING",
-        "ENSURE_VERIFY_APPS" : "ENSURE_VERIFY_APPS",
-        "AUTO_TIME" : "AUTO_TIME",
-        "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
-        "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
-        "APPLICATION_OPERATION_CODE" : "APP-RESTRICTION",
-        "SYSTEM_UPDATE_POLICY_CODE" : "SYSTEM_UPDATE_POLICY",
-        "KIOSK_APPS_CODE" : "KIOSK_APPS"
+        "DISALLOW_CONFIG_BLUETOOTH": "DISALLOW_CONFIG_BLUETOOTH",
+        "DISALLOW_CONFIG_CELL_BROADCASTS": "DISALLOW_CONFIG_CELL_BROADCASTS",
+        "DISALLOW_CONFIG_CREDENTIALS": "DISALLOW_CONFIG_CREDENTIALS",
+        "DISALLOW_CONFIG_MOBILE_NETWORKS": "DISALLOW_CONFIG_MOBILE_NETWORKS",
+        "DISALLOW_CONFIG_TETHERING": "DISALLOW_CONFIG_TETHERING",
+        "DISALLOW_CONFIG_VPN": "DISALLOW_CONFIG_VPN",
+        "DISALLOW_CONFIG_WIFI": "DISALLOW_CONFIG_WIFI",
+        "DISALLOW_APPS_CONTROL": "DISALLOW_APPS_CONTROL",
+        "DISALLOW_CREATE_WINDOWS": "DISALLOW_CREATE_WINDOWS",
+        "DISALLOW_CROSS_PROFILE_COPY_PASTE": "DISALLOW_CROSS_PROFILE_COPY_PASTE",
+        "DISALLOW_DEBUGGING_FEATURES": "DISALLOW_DEBUGGING_FEATURES",
+        "DISALLOW_FACTORY_RESET": "DISALLOW_FACTORY_RESET",
+        "DISALLOW_ADD_USER": "DISALLOW_ADD_USER",
+        "DISALLOW_INSTALL_APPS": "DISALLOW_INSTALL_APPS",
+        "DISALLOW_INSTALL_UNKNOWN_SOURCES": "DISALLOW_INSTALL_UNKNOWN_SOURCES",
+        "DISALLOW_MODIFY_ACCOUNTS": "DISALLOW_MODIFY_ACCOUNTS",
+        "DISALLOW_MOUNT_PHYSICAL_MEDIA": "DISALLOW_MOUNT_PHYSICAL_MEDIA",
+        "DISALLOW_NETWORK_RESET": "DISALLOW_NETWORK_RESET",
+        "DISALLOW_OUTGOING_BEAM": "DISALLOW_OUTGOING_BEAM",
+        "DISALLOW_OUTGOING_CALLS": "DISALLOW_OUTGOING_CALLS",
+        "DISALLOW_REMOVE_USER": "DISALLOW_REMOVE_USER",
+        "DISALLOW_SAFE_BOOT": "DISALLOW_SAFE_BOOT",
+        "DISALLOW_SHARE_LOCATION": "DISALLOW_SHARE_LOCATION",
+        "DISALLOW_SMS": "DISALLOW_SMS",
+        "DISALLOW_UNINSTALL_APPS": "DISALLOW_UNINSTALL_APPS",
+        "DISALLOW_UNMUTE_MICROPHONE": "DISALLOW_UNMUTE_MICROPHONE",
+        "DISALLOW_USB_FILE_TRANSFER": "DISALLOW_USB_FILE_TRANSFER",
+        "ALLOW_PARENT_PROFILE_APP_LINKING": "ALLOW_PARENT_PROFILE_APP_LINKING",
+        "ENSURE_VERIFY_APPS": "ENSURE_VERIFY_APPS",
+        "AUTO_TIME": "AUTO_TIME",
+        "SET_SCREEN_CAPTURE_DISABLED": "SET_SCREEN_CAPTURE_DISABLED",
+        "SET_STATUS_BAR_DISABLED": "SET_STATUS_BAR_DISABLED",
+        "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
+        "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
+        "KIOSK_APPS_CODE": "KIOSK_APPS"
     };
 
     // Constants to define Windows Operation Constants
@@ -151,10 +151,8 @@ var operationModule = function () {
                 break;
             case iosOperationConstants["DOMAIN_OPERATION_CODE"]:
                 payload = {
-                    "operation": {
-                        "emailDomains": operationData["emailDomains"],
-                        "webDomains": operationData["webDomains"]
-                    }
+                    "emailDomains": operationPayload["emailDomains"],
+                    "webDomains": operationPayload["webDomains"]
                 };
                 break;
             case iosOperationConstants["RESTRICTIONS_OPERATION_CODE"]:
@@ -839,6 +837,15 @@ var operationModule = function () {
                     "encryptStorageEnabled": operationPayload["encrypted"]
                 };
                 break;
+            case androidOperationConstants["WORK_PROFILE_CODE"]:
+                payload = {
+                    "workProfilePolicyProfileName": operationPayload["profileName"],
+                    "workProfilePolicyEnableSystemApps": operationPayload["enableSystemApps"],
+                    "workProfilePolicyHideSystemApps": operationPayload["hideSystemApps"],
+                    "workProfilePolicyUnhideSystemApps": operationPayload["unhideSystemApps"],
+                    "workProfilePolicyEnablePlaystoreApps": operationPayload["enablePlaystoreApps"]
+                };
+                break;
             case androidOperationConstants["WIFI_OPERATION_CODE"]:
                 payload = {
                     "wifiSSID": operationPayload["ssid"],
@@ -1636,7 +1643,6 @@ var operationModule = function () {
                 generatedProfile[operationCode] = payload["operation"];
             }
         }
-        console.log(generatedProfile);
         return generatedProfile;
     };
 
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 887bad097..544dc23d7 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
@@ -27,7 +27,7 @@
                       <i class="fw fw-add fw-stack-1x fw-inverse"></i>
                    </span>
                 </span>
-                &nbsp;&nbsp;Add your new mobile device to {{@app.conf.appName}}
+                  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>
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/templates/policy-compliance.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.view/public/templates/policy-compliance.hbs
index 673806e89..9c775634e 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/templates/policy-compliance.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.view/public/templates/policy-compliance.hbs
@@ -39,10 +39,10 @@
                             <b>Compliance Status</b>
                             <br>
                             {{#equal complianceStatus "COMPLIANT"}}
-                                <span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Compliant</span>
+                                <span><i class="fw fw-ok icon-success"></i>  Compliant</span>
                             {{/equal}}
                             {{#equal complianceStatus "NON-COMPLIANT"}}
-                                <span><i class="fw fw-warning icon-danger"></i>&nbsp;&nbsp;Not Compliant</span>
+                                <span><i class="fw fw-warning icon-danger"></i>  Not Compliant</span>
                             {{/equal}}
                         </div>
                     </div>
@@ -58,7 +58,7 @@
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-view fw-stack-1x"></i>
                        </span>
-                       &nbsp;View
+                        View
                     </a>
                 </span>
             </div>
@@ -77,8 +77,8 @@
         <tr data-type="selectable">
             <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
             <td data-display="{{complianceStatus}}" data-grid-label="Status">
-                {{#equal complianceStatus true}}<span><i class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Compliant</span>{{/equal}}
-                {{#equal complianceStatus false}}<span><i class="fw fw-warning icon-danger"></i>&nbsp;&nbsp;Not Compliant</span>{{/equal}}
+                {{#equal complianceStatus true}}<span><i class="fw fw-ok icon-success"></i>  Compliant</span>{{/equal}}
+                {{#equal complianceStatus false}}<span><i class="fw fw-warning icon-danger"></i>  Not Compliant</span>{{/equal}}
             </td>
         </tr>
     {{/each}}
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/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index b5c1287dd..5379eb8db 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/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -52,13 +52,13 @@
                                         <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                                         <td style="padding:10px 15px;">
                                             {{#equal deviceView.status "ACTIVE"}}<span><i
-                                                    class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
+                                                    class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
                                             {{#equal deviceView.status "INACTIVE"}}<span><i
-                                                    class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
+                                                    class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                             {{#equal deviceView.status "BLOCKED"}}<span><i
-                                                    class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
+                                                    class="fw fw-remove icon-danger"></i>Blocked</span>{{/equal}}
                                             {{#equal deviceView.status "REMOVED"}}<span><i
-                                                    class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
+                                                    class="fw fw-delete icon-danger"></i>Removed</span>{{/equal}}
                                         </td>
                                     </tr>
                                 {{/if}}
@@ -314,7 +314,7 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Policy Compliance
-                                        &nbsp;&nbsp;
+                                        
                                         <span>
                             <a href="javascript:void(0);" id="refresh-policy">
                                 <i class="fw fw-refresh"></i>
@@ -331,7 +331,7 @@
                             </span>
                                             <div id="policy-spinner"
                                                  class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
-                                                <i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;Loading Policy
+                                                <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
                                                 Compliance...
                                             </div>
                                             <div id="policy-list-container">
@@ -364,7 +364,7 @@
                                                 <div id="map-error" class="message message-warning">
                                                     <h4 class="remove-margin">
                                                         <i class="icon fw fw-warning"></i>
-                                                        &nbsp;Device location information is not available.
+                                                        Device location information is not available.
                                                     </h4>
                                                 </div>
                                                 <p class="add-padding-5x"></p>
@@ -388,7 +388,7 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Installed Applications
-                                        &nbsp;&nbsp;
+                                        
                                         <span>
                             <a href="javascript:void(0);" id="refresh-apps">
                                 <i class="fw fw-refresh"></i>
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/view.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/view.js
index 7c482e7b8..47ca8a08c 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/view.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/view.js
@@ -115,7 +115,7 @@ function onRequest(context) {
                             }
                         } else if (deviceType == "ios") {
                             viewModel["BatteryLevel"] = {};
-                            viewModel["BatteryLevel"]["value"] = filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BatteryLevel"];
+                            viewModel["BatteryLevel"]["value"] = Math. round(filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"]["BatteryLevel"] * 10000) / 100;
 
                             viewModel["internalMemory"] = {};
                             viewModel["internalMemory"]["total"] = Math.
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/js/policy-create.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.create/public/js/policy-create.js
index 272be8ed2..196a78f7c 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/js/policy-create.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.create/public/js/policy-create.js
@@ -1843,28 +1843,23 @@ validateStep["policy-profile"] = function () {
 
                 if (continueToCheckNextInputs) {
                     var calendarAccountPort = $("input#calendar-account-port").val();
-                    if (!calendarAccountPort) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is empty. You cannot proceed.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!$.isNumeric(calendarAccountPort)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port requires a number input.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is not within the range " +
+                    if (calendarAccountPort) {
+                        if (!$.isNumeric(calendarAccountPort)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port requires a number input.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port is not within the range " +
                                 "of valid port numbers.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        }
                     }
                 }
 
@@ -2387,8 +2382,6 @@ var savePolicy = function (policy, isActive, serviceURL) {
         payload["roles"] = [];
     }
 
-    console.log(JSON.stringify(payload));
-
     invokerUtil.post(
         serviceURL,
         payload,
@@ -2543,8 +2536,8 @@ 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++) {
+    var slideDownVotes = 0;
+    for (var i = 0; i < valueSet.length; i++) {
         if (selectedValueOnChange == valueSet[i]) {
             slideDownVotes++;
         }
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 2cf3579e1..dc81f619e 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
@@ -217,7 +217,7 @@
                         <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">
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -657,7 +657,8 @@
                     <div>
                         <ul class="message message-info">
                             <i class="icon fw fw-info"></i>
-                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.</a>
+                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
+                                version 6.0 Marshmallow onwards only.</a>
                         </ul>
                     </div>
                     <div class="wr-input-control">
@@ -691,9 +692,9 @@
                         </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.
+                        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"
@@ -766,7 +767,8 @@
                         <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.">
+                                  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>
@@ -787,7 +789,8 @@
                                     </span>
                         </label>
                         <select class="form-control operationDataKeys" id="wifi-eap"
-                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))" data-key="wifiEAP">
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
+                                data-key="wifiEAP">
                             <option value="peap">PEAP</option>
                             <option value="tls">TLS</option>
                             <option value="ttls">TTLS</option>
@@ -862,7 +865,8 @@
                                 </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"
@@ -870,8 +874,8 @@
                     </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.">
+                            Password
+                            <span class="helper required" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -902,7 +906,8 @@
                         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">
+                <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>
@@ -931,7 +936,8 @@
                             </span>
                         </label>
                         <br/>
-                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
+                        <a href="#restricted-applications-grid" class="btn btn-secondary 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>
@@ -1094,8 +1100,10 @@
                     </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">
+                            <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">
                                     Allow cross profile copy-paste
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -1206,24 +1214,34 @@
                         <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">
+                                   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">
                                 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">
+                                   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">
                                 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">
+                                   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">
                                 Window
                             </span>
                         </label>
@@ -1344,11 +1362,13 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="cosu-whitelisted-applications">
                             Whitelisted Applications to enter Lock Task Mode
-                            <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
+                            <span class="helper" title="Configuration information specific to a given third-party VPN
+                            solution. This has to be input as key/value pairs.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary 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>
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 761bd4847..a71675b2e 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
@@ -6,103 +6,103 @@
                 <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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-block fw-stack-2x"></i>
             </span>
             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>
+            <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)">
             <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-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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-invitation fw-stack-2x"></i>
             </span>
             Email Settings
-        <span id="email-configured" class="has-configured status-icon hidden"><i
-                class="fw fw-ok"></i></span>
+            <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-error" class="has-error status-icon hidden"><i
-                class="fw fw-error"></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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-airplay fw-stack-2x"></i>
             </span>
             AirPlay Settings
-        <span id="airplay-configured" class="has-configured status-icon hidden"><i
-                class="fw fw-ok"></i></span>
+            <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-error" class="has-error status-icon hidden"><i
-                class="fw fw-error"></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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-mail fw-stack-2x"></i>
             </span>
             Manage Domains
-        <span id="domain-configured" class="has-configured status-icon hidden"><i
-                class="fw fw-ok"></i></span>
+            <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-error" class="has-error status-icon hidden"><i
-                class="fw fw-error"></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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-ldap fw-stack-2x"></i>
             </span>
             LDAP Settings
-        <span id="ldap-configured" class="has-configured status-icon hidden"><i
-                class="fw fw-ok"></i></span>
+            <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-error" class="has-error status-icon hidden"><i
-                class="fw fw-error"></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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-calendar fw-stack-2x"></i>
             </span>
             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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-subscribed-calendar fw-stack-2x"></i>
             </span>
             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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
@@ -118,12 +118,12 @@
                 <i class="fw fw-service-provider fw-stack-2x"></i>
             </span>
             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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
@@ -139,12 +139,12 @@
                 <i class="fw fw-vpn fw-stack-2x"></i>
             </span>
             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>
+            <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)">
                 <span class="fw-stack fw-lg">
@@ -152,12 +152,12 @@
                     <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>
+            <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>
 
@@ -359,7 +359,9 @@
                         <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">
+                                  title="The maximum number of failed password entry attempts. If the correct password
+                                   is not entered within the defined number of attempts, the data on the device will be
+                                   erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -416,7 +418,7 @@
                     <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="helper" title="Display name of the connection.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -428,7 +430,8 @@
                             <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.">
+                                  title="Specifies whether to send all traffic through the VPN interface. If true, all
+                                  network traffic is sent over VPN.">
                                 Override Primary
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -450,16 +453,19 @@
                         <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-grid" class="btn btn-secondary 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>
-                                    
+
                                     Add Domain
                                 </a>
                             </label>
@@ -489,11 +495,13 @@
                                             <span class="index"></span>
                                         </td>
                                         <td data-title="Domain">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="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=""/>
+                                            <input type="text" class="form-control grid-input-text"
+                                                   data-child-key="extra" data-default=""/>
                                         </td>
                                         <td>
                         <span class="list-group-item-actions">
@@ -514,16 +522,20 @@
                         <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-never-grid" class="btn btn-secondary 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>
-                                    
+
                                     Add Domain
                                 </a>
                             </label>
@@ -553,11 +565,13 @@
                                             <span class="index"></span>
                                         </td>
                                         <td data-title="Domain">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="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=""/>
+                                            <input type="text" class="form-control grid-input-text"
+                                                   data-child-key="extra" data-default=""/>
                                         </td>
                                         <td>
                             <span class="list-group-item-actions">
@@ -578,16 +592,20 @@
                         <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-retry-grid" class="btn btn-secondary 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>
-                                    
+
                                     Add Domain
                                 </a>
                             </label>
@@ -617,11 +635,13 @@
                                             <span class="index"></span>
                                         </td>
                                         <td data-title="Domain">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="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=""/>
+                                            <input type="text" class="form-control grid-input-text"
+                                                   data-child-key="extra" data-default=""/>
                                         </td>
                                         <td>
                         <span class="list-group-item-actions">
@@ -645,16 +665,19 @@
                     <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#vpn-vendor-configs-grid" class="btn btn-secondary 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>
-                                
+
                                 Add Configuration
                             </a>
                         </label>
@@ -715,7 +738,8 @@
                                 <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" onloadstart="slideDownPaneAgainstValueSet(this, 'pptp-config', ['PPTP']);"
+                        <select id="vpn-type" class="form-control operationDataKeys" data-key="vpnType" data-default="0"
+                                onloadstart="slideDownPaneAgainstValueSet(this, 'pptp-config', ['PPTP']);"
                                 onchange="slideDownPaneAgainstValueSet(this, 'pptp-config', ['PPTP']); slideDownPaneAgainstValueSet(this, 'l2tp-config', ['L2TP']); slideDownPaneAgainstValueSet(this, 'ipsec-config', ['IPSec']); slideDownPaneAgainstValueSet(this, 'ikev2-config', ['IKEv2']); slideDownPaneAgainstValueSet(this, 'pulsesecure-config', ['PulseSecure']);">
                             <option value="PPTP" selected="selected">PPTP</option>
                             <option value="L2TP">L2TP</option>
@@ -744,8 +768,8 @@
                                 <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.">
+                                <span class="helper"
+                                      title="Whether to use a token card such as an RSA SecurID card for connecting.">
                                 Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -777,7 +801,7 @@
                             <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.">
+                                <span class="helper" title="Whether RSA Secure ID is enabled.">
                                 RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -788,7 +812,7 @@
                                 <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.">
+                                <span class="helper" title="Enables encryption on the connection.">
                                 CCP Encryption Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -800,8 +824,8 @@
                                     <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.">
+                                    <span class="helper"
+                                          title="Enables encryption on the connection. Using automatic encryption level.">
                                     Automatic (CCPMPPE40) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -812,8 +836,8 @@
                                     <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.">
+                                    <span class="helper"
+                                          title="Enables encryption on the connection. Using maximum encryption level.">
                                     Maximum (CCPMPPE128) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -841,8 +865,8 @@
                                 <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.">
+                                <span class="helper"
+                                      title="Whether to use a token card such as an RSA SecurID card for connecting.">
                                 Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -874,7 +898,7 @@
                             <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.">
+                                <span class="helper" title="Whether RSA Secure ID is enabled.">
                                 RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -900,7 +924,7 @@
                         <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="helper" title="Authentication method.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -915,7 +939,7 @@
                             <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="helper" title="The name of the group to use.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -925,8 +949,8 @@
                             <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="helper"
+                                          title="The shared secret for this VPN account.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -938,8 +962,8 @@
                             <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="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>
@@ -953,7 +977,7 @@
                                        class="form-control operationDataKeys" data-key="ipsecXAuthEnabled"
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/>
-                            <span class="helper" title="Whether XAuth is enabled.">
+                                <span class="helper" title="Whether XAuth is enabled.">
                                 XAuth Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -976,8 +1000,8 @@
                             <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.">
+                                <span class="helper"
+                                      title="Tells whether to prompt for a PIN when connecting. Used for Cisco IPSec.">
                                 Prompt for VPN PIN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -992,8 +1016,8 @@
                         <div class="wr-input-control">
                             <label class="wr-input-label" for="vpn-pulsesecure-address">
                                 Remote Address*
-                            <span class="helper"
-                                  title="IP address or host name of the VPN server. Used for Pulse Secure.">
+                                <span class="helper"
+                                      title="IP address or host name of the VPN server. Used for Pulse Secure.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1042,7 +1066,7 @@
                         <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="helper" title="Identifier of the IKEv2 client.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1057,7 +1081,7 @@
                         <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="helper" title="Remote identifier.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1072,7 +1096,7 @@
                         <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="helper" title="Authentication method.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1087,8 +1111,8 @@
                             <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="helper"
+                                          title="The shared secret for this VPN account.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -1100,8 +1124,8 @@
                             <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="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>
@@ -1115,7 +1139,7 @@
                                        class="form-control operationDataKeys" data-key="ikev2ExtendedAuthEnabled"
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/>
-                            <span class="helper" title="Whether XAuth is enabled.">
+                                <span class="helper" title="Whether XAuth is enabled.">
                                 Extended Authentication Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1125,7 +1149,7 @@
                             <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="helper" title="Username used for authentication.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -1135,7 +1159,7 @@
                             <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="helper" title="Password used for authentication.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -1146,7 +1170,7 @@
                         <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="helper" title="Dead Peer Detection Interval.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1162,7 +1186,8 @@
                             <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.">
+                                      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>
@@ -1173,7 +1198,9 @@
                             <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.">
+                                      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>
@@ -1221,8 +1248,10 @@
                     <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="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>
@@ -1234,8 +1263,9 @@
                             <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.">
+                            <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.">
                     On Demand Match App Enabled
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
@@ -1244,16 +1274,19 @@
                     <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#safari-domains-grid" class="btn btn-secondary 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>
-                                
+
                                 Add Safari Domain
                             </a>
                         </label>
@@ -1287,7 +1320,8 @@
                                                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=""/>
+                                        <input type="text" class="form-control grid-input-text" data-child-key="extra"
+                                               data-default=""/>
                                     </td>
                                     <td>
                                 <span class="list-group-item-actions">
@@ -1338,16 +1372,19 @@
                     <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="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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#app-vpn-mappings-grid" class="btn btn-secondary 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>
-                                
+
                                 Add Mapping
                             </a>
                         </label>
@@ -1378,7 +1415,8 @@
                                         <span class="index"></span>
                                     </td>
                                     <td data-title="App Identifier">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="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">
@@ -1449,7 +1487,8 @@
                         <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.">
+                                  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>
@@ -1476,7 +1515,8 @@
                             <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.">
+                                  title="If checked, the network is treated as a hotspot. Available in iOS 7.0 and later
+                                  .">
                                 Hot Spot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1489,7 +1529,8 @@
                                    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.">
+                                  title="Indicates if connecting to roaming service providers is allowed. Available in
+                                  iOS 7.0 and later.">
                                 Enable Service Provider Roaming
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1501,7 +1542,8 @@
                             <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.">
+                                  title="If unchecked, user has to tap the network name to join it. Available in iOS 5.0
+                                   and later.">
                                 Auto Join
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1524,7 +1566,8 @@
                         <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.">
+                                  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>
@@ -1613,7 +1656,8 @@
                                        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.">
+                                      title="If unchecked, prevents a device from connecting directly to the destination
+                                       if the PAC file is unreachable. Available in iOS 7 and later.">
                                     Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -1626,7 +1670,8 @@
                         <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.">
+                                  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>
@@ -1649,8 +1694,10 @@
                         <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="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>
@@ -1667,8 +1714,8 @@
                             <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="helper"
+                                          title="Authentication protocols supported on target network.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                     <br>
@@ -1681,7 +1728,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="13"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     TLS
                                 </span>
                                     </label>
@@ -1689,7 +1736,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="17"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     LEAP
                                 </span>
                                     </label>
@@ -1697,7 +1744,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="18"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     EAP-SIM
                                 </span>
                                     </label>
@@ -1705,7 +1752,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="21"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     TTLS
                                 </span>
                                     </label>
@@ -1713,7 +1760,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="23"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     EAP-AKA
                                 </span>
                                     </label>
@@ -1721,7 +1768,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="25"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     PEAP
                                 </span>
                                     </label>
@@ -1729,7 +1776,7 @@
                                     <label class="wr-input-control checkbox">
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="43"/>
-                                <span class="helper" title="">
+                                        <span class="helper" title="">
                                     EAP-FAST
                                 </span>
                                     </label>
@@ -1739,8 +1786,10 @@
                             <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="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>
@@ -1752,8 +1801,8 @@
                             <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="helper"
+                                          title="If not provided, the user will be prompted during login.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -1766,8 +1815,9 @@
                                     <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.">
+                                    <span class="helper"
+                                          title="If checked, the user will be prompted for a password each time they
+                                          connect to the network.">
                                 One Time Password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1779,18 +1829,21 @@
                             <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="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="btn btn-secondary grid-input-add"
+                                    <a href="#wifi-payload-certificate-anchor-uuids-grid"
+                                       class="btn btn-secondary 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>
-                                        
+
                                         Add Certificate Payload Anchor UUID
                                     </a>
                                 </label>
@@ -1822,7 +1875,8 @@
                                             </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 ]"/>
+                                                       data-default=""
+                                                       placeholder="[ Requires a Certificate Payload UUID ]"/>
                                             </td>
                                             <td>
                                             <span class="list-group-item-actions">
@@ -1848,18 +1902,25 @@
                             <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="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="btn btn-secondary grid-input-add"
+                                    <a href="#wifi-tls-trusted-server-names-grid"
+                                       class="btn btn-secondary 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>
-                                        
+
                                         Add TLS Trusted Server Certificate Name
                                     </a>
                                 </label>
@@ -1891,7 +1952,8 @@
                                             </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 ]"/>
+                                                       data-default=""
+                                                       placeholder="[ Requires a Certificate Common Name ]"/>
                                             </td>
                                             <td>
                                             <span class="list-group-item-actions">
@@ -1917,10 +1979,14 @@
                             <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"
+                                           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.">
+                                    <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.">
                                 Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -1932,8 +1998,11 @@
                                     <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.">
+                                    <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.">
                                 Require TLS Certificate
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -1943,8 +2012,8 @@
                             <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="helper"
+                                          title="This is the inner authentication used by the TTLS module.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -1960,8 +2029,11 @@
                             <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="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>
@@ -1983,8 +2055,9 @@
                                             <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.">
+                                            <span class="helper"
+                                                  title="If checked, the device will use an existing PAC. Otherwise, the
+                                                   server must present its identity using a certificate.">
                                         Use existing PAC for EAP-FAST
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
@@ -1997,8 +2070,11 @@
                                                     <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.">
+                                                    <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.">
                                                 Allow PAC Provisioning
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
@@ -2008,12 +2084,16 @@
                                                 <li>
                                                     <div class="wr-input-control">
                                                         <label class="wr-input-control checkbox">
-                                                            <input id="wifi-eap-fast-provision-pac-anonymously" type="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.">
+                                                            <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.">
                                                         Allow Anonymous PAC Provisioning
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
@@ -2029,7 +2109,7 @@
                             <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="helper" title="Valid values are 2 and 3. Default is 3">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -2045,8 +2125,11 @@
                         <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="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>
@@ -2061,7 +2144,8 @@
                         <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.">
+                                  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>
@@ -2071,7 +2155,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Roaming Consortium OI
                             </a>
                         </label>
@@ -2131,16 +2215,18 @@
                         <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.">
+                                  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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-nai-realm-names-grid" class="btn btn-secondary 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>
-                                
+
                                 Add NAI Realm Name
                             </a>
                         </label>
@@ -2198,16 +2284,19 @@
                         <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.">
+                                  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="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-mcc-and-mncs-grid" class="btn btn-secondary 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>
-                                
+
                                 Add MCC/MNC Pair
                             </a>
                         </label>
@@ -2354,7 +2443,9 @@
                         <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.">
+                                  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>
@@ -2368,7 +2459,9 @@
                             <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.">
+                                  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.">
                                 Prevent Move
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -2380,7 +2473,8 @@
                             <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.">
+                                  title="When checked, this account is not available for sending mail in third-party
+                                  applications. Available only in iOS 5.0 and later.">
                                 Prevent App Sheet
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -2403,7 +2497,8 @@
                         <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.">
+                                  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>
@@ -2416,7 +2511,8 @@
                         <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.">
+                                  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>
@@ -2444,7 +2540,8 @@
                                    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.">
+                                  title="When checked, this account is excluded from recent address syncing. Available
+                                  only in iOS 6.0 and later.">
                                 Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -2484,7 +2581,8 @@
                         <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.">
+                                  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>
@@ -2511,7 +2609,10 @@
                         <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.">
+                                  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>
@@ -2566,7 +2667,8 @@
                         <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.">
+                                  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>
@@ -2593,7 +2695,10 @@
                         <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.">
+                                  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>
@@ -2608,7 +2713,8 @@
                                    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.">
+                                  title="When checked, the user will be prompted for the password only once and it will
+                                  be used for both outgoing and incoming mail.">
                                 Outgoing password same as incoming password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -2676,7 +2782,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Credential
                             </a>
                         </label>
@@ -2742,7 +2848,8 @@
                         <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.">
+                                  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>
@@ -2752,7 +2859,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Destination
                             </a>
                         </label>
@@ -2851,7 +2958,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Unmarked Email Domains
                             </a>
                         </label>
@@ -2915,7 +3022,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Managed Safari Web Domains
                             </a>
                         </label>
@@ -3068,7 +3175,8 @@
                         <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.">
+                                  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>
@@ -3078,7 +3186,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Search Setting
                             </a>
                         </label>
@@ -3111,41 +3219,29 @@
                                         <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 ]"/>
+                                        <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="Scope">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="searchSettingSearchBase" 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 data-title="Search Base">
-                                        <select class="form-control grid-input-select"
-                                                data-child-key="searchSettingSearchBase" data-default="0">
+                                        <select class="form-control grid-input-select" data-child-key="searchSettingScope" data-default="0">
                                             <option value="LDAPSearchSettingScopeBase" selected="selected">
                                                 Base
                                             </option>
-                                            <option value="LDAPSearchSettingScopeOneLevel">One Level
-                                            </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"
-                                                   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>
+                                        <span class="list-group-item-actions">
+                                            <a href="#ldap-search-settings-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>
@@ -3219,7 +3315,8 @@
                                    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.">
+                                  title="Having this checked, would enable Secure Socket Layer communication with CalDAV
+                                   server.">
                                 Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -3236,7 +3333,7 @@
                         </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 ]"/>
+                               placeholder="[ Optional field which requires Number Input ]"/>
                     </div>
 
                     <div class="wr-input-control">
@@ -3413,7 +3510,8 @@
                         <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.">
+                                  title="Can contain an arbitrary number of entries, each describing an APN configuratio
+                                  n.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
@@ -3423,7 +3521,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add APN Configuration
                             </a>
                         </label>
@@ -3590,7 +3688,8 @@
                         <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.">
+                                  title="Can contain an arbitrary number of entries, each describing an APN configuratio
+                                  n.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
@@ -3600,7 +3699,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add APN Configuration
                             </a>
                         </label>
@@ -3727,9 +3826,11 @@
                                 <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"/>
+                                               data-key="restrictionsAllowCamera" data-default="true"
+                                               checked="checked"/>
                                         <span class="helper"
-                                              title="Having this checked would enable Usage of phone camera in the device">
+                                              title="Having this checked would enable Usage of phone camera in the devic
+                                              e">
                                             Allow use of camera
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3742,7 +3843,8 @@
                                         <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.">
+                                              title="Having this checked would enable use of Messages app with supervised
+                                               devices. Available in iOS 6.0 and later.">
                                             Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3752,8 +3854,10 @@
                             <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"/>
+                                        <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">
                                             Allow screenshots
@@ -3765,10 +3869,13 @@
                             <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"/>
+                                        <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.">
+                                              title="Having this checked would allow AirDrop feature in the device.
+                                              Available only in iOS 7.0 and later.">
                                             Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3778,8 +3885,10 @@
                             <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"/>
+                                        <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.">
                                             Allow voice dialing while device is locked
@@ -3792,7 +3901,8 @@
                                 <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"
+                                               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.">
@@ -3807,10 +3917,12 @@
                                             <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"
+                                                       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.">
+                                                      title="Having this checked would allow Siri as assistant while
+                                                      device is locked. Available only in iOS 5.1 and later.">
                                                     Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
@@ -3820,9 +3932,11 @@
                                     <li>
                                         <div class="wr-input-control">
                                             <label class="wr-input-control checkbox">
-                                                <input id="restrictions-force-assistant-profanity-filter" type="checkbox"
+                                                <input id="restrictions-force-assistant-profanity-filter"
+                                                       type="checkbox"
                                                        class="child-input operationDataKeys"
-                                                       data-key="restrictionsForceAssistantProfanityFilter" data-default="true"
+                                                       data-key="restrictionsForceAssistantProfanityFilter"
+                                                       data-default="true"
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would force use of Siri profanity filter.">
@@ -3835,7 +3949,8 @@
                                     <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"
+                                                <input id="restrictions-allow-assistant-user-generated-content"
+                                                       type="checkbox"
                                                        class="child-input operationDataKeys"
                                                        data-key="restrictionsAllowAssistantUserGeneratedContent"
                                                        data-default="true" checked="checked"/>
@@ -3856,7 +3971,8 @@
                                                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.">
+                                              title="Having this checked would allow modifying account settings in the
+                                               device. Available only in iOS 7.0 and later.">
                                             Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3867,10 +3983,12 @@
                                 <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"
+                                               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.">
+                                              title="Having this checked would allow changes to cellular data usage for
+                                              apps in the device. Available only in iOS 7.0 and later.">
                                             Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3880,10 +3998,13 @@
                             <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"/>
+                                        <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.">
+                                              title="Having this checked would enable iBookStore in the device.
+                                              Available in iOS 6.0 and later.">
                                             Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3897,7 +4018,8 @@
                                                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.">
+                                              title="Having this checked would enable iBookStore tagged as Erotica in
+                                              the device. Available in iOS 6.0 and later.">
                                             Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3921,8 +4043,10 @@
                             <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"/>
+                                        <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.">
                                             Allow removing apps
@@ -3949,7 +4073,8 @@
                                 <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"
+                                               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.">
@@ -3962,8 +4087,10 @@
                             <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"/>
+                                        <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.">
                                             Allow iCloud backup
@@ -3979,7 +4106,8 @@
                                                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.">
+                                              title="Having this checked would enable syncing iCloud documents and data
+                                              in the device.">
                                             Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -3993,7 +4121,8 @@
                                                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.">
+                                              title="Having this checked would enable syncing iCloud keychain in the
+                                              device.">
                                             Allow iCloud keychain
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4004,10 +4133,12 @@
                                 <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"
+                                               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.">
+                                              title="Having this checked would allow managed apps in the device to store
+                                               data in iCloud.">
                                             Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4018,10 +4149,12 @@
                                 <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"
+                                               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.">
+                                              title="Having this checked would allow backup of enterprise books in the
+                                              device.">
                                             Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4032,10 +4165,12 @@
                                 <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"
+                                               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.">
+                                              title="When unchecked, Enterprise books notes and highlights will not be
+                                              synced.">
                                             Allow enterprise books data sync
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4046,10 +4181,12 @@
                                 <div class="wr-input-control">
                                     <label class="wr-input-control checkbox">
                                         <input id="restrictions-allow-diagnostic-submission" type="checkbox"
-                                               class="operationDataKeys" data-key="restrictionsAllowDiagnosticSubmission"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowDiagnosticSubmission"
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
-                                              title="Having this checked would automatically submit diagnostic reports to Apple.">
+                                              title="Having this checked would automatically submit diagnostic reports
+                                              to Apple.">
                                             Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4063,7 +4200,10 @@
                                                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.">
+                                              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.">
                                             Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4074,7 +4214,8 @@
                                 <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"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowFindMyFriendsModification"
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, changes to Find My Friends are disabled.">
@@ -4088,10 +4229,12 @@
                                 <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"
+                                               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.">
+                                              title="Having this unchecked would prevent Touch ID from unlocking a
+                                              device.">
                                             Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4101,12 +4244,15 @@
                             <li>
                                 <div class="wr-input-control">
                                     <label class="wr-input-control checkbox">
-                                        <input id="restrictions-allow-global-background-fetch-when-roaming" type="checkbox"
+                                        <input id="restrictions-allow-global-background-fetch-when-roaming"
+                                               type="checkbox"
                                                class="operationDataKeys"
-                                               data-key="restrictionsAllowGlobalBackgroundFetchWhenRoaming" data-default="true"
+                                               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.">
+                                              title="Having this unchecked would disable global background fetch
+                                              activity when an iOS phone is roaming.">
                                             Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4117,10 +4263,12 @@
                                 <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"
+                                               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.">
+                                              title="Having this unchecked would prevent Control Center from appearing
+                                              on the Lock screen. Available in iOS 7 and later.">
                                             Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4131,10 +4279,13 @@
                                 <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"
+                                               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.">
+                                              title="Having this unchecked would disable Notifications view in
+                                              Notification Center on the lock screen. Available only in iOS 7.0 and
+                                              later.">
                                             Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4148,7 +4299,8 @@
                                                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.">
+                                              title="Having this unchecked would disable Today view in Notification
+                                              Center on the lock screen. Available only in iOS 7.0 and later.">
                                             Show Today view in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4158,10 +4310,16 @@
                             <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"/>
+                                        <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.">
+                                              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.">
                                             Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4172,10 +4330,12 @@
                                 <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"
+                                               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.">
+                                              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.">
                                             Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4186,10 +4346,13 @@
                                 <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"
+                                               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.">
+                                              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.">
                                             Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4199,10 +4362,14 @@
                             <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"/>
+                                        <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.">
+                                              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.">
                                             Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4226,8 +4393,10 @@
                             <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"/>
+                                        <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.">
                                             Allow Photo Stream
@@ -4239,8 +4408,10 @@
                             <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"/>
+                                        <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.">
                                             Allow Shared Photo Stream
@@ -4252,12 +4423,15 @@
                             <li>
                                 <div class="wr-input-control">
                                     <label class="wr-input-control checkbox">
-                                        <input id="restrictions-allow-ui-configuration-profile-installation" type="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.">
+                                              title="When unchecked, the user is prohibited from installing
+                                              configuration profiles and certificates interactively. Available only in
+                                              iOS 6.0 and later.">
                                             Allow user prompted profile installation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4271,7 +4445,8 @@
                                                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.">
+                                              title="When unchecked, automatically rejects untrusted HTTPS certificates
+                                              without prompting the user. Available only in iOS 5.0 and later.">
                                             Allow untrusted TLS prompt
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4295,8 +4470,10 @@
                             <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"/>
+                                        <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.">
                                             Allow voice dialing
@@ -4326,7 +4503,8 @@
                                                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.">
+                                              title="Having this checked would limit ad tracking. Available only in iOS
+                                              7.0 and later.">
                                             Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4341,7 +4519,9 @@
                                                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.">
+                                              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.">
                                             Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4356,7 +4536,9 @@
                                                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.">
+                                              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.">
                                             Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4367,10 +4549,12 @@
                                 <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"
+                                               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.">
+                                              title="When unchecked, “Erase All Content And Settings” option in the
+                                              Reset UI is disabled.">
                                             Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4381,7 +4565,8 @@
                                 <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"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowSpotlightInternetResults"
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Spotlight will not return Internet search results.">
@@ -4395,10 +4580,12 @@
                                 <div class="wr-input-control">
                                     <label class="wr-input-control checkbox">
                                         <input id="restrictionsAllowEnablingRestrictions" type="checkbox"
-                                               class="operationDataKeys" data-key="restrictionsAllowEnablingRestrictions"
+                                               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.">
+                                              title="When unchecked, “Enable Restrictions” option in the Restrictions
+                                              UI in Settings is disabled.">
                                             Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4409,7 +4596,8 @@
                                 <div class="wr-input-control">
                                     <label class="wr-input-control checkbox">
                                         <input id="restrictions-allow-activity-continuation" type="checkbox"
-                                               class="operationDataKeys" data-key="restrictionsAllowActivityContinuation"
+                                               class="operationDataKeys"
+                                               data-key="restrictionsAllowActivityContinuation"
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Activity Continuation will be disabled.">
@@ -4440,7 +4628,8 @@
                                                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.">
+                                              title="When unchecked, predictive keyboards are disabled. Available in iOS
+                                               8.1.3 and later.">
                                             Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4450,11 +4639,13 @@
                             <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"
+                                        <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.">
+                                              title="When unchecked, keyboard auto-correction is disabled. Available in
+                                              iOS 8.1.3 and later.">
                                             Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4464,8 +4655,10 @@
                             <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"/>
+                                        <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.">
                                             Allow keyboard spell-check ( Supervised only )
@@ -4576,7 +4769,8 @@
                                                        data-key="restrictionsSafariAllowPopups" data-default="true"
                                                        checked="checked"/>
                                                 <span class="helper"
-                                                      title="Having this checked would enable Pop-ups on Safari in the device.">
+                                                      title="Having this checked would enable Pop-ups on Safari in the
+                                                      device.">
                                                     Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
@@ -4588,7 +4782,8 @@
                                             <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.">
+                                                      title="Determines conditions under which the device will accept
+                                                      cookies.">
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4610,7 +4805,9 @@
                                                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.">
+                                              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.">
                                             Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4653,7 +4850,8 @@
                                                data-key="restrictionsAllowAddingGameCenterFriends" data-default="true"
                                                checked="checked"/>
                                         <span class="helper"
-                                              title="Having this checked would allow adding Game Center friends in the device.">
+                                              title="Having this checked would allow adding Game Center friends in the
+                                              device.">
                                             Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
@@ -4674,7 +4872,9 @@
                                            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.">
+                                              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>
@@ -4684,7 +4884,7 @@
                                                 <i class="fw fw-add fw-stack-1x"></i>
                                                 <i class="fw fw-ring fw-stack-2x"></i>
                                             </span>
-                                            
+
                                             Add Application Bundle ID
                                         </a>
                                     </label>
@@ -4794,7 +4994,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                
+
                                 Add Application
                             </a>
                         </label>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.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 03be4923b..14c96fee6 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
@@ -95,7 +95,7 @@
                         <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
+                                   Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -105,7 +105,7 @@
                         <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
+                                   Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -168,7 +168,9 @@
                             <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 ]">
+                        <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">
@@ -180,17 +182,20 @@
                             <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 ]">
+                        <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">
+                            <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">
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -222,7 +227,8 @@
                         </label>
                     </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.
+                        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>
@@ -237,9 +243,11 @@
                     <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
+                            <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.">
+                                   Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -252,7 +260,8 @@
 
         <!-- 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 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
@@ -264,11 +273,12 @@
                     </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.
+                        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">
+                <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>
@@ -278,9 +288,10 @@
                     <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" />
+                            <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
+                                   Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -292,7 +303,8 @@
         <!-- /encrypt-storage -->
         <!--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 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
@@ -306,7 +318,8 @@
                         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">
+                <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>
@@ -327,16 +340,19 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
+                            <a href="#restricted-applications-grid" class="btn btn-secondary 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">
+                        <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>
@@ -361,14 +377,19 @@
                                         <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 ]" />
+                                        <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 ]" />
+                                        <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" 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>
@@ -460,7 +481,7 @@
                 <!--<div class="panel-heading" role="tab">-->
                     <!--<h2 class="sub-title panel-title">-->
                         <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;App Installations-->
+                        <!--   App Installations-->
                         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
                             <!--<input type="checkbox" />-->
                             <!--<span class="helper"></span>-->
@@ -504,7 +525,7 @@
                 <!--<div class="panel-heading" role="tab">-->
                     <!--<h2 class="sub-title panel-title">-->
                         <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
+                        <!--   App Uninstallations-->
                         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
                             <!--<input type="checkbox" />-->
                             <!--<span class="helper"></span>-->
@@ -534,7 +555,7 @@
                 <!--<div class="panel-heading" role="tab">-->
                     <!--<h2 class="sub-title panel-title">-->
                         <!--<br>-->
-                        <!--&nbsp;&nbsp;&nbsp;Web clips-->
+                        <!--   Web clips-->
                         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
                             <!--<input type="checkbox" />-->
                             <!--<span class="helper"></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/edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
index 14a1df933..901ba1cc0 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/edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs
@@ -142,14 +142,14 @@
                                                 <input id="user-roles-radio-btn" type="radio"
                                                        name="select-users-radio-btn" class="select-users-radio"
                                                        checked/>
-                                                <span class="helper">&nbsp;Set user role(s)</span>
+                                                <span class="helper"> Set user role(s)</span>
                                             </label>
                                         {{/if}}
                                         {{#if isAuthorizedViewUsers}}
                                             <label class="wr-input-control radio light" rel="assetfilter">
                                                 <input id="users-radio-btn" type="radio" name="select-users-radio-btn"
                                                        class="select-users-radio"/>
-                                                <span class="helper">&nbsp;Set user(s)</span>
+                                                <span class="helper"> Set user(s)</span>
                                             </label>
                                         {{/if}}
                                     </div>
@@ -231,9 +231,9 @@
                                 <div class="wr-advance-operations">
                                     <div class="wr-advance-operations-init">
                                         <br>
-                                        &nbsp;&nbsp;
+
                                         <i class="fw fw-settings fw-spin fw-2x"></i>
-                                        &nbsp;Loading platform features . . .
+                                         Loading platform features . . .
                                         <br>
                                         <br>
                                     </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/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 eacae0229..41b2f9e30 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
@@ -1601,28 +1601,23 @@ validateStep["policy-profile"] = function () {
 
                 if (continueToCheckNextInputs) {
                     var calendarAccountPort = $("input#calendar-account-port").val();
-                    if (!calendarAccountPort) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is empty. You cannot proceed.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!$.isNumeric(calendarAccountPort)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port requires a number input.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
-                    } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
-                        validationStatus = {
-                            "error": true,
-                            "subErrorMsg": "Account Port is not within the range " +
-                                           "of valid port numbers.",
-                            "erroneousFeature": operation
-                        };
-                        continueToCheckNextInputs = false;
+                    if (calendarAccountPort) {
+                        if (!$.isNumeric(calendarAccountPort)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port requires a number input.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        } else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
+                            validationStatus = {
+                                "error": true,
+                                "subErrorMsg": "Account Port is not within the range " +
+                                "of valid port numbers.",
+                                "erroneousFeature": operation
+                            };
+                            continueToCheckNextInputs = false;
+                        }
                     }
                 }
 
@@ -2319,8 +2314,8 @@ 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++) {
+    var slideDownVotes = 0;
+    for (var i = 0; i < valueSet.length; i++) {
         if (selectedValueOnChange == valueSet[i]) {
             slideDownVotes++;
         }
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
index 7a7460ecf..37b59a8ae 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
@@ -86,7 +86,7 @@
         <!--</span>-->
         <!--Web clips-->
         <!--</a>-->
-        
+
         <!--
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
             <span class="wr-hidden-operation-icon fw-stack">
@@ -243,7 +243,7 @@
                         <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">
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -787,7 +787,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="wifi-ssid">
                             Service Set Identifier (SSID) *
-                                <span class="helper" title="Identification of the wireless network to be configured.">
+                            <span class="helper" title="Identification of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             <br>
@@ -799,8 +799,8 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="wifi-type">
                             Security*
-                                    <span class="helper"
-                                          title="Security type of the wireless network to be configured. 802.1x EAP works with Android 4.3 and above devices only.">
+                            <span class="helper"
+                                  title="Security type of the wireless network to be configured. 802.1x EAP works with Android 4.3 and above devices only.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -816,7 +816,7 @@
                     <div class="wr-input-control" id="control-wifi-eap" style="display:none;">
                         <label class="wr-input-label" for="wifi-eap">
                             EAP Method
-                                    <span class="helper" title="EAP Method of the wireless network to be configured.">
+                            <span class="helper" title="EAP Method of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -834,8 +834,8 @@
                     <div class="wr-input-control" id="control-wifi-phase2" style="display:none;">
                         <label class="wr-input-label" for="wifi-phase2">
                             Phase 2 Authentication
-                                    <span class="helper"
-                                          title="Phase 2 authentication of the wireless network to be configured.">
+                            <span class="helper"
+                                  title="Phase 2 authentication of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -850,7 +850,7 @@
                     <div class="wr-input-control" id="control-wifi-provisioning" style="display:none;">
                         <label class="wr-input-label" for="wifi-provisioning">
                             Provisioning
-                                    <span class="helper" title="Provisioning of the wireless network to be configured.">
+                            <span class="helper" title="Provisioning of the wireless network to be configured.">
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
@@ -865,7 +865,7 @@
                     <div class="wr-input-control" id="control-wifi-identity" style="display:none;">
                         <label class="wr-input-label" for="wifi-identity">
                             Identity
-                                <span class="helper" title="Identity of the wireless network to be configured.">
+                            <span class="helper" title="Identity of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -879,7 +879,7 @@
                     <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
                         <label class="wr-input-label" for="wifi-anoidentity">
                             Anonymous Identity
-                                <span class="helper" title="Identity of the wireless network to be configured.">
+                            <span class="helper" title="Identity of the wireless network to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -893,7 +893,7 @@
                     <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
                         <label class="wr-input-label" for="wifi-password">
                             CA Certificate
-                                <span class="helper" title="CA Certificate for the wireless network.">
+                            <span class="helper" title="CA Certificate for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -906,10 +906,10 @@
                     </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>
+                            Password
+                            <span class="helper required" 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"/>
@@ -967,12 +967,13 @@
                             </span>
                         </label>
                         <br/>
-                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add " data-click-event="add-form">
+                        <a href="#restricted-applications-grid" class="btn btn-secondary 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>
-                            
+
                             Add Application
                         </a>
                         <div id="restricted-applications"
@@ -1062,7 +1063,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-server-address">
                             VPN Server Address*
-                                <span class="helper" title="Address of the VPN server to be configured.">
+                            <span class="helper" title="Address of the VPN server to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1072,7 +1073,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-server-port">
                             VPN Server Port
-                                <span class="helper" title="Port of the VPN server to be configured.">
+                            <span class="helper" title="Port of the VPN server to be configured.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1082,7 +1083,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-shared-secret">
                             Shared Secret
-                                <span class="helper" title="Shared secret.">
+                            <span class="helper" title="Shared secret.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1092,7 +1093,7 @@
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-dns">
                             DNS Server
-                                <span class="helper" title="DNS Server.">
+                            <span class="helper" title="DNS Server.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -1330,7 +1331,8 @@
                         <hr>
                         <div class="panel-title-description">
                             This configuration can be used to set system update policy to an Android Device in COSU.
-                            Once this configuration profile is installed on a device, corresponding users will not be able
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
                             to modify these settings on their devices.
                         </div>
                     </h2>
@@ -1338,7 +1340,8 @@
                 <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">
+                    <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">
@@ -1352,24 +1355,31 @@
                         <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">
+                                   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">
                                 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">
+                                   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">
                                 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">
+                                   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">
                                 Window
                             </span>
                         </label>
@@ -1468,7 +1478,8 @@
                 <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Whitelist Applications (COSU)
-                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
+                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch"
+                               data-toggle="collapse"
                                data-target="#cosu-whitelisted-applications-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
@@ -1476,8 +1487,10 @@
                         </label>
                         <hr>
                         <div class="panel-title-description">
-                            This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU.
-                            Once this configuration profile is installed on a device, corresponding users will not be able
+                            This configuration can be used to whitelist applications in lock task mode of an Android
+                            Device in COSU.
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
                             to modify these settings on their devices.
                         </div>
                     </h2>
@@ -1485,22 +1498,25 @@
                 <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="cosu-whitelisted-applications-body">
 
-                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="cosu-whitelisted-applications">
                             Whitelisted Applications to enter Lock Task Mode
-                            <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
+                            <span class="helper"
+                                  title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary 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>
-                                
+
                                 Add Application
                             </a>
                         </label>
@@ -1526,19 +1542,21 @@
                             </table>
                             <table class="template hidden">
                                 <tbody data-add-form="#cosu-whitelisted-applications-grid">
-                                    <tr data-add-form-element="clone">
-                                        <td data-title="No:">
-                                            <span class="index"></span>
-                                        </td>
-                                        <td data-title="Application Name / Description">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                                   maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
-                                        </td>
-                                        <td data-title="Package Name">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="packageName"
-                                                   maxlength="100" data-default="" placeholder="[ Package Name ]"/>
-                                        </td>
-                                        <td>
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Application Name / Description">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default=""
+                                               placeholder="[ Application Name / Description ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]"/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions">
                                                 <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
                                                    data-click-event="remove-form">
@@ -1548,8 +1566,8 @@
                                                     </span>
                                                 </a>
                                             </span>
-                                        </td>
-                                    </tr>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs
index 3359b8c21..0f0d54d8a 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-edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios-edit.hbs
@@ -198,7 +198,7 @@
                                    checked="checked"/>
                             <span class="helper"
                                   title="Determines whether the user is forced to set a passcode.">
-                                &nbsp;&nbsp;&nbsp;Force Passcode
+                                Force Passcode
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -211,7 +211,7 @@
                                    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
+                                Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -224,7 +224,7 @@
                                    data-key="passcodePolicyRequireAlphanumeric" checked="checked"/>
                             <span class="helper"
                                   title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
+                                Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -361,7 +361,9 @@
                         <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">
+                                  title="The maximum number of failed password entry attempts. If the correct password 
+                                  is not entered within the defined number of attempts, the data on the device will be 
+                                  erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -430,8 +432,9 @@
                             <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
+                                  title="Specifies whether to send all traffic through the VPN interface. If true, all 
+                                  network traffic is sent over VPN.">
+                                Override Primary
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -443,7 +446,7 @@
                                    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
+                                On-demand Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -453,17 +456,18 @@
                             <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.">
+                                      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"
+                                <a href="#on-demand-match-domains-grid" class="btn btn-secondary 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>
@@ -521,17 +525,19 @@
                             <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.">
+                                      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"
+                                <a href="#on-demand-match-domains-never-grid" class="btn btn-secondary 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>
@@ -589,17 +595,19 @@
                             <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.">
+                                      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"
+                                <a href="#on-demand-match-domains-retry-grid" class="btn btn-secondary 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>
@@ -660,16 +668,17 @@
                         <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.">
+                                  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">
+                            <a href="#vpn-vendor-configs-grid" class="btn btn-secondary 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>
@@ -760,7 +769,7 @@
                                        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
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -792,7 +801,7 @@
                                 <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
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -803,7 +812,7 @@
                                        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
+                                CCP Encryption Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -816,7 +825,7 @@
                                            data-default="false"/>
                                     <span class="helper"
                                           title="Enables encryption on the connection. Using automatic encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Automatic (CCPMPPE40) Encryption Level Enabled
+                                    Automatic (CCPMPPE40) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -828,7 +837,7 @@
                                            data-default="false"/>
                                     <span class="helper"
                                           title="Enables encryption on the connection. Using maximum encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Maximum (CCPMPPE128) Encryption Level Enabled
+                                    Maximum (CCPMPPE128) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -857,7 +866,7 @@
                                        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
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -889,7 +898,7 @@
                                 <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
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -968,7 +977,7 @@
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/>
                                 <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;XAuth Enabled
+                                XAuth Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -992,7 +1001,7 @@
                                        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
+                                Prompt for VPN PIN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1091,7 +1100,7 @@
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/>
                                 <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;Extended Authentication Enabled
+                                Extended Authentication Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1137,7 +1146,8 @@
                             <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.">
+                                      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>
@@ -1148,7 +1158,9 @@
                             <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.">
+                                      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>
@@ -1197,7 +1209,9 @@
                         <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.">
+                                  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>
@@ -1210,8 +1224,9 @@
                                    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
+                                  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.">
+                    On Demand Match App Enabled
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
                         </label>
@@ -1220,16 +1235,17 @@
                         <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.">
+                                  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">
+                            <a href="#safari-domains-grid" class="btn btn-secondary 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>
@@ -1316,16 +1332,17 @@
                         <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.">
+                                  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">
+                            <a href="#app-vpn-mappings-grid" class="btn btn-secondary 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>
@@ -1429,7 +1446,8 @@
                         <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.">
+                                  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>
@@ -1446,7 +1464,7 @@
                                    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
+                                Hidden Network
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1458,7 +1476,7 @@
                                    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
+                                Hot Spot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1470,8 +1488,9 @@
                                    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
+                                  title="Indicates if connecting to roaming service providers is allowed. Available in 
+                                  iOS 7.0 and later.">
+                                Enable Service Provider Roaming
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1482,8 +1501,9 @@
                             <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
+                                  title="If unchecked, user has to tap the network name to join it. Available in iOS 5.0
+                                   and later.">
+                                Auto Join
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1506,7 +1526,8 @@
                         <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.">
+                                  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>
@@ -1597,8 +1618,9 @@
                                        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
+                                      title="If unchecked, prevents a device from connecting directly to the destination
+                                       if the PAC file is unreachable. Available in iOS 7 and later.">
+                                    Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
@@ -1610,7 +1632,8 @@
                         <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.">
+                                  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>
@@ -1634,7 +1657,9 @@
                             <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.">
+                                      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>
@@ -1666,7 +1691,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="13"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;TLS
+                                    TLS
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1674,7 +1699,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="17"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;LEAP
+                                    LEAP
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1682,7 +1707,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="18"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-SIM
+                                    EAP-SIM
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1690,7 +1715,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="21"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;TTLS
+                                    TTLS
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1698,7 +1723,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="23"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-AKA
+                                    EAP-AKA
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1706,7 +1731,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="25"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;PEAP
+                                    PEAP
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1714,7 +1739,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="43"/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-FAST
+                                    EAP-FAST
                                 </span>
                                     </label>
                                 </div>
@@ -1724,7 +1749,9 @@
                                 <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.">
+                                          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>
@@ -1751,8 +1778,9 @@
                                            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
+                                          title="If checked, the user will be prompted for a password each time they 
+                                          connect to the network.">
+                                One Time Password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -1764,17 +1792,19 @@
                                 <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.">
+                                          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"
+                                    <a href="#wifi-payload-certificate-anchor-uuids-grid" class="btn btn-secondary 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>
@@ -1834,17 +1864,23 @@
                                 <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.">
+                                          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"
+                                    <a href="#wifi-tls-trusted-server-names-grid" class="btn btn-secondary 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>
@@ -1907,8 +1943,11 @@
                                            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
+                                          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.">
+                                Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -1920,8 +1959,11 @@
                                            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
+                                          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.">
+                                Require TLS Certificate
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -1948,7 +1990,10 @@
                                 <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.">
+                                          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>
@@ -1971,8 +2016,9 @@
                                                    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
+                                                  title="If checked, the device will use an existing PAC. Otherwise, 
+                                                  the server must present its identity using a certificate.">
+                                        Use existing PAC for EAP-FAST
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                                         </label>
@@ -1985,8 +2031,11 @@
                                                            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
+                                                          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.">
+                                                Allow PAC Provisioning
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
                                                 </label>
@@ -2001,8 +2050,11 @@
                                                                    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
+                                                                  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.">
+                                                        Allow Anonymous PAC Provisioning
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                         </label>
@@ -2034,7 +2086,10 @@
                             <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.">
+                                      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>
@@ -2049,17 +2104,18 @@
                         <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.">
+                                  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"
+                            <a href="#wifi-roaming-consortium-ois-grid" class="btn btn-secondary 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>
@@ -2119,16 +2175,17 @@
                         <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.">
+                                  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">
+                            <a href="#wifi-nai-realm-names-grid" class="btn btn-secondary 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>
@@ -2186,16 +2243,18 @@
                         <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.">
+                                  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">
+                            <a href="#wifi-mcc-and-mncs-grid" class="btn btn-secondary 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>
@@ -2299,13 +2358,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add"
+                            <a href="#restricted-applications-grid" class="btn btn-secondary 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>
@@ -2456,7 +2515,9 @@
                         <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.">
+                                  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>
@@ -2470,8 +2531,10 @@
                             <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
+                                  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.">
+                                Prevent Move
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2482,8 +2545,9 @@
                             <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
+                                  title="When checked, this account is not available for sending mail in third-party
+                                  applications. Available only in iOS 5.0 and later.">
+                                Prevent App Sheet
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2495,7 +2559,7 @@
                                    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
+                                Enable S/MIME
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2505,7 +2569,8 @@
                         <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.">
+                                  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>
@@ -2518,7 +2583,8 @@
                         <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.">
+                                  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>
@@ -2534,7 +2600,7 @@
                                    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
+                                Enable Per-Message Signing and Encryption Switch
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2546,8 +2612,9 @@
                                    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
+                                  title="When checked, this account is excluded from recent address syncing. Available
+                                  only in iOS 6.0 and later.">
+                                Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2576,7 +2643,7 @@
                                    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 )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2586,7 +2653,8 @@
                         <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.">
+                                  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>
@@ -2613,7 +2681,10 @@
                         <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.">
+                                  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>
@@ -2658,7 +2729,7 @@
                                    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 )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2668,7 +2739,8 @@
                         <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.">
+                                  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>
@@ -2695,7 +2767,10 @@
                         <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.">
+                                  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>
@@ -2710,8 +2785,9 @@
                                    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
+                                  title="When checked, the user will be prompted for the password only once and it
+                                  will be used for both outgoing and incoming mail.">
+                                Outgoing password same as incoming password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2772,13 +2848,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#airplay-credentials-grid" class="grid-input-add"
+                            <a href="#airplay-credentials-grid" class="btn btn-secondary 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>
@@ -2844,17 +2920,18 @@
                         <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.">
+                                  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"
+                            <a href="#airplay-destinations-grid" class="btn btn-secondary 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>
@@ -2947,13 +3024,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#unmarked-email-domains-grid" class="grid-input-add"
+                            <a href="#unmarked-email-domains-grid" class="btn btn-secondary 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 Unmarked Email Domains
                             </a>
                         </label>
@@ -3011,13 +3088,13 @@
                         <label class="wr-input-label" for="safari-web-domains">
                             Managed Safari Web Domains
                             <br>
-                            <a href="#safari-web-domains-grid" class="grid-input-add"
+                            <a href="#safari-web-domains-grid" class="btn btn-secondary 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 Managed Safari Web Domains
                             </a>
                         </label>
@@ -3137,7 +3214,7 @@
                                    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 )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3171,17 +3248,18 @@
                         <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.">
+                                  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"
+                            <a href="#ldap-search-settings-grid" class="btn btn-secondary 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>
@@ -3322,8 +3400,9 @@
                                    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 )
+                                  title="Having this checked, would enable Secure Socket Layer communication with CalDAV
+                                   server.">
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3339,7 +3418,7 @@
                         </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 ]"/>
+                               placeholder="[ Optional field which requires Number Input ]"/>
                     </div>
 
                     <div class="wr-input-control">
@@ -3447,7 +3526,7 @@
                                    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 )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3520,13 +3599,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#apn-configurations-grid" class="grid-input-add"
+                            <a href="#apn-configurations-grid" class="btn btn-secondary 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>
@@ -3697,13 +3776,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cellular-apn-configurations-grid" class="grid-input-add"
+                            <a href="#cellular-apn-configurations-grid" class="btn btn-secondary 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>
@@ -3834,7 +3913,7 @@
                                                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
+                                            Allow use of camera
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3846,8 +3925,9 @@
                                         <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
+                                              title="Having this checked would enable use of Messages app with
+                                              supervised devices. Available in iOS 6.0 and later.">
+                                            Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3862,7 +3942,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow taking screenshots in the device">
-                                            &nbsp;&nbsp;&nbsp;Allow screenshots
+                                            Allow screenshots
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3876,8 +3956,9 @@
                                                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 )
+                                              title="Having this checked would allow AirDrop feature in the device.
+                                              Available only in iOS 7.0 and later.">
+                                            Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3892,7 +3973,7 @@
                                                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
+                                            Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3907,7 +3988,7 @@
                                                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
+                                            Allow Siri
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3923,7 +4004,7 @@
                                                        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
+                                                    Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3940,7 +4021,7 @@
                                                        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
+                                                    Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3955,8 +4036,10 @@
                                                        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 )
+                                                      title="Having this checked would allow Siri to query
+                                                      user-generated content from web in the device. Available in iOS 7
+                                                      and later.">
+                                                    Allow Siri to query user-generated content from web ( Supervised only )
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3971,8 +4054,9 @@
                                                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 )
+                                              title="Having this checked would allow modifying account settings in the
+                                              device. Available only in iOS 7.0 and later.">
+                                            Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3986,8 +4070,9 @@
                                                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 )
+                                              title="Having this checked would allow changes to cellular data usage for
+                                              apps in the device. Available only in iOS 7.0 and later.">
+                                            Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4001,8 +4086,9 @@
                                                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 )
+                                              title="Having this checked would enable iBookStore in the device.
+                                              Available in iOS 6.0 and later.">
+                                            Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4015,8 +4101,9 @@
                                                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 )
+                                              title="Having this checked would enable iBookStore tagged as Erotica in
+                                              the device. Available in iOS 6.0 and later.">
+                                            Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4030,7 +4117,7 @@
                                                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
+                                            Allow installing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4045,7 +4132,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow removal of apps in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow removing apps
+                                            Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4059,7 +4146,7 @@
                                                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
+                                            Allow in-app purchase
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4074,7 +4161,7 @@
                                                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
+                                            Require iTunes store password for all purchases
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4089,7 +4176,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iCloud backup in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow iCloud backup
+                                            Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4102,8 +4189,9 @@
                                                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
+                                              title="Having this checked would enable syncing iCloud documents and data
+                                              in the device.">
+                                            Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4116,8 +4204,9 @@
                                                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
+                                              title="Having this checked would enable syncing iCloud keychain in the
+                                              device.">
+                                            Allow iCloud keychain
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4131,8 +4220,9 @@
                                                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
+                                              title="Having this checked would allow managed apps in the device to store
+                                               data in iCloud.">
+                                            Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4146,8 +4236,9 @@
                                                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
+                                              title="Having this checked would allow backup of enterprise books in the
+                                              device.">
+                                            Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4161,8 +4252,9 @@
                                                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
+                                              title="When unchecked, Enterprise books notes and highlights will not be
+                                              synced.">
+                                            Allow enterprise books data sync
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4176,8 +4268,9 @@
                                                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
+                                              title="Having this checked would automatically submit diagnostic reports
+                                              to Apple.">
+                                            Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4190,8 +4283,11 @@
                                                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
+                                              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.">
+                                            Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4206,7 +4302,7 @@
                                                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
+                                            Allow Find My Friends modification
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4220,8 +4316,9 @@
                                                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
+                                              title="Having this unchecked would prevent Touch ID from unlocking a
+                                              device.">
+                                            Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4237,8 +4334,9 @@
                                                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
+                                              title="Having this unchecked would disable global background fetch
+                                              activity when an iOS phone is roaming.">
+                                            Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4252,8 +4350,9 @@
                                                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
+                                              title="Having this unchecked would prevent Control Center from appearing
+                                              on the Lock screen. Available in iOS 7 and later.">
+                                            Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4267,8 +4366,10 @@
                                                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
+                                              title="Having this unchecked would disable Notifications view in
+                                              Notification Center on the lock screen. Available only in iOS 7.0 and
+                                              later.">
+                                            Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4281,8 +4382,9 @@
                                                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
+                                              title="Having this unchecked would disable Today view in Notification
+                                              Center on the lock screen. Available only in iOS 7.0 and later.">
+                                            Show Today view in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4296,8 +4398,12 @@
                                                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 )
+                                              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.">
+                                            Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4311,8 +4417,9 @@
                                                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
+                                              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.">
+                                            Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4326,8 +4433,10 @@
                                                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
+                                              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.">
+                                            Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4341,8 +4450,10 @@
                                                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
+                                              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.">
+                                            Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4355,8 +4466,9 @@
                                                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
+                                              title="When unchecked, Passbook notifications will not be shown on the
+                                              lock screen. Available only in iOS 6.0 and later.">
+                                            Show Passbook notifications in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4370,8 +4482,9 @@
                                                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
+                                              title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0
+                                               and later.">
+                                            Allow Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4385,8 +4498,9 @@
                                                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
+                                              title="When unchecked, Shared Photo Stream will be disabled. Available
+                                              only in iOS 6.0 and later.">
+                                            Allow Shared Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4401,8 +4515,10 @@
                                                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
+                                              title="When unchecked, the user is prohibited from installing
+                                              configuration profiles and certificates interactively. Available only in
+                                              iOS 6.0 and later.">
+                                            Allow user prompted profile installation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4415,8 +4531,9 @@
                                                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
+                                              title="When unchecked, automatically rejects untrusted HTTPS certificates
+                                              without prompting the user. Available only in iOS 5.0 and later.">
+                                            Allow untrusted TLS prompt
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4430,7 +4547,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, video conferencing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow video conferencing
+                                            Allow video conferencing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4445,7 +4562,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, voice dialing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow voice dialing
+                                            Allow voice dialing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4459,7 +4576,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would force encrypting all backups.">
-                                            &nbsp;&nbsp;&nbsp;Force encrypting all backups
+                                            Force encrypting all backups
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4472,8 +4589,9 @@
                                                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
+                                              title="Having this checked would limit ad tracking. Available only in iOS
+                                              7.0 and later.">
+                                            Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4487,8 +4605,10 @@
                                                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
+                                              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.">
+                                            Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4502,8 +4622,10 @@
                                                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
+                                              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.">
+                                            Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4517,8 +4639,9 @@
                                                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 )
+                                              title="When unchecked, “Erase All Content And Settings” option in the
+                                              Reset UI is disabled.">
+                                            Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4533,7 +4656,7 @@
                                                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 )
+                                            Allow Spotlight Internet results ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4547,8 +4670,9 @@
                                                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 )
+                                              title="When unchecked, “Enable Restrictions” option in the Restrictions
+                                              UI in Settings is disabled.">
+                                            Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4563,7 +4687,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Activity Continuation will be disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Activity Continuation
+                                            Allow Activity Continuation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4577,7 +4701,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, definition lookup is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow definition lookup
+                                            Allow definition lookup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4590,8 +4714,9 @@
                                                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 )
+                                              title="When unchecked, predictive keyboards are disabled. Available in
+                                              iOS 8.1.3 and later.">
+                                            Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4605,8 +4730,9 @@
                                                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 )
+                                              title="When unchecked, keyboard auto-correction is disabled. Available
+                                              in iOS 8.1.3 and later.">
+                                            Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4620,8 +4746,9 @@
                                                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 )
+                                              title="When unchecked, keyboard spell-check is disabled. Available in
+                                              iOS 8.1.3 and later.">
+                                            Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4642,7 +4769,7 @@
                                                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
+                                            Allow use of iTunes Store
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4656,7 +4783,7 @@
                                                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 )
+                                            Allow use of Podcasts ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4670,7 +4797,7 @@
                                                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
+                                            Allow Safari
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4684,8 +4811,9 @@
                                                        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
+                                                      title="Having this checked would enable Safari AutoFill feature
+                                                      in the device.">
+                                                    Enable AutoFill
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4699,8 +4827,9 @@
                                                        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
+                                                      title="Having this checked would force Safari Fraud warning
+                                                      feature in the device.">
+                                                    Force Fraud warning
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4714,8 +4843,9 @@
                                                        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
+                                                      title="Having this checked would enable Javascript on Safari
+                                                      in the device.">
+                                                    Enable Javascript
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4729,8 +4859,9 @@
                                                        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
+                                                      title="Having this checked would enable Pop-ups on Safari in
+                                                      the device.">
+                                                    Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4741,7 +4872,8 @@
                                             <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.">
+                                                      title="Determines conditions under which the device will
+                                                      accept cookies.">
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4763,8 +4895,10 @@
                                                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
+                                              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.">
+                                            Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4778,7 +4912,7 @@
                                                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 )
+                                            Allow use of Game Center ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4792,7 +4926,7 @@
                                                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
+                                            Allow multiplayer gaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4806,8 +4940,9 @@
                                                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
+                                              title="Having this checked would allow adding Game Center friends in the
+                                              device.">
+                                            Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4827,17 +4962,19 @@
                                            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.">
+                                              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">
+                                           class="btn btn-secondary 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>
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-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-windows-edit.hbs
index 8f7528f1a..2d31ab95c 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-edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-windows-edit.hbs
@@ -1,566 +1,610 @@
 <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 on Camera
-        <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 on Camera
+            <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('app-restriction', 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('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('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('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('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('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>
-            </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>
+    <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 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>
 
-            <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
+                    <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">
+                                   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
+                                   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>
-                    <option value="16">16</option>
-                    <option value="17">17</option>
-                    <option value="18">18</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>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</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>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
+                            Maximum number of failed attempts
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password
+                                  is not entered within the defined number of attempts, the data on the 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>
+        <!-- /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 on Camera
+                        <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 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>
+                    Un-check following checkbox in case you need to disable camera.
                     <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">
+                    <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.">
+                                   Allow use of camera
                                 <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>
+                    </div>
+                    <br>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-<!-- /passcode-policy -->
+        <!-- /camera -->
 
-<!-- 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 on Camera
-                <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 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>
-            Un-check following checkbox in case you need to disable camera.
-            <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
+        <!-- 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 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>
+                    Un-check following checkbox in case you need to disable storage-encryption.
+                    <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">
+                                   Enable storage-encryption
                                 <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>
-            </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.
+                        </label>
+                    </div>
+                    <br>
+                </div>
             </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 need to disable storage-encryption.
-            <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>
-            </div>
-            <br>
-        </div>
-    </div>
-</div>
-<!-- /encrypt-storage -->
+        <!-- /encrypt-storage -->
 
-<!--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>
+        <!--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>
 
-            <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="btn btn-secondary 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>
+
+                                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" 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>
+        <!--/app-restriction-->
+
+
+        <!-- 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.-->
+        <!--</div>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
+        <!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--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-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="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
+        <!--</div>-->
+        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!-- /wi-fi -->
+
+        <!-- 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>-->
+        <!--   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>-->
+        <!--   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>-->
+        <!--   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 -->
     </div>
-</div>
-<!--/app-restriction-->
-
-
-<!-- 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.-->
-<!--</div>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
-<!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--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-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="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
-<!--</div>-->
-<!--&lt;!&ndash;</div>&ndash;&gt;-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /wi-fi -->
-
-<!-- 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 -->
-</div>
 </div>
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.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.view/public/js/view.js
index ad6651977..69b6403b3 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/js/view.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.view/public/js/view.js
@@ -1954,8 +1954,8 @@ 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++) {
+    var slideDownVotes = 0;
+    for (var i = 0; i < valueSet.length; i++) {
         if (selectedValueOnChange == valueSet[i]) {
             slideDownVotes++;
         }
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
index 83fb622d6..bbaefc937 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
@@ -5,7 +5,8 @@
                     <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-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>
@@ -23,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">
@@ -60,7 +63,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>
@@ -69,8 +73,10 @@
                 <i class="fw fw-import fw-stack-2x"></i>
             </span>
             System Update Policy (COSU)
-            <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide">
@@ -78,20 +84,24 @@
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
             Whitelist Apps (COSU)
-            <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
             <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
         </a>
     </div>
     <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 class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
                 <div id="passcode-policy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Passcode Policy
-                        <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse" data-target="#passcode-policy-body">
-                            <input type="checkbox" />
+                        <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
@@ -102,7 +112,8 @@
                         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">
+                <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>
@@ -110,8 +121,11 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="passcode-policy-allow-simple" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple" checked="checked" disabled/>
-                            <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
                                 Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -120,7 +134,9 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="passcode-policy-require-alphanumeric" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric" checked="checked" disabled/>
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked" disabled/>
                             <span class="helper" title="Require passcode to contain both letters and numbers">
                                 Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
@@ -135,7 +151,8 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-min-length" class="form-control operationDataKeys" data-key="passcodePolicyMinLength" data-default="0" disabled>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0" disabled>
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -157,11 +174,13 @@
                     <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="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys" data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -182,7 +201,9 @@
                             <br>
                             ( Should be in between 1-to-730 days or none )
                         </label>
-                        <input id="passcode-policy-max-passcode-age-in-days" type="text" class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" placeholder="[ Requires Number Input ]" disabled>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3" placeholder="[ Requires Number Input ]" disabled>
                     </div>
 
                     <div class="wr-input-control">
@@ -194,17 +215,21 @@
                             <br>
                             ( Should be in between 1-to-50 passcodes or none )
                         </label>
-                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys" data-key="passcodePolicyPasscodeHistory" maxlength="2" placeholder="[ Requires Number Input ]" disabled>
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2"
+                               placeholder="[ Requires Number Input ]" disabled>
                     </div>
 
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
                             Maximum number of failed attempts
-                            <span class="helper" title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
-                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys" data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -241,7 +266,8 @@
                         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">
+                <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>
@@ -251,7 +277,8 @@
 
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="camera-enabled" type="checkbox" class="operationDataKeys" data-key="cameraEnabled"
+                            <input id="camera-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="cameraEnabled"
                                    checked="checked" disabled/>
                             <span class="helper"
                                   title="Having this checked would enable Usage of phone camera in the device.">
@@ -659,7 +686,8 @@
                     <br>
                     <br>
                     <b>
-                        Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.
+                        Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards
+                        only.
                     </b>
                     <br><br>
                     <div class="wr-input-control">
@@ -680,23 +708,28 @@
 
         <!-- 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 class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
                 <div id="encrypt-storage-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Encryption Settings
-                        <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#encrypt-storage-body">
-                            <input type="checkbox" />
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
                     </h2>
                     <div class="panel-title-description">
-                        This configuration can be used to encrypt data on an Android device, when the device is locked and
-                        make it readable when the passcode is entered. Once this configuration profile is installed on a device,
+                        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">
+                <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>
@@ -706,8 +739,10 @@
                     <br>
                     <div class="wr-input-control">
                         <label class="wr-input-control checkbox">
-                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys" data-key="encryptStorageEnabled" checked="checked" disabled/>
-                            <span class="helper" title="Having this checked would enable Storage-encryption in the device">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
                                 Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
@@ -726,7 +761,7 @@
                     <h2 class="sub-title panel-title">
                         Wi-Fi Settings
                         <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#wifi-body">
-                            <input type="checkbox" />
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
@@ -737,7 +772,8 @@
                         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">
+                <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">-->
@@ -770,7 +806,8 @@
                             <br>
                             ( should be 1-to-30 characters long )
                         </label>
-                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Required field ]" disabled/>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" placeholder="[ Required field ]" disabled/>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="wifi-type">
@@ -797,7 +834,8 @@
                                     </span>
                         </label>
                         <select class="form-control operationDataKeys" id="wifi-eap"
-                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))" data-key="wifiEAP" disabled>
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
+                                data-key="wifiEAP" disabled>
                             <option value="peap">PEAP</option>
                             <option value="tls">TLS</option>
                             <option value="ttls">TTLS</option>
@@ -829,7 +867,8 @@
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                         </label>
-                        <select class="form-control operationDataKeys" id="wifi-provisioning" data-key="wifiProvisioning" disabled>
+                        <select class="form-control operationDataKeys" id="wifi-provisioning"
+                                data-key="wifiProvisioning" disabled>
                             <option value="0">0</option>
                             <option value="1">1</option>
                             <option value="2">2</option>
@@ -848,7 +887,7 @@
                         </label>
                         <input id="wifi-identity" type="text" class="form-control operationDataKeys"
                                data-key="wifiIdentity"
-                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled />
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]" disabled/>
                     </div>
                     <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
                         <label class="wr-input-label" for="wifi-anoidentity">
@@ -866,8 +905,8 @@
                     </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.">
+                            Password
+                            <span class="helper required" title="Password for the wireless network.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
@@ -881,12 +920,14 @@
         <!-- /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 class="panel panel-default operation-data" data-operation="app-restriction"
+                 data-operation-code="APP-RESTRICTION">
                 <div id="app-restriction-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Application Restriction Settings
-                        <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#app-restriction-body">
-                            <input type="checkbox" />
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#app-restriction-body">
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
@@ -895,13 +936,15 @@
                         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">
+                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="app-restriction-body">
                     <hr/>
                     <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
 
-                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType" disabled>
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"
+                            disabled>
                         <option value="" selected="selected">
                             None
                         </option>
@@ -917,7 +960,8 @@
                             </span>
                         </label>
                         <br/>
-                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add hidden" data-click-event="add-form">
+                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add hidden"
+                           data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -925,7 +969,9 @@
 
                             Add Application
                         </a>
-                        <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
+                        <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>
@@ -950,14 +996,18 @@
                                         <span class="index"></span>
                                     </td>
                                     <td data-title="App Name">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="appName" maxlength="100" data-default="" placeholder="[ Gmail ]" disabled/>
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Gmail ]" disabled/>
                                     </td>
                                     <td data-title="Package Name">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="packageName" maxlength="100" data-default="" placeholder="[ com.google.android.gm ]" disabled/>
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ com.google.android.gm ]" disabled/>
                                     </td>
                                     <td>
                                             <span class="list-group-item-actions hidden">
-                                                <a href="#restricted-applications-grid" class="grid-input-remove" data-click-event="remove-form">
+                                                <a href="#restricted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
                                                     <span class="fw-stack helper" title="Remove Entry">
                                                         <i class="fw fw-ring fw-stack-2x"></i>
                                                         <i class="fw fw-delete fw-stack-1x"></i>
@@ -982,7 +1032,7 @@
                     <h2 class="sub-title panel-title">
                         VPN Settings
                         <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#vpn-body">
-                            <input type="checkbox" />
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
@@ -993,7 +1043,8 @@
                         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">
+                <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>
@@ -1008,7 +1059,9 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
-                        <input id="vpn-server-address" type="text" class="form-control operationDataKeys" data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]" disabled/>
+                        <input id="vpn-server-address" type="text" class="form-control operationDataKeys"
+                               data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]"
+                               disabled/>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-server-port">
@@ -1017,7 +1070,8 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
-                        <input id="vpn-server-port" type="text" class="form-control operationDataKeys" data-key="serverPort" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                        <input id="vpn-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="serverPort" maxlength="100" placeholder="[ Optional field ]" disabled/>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-shared-secret">
@@ -1026,7 +1080,8 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
-                        <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys" data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                        <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys"
+                               data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]" disabled/>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="vpn-dns">
@@ -1035,7 +1090,8 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                         </label>
-                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer" maxlength="100" placeholder="[ Optional field ]" disabled/>
+                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer"
+                               maxlength="100" placeholder="[ Optional field ]" disabled/>
                     </div>
                 </div>
             </div>
@@ -1151,21 +1207,25 @@
 
         <!--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 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 hidden" data-toggle="collapse" data-target="#work-profile-policy-body">
-                            <input type="checkbox" />
+                        <label id="work-profile-policy-lbl" class="wr-input-control switch hidden"
+                               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.
+                        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">
+                <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>
@@ -1188,7 +1248,8 @@
                             </span>
                             <br>
                         </label>
-                        <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys" data-key="workProfilePolicyProfileName" maxlength="20" disabled>
+                        <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys"
+                               data-key="workProfilePolicyProfileName" maxlength="20" disabled>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
@@ -1197,9 +1258,12 @@
                                 <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 )
+                            ( 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" disabled></textarea>
+                        <textarea id="workProfilePolicyEnableSystemApps" type="text"
+                                  class="form-control operationDataKeys" rows="4"
+                                  data-key="workProfilePolicyEnableSystemApps" disabled></textarea>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
@@ -1208,9 +1272,12 @@
                                 <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 )
+                            ( 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="" disabled></textarea>
+                        <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyHideSystemApps" placeholder=""
+                                  disabled></textarea>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
@@ -1219,20 +1286,27 @@
                                 <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 )
+                            ( 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="" disabled></textarea>
+                        <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyUnhideSystemApps" placeholder=""
+                                  disabled></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="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 )
+                            ( 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="" disabled></textarea>
+                        <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyEnablePlaystoreApps" placeholder=""
+                                  disabled></textarea>
                     </div>
                 </div>
             </div>
@@ -1244,7 +1318,8 @@
                 <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         System Update Policy (COSU)
-                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch hidden"
+                               data-toggle="collapse"
                                data-target="#cosu-system-update-policy-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
@@ -1261,7 +1336,8 @@
                 </div>
                 <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="cosu-system-update-policy-body">
-                    <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                    <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">
@@ -1275,24 +1351,33 @@
                         <label class="wr-input-control radio light">
                             <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
                                    class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
-                                   value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" checked disabled/>
-                            <span class="helper" title="Installs system update automatically as soon as one is available">
+                                   value="automatic"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"
+                                   checked disabled/>
+                            <span class="helper"
+                                  title="Installs system update automatically as soon as one is available">
                                 Automatic
                             </span>
                         </label>
                         <label class="wr-input-control radio light">
                             <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
                                    class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
-                                   value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" disabled/>
-                            <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
+                                   value="postpone"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"
+                                   disabled/>
+                            <span class="helper"
+                                  title="Incoming system update will be blocked for a maximum of 30 days">
                                 Postpone
                             </span>
                         </label>
                         <label class="wr-input-control radio light">
                             <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
                                    class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
-                                   value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" disabled/>
-                            <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
+                                   value="window"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"
+                                   disabled/>
+                            <span class="helper"
+                                  title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
                                 Window
                             </span>
                         </label>
@@ -1390,7 +1475,8 @@
                 <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
                     <h2 class="sub-title panel-title">
                         Whitelist Applications (COSU)
-                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch hidden"
+                               data-toggle="collapse"
                                data-target="#cosu-whitelisted-applications-body">
                             <input type="checkbox"/>
                             <span class="helper"></span>
@@ -1398,7 +1484,8 @@
                         </label>
                         <hr>
                         <div class="panel-title-description">
-                            This configuration can be used to whitelist applications in lock task mode of an Android Device in COSU.
+                            This configuration can be used to whitelist applications in lock task mode of an Android
+                            Device in COSU.
                             Once this configuration profile is installed on a device, corresponding users will not be
                             able
                             to modify these settings on their devices.
@@ -1408,17 +1495,20 @@
                 <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="cosu-whitelisted-applications-body">
 
-                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="cosu-whitelisted-applications">
                             Whitelisted Applications to enter Lock Task Mode
-                            <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
+                            <span class="helper"
+                                  title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add"
+                               data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1449,19 +1539,21 @@
                             </table>
                             <table class="template hidden">
                                 <tbody data-add-form="#cosu-whitelisted-applications-grid">
-                                    <tr data-add-form-element="clone">
-                                        <td data-title="No:">
-                                            <span class="index"></span>
-                                        </td>
-                                        <td data-title="Application Name / Description">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                                   maxlength="100" data-default="" placeholder="[ Application Name / Description ]" disabled/>
-                                        </td>
-                                        <td data-title="Package Name">
-                                            <input type="text" class="form-control grid-input-text" data-child-key="packageName"
-                                                   maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
-                                        </td>
-                                        <td>
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Application Name / Description">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default=""
+                                               placeholder="[ Application Name / Description ]" disabled/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions hidden">
                                                 <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
                                                    data-click-event="remove-form">
@@ -1471,8 +1563,8 @@
                                                     </span>
                                                 </a>
                                             </span>
-                                        </td>
-                                    </tr>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios-view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios-view.hbs
index b615923e4..910ce3c85 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios-view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios-view.hbs
@@ -198,7 +198,7 @@
                                    checked="checked" disabled/>
                             <span class="helper"
                                   title="Determines whether the user is forced to set a passcode.">
-                                &nbsp;&nbsp;&nbsp;Force Passcode
+                                Force Passcode
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -211,7 +211,7 @@
                                    data-key="passcodePolicyAllowSimple" checked="checked" disabled/>
                             <span class="helper"
                                   title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
+                                Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -224,7 +224,7 @@
                                    data-key="passcodePolicyRequireAlphanumeric" checked="checked" disabled/>
                             <span class="helper"
                                   title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
+                                Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -361,7 +361,9 @@
                         <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">
+                                  title="The maximum number of failed password entry attempts. If the correct password 
+                                  is not entered within the defined number of attempts, the data on the device will be 
+                                  erased">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -431,8 +433,9 @@
                             <input id="vpn-override-primary" type="checkbox" class="form-control operationDataKeys"
                                    data-key="overridePrimary" data-default="true" disabled/>
                             <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
+                                  title="Specifies whether to send all traffic through the VPN interface. If true, all 
+                                  network traffic is sent over VPN.">
+                                Override Primary
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -444,8 +447,9 @@
                                    onchange="slideDownPaneAgainstValueSet(this, 'vpn-ondemand-config', ['true'])"
                                    disabled/>
                             <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
+                                  title="Check if the VPN connection should be brought up on demand, else leave 
+                                  un-checked.">
+                                On-demand Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -455,7 +459,8 @@
                             <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.">
+                                      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>
@@ -465,7 +470,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -524,7 +529,9 @@
                             <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.">
+                                      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>
@@ -534,7 +541,7 @@
                                         <i class="fw fw-add fw-stack-1x"></i>
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                     </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -593,7 +600,9 @@
                             <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.">
+                                      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>
@@ -603,7 +612,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -665,7 +674,8 @@
                         <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.">
+                                  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>
@@ -675,7 +685,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Configuration
                             </a>
                         </label>
@@ -770,7 +780,7 @@
                                        disabled/>
                                 <span class="helper"
                                       title="Whether to use a token card such as an RSA SecurID card for connecting.">
-                                &nbsp;&nbsp;&nbsp;Token Card Enabled
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -802,7 +812,7 @@
                                 <input id="vpn-pptp-rsa" type="checkbox" class="form-control operationDataKeys"
                                        data-key="pptpRSASecureID" data-default="false" disabled/>
                                 <span class="helper" title="Whether RSA Secure ID is enabled.">
-                                &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -814,7 +824,7 @@
                                        onchange="slideDownPaneAgainstValueSet(this, 'pptp-encryption-config', ['true'])"
                                        disabled/>
                                 <span class="helper" title="Enables encryption on the connection.">
-                                &nbsp;&nbsp;&nbsp;CCP Encryption Enabled
+                                CCP Encryption Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -827,7 +837,7 @@
                                            data-default="false" disabled/>
                                     <span class="helper"
                                           title="Enables encryption on the connection. Using automatic encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Automatic (CCPMPPE40) Encryption Level Enabled
+                                    Automatic (CCPMPPE40) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -839,7 +849,7 @@
                                            data-default="false" disabled/>
                                     <span class="helper"
                                           title="Enables encryption on the connection. Using maximum encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Maximum (CCPMPPE128) Encryption Level Enabled
+                                    Maximum (CCPMPPE128) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -869,7 +879,7 @@
                                        disabled/>
                                 <span class="helper"
                                       title="Whether to use a token card such as an RSA SecurID card for connecting.">
-                                &nbsp;&nbsp;&nbsp;Token Card Enabled
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -901,7 +911,7 @@
                                 <input id="vpn-l2tp-rsa" type="checkbox" class="form-control operationDataKeys"
                                        data-key="l2tpRSASecureID" data-default="false" disabled/>
                                 <span class="helper" title="Whether RSA Secure ID is enabled.">
-                                &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -981,7 +991,7 @@
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])" disabled/>
                                 <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;XAuth Enabled
+                                XAuth Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1005,7 +1015,7 @@
                                        data-key="ipsecPromptForVPNPIN" data-default="false" disabled/>
                                 <span class="helper"
                                       title="Tells whether to prompt for a PIN when connecting. Used for Cisco IPSec.">
-                                &nbsp;&nbsp;&nbsp;Prompt for VPN PIN
+                                Prompt for VPN PIN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1106,7 +1116,7 @@
                                        onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"
                                        disabled/>
                                 <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;Extended Authentication Enabled
+                                Extended Authentication Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1152,7 +1162,8 @@
                             <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.">
+                                      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>
@@ -1164,7 +1175,9 @@
                             <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.">
+                                      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>
@@ -1214,7 +1227,9 @@
                         <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.">
+                                  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>
@@ -1227,8 +1242,9 @@
                                    class="form-control operationDataKeys" data-key="onDemandMatchAppEnabled"
                                    data-default="true" disabled/>
                             <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
+                                  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.">
+                    On Demand Match App Enabled
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
                         </label>
@@ -1237,7 +1253,8 @@
                         <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.">
+                                  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>
@@ -1247,7 +1264,7 @@
                                     <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>
@@ -1339,7 +1356,8 @@
                         <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.">
+                                  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>
@@ -1349,7 +1367,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Mapping
                             </a>
                         </label>
@@ -1464,7 +1482,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Application
                             </a>
                         </label>
@@ -1573,7 +1591,8 @@
                         <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.">
+                                  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>
@@ -1590,7 +1609,7 @@
                                    data-key="wifiHiddenNetwork" data-default="false" disabled/>
                             <span class="helper"
                                   title="Enable this if target network is not open or broadcasting">
-                                &nbsp;&nbsp;&nbsp;Hidden Network
+                                Hidden Network
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1601,8 +1620,9 @@
                             <input id="wifi-is-hot-spot" type="checkbox" class="form-control operationDataKeys"
                                    data-key="wifiIsHotSpot" data-default="false" disabled/>
                             <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
+                                  title="If checked, the network is treated as a hotspot. Available in iOS 7.0 and later
+                                  .">
+                                Hot Spot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1614,8 +1634,9 @@
                                    class="form-control operationDataKeys" data-key="wifiServiceProviderRoamingEnabled"
                                    data-default="false" disabled/>
                             <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
+                                  title="Indicates if connecting to roaming service providers is allowed. Available in
+                                  iOS 7.0 and later.">
+                                Enable Service Provider Roaming
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1627,7 +1648,7 @@
                                    data-key="wifiAutoJoin" data-default="true" checked="checked" disabled/>
                             <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
+                                Auto Join
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1650,7 +1671,8 @@
                         <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.">
+                                  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>
@@ -1742,8 +1764,9 @@
                                        class="form-control operationDataKeys" data-key="wifiProxyPACFallbackAllowed"
                                        data-default="true" checked="checked" disabled/>
                                 <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
+                                      title="If unchecked, prevents a device from connecting directly to the destination
+                                       if the PAC file is unreachable. Available in iOS 7 and later.">
+                                    Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
@@ -1755,7 +1778,8 @@
                         <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.">
+                                  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>
@@ -1780,7 +1804,9 @@
                             <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.">
+                                      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>
@@ -1812,7 +1838,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="13" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;TLS
+                                    TLS
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1820,7 +1846,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="17" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;LEAP
+                                    LEAP
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1828,7 +1854,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="18" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-SIM
+                                    EAP-SIM
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1836,7 +1862,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="21" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;TTLS
+                                    TTLS
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1844,7 +1870,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="23" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-AKA
+                                    EAP-AKA
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1852,7 +1878,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="25" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;PEAP
+                                    PEAP
                                 </span>
                                     </label>
                                     <br/><br/>
@@ -1860,7 +1886,7 @@
                                         <input type="checkbox" class="form-control child-input" data-default="false"
                                                data-value="43" disabled/>
                                         <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-FAST
+                                    EAP-FAST
                                 </span>
                                     </label>
                                 </div>
@@ -1870,7 +1896,9 @@
                                 <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.">
+                                          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>
@@ -1898,8 +1926,9 @@
                                            class="form-control operationDataKeys" data-key="wifiEAPOneTimePassword"
                                            data-default="false" disabled/>
                                     <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
+                                          title="If checked, the user will be prompted for a password each time they
+                                          connect to the network.">
+                                One Time Password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -1911,7 +1940,9 @@
                                 <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.">
+                                          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>
@@ -1921,7 +1952,7 @@
                                     <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>
@@ -1982,7 +2013,12 @@
                                 <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.">
+                                          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>
@@ -1992,7 +2028,7 @@
                                     <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>
@@ -2056,8 +2092,11 @@
                                            data-key="wifiEAPTLSAllowTrustExceptions"
                                            data-default="true" checked="checked" disabled/>
                                     <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
+                                          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 i
+                                          sn't already trusted.">
+                                Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -2069,8 +2108,11 @@
                                            class="form-control operationDataKeys" data-key="wifiEAPTLSCertIsRequired"
                                            data-default="true" checked="checked" disabled/>
                                     <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
+                                          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.">
+                                Require TLS Certificate
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -2097,7 +2139,10 @@
                                 <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.">
+                                          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>
@@ -2120,8 +2165,9 @@
                                                    class="parent-input form-control operationDataKeys"
                                                    data-key="wifiEAPFastUsePAC" data-default="false" disabled/>
                                             <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
+                                                  title="If checked, the device will use an existing PAC. Otherwise, the
+                                                   server must present its identity using a certificate.">
+                                        Use existing PAC for EAP-FAST
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                                         </label>
@@ -2135,8 +2181,11 @@
                                                            data-key="wifiEAPFastProvisionPAC" data-default="false"
                                                            disabled/>
                                                     <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
+                                                          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.">
+                                                Allow PAC Provisioning
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
                                                 </label>
@@ -2151,8 +2200,11 @@
                                                                    data-key="wifiEAPFastProvisionPACAnonymously"
                                                                    data-default="false" disabled/>
                                                             <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
+                                                                  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.">
+                                                        Allow Anonymous PAC Provisioning
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                         </label>
@@ -2184,7 +2236,10 @@
                             <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.">
+                                      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>
@@ -2199,7 +2254,8 @@
                         <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.">
+                                  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>
@@ -2209,7 +2265,7 @@
                                     <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>
@@ -2269,7 +2325,8 @@
                         <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.">
+                                  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>
@@ -2278,7 +2335,7 @@
                                     <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>
@@ -2336,7 +2393,9 @@
                         <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.">
+                                  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>
@@ -2345,7 +2404,7 @@
                                     <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>
@@ -2495,7 +2554,9 @@
                         <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.">
+                                  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>
@@ -2509,8 +2570,10 @@
                             <input id="email-prevent-move" type="checkbox" class="form-control operationDataKeys"
                                    data-key="emailPreventMove" data-default="false" disabled/>
                             <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
+                                  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.">
+                                Prevent Move
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2521,8 +2584,9 @@
                             <input id="email-prevent-app-sheet" type="checkbox" class="form-control operationDataKeys"
                                    data-key="emailPreventAppSheet" data-default="false" disabled/>
                             <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
+                                  title="When checked, this account is not available for sending mail in third-party
+                                  applications. Available only in iOS 5.0 and later.">
+                                Prevent App Sheet
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2534,7 +2598,7 @@
                                    data-key="emailSMIMEEnabled" data-default="false" disabled/>
                             <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
+                                Enable S/MIME
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2544,7 +2608,8 @@
                         <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.">
+                                  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>
@@ -2557,7 +2622,8 @@
                         <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.">
+                                  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>
@@ -2573,7 +2639,7 @@
                                    data-default="false" disabled/>
                             <span class="helper"
                                   title="When checked, enable per-message signing and encryption switch.">
-                                &nbsp;&nbsp;&nbsp;Enable Per-Message Signing and Encryption Switch
+                                Enable Per-Message Signing and Encryption Switch
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2585,8 +2651,9 @@
                                    class="form-control operationDataKeys" data-key="emailDisableMailRecentSyncing"
                                    data-default="false" disabled/>
                             <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
+                                  title="When checked, this account is excluded from recent address syncing. Available
+                                  only in iOS 6.0 and later.">
+                                Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2615,7 +2682,7 @@
                                    data-key="emailIncomingUseSSL" data-default="true" checked="checked" disabled/>
                             <span class="helper"
                                   title="Designates whether the incoming mail server uses SSL for authentication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2625,7 +2692,8 @@
                         <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.">
+                                  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>
@@ -2653,7 +2721,10 @@
                         <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.">
+                                  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>
@@ -2698,7 +2769,7 @@
                                    data-key="emailOutgoingUseSSL" data-default="true" checked="checked" disabled/>
                             <span class="helper"
                                   title="Designates whether the outgoing mail server uses SSL for authentication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2736,7 +2807,10 @@
                         <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.">
+                                  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>
@@ -2752,8 +2826,9 @@
                                    data-key="emailOutgoingPasswordSameAsIncomingPassword" data-default="false"
                                    disabled/>
                             <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
+                                  title="When checked, the user will be prompted for the password only once and it will
+                                  be used for both outgoing and incoming mail.">
+                                Outgoing password same as incoming password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2820,7 +2895,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Credential
                             </a>
                         </label>
@@ -2887,7 +2962,8 @@
                         <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.">
+                                  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>
@@ -2897,7 +2973,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Destination
                             </a>
                         </label>
@@ -2997,7 +3073,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Unmarked Email Domains
                             </a>
                         </label>
@@ -3061,7 +3137,7 @@
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Managed Safari Web Domains
                             </a>
                         </label>
@@ -3181,7 +3257,7 @@
                                    data-key="ldapUseSSL" data-default="true" checked="checked" disabled/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3215,7 +3291,8 @@
                         <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.">
+                                  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>
@@ -3225,7 +3302,7 @@
                                     <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>
@@ -3368,8 +3445,9 @@
                                    class="form-control operationDataKeys" data-key="calendarUseSSL"
                                    checked="checked" disabled/>
                             <span class="helper"
-                                  title="Having this checked, would enable Secure Socket Layer communication with CalDAV server.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                  title="Having this checked, would enable Secure Socket Layer communication with CalDAV
+                                   server.">
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3493,7 +3571,7 @@
                                    data-key="calendarSubscriptionUseSSL" checked="checked" disabled/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3572,7 +3650,7 @@
                                     <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>
@@ -3750,7 +3828,7 @@
                                     <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>
@@ -3882,7 +3960,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="Having this checked would enable Usage of phone camera in the device">
-                                            &nbsp;&nbsp;&nbsp;Allow use of camera
+                                            Allow use of camera
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3895,8 +3973,9 @@
                                                data-key="restrictionsAllowChat" data-default="true" checked="checked"
                                                disabled/>
                                         <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
+                                              title="Having this checked would enable use of Messages app with
+                                              supervised devices. Available in iOS 6.0 and later.">
+                                            Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3912,7 +3991,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow taking screenshots in the device">
-                                            &nbsp;&nbsp;&nbsp;Allow screenshots
+                                            Allow screenshots
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3926,8 +4005,9 @@
                                                data-key="restrictionsAllowAirDrop" data-default="true" checked="checked"
                                                disabled/>
                                         <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 )
+                                              title="Having this checked would allow AirDrop feature in the device.
+                                              Available only in iOS 7.0 and later.">
+                                            Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3943,7 +4023,7 @@
                                                disabled/>
                                         <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
+                                            Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3958,7 +4038,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would enable Siri as assistant in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow Siri
+                                            Allow Siri
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3973,8 +4053,9 @@
                                                        data-default="true"
                                                        checked="checked" disabled/>
                                                 <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
+                                                      title="Having this checked would allow Siri as assistant while
+                                                      device is locked. Available only in iOS 5.1 and later.">
+                                                    Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3991,7 +4072,7 @@
                                                        checked="checked" disabled/>
                                                 <span class="helper"
                                                       title="Having this checked would force use of Siri profanity filter.">
-                                                    &nbsp;&nbsp;&nbsp;Force use of Siri profanity filter
+                                                    Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4006,8 +4087,10 @@
                                                        data-key="restrictionsAllowAssistantUserGeneratedContent"
                                                        data-default="true" checked="checked" disabled/>
                                                 <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 )
+                                                      title="Having this checked would allow Siri to query
+                                                      user-generated content from web in the device. Available in iOS 7
+                                                      and later.">
+                                                    Allow Siri to query user-generated content from web ( Supervised only )
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4022,8 +4105,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowAccountModification"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="Having this checked would allow modifying account settings in the
+                                              device. Available only in iOS 7.0 and later.">
+                                            Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4037,8 +4121,9 @@
                                                data-key="restrictionsAllowAppCellularDataModification"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="Having this checked would allow changes to cellular data usage for
+                                              apps in the device. Available only in iOS 7.0 and later.">
+                                            Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4053,8 +4138,9 @@
                                                checked="checked"
                                                disabled/>
                                         <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 )
+                                              title="Having this checked would enable iBookStore in the device.
+                                              Available in iOS 6.0 and later.">
+                                            Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4067,8 +4153,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowBookstoreErotica"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="Having this checked would enable iBookStore tagged as Erotica in
+                                              the device. Available in iOS 6.0 and later.">
+                                            Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4082,7 +4169,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow installing apps in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow installing apps
+                                            Allow installing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4098,7 +4185,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow removal of apps in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow removing apps
+                                            Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4112,7 +4199,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow in-app purchase in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow in-app purchase
+                                            Allow in-app purchase
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4127,7 +4214,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                            Require iTunes store password for all purchases
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4143,7 +4230,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="Having this checked would enable iCloud backup in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow iCloud backup
+                                            Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4156,8 +4243,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowCloudDocumentSync"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="Having this checked would enable syncing iCloud documents and data
+                                              in the device.">
+                                            Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4170,8 +4258,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowCloudKeychainSync"
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
-                                              title="Having this checked would enable syncing iCloud keychain in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow iCloud keychain
+                                              title="Having this checked would enable syncing iCloud keychain in the
+                                              device.">
+                                            Allow iCloud keychain
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4185,8 +4274,9 @@
                                                data-key="restrictionsAllowManagedAppsCloudSync"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="Having this checked would allow managed apps in the device to store
+                                               data in iCloud.">
+                                            Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4200,8 +4290,9 @@
                                                data-key="restrictionsAllowEnterpriseBookBackup"
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
-                                              title="Having this checked would allow backup of enterprise books in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow backup of enterprise books
+                                              title="Having this checked would allow backup of enterprise books in the
+                                              device.">
+                                            Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4215,8 +4306,9 @@
                                                data-key="restrictionsAllowEnterpriseBookMetadataSync"
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
-                                              title="When unchecked, Enterprise books notes and highlights will not be synced.">
-                                            &nbsp;&nbsp;&nbsp;Allow enterprise books data sync
+                                              title="When unchecked, Enterprise books notes and highlights will not be
+                                              synced.">
+                                            Allow enterprise books data sync
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4230,8 +4322,9 @@
                                                data-key="restrictionsAllowDiagnosticSubmission"
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
-                                              title="Having this checked would automatically submit diagnostic reports to Apple.">
-                                            &nbsp;&nbsp;&nbsp;Allow diagnostic submission
+                                              title="Having this checked would automatically submit diagnostic reports
+                                              to Apple.">
+                                            Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4244,8 +4337,11 @@
                                                class="operationDataKeys" data-key="restrictionsAllowExplicitContent"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              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.">
+                                            Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4260,7 +4356,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="When unchecked, changes to Find My Friends are disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Find My Friends modification
+                                            Allow Find My Friends modification
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4274,8 +4370,9 @@
                                                data-key="restrictionsAllowFingerprintForUnlock"
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
-                                              title="Having this unchecked would prevent Touch ID from unlocking a device.">
-                                            &nbsp;&nbsp;&nbsp;Allow fingerprint for unlock
+                                              title="Having this unchecked would prevent Touch ID from unlocking a
+                                              device.">
+                                            Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4291,8 +4388,9 @@
                                                data-default="true"
                                                checked="checked" disabled/>
                                         <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
+                                              title="Having this unchecked would disable global background fetch
+                                              activity when an iOS phone is roaming.">
+                                            Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4306,8 +4404,9 @@
                                                data-key="restrictionsAllowLockScreenControlCenter"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="Having this unchecked would prevent Control Center from appearing
+                                              on the Lock screen. Available in iOS 7 and later.">
+                                            Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4321,8 +4420,10 @@
                                                data-key="restrictionsAllowLockScreenNotificationsView"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="Having this unchecked would disable Notifications view in
+                                              Notification Center on the lock screen. Available only in iOS 7.0 and
+                                              later.">
+                                            Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4335,8 +4436,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowLockScreenTodayView"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="Having this unchecked would disable Today view in Notification
+                                              Center on the lock screen. Available only in iOS 7.0 and later.">
+                                            Show Today view in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4351,8 +4453,12 @@
                                                checked="checked"
                                                disabled/>
                                         <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 )
+                                              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.">
+                                            Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4366,8 +4472,9 @@
                                                data-key="restrictionsAllowOpenFromManagedToUnmanaged"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              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.">
+                                            Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4381,8 +4488,10 @@
                                                data-key="restrictionsAllowOpenFromUnmanagedToManaged"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              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.">
+                                            Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4397,8 +4506,10 @@
                                                checked="checked"
                                                disabled/>
                                         <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
+                                              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.">
+                                            Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4411,8 +4522,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowPassbookWhileLocked"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="When unchecked, Passbook notifications will not be shown on the
+                                              lock screen. Available only in iOS 6.0 and later.">
+                                            Show Passbook notifications in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4427,8 +4539,9 @@
                                                checked="checked"
                                                disabled/>
                                         <span class="helper"
-                                              title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow Photo Stream
+                                              title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0
+                                               and later.">
+                                            Allow Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4443,8 +4556,9 @@
                                                checked="checked"
                                                disabled/>
                                         <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
+                                              title="When unchecked, Shared Photo Stream will be disabled. Available
+                                              only in iOS 6.0 and later.">
+                                            Allow Shared Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4459,8 +4573,10 @@
                                                data-key="restrictionsAllowUIConfigurationProfileInstallation"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="When unchecked, the user is prohibited from installing
+                                              configuration profiles and certificates interactively. Available only in
+                                              iOS 6.0 and later.">
+                                            Allow user prompted profile installation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4473,8 +4589,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowUntrustedTLSPrompt"
                                                data-default="true" checked="checked" disabled/>
                                         <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
+                                              title="When unchecked, automatically rejects untrusted HTTPS certificates
+                                              without prompting the user. Available only in iOS 5.0 and later.">
+                                            Allow untrusted TLS prompt
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4488,7 +4605,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="When unchecked, video conferencing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow video conferencing
+                                            Allow video conferencing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4504,7 +4621,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="When unchecked, voice dialing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow voice dialing
+                                            Allow voice dialing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4518,7 +4635,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would force encrypting all backups.">
-                                            &nbsp;&nbsp;&nbsp;Force encrypting all backups
+                                            Force encrypting all backups
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4531,8 +4648,9 @@
                                                class="operationDataKeys" data-key="restrictionsForceLimitAdTracking"
                                                data-default="false" disabled/>
                                         <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
+                                              title="Having this checked would limit ad tracking. Available only in iOS
+                                              7.0 and later.">
+                                            Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4546,8 +4664,10 @@
                                                data-key="restrictionsForceAirPlayOutgoingRequestsPairingPassword"
                                                data-default="false" disabled/>
                                         <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
+                                              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.">
+                                            Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4561,8 +4681,10 @@
                                                data-key="restrictionsForceAirPlayIncomingRequestsPairingPassword"
                                                data-default="false" disabled/>
                                         <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
+                                              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.">
+                                            Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4576,8 +4698,9 @@
                                                data-key="restrictionsAllowEraseContentAndSettings"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="When unchecked, “Erase All Content And Settings” option in the
+                                              Reset UI is disabled.">
+                                            Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4592,7 +4715,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="When unchecked, Spotlight will not return Internet search results.">
-                                            &nbsp;&nbsp;&nbsp;Allow Spotlight Internet results ( Supervised only )
+                                            Allow Spotlight Internet results ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4606,8 +4729,9 @@
                                                data-key="restrictionsAllowEnablingRestrictions"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="When unchecked, “Enable Restrictions” option in the Restrictions
+                                              UI in Settings is disabled.">
+                                            Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4622,7 +4746,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="When unchecked, Activity Continuation will be disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Activity Continuation
+                                            Allow Activity Continuation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4636,7 +4760,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="When unchecked, definition lookup is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow definition lookup
+                                            Allow definition lookup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4649,8 +4773,9 @@
                                                class="operationDataKeys" data-key="restrictionsAllowPredictiveKeyboard"
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                              title="When unchecked, predictive keyboards are disabled. Available in
+                                              iOS 8.1.3 and later.">
+                                            Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4665,8 +4790,9 @@
                                                checked="checked"
                                                disabled/>
                                         <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 )
+                                              title="When unchecked, keyboard auto-correction is disabled. Available in
+                                              iOS 8.1.3 and later.">
+                                            Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4681,8 +4807,9 @@
                                                checked="checked"
                                                disabled/>
                                         <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 )
+                                              title="When unchecked, keyboard spell-check is disabled. Available in
+                                              iOS 8.1.3 and later.">
+                                            Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4703,7 +4830,7 @@
                                                disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow use of iTunes store in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow use of iTunes Store
+                                            Allow use of iTunes Store
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4717,7 +4844,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow use of Podcasts in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow use of Podcasts ( Supervised only )
+                                            Allow use of Podcasts ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4731,7 +4858,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow use of Safari in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow Safari
+                                            Allow Safari
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4745,8 +4872,9 @@
                                                        data-key="restrictionsSafariAllowAutoFill" data-default="true"
                                                        checked="checked" disabled/>
                                                 <span class="helper"
-                                                      title="Having this checked would enable Safari AutoFill feature in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable AutoFill
+                                                      title="Having this checked would enable Safari AutoFill feature in
+                                                       the device.">
+                                                    Enable AutoFill
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4760,8 +4888,9 @@
                                                        data-key="restrictionsSafariForceFraudWarning"
                                                        data-default="false" disabled/>
                                                 <span class="helper"
-                                                      title="Having this checked would force Safari Fraud warning feature in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Force Fraud warning
+                                                      title="Having this checked would force Safari Fraud warning
+                                                      feature in the device.">
+                                                    Force Fraud warning
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4775,8 +4904,9 @@
                                                        data-key="restrictionsSafariAllowJavaScript" data-default="true"
                                                        checked="checked" disabled/>
                                                 <span class="helper"
-                                                      title="Having this checked would enable Javascript on Safari in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable Javascript
+                                                      title="Having this checked would enable Javascript on Safari in
+                                                      the device.">
+                                                    Enable Javascript
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4790,8 +4920,9 @@
                                                        data-key="restrictionsSafariAllowPopups" data-default="true"
                                                        checked="checked" disabled/>
                                                 <span class="helper"
-                                                      title="Having this checked would enable Pop-ups on Safari in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable Pop-ups
+                                                      title="Having this checked would enable Pop-ups on Safari in the
+                                                      device.">
+                                                    Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4802,7 +4933,8 @@
                                             <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.">
+                                                      title="Determines conditions under which the device will accept
+                                                      cookies.">
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -4825,8 +4957,10 @@
                                                data-key="restrictionsAllowYouTube" data-default="true" checked="checked"
                                                disabled/>
                                         <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
+                                              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.">
+                                            Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4840,7 +4974,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <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 )
+                                            Allow use of Game Center ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4854,7 +4988,7 @@
                                                data-default="true" checked="checked" disabled/>
                                         <span class="helper"
                                               title="Having this checked would allow multiplayer gaming in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow multiplayer gaming
+                                            Allow multiplayer gaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4868,8 +5002,9 @@
                                                data-key="restrictionsAllowAddingGameCenterFriends" data-default="true"
                                                checked="checked" disabled/>
                                         <span class="helper"
-                                              title="Having this checked would allow adding Game Center friends in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow adding Game Center friends
+                                              title="Having this checked would allow adding Game Center friends in the
+                                              device.">
+                                            Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4889,7 +5024,9 @@
                                            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.">
+                                              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>
@@ -4899,7 +5036,7 @@
                                                 <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>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows-view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows-view.hbs
index c05725b89..03ed95648 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows-view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows-view.hbs
@@ -1,566 +1,610 @@
 <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 on Camera
-        <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 on Camera
+            <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('app-restriction', 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('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('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('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('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('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 hidden" data-toggle="collapse" data-target="#passcode-policy-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to set a passcode policy to an 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>
+    <div class="wr-hidden-operations-content col-lg-8">
+        <!-- passcode-policy -->
+        <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
+            <div class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
+                <div id="passcode-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Passcode Policy
+                        <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an 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>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-allow-simple" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple" checked="checked" disabled/>
-                            <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                   Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-            </div>
+                        </label>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-require-alphanumeric" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric" checked="checked" disabled/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked" disabled/>
                             <span class="helper" title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
+                                   Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-            </div>
+                        </label>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-length">
-                    Minimum passcode length
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-length">
+                            Minimum passcode length
                             <span class="helper" title="Minimum number of characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-min-length" class="form-control operationDataKeys" data-key="passcodePolicyMinLength" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="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>
-                </select>
-            </div>
+                        </label>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="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>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-complex-chars">
-                    Minimum number of complex characters
-                            <span class="helper" title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-complex-chars">
+                            Minimum number of complex characters
+                            <span class="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys" data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="1">01</option>
-                    <option value="2">02</option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                </select>
-            </div>
+                        </label>
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="1">01</option>
+                            <option value="2">02</option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                        </select>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
-                    Maximum passcode age in days
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Maximum passcode age in days
                             <span class="helper" title="Number of days after which a passcode must be changed">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    ( Should be in between 1-to-730 days or none )
-                </label>
-                <input id="passcode-policy-max-passcode-age-in-days" type="text" class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" placeholder="[ Requires Number Input ]" disabled>
-            </div>
+                            <br>
+                            ( Should be in between 1-to-730 days or none )
+                        </label>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3" placeholder="[ Requires Number Input ]" disabled>
+                    </div>
 
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-passcode-history">
-                    Passcode history
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-passcode-history">
+                            Passcode history
                             <span class="helper" title="Number of consequent unique passcodes to be used before reuse">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
+                            <br>
+                            ( Should be in between 1-to-50 passcodes or none )
+                        </label>
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2"
+                               placeholder="[ Requires Number Input ]" disabled>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
+                            Maximum number of failed attempts
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- /passcode-policy -->
+
+        <!-- camera -->
+        <div class="wr-hidden-operation" data-operation="camera">
+            <div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
+                <div id="camera-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Restrictions on Camera
+                        <label class="wr-input-control switch hidden" 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 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>
+                    Un-check following checkbox in case you need to disable camera.
                     <br>
-                    ( Should be in between 1-to-50 passcodes or none )
-                </label>
-                <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys" data-key="passcodePolicyPasscodeHistory" maxlength="2" placeholder="[ Requires Number Input ]" disabled>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
-                    Maximum number of failed attempts
-                            <span class="helper" title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
+                    <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" disabled/>
+                            <span class="helper"
+                                  title="Having this checked would enable Usage of phone camera in the device.">
+                                   Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
-                <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys" data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                    <option value="6">06</option>
-                    <option value="7">07</option>
-                    <option value="8">08</option>
-                    <option value="9">09</option>
-                    <option value="10">10</option>
-                </select>
+                        </label>
+                    </div>
+                    <br>
+                </div>
             </div>
         </div>
-    </div>
-</div>
-<!-- /passcode-policy -->
+        <!-- /camera -->
 
-<!-- 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 on Camera
-                <label class="wr-input-control switch hidden" 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 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>
-            Un-check following checkbox in case you need to disable camera.
-            <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" disabled/>
-                            <span class="helper" title="Having this checked would enable Usage of phone camera in the device.">
-                                &nbsp;&nbsp;&nbsp;Allow use of camera
+        <!-- encrypt-storage -->
+        <div class="wr-hidden-operation" data-operation="encrypt-storage">
+            <div class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
+                <div id="encrypt-storage-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Encryption Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to encrypt data on an 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>
+                    Un-check following checkbox in case you need to disable storage-encryption.
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked" disabled/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
+                                   Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                </label>
+                        </label>
+                    </div>
+                    <br>
+                </div>
             </div>
-            <br>
         </div>
-    </div>
-</div>
-<!-- /camera -->
+        <!-- /encrypt-storage -->
 
-<!-- encrypt-storage -->
-<div class="wr-hidden-operation" data-operation="encrypt-storage">
-    <div class="panel panel-default operation-data" data-operation="encrypt-storage" data-operation-code="ENCRYPT_STORAGE">
-        <div id="encrypt-storage-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Encryption Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#encrypt-storage-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to encrypt data on an 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>
-            Un-check following checkbox in case you need to disable storage-encryption.
-            <br>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys" data-key="encryptStorageEnabled" checked="checked" disabled/>
-                            <span class="helper" title="Having this checked would enable Storage-encryption in the device">
-                                &nbsp;&nbsp;&nbsp;Enable storage-encryption
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-            </div>
-            <br>
-        </div>
-    </div>
-</div>
-<!-- /encrypt-storage -->
+        <!--app-restriction-->
+        <div class="wr-hidden-operation" data-operation="app-restriction">
+            <div class="panel panel-default operation-data" data-operation="app-restriction"
+                 data-operation-code="APP-RESTRICTION">
+                <div id="app-restriction-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Application Restriction Settings
+                        <label class="wr-input-control switch hidden" data-toggle="collapse"
+                               data-target="#app-restriction-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to create a black list or white list of applications.
+                    </div>
+                </div>
+                <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>
 
-<!--app-restriction-->
-<div class="wr-hidden-operation" data-operation="app-restriction">
-    <div class="panel panel-default operation-data" data-operation="app-restriction" data-operation-code="APP-RESTRICTION">
-        <div id="app-restriction-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Application Restriction Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#app-restriction-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to create a black list or white list of applications.
-            </div>
-        </div>
-        <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
-            <hr/>
-            <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </div>
-
-            <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType" disabled>
-                <option value="" selected="selected">
-                    None
-                </option>
-                <option value="black-list">Black List</option>
-                <option value="white-list">White List</option>
-            </select>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"
+                            disabled>
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="restricted-applications">
+                            Restricted Application List
                             <span class="helper" title="Add an application to restrict.">
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
-                    <br>
-                    <br>
-                    <a href="#restricted-applications-grid" class="grid-input-add hidden" data-click-event="add-form">
+                            <br>
+                            <br>
+                            <a href="#restricted-applications-grid" class="grid-input-add hidden"
+                               data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                        &nbsp;
-                        Add Application
-                    </a>
-                </label>
-                <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Application Name/Description</th>
-                            <th>Package Name</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#restricted-applications-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="4">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#restricted-applications-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="App Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="appName" maxlength="100" data-default="" placeholder="[ Application Name or Description ]" disabled/>
-                            </td>
-                            <td data-title="Package Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="packageName" maxlength="100" data-default="" placeholder="[ Package Name of Application ]" disabled/>
-                            </td>
-                            <td>
+
+                                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 ]" disabled/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ Package Name of Application ]" disabled/>
+                                    </td>
+                                    <td>
                                             <span class="list-group-item-actions hidden">
-                                                <a href="#restricted-applications-grid" class="grid-input-remove" data-click-event="remove-form">
+                                                <a href="#restricted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
                                                     <span class="fw-stack helper" title="Remove Entry">
                                                         <i class="fw fw-ring fw-stack-2x"></i>
                                                         <i class="fw fw-delete fw-stack-1x"></i>
                                                     </span>
                                                 </a>
                                             </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
+        <!--/app-restriction-->
+
+        <!-- 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.-->
+        <!--</div>-->
+        <!--</h2>-->
+        <!--</div>-->
+        <!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
+        <!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
+        <!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
+        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;</a>&ndash;&gt;-->
+        <!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--&lt;!&ndash;<br>&ndash;&gt;-->
+        <!--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-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="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
+        <!--</div>-->
+        <!--&lt;!&ndash;</div>&ndash;&gt;-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!-- /wi-fi -->
+
+        <!-- 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>-->
+        <!--   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>-->
+        <!--   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>-->
+        <!--   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 -->
     </div>
-</div>
-<!--/app-restriction-->
-
-<!-- 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.-->
-<!--</div>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
-<!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--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-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="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
-<!--</div>-->
-<!--&lt;!&ndash;</div>&ndash;&gt;-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /wi-fi -->
-
-<!-- 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 -->
-</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.wizard/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.wizard/public/templates/hidden-operations-android.hbs
index d1f8d67da..be3b63245 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.wizard/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.wizard/public/templates/hidden-operations-android.hbs
@@ -5,7 +5,8 @@
                     <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-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>
@@ -23,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">
@@ -37,46 +40,50 @@
             <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('install-apps', this)">-->
-                <!--<span class="wr-hidden-operations-icon fw-stack">-->
-                    <!--<i class="fw fw-application fw-stack-2x"></i>-->
-                <!--</span>-->
-            <!--App Installations-->
+        <!--<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-->
+        <!--<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-->
+        <!--<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 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" />
+                        <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
+                            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-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>
@@ -84,9 +91,12 @@
 
                     <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
+                            <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">
+                                   Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -94,9 +104,11 @@
 
                     <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" />
+                            <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
+                                   Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -109,7 +121,8 @@
                                 <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">
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -131,11 +144,13 @@
                     <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="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">
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -156,7 +171,9 @@
                             <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">
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3">
                     </div>
 
                     <div class="wr-input-control">
@@ -168,17 +185,20 @@
                             <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">
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2">
                     </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">
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the 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">
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -204,19 +224,22 @@
                     <h2 class="sub-title panel-title">
                         Restrictions on Camera
                         <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
-                            <input type="checkbox" />
+                            <input type="checkbox"/>
                             <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 Android device together with all the applications using the camera.
-                            Once this configuration profile is installed on a device, corresponding users will not be able
+                            This configuration can be used to restrict the usage of camera on an Android 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>
-                <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
+                <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>
@@ -225,9 +248,11 @@
                     <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
+                            <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.">
+                                   Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -240,24 +265,29 @@
 
         <!-- 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 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" />
+                        <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,
+                            This configuration can be used to encrypt data on an Android device, when the device is
+                            locked and
+                            make it readable when the passcode is entered. Once this configuration profile is installed
+                            on a device,
                             corresponding users will not be able to modify these settings on their devices.
                         </div>
                     </h2>
                 </div>
-                <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
+                <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>
@@ -266,9 +296,11 @@
                     <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
+                            <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">
+                                   Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -286,62 +318,66 @@
                     <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" />
+                            <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
+                            Once this configuration profile is installed on a device, corresponding users will not be
+                            able
                             to modify these settings on their devices.
                         </div>
                     </h2>
                 </div>
-                <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">
+                <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)*
-                                <span class="helper" title="Identification of the wireless network to be configured.">
+                    <!--<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>
-                            </label>
-                            <label id="wifiSsidValidationText" class="wr-input-label hidden">
-                                Service Set Identifier should be 1-to-30 characters long
-                            </label>
-                            <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
-                        </div>
-                        <div class="wr-input-control">
-                            <label class="wr-input-label" for="wifi-password">
-                                Password*
-                                <span class="helper" title="Password for the wireless network.">
+                        </label>
+                        <label id="wifiSsidValidationText" class="wr-input-label hidden">
+                            Service Set Identifier should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-password">
+                            Password
+                            <span class="helper required" 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" />
-                        </div>
+                        </label>
+                        <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                               data-key="wifiPassword" maxlength="100"/>
+                    </div>
                     <!--</div>-->
                 </div>
             </div>
@@ -350,108 +386,108 @@
 
         <!-- 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="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--   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 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 class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--   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 class="panel panel-default operation-data" data-operation="WEBCLIP">-->
+        <!--<div class="panel-heading" role="tab">-->
+        <!--<h2 class="sub-title panel-title">-->
+        <!--<br>-->
+        <!--   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 -->
     </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.wizard/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.wizard/public/templates/hidden-operations-ios.hbs
index 113ce1370..cba2e6220 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.wizard/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.wizard/public/templates/hidden-operations-ios.hbs
@@ -5,7 +5,8 @@
                 <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-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>
@@ -68,9 +69,11 @@
                 <i class="fw fw-subscribed-calendar fw-stack-2x"></i>
             </span>
             Calendar Subscription
-            <span id="calendar-subscription-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <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>
+            <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)">
             <span class="wr-hidden-operations-icon fw-stack">
@@ -106,24 +109,28 @@
     <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 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" />
+                        <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
+                            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-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>
@@ -131,9 +138,10 @@
 
                     <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" />
+                            <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
+                                   Force Passcode
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -141,9 +149,12 @@
 
                     <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
+                            <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">
+                                   Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -151,9 +162,11 @@
 
                     <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" />
+                            <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
+                                   Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -166,7 +179,8 @@
                                 <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">
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -192,11 +206,13 @@
                     <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="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">
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -215,7 +231,9 @@
                                 <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=""/>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3" data-default=""/>
                     </div>
 
                     <div class="wr-input-control">
@@ -226,17 +244,20 @@
                                 <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="">
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2" data-default="">
                     </div>
 
                     <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="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">
+                        <select id="passcode-policy-max-auto-lock" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxAutoLock" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -251,11 +272,13 @@
                     <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="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">
+                        <select id="passcode-policy-grace-period" class="form-control operationDataKeys"
+                                data-key="passcodePolicyGracePeriod" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -272,11 +295,13 @@
                     <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="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the 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">
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
                             <option value="" selected="selected">
                                 None
                             </option>
@@ -302,19 +327,22 @@
                     <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" />
+                            <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
+                            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-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>
@@ -326,26 +354,30 @@
                                 <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="">
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" data-default="">
                     </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="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="">
+                        <input id="wifi-domain-name" type="text" class="form-control operationDataKeys"
+                               data-key="wifiDomainName" maxlength="100" data-default="">
                     </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" />
+                            <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
+                                   Hidden Network
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -353,9 +385,11 @@
 
                     <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
+                            <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.">
+                                   Hot Spot
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -363,9 +397,12 @@
 
                     <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
+                            <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.">
+                                   Enable Service Provider Roaming
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -373,9 +410,11 @@
 
                     <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
+                            <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.">
+                                   Auto Join
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -388,17 +427,21 @@
                                 <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="">
+                        <input id="wifi-displayed-operator-name" type="text" class="form-control operationDataKeys"
+                               data-key="wifiDisplayedOperatorName" maxlength="100" data-default="">
                     </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="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'])">
+                        <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>
@@ -421,7 +464,8 @@
                                     <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=""/>
+                            <input id="wifi-proxy-server" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyServer" maxlength="100" data-default=""/>
                         </div>
 
                         <div class="wr-input-control">
@@ -431,7 +475,8 @@
                                     <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=""/>
+                            <input id="wifi-proxy-port" type="text" class="form-control operationDataKeys"
+                                   data-key="wifiProxyPort" maxlength="5" data-default=""/>
                         </div>
 
                         <div class="wr-input-control">
@@ -441,7 +486,9 @@
                                     <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 ]" />
+                            <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">
@@ -451,7 +498,9 @@
                                     <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 ]" />
+                            <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">
@@ -461,14 +510,19 @@
                                     <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 ]">
+                            <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"/>
-                                <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
+                                <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.">
+                                       Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
@@ -479,11 +533,14 @@
                     <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="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'])">
+                        <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>
@@ -493,374 +550,438 @@
 
                     <div id="advanced-security-config" class="slidable-pane" style="display:none;">
 
-                    For WEP, WPA or ANY Encryption Security Type :
-                    <br>
-                    <br>
+                        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.">
+                        <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>
-
-                    <div class="eap-client-config">
-
-                    EAP Client Configuration ( Optional ) :
-                    <br>
-                    <br>
-
-                    <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"/>
-                                <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"/>
-                                <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"/>
-                                <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"/>
-                                <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"/>
-                                <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"/>
-                                <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"/>
-                                <span class="helper" title="">
-                                    &nbsp;&nbsp;&nbsp;EAP-FAST
-                                </span>
                             </label>
+                            <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                                   data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]">
                         </div>
-                    </div>
 
-                    <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="eap-client-config">
 
-                    <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" />
-                            <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>
-
-                    <br>
-
-                    <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>
+                            EAP Client Configuration ( Optional ) :
                             <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>
-                                            <span class="list-group-item-actions">
-                                                <a href="#wifi-payload-certificate-anchor-uuids-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>
-
-                    <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">
-                                <span class="icon fw-stack">
-                                    <i class="fw fw-add fw-stack-1x"></i>
-                                    <i class="fw fw-ring fw-stack-2x"></i>
+
+                            <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"/>
+                                        <span class="helper" title="">
+                                       TLS
                                 </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>
-                                            <span class="list-group-item-actions">
-                                                <a href="#wifi-tls-trusted-server-names-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>
-
-                    <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>
+                                    </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="">
+                                       LEAP
                                 </span>
-                        </label>
-                    </div>
+                                    </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="">
+                                       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"/>
+                                        <span class="helper" title="">
+                                       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"/>
+                                        <span class="helper" title="">
+                                       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"/>
+                                        <span class="helper" title="">
+                                       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"/>
+                                        <span class="helper" title="">
+                                       EAP-FAST
+                                </span>
+                                    </label>
+                                </div>
+                            </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
+                            <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>
-                    </div>
+                                </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-tls-inner-auth-type">
-                            TTLS Inner Authentication Type
-                            <span class="helper" title="This is the inner authentication used by the TTLS module.">
+                            <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>
-                        <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>
+                                </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-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" />
-                                    <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>
+                                    <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.">
+                                   One Time Password
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
                                 </label>
                             </div>
-                            <ul class="grouped-child-input">
+
+                            <br>
+
+                            <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">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+
+                                        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" 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>
+
+                            <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">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+
+                                        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"
+                                                   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>
+
+                            <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.">
+                                   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"/>
+                                    <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.">
+                                   Require TLS Certificate
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                </label>
+                            </div>
+
+                            <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
+                                    <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-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>
+                                            <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.">
+                                           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>
+                                        <li class="grouped-input">
                                             <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>
+                                                    <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.">
+                                                   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"/>
+                                                            <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.">
+                                                           Allow Anonymous PAC Provisioning
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                        </label>
+                                                    </div>
+                                                </li>
+                                            </ul>
                                         </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">
+                            <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>
+                                </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>
 
-                    <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.">
+                        <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 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="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">
+                            <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">
+                        <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>
@@ -879,24 +1000,27 @@
                             </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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#wifi-roaming-consortium-ois-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -907,7 +1031,8 @@
                     <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="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>
@@ -916,25 +1041,27 @@
                                     <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">
+                        <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>
+                                <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>
+                                <tr data-help-text="add-form">
+                                    <td colspan="3">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                             <table class="template hidden">
@@ -944,11 +1071,13 @@
                                         <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 ]" />
+                                        <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" data-click-event="remove-form">
+                                            <a href="#wifi-nai-realm-names-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>
@@ -967,7 +1096,8 @@
                     <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="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>
@@ -976,11 +1106,13 @@
                                     <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">
+                        <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>
@@ -1005,14 +1137,17 @@
                                         <span class="index"></span>
                                     </td>
                                     <td data-title="Mobile Country Code ( MCC )">
-                                        <input type="text" class="form-control grid-input-text" maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]" />
+                                        <input type="text" class="form-control grid-input-text" 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" maxlength="3" data-default="" placeholder="[ Requires 3-digit-input ]" />
+                                        <input type="text" class="form-control grid-input-text" 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" data-click-event="remove-form">
+                                            <a href="#wifi-mcc-and-mncs-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>
@@ -1036,8 +1171,9 @@
                 <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" />
+                        <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>
@@ -1050,7 +1186,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="email-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="email-body">
+                <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>
@@ -1063,7 +1200,9 @@
                                 <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 ]" />
+                        <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">
@@ -1073,7 +1212,9 @@
                                 <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'])">
+                        <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>
@@ -1085,7 +1226,10 @@
                             <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 ]" />
+                            <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>
@@ -1093,28 +1237,36 @@
                     <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="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 ]" />
+                        <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="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 ]" />
+                        <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
+                            <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.">
+                                   Prevent Move
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1122,9 +1274,11 @@
 
                     <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
+                            <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.">
+                                   Prevent App Sheet
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1132,9 +1286,11 @@
 
                     <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
+                            <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.">
+                                   Enable S/MIME
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1143,28 +1299,37 @@
                     <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="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 ]" />
+                        <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="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 ]" />
+                        <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
+                            <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.">
+                                   Enable Per-Message Signing and Encryption Switch
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1172,9 +1337,12 @@
 
                     <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
+                            <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.">
+                                   Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1187,18 +1355,23 @@
                     <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="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 ]" />
+                        <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 )
+                            <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.">
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1207,11 +1380,13 @@
                     <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="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="" />
+                        <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">
@@ -1221,7 +1396,8 @@
                                 <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">
+                        <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>
@@ -1230,21 +1406,27 @@
                     <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="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 ]">
+                        <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="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 ]">
+                        <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>
@@ -1254,18 +1436,23 @@
                     <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="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 ]" />
+                        <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 )
+                            <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.">
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1274,11 +1461,13 @@
                     <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="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="" />
+                        <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">
@@ -1288,7 +1477,8 @@
                                 <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">
+                        <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>
@@ -1297,18 +1487,24 @@
                     <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="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 ]">
+                        <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
+                            <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.">
+                                   Outgoing password same as incoming password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1317,11 +1513,14 @@
                     <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="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 ]">
+                        <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>
@@ -1335,8 +1534,9 @@
                 <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" />
+                        <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>
@@ -1349,7 +1549,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="airplay-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="airplay-body">
+                <div id="airplay-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="airplay-body">
 
                     <div id="airplay-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
@@ -1367,51 +1568,58 @@
                                     <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">
+                        <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>
+                                <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>
+                                <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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#airplay-credentials-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1422,7 +1630,8 @@
                     <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="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>
@@ -1431,47 +1640,52 @@
                                     <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">
+                        <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>
+                                <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>
+                                <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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#airplay-destinations-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1488,8 +1702,9 @@
                 <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" />
+                        <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>
@@ -1501,7 +1716,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="ldap-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="ldap-body">
+                <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>
@@ -1514,7 +1730,9 @@
                                 <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 ]" />
+                        <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">
@@ -1524,14 +1742,18 @@
                                 <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 ]" />
+                        <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" />
-                            <span class="helper" title="Having this checked, would enable Secure Socket Layer communication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                            <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.">
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1544,7 +1766,9 @@
                                 <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 ]">
+                        <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">
@@ -1554,13 +1778,15 @@
                                 <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 ]">
+                        <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
-                            <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="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>
@@ -1569,61 +1795,71 @@
                                     <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">
+                        <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>
+                                <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>
+                                <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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#ldap-search-settings-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1640,8 +1876,9 @@
                 <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" />
+                        <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>
@@ -1653,7 +1890,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="calendar-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="calendar-body">
+                <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>
@@ -1666,7 +1904,10 @@
                                 <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 ]" />
+                        <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">
@@ -1676,14 +1917,18 @@
                                 <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 ]" />
+                        <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" />
-                            <span class="helper" title="Having this checked, would enable Secure Socket Layer communication with CalDAV server.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                            <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.">
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1696,7 +1941,9 @@
                                 <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 ]" />
+                        <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">
@@ -1706,17 +1953,22 @@
                                 <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 ]">
+                        <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
-                            <span class="helper" title="CalDAV account username is required for devices being prepared or supervised.">
+                            <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 ]">
+                        <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">
@@ -1726,7 +1978,8 @@
                                 <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 ]">
+                        <input id="calendar-account-password" type="password" class="form-control operationDataKeys"
+                               data-key="calendarAccountPassword" maxlength="100" placeholder="[ Optional field ]">
                     </div>
 
                 </div>
@@ -1736,12 +1989,14 @@
 
         <!-- 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 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" />
+                        <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>
@@ -1753,7 +2008,8 @@
                         </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-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>
@@ -1766,7 +2022,10 @@
                                 <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 ]" />
+                        <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">
@@ -1776,14 +2035,19 @@
                                 <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 ]" />
+                        <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" />
-                            <span class="helper" title="Having this checked, would enable Secure Socket Layer communication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                            <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.">
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1796,7 +2060,9 @@
                                 <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 ]">
+                        <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">
@@ -1806,7 +2072,9 @@
                                 <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 ]">
+                        <input id="calendar-subscription-password" type="password"
+                               class="form-control operationDataKeys" data-key="calendarSubscriptionPassword"
+                               maxlength="100" placeholder="[ Optional field ]">
                     </div>
 
                 </div>
@@ -1820,8 +2088,9 @@
                 <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" />
+                        <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>
@@ -1834,7 +2103,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="apn-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="apn-body">
+                <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>
@@ -1843,7 +2113,8 @@
                     <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="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>
@@ -1852,63 +2123,75 @@
                                     <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">
+                        <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>
+                                <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>
+                                <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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#apn-configurations-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -1925,8 +2208,9 @@
                 <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" />
+                        <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>
@@ -1940,7 +2224,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="cellular-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="cellular-body">
+                <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>
@@ -1953,7 +2238,9 @@
                                 <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 ]">
+                        <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">
@@ -1963,7 +2250,8 @@
                                 <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">
+                        <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>
@@ -1976,7 +2264,9 @@
                                 <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 ]">
+                        <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">
@@ -1986,85 +2276,102 @@
                                 <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 ]">
+                        <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
-                            <span class="helper" title="Can contain an arbitrary number of entries, each describing an APN configuration.">
+                            <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">
+                            <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">
+                        <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>
+                                <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>
+                                <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>
+                                <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" data-click-event="remove-form">
+                                                <a href="#cellular-apn-configurations-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>
+                                    </td>
+                                </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -2077,12 +2384,13 @@
 
         <!-- Restrictions -->
         <div class="wr-hidden-operation" data-operation="restrictions">
-            <div class="panel panel-default operation-data" data-operation="restrictions" data-operation-code="RESTRICTION">
+            <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" />
+                            <input type="checkbox"/>
                             <span class="helper"></span>
                             <span class="text"></span>
                         </label>
@@ -2094,7 +2402,8 @@
                         </div>
                     </h2>
                 </div>
-                <div id="restrictions-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="restrictions-body">
+                <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>
@@ -2107,9 +2416,12 @@
                             <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
+                                        <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">
+                                               Allow use of camera
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2118,9 +2430,11 @@
                             <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
+                                        <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.">
+                                               Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2129,9 +2443,12 @@
                             <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
+                                        <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">
+                                               Allow screenshots
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2140,9 +2457,12 @@
                             <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 )
+                                        <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.">
+                                               Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2151,9 +2471,12 @@
                             <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
+                                        <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.">
+                                               Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2162,9 +2485,13 @@
                             <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
+                                        <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.">
+                                               Allow Siri
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2173,9 +2500,13 @@
                                     <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
+                                                <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.">
+                                                       Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2184,9 +2515,13 @@
                                     <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
+                                                <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.">
+                                                       Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2195,9 +2530,13 @@
                                     <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 )
+                                                <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.">
+                                                       Allow Siri to query user-generated content from web ( Supervised only )
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2208,9 +2547,12 @@
                             <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 )
+                                        <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.">
+                                               Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2219,9 +2561,13 @@
                             <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 )
+                                        <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.">
+                                               Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2230,9 +2576,12 @@
                             <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 )
+                                        <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.">
+                                               Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2241,9 +2590,12 @@
                             <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 )
+                                        <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.">
+                                               Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2252,130 +2604,12 @@
                             <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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" />
-                                        <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
+                                        <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.">
+                                               Allow installing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2384,9 +2618,12 @@
                             <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
+                                        <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.">
+                                               Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2395,9 +2632,12 @@
                             <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
+                                        <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.">
+                                               Allow in-app purchase
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2406,9 +2646,13 @@
                             <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
+                                        <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.">
+                                               Require iTunes store password for all purchases
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2417,9 +2661,12 @@
                             <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
+                                        <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.">
+                                               Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2428,9 +2675,12 @@
                             <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
+                                        <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.">
+                                               Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2439,9 +2689,86 @@
                             <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
+                                        <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.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="Having this checked would allow managed apps in the device to store data in iCloud.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="Having this checked would allow backup of enterprise books in the device.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="When unchecked, Enterprise books notes and highlights will not be synced.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="Having this checked would automatically submit diagnostic reports to Apple.">
+                                               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"/>
+                                        <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.">
+                                               Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2450,9 +2777,13 @@
                             <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 )
+                                        <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.">
+                                               Allow Find My Friends modification
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2461,9 +2792,13 @@
                             <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
+                                        <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.">
+                                               Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2472,9 +2807,13 @@
                             <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
+                                        <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.">
+                                               Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2483,9 +2822,13 @@
                             <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
+                                        <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.">
+                                               Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2494,9 +2837,13 @@
                             <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
+                                        <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.">
+                                               Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2505,9 +2852,26 @@
                             <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
+                                        <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.">
+                                               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"/>
+                                        <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.">
+                                               Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2516,9 +2880,13 @@
                             <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
+                                        <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.">
+                                               Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2527,9 +2895,13 @@
                             <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
+                                        <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.">
+                                               Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2538,9 +2910,12 @@
                             <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
+                                        <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.">
+                                               Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2549,9 +2924,82 @@
                             <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" />
+                                        <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.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0 and later.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="When unchecked, Shared Photo Stream will be disabled. Available only in iOS 6.0 and later.">
+                                               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"/>
+                                        <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.">
+                                               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"/>
+                                        <span class="helper"
+                                              title="When unchecked, automatically rejects untrusted HTTPS certificates without prompting the user. Available only in iOS 5.0 and later.">
+                                               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"/>
                                         <span class="helper" title="When unchecked, video conferencing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow video conferencing
+                                               Allow video conferencing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2560,9 +3008,11 @@
                             <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" />
+                                        <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
+                                               Allow voice dialing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2571,9 +3021,12 @@
                             <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
+                                        <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.">
+                                               Force encrypting all backups
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2582,9 +3035,12 @@
                             <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
+                                        <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.">
+                                               Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2593,9 +3049,13 @@
                             <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
+                                        <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.">
+                                               Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2604,9 +3064,13 @@
                             <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
+                                        <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.">
+                                               Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2615,9 +3079,13 @@
                             <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 )
+                                        <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.">
+                                               Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2626,9 +3094,13 @@
                             <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 )
+                                        <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.">
+                                               Allow Spotlight Internet results ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2637,9 +3109,13 @@
                             <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 )
+                                        <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.">
+                                               Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2648,9 +3124,13 @@
                             <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
+                                        <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.">
+                                               Allow Activity Continuation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2659,9 +3139,11 @@
                             <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" />
+                                        <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
+                                               Allow definition lookup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2670,9 +3152,12 @@
                             <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 )
+                                        <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.">
+                                               Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2681,9 +3166,12 @@
                             <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 )
+                                        <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.">
+                                               Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2692,9 +3180,12 @@
                             <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 )
+                                        <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.">
+                                               Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2710,9 +3201,12 @@
                             <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
+                                        <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.">
+                                               Allow use of iTunes Store
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2721,9 +3215,12 @@
                             <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 )
+                                        <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.">
+                                               Allow use of Podcasts ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2732,9 +3229,12 @@
                             <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
+                                        <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.">
+                                               Allow Safari
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2743,9 +3243,13 @@
                                     <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
+                                                <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.">
+                                                       Enable AutoFill
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2754,9 +3258,13 @@
                                     <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
+                                                <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.">
+                                                       Force Fraud warning
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2765,9 +3273,13 @@
                                     <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
+                                                <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.">
+                                                       Enable Javascript
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2776,9 +3288,13 @@
                                     <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
+                                                <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.">
+                                                       Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2788,11 +3304,14 @@
                                         <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="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">
+                                            <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>
@@ -2804,9 +3323,12 @@
                             <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
+                                        <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.">
+                                               Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2815,9 +3337,12 @@
                             <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 )
+                                        <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.">
+                                               Allow use of Game Center ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2826,9 +3351,12 @@
                             <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
+                                        <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.">
+                                               Allow multiplayer gaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2837,9 +3365,13 @@
                             <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
+                                        <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.">
+                                               Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2855,58 +3387,66 @@
                         <ul class="listing">
                             <li>
                                 <div class="wr-input-control">
-                                    <label class="wr-input-label" for="restrictions-autonomous-single-app-mode-permitted-app-ids">
+                                    <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="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">
+                                        <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">
+                                    <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>
+                                            <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>
+                                            <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>
+                                            <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" data-click-event="remove-form">
+                                                            <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-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>
+                                                </td>
+                                            </tr>
                                             </tbody>
                                         </table>
                                     </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.wizard/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.wizard/public/templates/hidden-operations-windows.hbs
index 7fb5d6323..337ab455d 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.wizard/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.wizard/public/templates/hidden-operations-windows.hbs
@@ -96,7 +96,7 @@
                                    checked="checked"/>
                             <span class="helper"
                                   title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
+                                   Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -108,7 +108,7 @@
                                    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
+                                   Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -258,7 +258,7 @@
                                    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
+                                   Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -306,7 +306,7 @@
                                    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
+                                   Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -391,7 +391,7 @@
         <!--<div class="panel-heading" role="tab">-->
         <!--<h2 class="sub-title panel-title">-->
         <!--<br>-->
-        <!--&nbsp;&nbsp;&nbsp;App Installations-->
+        <!--   App Installations-->
         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
         <!--<input type="checkbox" />-->
         <!--<span class="helper"></span>-->
@@ -435,7 +435,7 @@
         <!--<div class="panel-heading" role="tab">-->
         <!--<h2 class="sub-title panel-title">-->
         <!--<br>-->
-        <!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
+        <!--   App Uninstallations-->
         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
         <!--<input type="checkbox" />-->
         <!--<span class="helper"></span>-->
@@ -465,7 +465,7 @@
         <!--<div class="panel-heading" role="tab">-->
         <!--<h2 class="sub-title panel-title">-->
         <!--<br>-->
-        <!--&nbsp;&nbsp;&nbsp;Web clips-->
+        <!--   Web clips-->
         <!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
         <!--<input type="checkbox" />-->
         <!--<span class="helper"></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.wizard/wizard.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.wizard/wizard.hbs
index cd911ec9b..15a2663b5 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.wizard/wizard.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.wizard/wizard.hbs
@@ -60,7 +60,7 @@
                 <hr>
                 <button class="wr-btn wizard-stepper" data-current="policy-message"
                         data-direct="{{@app.context}}/policies">
-                    &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
+                        View policy list
                 </button>
                 <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
                         <span class="fw-stack">
@@ -170,13 +170,13 @@
                                     <input id="user-roles-radio-btn" type="radio"
                                            name="select-users-radio-btn" class="select-users-radio"
                                            checked/>
-                                    <span class="helper">&nbsp;Set user role(s)</span>
+                                    <span class="helper"> Set user role(s)</span>
                                 </label>
                                 <label class="wr-input-control radio light" rel="assetfilter">
                                     <input id="users-radio-btn" type="radio"
                                            name="select-users-radio-btn"
                                            class="select-users-radio"/>
-                                    <span class="helper">&nbsp;Set user(s)</span>
+                                    <span class="helper"> Set user(s)</span>
                                 </label>
                             </div>
                             <div id="user-roles-select-field" class="select-users">
@@ -223,12 +223,12 @@
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-is-back-btn="true" data-current="policy-criteria"
                                data-next="policy-profile">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-criteria" data-next="policy-naming"
                                data-validate="false">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Continue
                             </a>
                         </div>
                     </div>
@@ -254,9 +254,9 @@
                         <div class="wr-advance-operations">
                             <div class="wr-advance-operations-init">
                                 <br>
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                                 <i class="fw fw-settings fw-spin fw-2x"></i>
-                                &nbsp;&nbsp;&nbsp;
+
                                 Loading platform features . . .
                                 <br>
                                 <br>
@@ -266,12 +266,12 @@
                             <a href="javascript:window.history.back()"
                                class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-profile" data-next="policy-platform">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-profile" data-next="policy-criteria"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                    Continue
                             </a>
                         </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.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 24f36a7b6..2c4e3a3f8 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
@@ -86,7 +86,7 @@
                 <span id="notifications-icon" class="icon fw-stack hidden">
                     <i class="fw fw-notification fw-stack-1x"></i>
                 </span>
-                <span id="notifications-spacer" class="hidden">&nbsp;</span>
+                <span id="notifications-spacer" class="hidden"> </span>
                 <span class="text-capitalize">Notifications</span>
             </a>
         </li>
@@ -105,7 +105,7 @@
                     <i class="fw fw-ring fw-stroke fw-stack-2x"></i>
                     <i class="fw fw-notification fw-stack-1x"></i>
                 </span>
-                &nbsp;&nbsp;View All Notifications
+                  View All Notifications
             </a>
         </div>
     </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/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
index 8e2b80c9f..5a58bf3d3 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
@@ -10,6 +10,7 @@
     "adminService":"%https.ip%",
     "idPServer":"%https.ip%",
     "callBackUrl":"%https.ip%/mdm-admin",
+    "enableEval":true,
     "oauthProvider": {
         "appRegistration": {
             "appType": "webapp",
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
index f3d3b75ef..6a20d5ec2 100644
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk and b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk differ
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs
index c4a0944ad..fc528dbb3 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs
@@ -52,6 +52,7 @@ under the License. --}}
             </div>
         </div>
     </div>
+    {{#if enableEval}}
     <div class="row">
         <div class="col-md-4 wr-text">
             <div class="wr-buttons text-center">
@@ -65,4 +66,5 @@ under the License. --}}
             </div>
         </div>
     </div>
+    {{/if}}
 {{/zone}}
\ 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/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.js
index cdc1d7695..172e04692 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.js
@@ -33,5 +33,6 @@ function onRequest(context) {
     } else {
         viewModel.companyName = companyProps.companyName;
     }
+    viewModel.enableEval = mdmProps.enableEval;
     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/emm-web-agent/app/units/mdm.unit.enrollments.login-box/login-box.hbs 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.enrollments.login-box/login-box.hbs
index 9560b933e..99771dfe1 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.enrollments.login-box/login-box.hbs
+++ 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.enrollments.login-box/login-box.hbs
@@ -51,13 +51,13 @@ under the License. --}}
                 <div class="radio">
                     <label class="input-label">
                         <input type="radio" name="ownership" value="BYOD" checked>
-                        &nbsp; BYOD (This is my own device)
+                          BYOD (This is my own device)
                     </label>
                 </div>
                 <div class="radio">
                     <label class="input-label">
                         <input type="radio" name="ownership" value="COPE">
-                        &nbsp; COPE (This is a corporate device)
+                          COPE (This is a corporate device)
                     </label>
                 </div>
             </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml
index a75356353..c72e5c589 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.url.printer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mobile-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
index 3f88f298a..715beb9df 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>mobile-base-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/mobile-base-plugin/pom.xml b/components/mobile-plugins/mobile-base-plugin/pom.xml
index 42c77bb4f..6adb15891 100644
--- a/components/mobile-plugins/mobile-base-plugin/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index 5766f13e2..2957d4c2a 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index f5350b314..544a5df8a 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
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 208a667a0..83fa341c9 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
@@ -50,7 +50,7 @@ public interface ConfigurationMgtService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
             value = "Getting Windows Platform Configurations",
-            notes = "Get the Windows platform configuration details using this REST API",
+            notes = "Get the Windows platform configuration details using this REST API.",
             response = PlatformConfiguration.class,
             tags = "Windows Configuration Management"
     )
@@ -74,16 +74,16 @@ public interface ConfigurationMgtService {
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Applications can be blacklisted via the application restriction policy too.."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n Th resource to be deleted does not exist."),
             @ApiResponse(
                     code = 406,
-                    message = "Not Acceptable.\n The requested media type is not supported"),
+                    message = "Not Acceptable.\n The requested media type is not supported."),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n Server error occurred while fetching Windows platform configuration.")
+                    message = "Internal Server Error. \n Server error occurred while fetching the Windows platform configuration.")
     })
     @Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
     PlatformConfiguration getConfiguration() throws WindowsConfigurationException;
@@ -100,14 +100,14 @@ public interface ConfigurationMgtService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Updating Windows Platform Configuration.",
+            value = "Updating Windows Platform Configurations",
             notes = "Update the Windows platform configurations using this REST API.",
             tags = "Windows Configuration Management"
     )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Windows platform configuration has been updated successfully",
+                    message = "OK. \n Successfully updated the Windows platform configurations.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -121,25 +121,28 @@ public interface ConfigurationMgtService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 400,
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while modifying Windows platform configuration.")
+                            "Server error occurred while modifying the Windows platform configurations.")
     })
     @Permission(name = "Manage Configurations", permission = "/device-mgt/configurations/manage")
-    Message updateConfiguration( @ApiParam(name = "configuration",
-            value = "PlatformConfiguration")PlatformConfiguration configuration) throws WindowsConfigurationException;
+    Message updateConfiguration
+    ( @ApiParam(
+            name = "configuration",
+            value = "The properties to update the Windows platform configurations.")
+      PlatformConfiguration configuration) throws WindowsConfigurationException;
 
     @GET
     @Path("license")
@@ -147,9 +150,9 @@ public interface ConfigurationMgtService {
     @ApiOperation(
             produces = MediaType.TEXT_PLAIN,
             httpMethod = "GET",
-            value = "Getting the License Agreement for Windows Device Registration",
+            value = "Getting the License Agreement to Register a Windows Device",
             notes = "Use this REST API to retrieve the license agreement that is used for the Windows device " +
-                    "registration process",
+                    "registration process.",
             response = String.class,
             tags = "Windows Configuration Management")
     @ApiResponses(value = {
@@ -167,27 +170,29 @@ public interface ConfigurationMgtService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests."),
                     }),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be deleted does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 406,
-                    message = "Not Acceptable.\n The requested media type is not supported"),
+                    message = "Not Acceptable.\n The requested media type is not supported."),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n Server error occurred while fetching Windows license configuration.")
+                    message = "Internal Server Error. \n Server error occurred while fetching the Windows license configuration.")
     })
     @Permission(name = "Enroll Device", permission = "/device-mgt/devices/enroll/windows")
     Response getLicense(
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince) throws WindowsConfigurationException;
 
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
index dba43662b..d3053aaca 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Windows UI</name>
     <packaging>pom</packaging>
 
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index 638a5e26d..e4199de38 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -38,12 +38,10 @@
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">STEP 01</span>&nbsp;&nbsp;&nbsp;Windows Mobile.</li>
-        <li class="padding-top-double"><span class="circle">STEP 02</span>&nbsp;&nbsp;&nbsp;Go ahead and click [Enroll
-                                                                          Device].
+        <li class="padding-top-double"><span class="circle">STEP 01</span>   Windows Mobile.</li>
+        <li class="padding-top-double"><span class="circle">STEP 02</span>   Go ahead and click [Enroll Device].
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed to [Prepare]
-                                                                          section.
+        <li class="padding-top-double"><span class="circle">STEP 03</span>   Proceed to [Prepare] section.
         </li>
     </ul>
     <br>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
index ef310a9fd..8f31df6e7 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/mobile-plugins/windows-plugin/pom.xml b/components/mobile-plugins/windows-plugin/pom.xml
index aa7991693..260ea5f4f 100644
--- a/components/mobile-plugins/windows-plugin/pom.xml
+++ b/components/mobile-plugins/windows-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
index 6c5c2eb19..2e1aa54bb 100644
--- a/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - App management MDM OSGI Connector</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for APP management OSGI MDM connection
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
-	    <version>2.2.5-SNAPSHOT</version>
+	    <version>2.2.6-SNAPSHOT</version>
 		<exclusions>
 		     <exclusion>
                         <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index 64ebaa7c5..ecefb8eb0 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extensions-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Extensions</name>
     <url>http://wso2.org</url>
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
index 818ac6c2a..969da2b99 100644
--- a/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>androidsense-plugin-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Android Sense Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/iot-plugins-feature/androidsense-plugin-feature/pom.xml b/features/iot-plugins-feature/androidsense-plugin-feature/pom.xml
index 3b780508e..16c9bc64f 100644
--- a/features/iot-plugins-feature/androidsense-plugin-feature/pom.xml
+++ b/features/iot-plugins-feature/androidsense-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
index 23acbeff7..d24fc1641 100644
--- a/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
+++ b/features/iot-plugins-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>arduino-plugin-feature</artifactId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/iot-plugins-feature/arduino-plugin-feature/pom.xml b/features/iot-plugins-feature/arduino-plugin-feature/pom.xml
index 4dec50f75..ceb924fb6 100644
--- a/features/iot-plugins-feature/arduino-plugin-feature/pom.xml
+++ b/features/iot-plugins-feature/arduino-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>iot-plugins-feature</artifactId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/iot-plugins-feature/iot-analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml b/features/iot-plugins-feature/iot-analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
index 08945d8f7..b9f36c5fa 100644
--- a/features/iot-plugins-feature/iot-analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Analytics Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/iot-plugins-feature/iot-analytics-feature/pom.xml b/features/iot-plugins-feature/iot-analytics-feature/pom.xml
index f47b1273f..96e5ec905 100644
--- a/features/iot-plugins-feature/iot-analytics-feature/pom.xml
+++ b/features/iot-plugins-feature/iot-analytics-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index 88af0ea81..5ae74a97c 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-base-plugin-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.adapter.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - IoT Device Management Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the adapter bundles required for IoT Server</description>
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
index 88c0f19e8..83e8a19c9 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
@@ -23,14 +23,14 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>iot-base-plugin-feature</artifactId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.device.mgt.iot.feature</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.5-SNAPSHOT</version>
+	<version>2.2.6-SNAPSHOT</version>
 	<name>WSO2 Carbon - IoT Device Management Feature</name>
 	<url>http://wso2.org</url>
 	<description>This feature contains the core bundles required for IoT Server</description>
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/pom.xml
index 868da237a..9e0e6a20f 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-base-plugin-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management IoT Base Plugin Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/iot-plugins-feature/iot-devicetypes-feature/org.wso2.carbon.device.mgt.iot.devicetypes.feature/pom.xml b/features/iot-plugins-feature/iot-devicetypes-feature/org.wso2.carbon.device.mgt.iot.devicetypes.feature/pom.xml
index 28e24aaec..73a4199b7 100644
--- a/features/iot-plugins-feature/iot-devicetypes-feature/org.wso2.carbon.device.mgt.iot.devicetypes.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-devicetypes-feature/org.wso2.carbon.device.mgt.iot.devicetypes.feature/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-devicetypes-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
diff --git a/features/iot-plugins-feature/iot-devicetypes-feature/pom.xml b/features/iot-plugins-feature/iot-devicetypes-feature/pom.xml
index bc6f81c2b..01efc3c2e 100644
--- a/features/iot-plugins-feature/iot-devicetypes-feature/pom.xml
+++ b/features/iot-plugins-feature/iot-devicetypes-feature/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
diff --git a/features/iot-plugins-feature/pom.xml b/features/iot-plugins-feature/pom.xml
index 946c20510..facb07736 100644
--- a/features/iot-plugins-feature/pom.xml
+++ b/features/iot-plugins-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-plugins-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
index 7bcaf83b8..3c5c9bc53 100644
--- a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>raspberrypi-plugin-feature</artifactId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/pom.xml b/features/iot-plugins-feature/raspberrypi-plugin-feature/pom.xml
index 187004c18..009c88ef7 100644
--- a/features/iot-plugins-feature/raspberrypi-plugin-feature/pom.xml
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
index 6e9ca1138..244280034 100644
--- a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>2.2.5-SNAPSHOT</version>
+		<version>2.2.6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/pom.xml
index 010b3d3f0..96f6950e2 100644
--- a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/pom.xml
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
index 125250e9f..7ebfa01a6 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>android-plugin-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Android Device Management Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Android Device Management
diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
index 6ed946bdd..0bcf194b0 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>android-plugin-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Android Plugin Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
index 4444651f4..fa3357f16 100644
--- a/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
+++ b/features/mobile-plugins-feature/mobile-base-plugin-feature/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-base-plugin-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Device Management Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Mobile Device Management functionality
diff --git a/features/mobile-plugins-feature/mobile-base-plugin-feature/pom.xml b/features/mobile-plugins-feature/mobile-base-plugin-feature/pom.xml
index e6092b147..351687883 100644
--- a/features/mobile-plugins-feature/mobile-base-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/mobile-base-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-base-plugin-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management EMM Base Plugin Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml
index c81d3aeae..3d9e95608 100644
--- a/features/mobile-plugins-feature/pom.xml
+++ b/features/mobile-plugins-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-plugins-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
     <url>http://wso2.org</url>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
index 56ad700f0..984a66650 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>windows-plugin-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.windows.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Windows Device Management Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Windows Device Management
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/pom.xml b/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
index d0e599a69..c0253fbf2 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins-feature</artifactId>
-        <version>2.2.5-SNAPSHOT</version>
+        <version>2.2.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>windows-plugin-feature</artifactId>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Windows Plugin Feature</name>
     <url>http://wso2.org</url>
diff --git a/pom.xml b/pom.xml
index 38b98cb77..ec4c16cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
     <artifactId>carbon-device-mgt-plugins-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.5-SNAPSHOT</version>
+    <version>2.2.6-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Plugins Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Management Plugins Parent</description>
@@ -1169,7 +1169,7 @@
         <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.9</carbon.kernel.version>
+        <carbon.kernel.version>4.4.10</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1202,7 +1202,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>1.2.6-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version>1.2.6</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>
 
 
@@ -1210,7 +1210,7 @@
         <carbon.appmgt.version>1.2.5</carbon.appmgt.version>
 
         <!-- Carbon Device Management Plugins -->
-        <carbon.devicemgt.plugins.version>2.2.5-SNAPSHOT</carbon.devicemgt.plugins.version>
+        <carbon.devicemgt.plugins.version>2.2.6-SNAPSHOT</carbon.devicemgt.plugins.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>