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 89059bcd6d..06019e1b83 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 1ea53b191a..1f9b95d49f 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 fc96f1cbb9..64d5287227 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/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 2f94c0533d..f626daf848 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 a3ff058d7f..2122884976 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 921db639f8..120ff49503 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/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 ca52690eb0..f73c15c706 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 41d8323317..67ba193b1a 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/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 9b6cf69dce..d881228b80 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 0d8131939c..8fc564c750 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 52bc44c842..0a49db9aef 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/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 01fd580631..bc4a3f42c1 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 b810eb3993..583e332f7a 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 dc3b01e3d5..1b026619ea 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/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 bba71218cf..d607d38759 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 fe04c3ce67..8d2cbf4d53 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 93e2e0a2fc..164d42e14d 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/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 3662eb6b1d..30b859b1ab 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 03cca30a02..39d88a7176 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
@@ -51,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}}
@@ -65,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}}
@@ -76,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}}
@@ -100,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}}
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 877ef2e471..b534033476 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>
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 887bad097c..544dc23d75 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 673806e89f..9c775634e2 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.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 8448b3f9d4..14c96fee62 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>
@@ -247,7 +247,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>
@@ -291,7 +291,7 @@
                             <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>
@@ -346,7 +346,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>
@@ -481,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>-->
@@ -525,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>-->
@@ -555,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 14a1df933d..901ba1cc08 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/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 cae0506283..3e6daf9300 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
@@ -105,7 +105,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>
@@ -117,7 +117,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>
@@ -266,7 +266,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>
@@ -314,7 +314,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>
@@ -370,7 +370,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>
@@ -506,7 +506,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>-->
@@ -550,7 +550,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>-->
@@ -580,7 +580,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.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 b856980b0a..03ed956482 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
@@ -105,7 +105,7 @@
                                    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>
@@ -117,7 +117,7 @@
                                    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>
@@ -264,7 +264,7 @@
                                    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
+                                   Allow use of camera
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -312,7 +312,7 @@
                                    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
+                                   Enable storage-encryption
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -371,7 +371,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>
@@ -506,7 +506,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>-->
@@ -550,7 +550,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>-->
@@ -580,7 +580,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/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 8de0db99ad..be3b63245b 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
@@ -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>
@@ -252,7 +252,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>
@@ -300,7 +300,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>
@@ -390,7 +390,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>-->
@@ -434,7 +434,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>-->
@@ -464,7 +464,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/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 99e4429cc2..cba2e62203 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
@@ -141,7 +141,7 @@
                             <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>
@@ -154,7 +154,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>
@@ -166,7 +166,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>
@@ -377,7 +377,7 @@
                             <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>
@@ -389,7 +389,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>
@@ -402,7 +402,7 @@
                                    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
+                                   Enable Service Provider Roaming
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -414,7 +414,7 @@
                                    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
+                                   Auto Join
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -522,7 +522,7 @@
                                        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
+                                       Allow Proxy PAC Fallback
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                             </label>
@@ -588,7 +588,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/>
@@ -596,7 +596,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/>
@@ -604,7 +604,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/>
@@ -612,7 +612,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/>
@@ -620,7 +620,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/>
@@ -628,7 +628,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/>
@@ -636,7 +636,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>
@@ -674,7 +674,7 @@
                                            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
+                                   One Time Password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -696,7 +696,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>
@@ -763,7 +763,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>
@@ -824,7 +824,7 @@
                                            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
+                                   Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -837,7 +837,7 @@
                                            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
+                                   Require TLS Certificate
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 </label>
@@ -888,7 +888,7 @@
                                                    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
+                                           Use existing PAC for EAP-FAST
                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                     </span>
                                         </label>
@@ -902,7 +902,7 @@
                                                            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
+                                                   Allow PAC Provisioning
                                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                             </span>
                                                 </label>
@@ -918,7 +918,7 @@
                                                                    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
+                                                           Allow Anonymous PAC Provisioning
                                                         <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                     </span>
                                                         </label>
@@ -975,7 +975,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>
@@ -1041,7 +1041,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>
@@ -1106,7 +1106,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>
@@ -1266,7 +1266,7 @@
                                    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
+                                   Prevent Move
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1278,7 +1278,7 @@
                                    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
+                                   Prevent App Sheet
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1290,7 +1290,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>
@@ -1329,7 +1329,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>
@@ -1342,7 +1342,7 @@
                                    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
+                                   Allow Recent Address syncing
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1371,7 +1371,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>
@@ -1452,7 +1452,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>
@@ -1504,7 +1504,7 @@
                                    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
+                                   Outgoing password same as incoming password
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1568,7 +1568,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>
@@ -1640,7 +1640,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>
@@ -1753,7 +1753,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>
@@ -1795,7 +1795,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>
@@ -1928,7 +1928,7 @@
                                    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 )
+                                   Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -2047,7 +2047,7 @@
                                    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>
@@ -2123,7 +2123,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>
@@ -2294,7 +2294,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>
@@ -2421,7 +2421,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>
@@ -2434,7 +2434,7 @@
                                                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
+                                               Allow Chat
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2448,7 +2448,7 @@
                                                data-default="true" 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>
@@ -2462,7 +2462,7 @@
                                                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 )
+                                               Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2476,7 +2476,7 @@
                                                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
+                                               Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2491,7 +2491,7 @@
                                                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>
@@ -2506,7 +2506,7 @@
                                                        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
+                                                       Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2521,7 +2521,7 @@
                                                        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
+                                                       Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2536,7 +2536,7 @@
                                                        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 )
+                                                       Allow Siri to query user-generated content from web ( Supervised only )
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -2552,7 +2552,7 @@
                                                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 )
+                                               Allow modifying account settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2567,7 +2567,7 @@
                                                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 )
+                                               Allow modifying cellular data app settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2581,7 +2581,7 @@
                                                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 )
+                                               Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2595,7 +2595,7 @@
                                                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 )
+                                               Enable iBookStore Erotica ( Supervised only prior to iOS 6.1 )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2609,7 +2609,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>
@@ -2623,7 +2623,7 @@
                                                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
+                                               Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2637,7 +2637,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>
@@ -2652,7 +2652,7 @@
                                                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>
@@ -2666,7 +2666,7 @@
                                                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
+                                               Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2680,7 +2680,7 @@
                                                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
+                                               Allow iCloud documents and data
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2694,7 +2694,7 @@
                                                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
+                                               Allow iCloud keychain
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2709,7 +2709,7 @@
                                                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
+                                               Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2724,7 +2724,7 @@
                                                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
+                                               Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2739,7 +2739,7 @@
                                                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
+                                               Allow enterprise books data sync
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2754,7 +2754,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would automatically submit diagnostic reports to Apple.">
-                                            &nbsp;&nbsp;&nbsp;Allow diagnostic submission
+                                               Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2768,7 +2768,7 @@
                                                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
+                                               Allow explicit content
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2783,7 +2783,7 @@
                                                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>
@@ -2798,7 +2798,7 @@
                                                checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would prevent Touch ID from unlocking a device.">
-                                            &nbsp;&nbsp;&nbsp;Allow fingerprint for unlock
+                                               Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2813,7 +2813,7 @@
                                                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
+                                               Allow global background fetch when roaming
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2828,7 +2828,7 @@
                                                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
+                                               Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2843,7 +2843,7 @@
                                                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
+                                               Show Notifications Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2857,7 +2857,7 @@
                                                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
+                                               Show Today view in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2871,7 +2871,7 @@
                                                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 )
+                                               Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2886,7 +2886,7 @@
                                                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
+                                               Allow documents from managed sources in unmanaged destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2901,7 +2901,7 @@
                                                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
+                                               Allow documents from unmanaged sources in managed destinations
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2915,7 +2915,7 @@
                                                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
+                                               Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2929,7 +2929,7 @@
                                                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
+                                               Show Passbook notifications in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2943,7 +2943,7 @@
                                                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
+                                               Allow Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2957,7 +2957,7 @@
                                                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
+                                               Allow Shared Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2972,7 +2972,7 @@
                                                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
+                                               Allow user prompted profile installation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2986,7 +2986,7 @@
                                                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
+                                               Allow untrusted TLS prompt
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -2999,7 +2999,7 @@
                                                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>
@@ -3012,7 +3012,7 @@
                                                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>
@@ -3026,7 +3026,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>
@@ -3040,7 +3040,7 @@
                                                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
+                                               Limit ad tracking
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3055,7 +3055,7 @@
                                                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
+                                               Force a pairing password for Airplay outgoing requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3070,7 +3070,7 @@
                                                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
+                                               Force a pairing password for Airplay incoming requests
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3085,7 +3085,7 @@
                                                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 )
+                                               Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3100,7 +3100,7 @@
                                                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>
@@ -3115,7 +3115,7 @@
                                                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 )
+                                               Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3130,7 +3130,7 @@
                                                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>
@@ -3143,7 +3143,7 @@
                                                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>
@@ -3157,7 +3157,7 @@
                                                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 )
+                                               Allow predictive keyboard ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3171,7 +3171,7 @@
                                                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 )
+                                               Allow keyboard auto-correction ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3185,7 +3185,7 @@
                                                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 )
+                                               Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3206,7 +3206,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>
@@ -3220,7 +3220,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>
@@ -3234,7 +3234,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>
@@ -3249,7 +3249,7 @@
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Safari AutoFill feature in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable AutoFill
+                                                       Enable AutoFill
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3264,7 +3264,7 @@
                                                        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
+                                                       Force Fraud warning
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3279,7 +3279,7 @@
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Javascript on Safari in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable Javascript
+                                                       Enable Javascript
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3294,7 +3294,7 @@
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would enable Pop-ups on Safari in the device.">
-                                                    &nbsp;&nbsp;&nbsp;Enable Pop-ups
+                                                       Enable Pop-ups
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3328,7 +3328,7 @@
                                                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
+                                               Allow YouTube
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3342,7 +3342,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>
@@ -3356,7 +3356,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>
@@ -3371,7 +3371,7 @@
                                                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
+                                               Allow adding Game Center friends
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3401,7 +3401,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.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 7fb5d63230..337ab455d4 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 cd911ec9b7..15a2663b57 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 24f36a7b66..2c4e3a3f8a 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/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 9560b933ec..99771dfe18 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/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 638a5e26d9..e4199de38a 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>