diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index a3b6161f6..d4eec72fa 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -756,13 +756,11 @@ var operationModule = function () {
                     }
                 };
                 break;
-            case iosOperationConstants["DOMAIN_CODE"]:
+            case iosOperationConstants["DOMAIN_OPERATION_CODE"]:
                 operationType = operationTypeConstants["PROFILE"];
                 payload = {
-                    "operation": {
-                        "emailDomains": operationData["emailDomains"],
-                        "webDomains": operationData["webDomains"]
-                    }
+                    "emailDomains": operationData["emailDomains"],
+                    "webDomains": operationData["webDomains"]
                 };
                 break;
             case iosOperationConstants["CELLULAR_OPERATION_CODE"]:
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
index adf9008d4..10fcf82e2 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
@@ -1362,7 +1362,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
index c0fcd1c10..4d326607c 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs
@@ -198,7 +198,7 @@
                                    checked="checked"/>
                             <span class="helper"
                                   title="Determines whether the user is forced to set a passcode.">
-                                &nbsp;&nbsp;&nbsp;Force Passcode
+                                Force Passcode
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -211,7 +211,7 @@
                                    data-key="passcodePolicyAllowSimple" checked="checked"/>
                             <span class="helper"
                                   title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
+                                Allow simple value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -224,7 +224,7 @@
                                    data-key="passcodePolicyRequireAlphanumeric" checked="checked"/>
                             <span class="helper"
                                   title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
+                                Require alphanumeric value
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -429,7 +429,7 @@
                                    data-key="overridePrimary" data-default="true"/>
                             <span class="helper"
                                   title="Specifies whether to send all traffic through the VPN interface. If true, all network traffic is sent over VPN.">
-                                &nbsp;&nbsp;&nbsp;Override Primary
+                                Override Primary
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -441,7 +441,7 @@
                                    onchange="slideDownPaneAgainstValueSet(this, 'vpn-ondemand-config', ['true'])"/>
                             <span class="helper"
                                   title="Check if the VPN connection should be brought up on demand, else leave un-checked.">
-                                &nbsp;&nbsp;&nbsp;On-demand Enabled
+                                On-demand Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -454,12 +454,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 <br>
-                                <a href="#on-demand-match-domains-grid" class="grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -518,12 +518,12 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 <br>
-                                <a href="#on-demand-match-domains-never-grid" class="grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-never-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                     <span class="icon fw-stack">
                                         <i class="fw fw-add fw-stack-1x"></i>
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                     </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -582,12 +582,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 <br>
-                                <a href="#on-demand-match-domains-retry-grid" class="grid-input-add" data-click-event="add-form">
+                                <a href="#on-demand-match-domains-retry-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                    &nbsp;
+                                    
                                     Add Domain
                                 </a>
                             </label>
@@ -649,12 +649,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#vpn-vendor-configs-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#vpn-vendor-configs-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Configuration
                             </a>
                         </label>
@@ -746,7 +746,7 @@
                                        onchange="slideDownPaneAgainstValueSet(this, 'pptp-card-config', ['false'])"/>
                             <span class="helper"
                                   title="Whether to use a token card such as an RSA SecurID card for connecting.">
-                                &nbsp;&nbsp;&nbsp;Token Card Enabled
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -778,7 +778,7 @@
                                 <input id="vpn-pptp-rsa" type="checkbox" class="form-control operationDataKeys"
                                        data-key="pptpRSASecureID" data-default="false"/>
                             <span class="helper" title="Whether RSA Secure ID is enabled.">
-                                &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -789,7 +789,7 @@
                                        data-key="pptpCCPEnabled" data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'pptp-encryption-config', ['true'])"/>
                             <span class="helper" title="Enables encryption on the connection.">
-                                &nbsp;&nbsp;&nbsp;CCP Encryption Enabled
+                                CCP Encryption Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -802,7 +802,7 @@
                                            data-default="false"/>
                                 <span class="helper"
                                       title="Enables encryption on the connection. Using automatic encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Automatic (CCPMPPE40) Encryption Level Enabled
+                                    Automatic (CCPMPPE40) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -814,7 +814,7 @@
                                            data-default="false"/>
                                 <span class="helper"
                                       title="Enables encryption on the connection. Using maximum encryption level.">
-                                    &nbsp;&nbsp;&nbsp;Maximum (CCPMPPE128) Encryption Level Enabled
+                                    Maximum (CCPMPPE128) Encryption Level Enabled
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -843,7 +843,7 @@
                                        onchange="slideDownPaneAgainstValueSet(this, 'l2tp-card-config', ['false'])"/>
                             <span class="helper"
                                   title="Whether to use a token card such as an RSA SecurID card for connecting.">
-                                &nbsp;&nbsp;&nbsp;Token Card Enabled
+                                Token Card Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -875,7 +875,7 @@
                                 <input id="vpn-l2tp-rsa" type="checkbox" class="form-control operationDataKeys"
                                        data-key="l2tpRSASecureID" data-default="false"/>
                             <span class="helper" title="Whether RSA Secure ID is enabled.">
-                                &nbsp;&nbsp;&nbsp;RSA SecureID Enabled
+                                RSA SecureID Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -954,7 +954,7 @@
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ipsec-xauth', ['true'])"/>
                             <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;XAuth Enabled
+                                XAuth Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -978,7 +978,7 @@
                                        data-key="ipsecPromptForVPNPIN" data-default="false"/>
                             <span class="helper"
                                   title="Tells whether to prompt for a PIN when connecting. Used for Cisco IPSec.">
-                                &nbsp;&nbsp;&nbsp;Prompt for VPN PIN
+                                Prompt for VPN PIN
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1116,7 +1116,7 @@
                                        data-default="false"
                                        onchange="slideDownPaneAgainstValueSet(this, 'ikev2-exauth', ['true'])"/>
                             <span class="helper" title="Whether XAuth is enabled.">
-                                &nbsp;&nbsp;&nbsp;Extended Authentication Enabled
+                                Extended Authentication Enabled
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             </label>
@@ -1236,7 +1236,7 @@
                                    data-default="true"/>
                 <span class="helper"
                       title="The Per-App VPN connection starts automatically when the apps linked to this Per-App VPN service initiate network communication, if the value is set to true.">
-                    &nbsp;&nbsp;&nbsp;On Demand Match App Enabled
+                    On Demand Match App Enabled
                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                 </span>
                         </label>
@@ -1248,12 +1248,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#safari-domains-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#safari-domains-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Safari Domain
                             </a>
                         </label>
@@ -1342,12 +1342,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#app-vpn-mappings-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#app-vpn-mappings-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Mapping
                             </a>
                         </label>
@@ -1465,7 +1465,7 @@
                                    data-key="wifiHiddenNetwork" data-default="false"/>
                             <span class="helper"
                                   title="Enable this if target network is not open or broadcasting">
-                                &nbsp;&nbsp;&nbsp;Hidden Network
+                                Hidden Network
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -1477,7 +1477,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>
@@ -1490,7 +1490,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>
@@ -1502,7 +1502,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>
@@ -1614,7 +1614,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>
@@ -1682,7 +1682,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/>
@@ -1690,7 +1690,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/>
@@ -1698,7 +1698,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/>
@@ -1706,7 +1706,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/>
@@ -1714,7 +1714,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/>
@@ -1722,7 +1722,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/>
@@ -1730,7 +1730,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>
@@ -1768,7 +1768,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>
@@ -1784,13 +1784,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                     <br>
-                                    <a href="#wifi-payload-certificate-anchor-uuids-grid" class="grid-input-add"
+                                    <a href="#wifi-payload-certificate-anchor-uuids-grid" class="btn btn-secondary grid-input-add"
                                        data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                        &nbsp;
+                                        
                                         Add Certificate Payload Anchor UUID
                                     </a>
                                 </label>
@@ -1853,13 +1853,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                     <br>
-                                    <a href="#wifi-tls-trusted-server-names-grid" class="grid-input-add"
+                                    <a href="#wifi-tls-trusted-server-names-grid" class="btn btn-secondary grid-input-add"
                                        data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                        &nbsp;
+                                        
                                         Add TLS Trusted Server Certificate Name
                                     </a>
                                 </label>
@@ -1921,7 +1921,7 @@
                                            data-default="true" checked="checked"/>
                             <span class="helper"
                                   title="Allows / disallows a dynamic trust decision by the user. The dynamic trust is the certificate dialogue that appears when a certificate isn't trusted. If this is unchecked, the authentication fails if the certificate isn't already trusted.">
-                                &nbsp;&nbsp;&nbsp;Allow TLS Trust Exceptions
+                                Allow TLS Trust Exceptions
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 </label>
@@ -1934,7 +1934,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>
@@ -1985,7 +1985,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>
@@ -1999,7 +1999,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>
@@ -2014,7 +2014,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>
@@ -2065,13 +2065,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-roaming-consortium-ois-grid" class="grid-input-add"
+                            <a href="#wifi-roaming-consortium-ois-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Roaming Consortium OI
                             </a>
                         </label>
@@ -2135,12 +2135,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-nai-realm-names-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-nai-realm-names-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add NAI Realm Name
                             </a>
                         </label>
@@ -2202,12 +2202,12 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-mcc-and-mncs-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-mcc-and-mncs-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add MCC/MNC Pair
                             </a>
                         </label>
@@ -2369,7 +2369,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>
@@ -2381,7 +2381,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>
@@ -2393,7 +2393,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>
@@ -2432,7 +2432,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>
@@ -2445,7 +2445,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>
@@ -2474,7 +2474,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>
@@ -2556,7 +2556,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>
@@ -2609,7 +2609,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>
@@ -2670,13 +2670,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#airplay-credentials-grid" class="grid-input-add"
+                            <a href="#airplay-credentials-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Credential
                             </a>
                         </label>
@@ -2746,13 +2746,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#airplay-destinations-grid" class="grid-input-add"
+                            <a href="#airplay-destinations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Destination
                             </a>
                         </label>
@@ -2845,13 +2845,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#unmarked-email-domains-grid" class="grid-input-add"
+                            <a href="#unmarked-email-domains-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Unmarked Email Domains
                             </a>
                         </label>
@@ -2909,13 +2909,13 @@
                         <label class="wr-input-label" for="safari-web-domains">
                             Managed Safari Web Domains
                             <br>
-                            <a href="#safari-web-domains-grid" class="grid-input-add"
+                            <a href="#safari-web-domains-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Managed Safari Web Domains
                             </a>
                         </label>
@@ -3034,7 +3034,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>
@@ -3072,13 +3072,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#ldap-search-settings-grid" class="grid-input-add"
+                            <a href="#ldap-search-settings-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Search Setting
                             </a>
                         </label>
@@ -3220,7 +3220,7 @@
                                    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>
@@ -3344,7 +3344,7 @@
                                    data-key="calendarSubscriptionUseSSL" checked="checked"/>
                             <span class="helper"
                                   title="Having this checked, would enable Secure Socket Layer communication.">
-                                &nbsp;&nbsp;&nbsp;Use Secure Socket Layer ( SSL )
+                                Use Secure Socket Layer ( SSL )
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                         </label>
@@ -3417,13 +3417,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#apn-configurations-grid" class="grid-input-add"
+                            <a href="#apn-configurations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add APN Configuration
                             </a>
                         </label>
@@ -3594,13 +3594,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cellular-apn-configurations-grid" class="grid-input-add"
+                            <a href="#cellular-apn-configurations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add APN Configuration
                             </a>
                         </label>
@@ -3730,7 +3730,7 @@
                                                data-key="restrictionsAllowCamera" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable Usage of phone camera in the device">
-                                            &nbsp;&nbsp;&nbsp;Allow use of camera
+                                            Allow use of camera
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3743,7 +3743,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>
@@ -3756,7 +3756,7 @@
                                                data-key="restrictionsAllowScreenShot" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow taking screenshots in the device">
-                                            &nbsp;&nbsp;&nbsp;Allow screenshots
+                                            Allow screenshots
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3769,7 +3769,7 @@
                                                data-key="restrictionsAllowAirDrop" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow AirDrop feature in the device. Available only in iOS 7.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow AirDrop ( Supervised only )
+                                            Allow AirDrop ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3782,7 +3782,7 @@
                                                data-key="restrictionsAllowVoiceDialing" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow voice dialing feature in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow voice dialing while device is locked
+                                            Allow voice dialing while device is locked
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3796,7 +3796,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable Siri as assistant in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow Siri
+                                            Allow Siri
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3811,7 +3811,7 @@
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would allow Siri as assistant while device is locked. Available only in iOS 5.1 and later.">
-                                                    &nbsp;&nbsp;&nbsp;Allow Siri while device is locked
+                                                    Allow Siri while device is locked
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3826,7 +3826,7 @@
                                                        checked="checked"/>
                                                 <span class="helper"
                                                       title="Having this checked would force use of Siri profanity filter.">
-                                                    &nbsp;&nbsp;&nbsp;Force use of Siri profanity filter
+                                                    Force use of Siri profanity filter
                                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                                 </span>
                                             </label>
@@ -3841,7 +3841,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>
@@ -3857,7 +3857,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>
@@ -3871,7 +3871,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>
@@ -3884,7 +3884,7 @@
                                                data-key="restrictionsAllowBookstore" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iBookStore in the device. Available in iOS 6.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Enable iBookStore ( Supervised only )
+                                            Enable iBookStore ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3898,7 +3898,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>
@@ -3912,7 +3912,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>
@@ -3925,7 +3925,7 @@
                                                data-key="restrictionsAllowAppRemoval" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow removal of apps in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow removing apps
+                                            Allow removing apps
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3939,7 +3939,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>
@@ -3953,7 +3953,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would force iTunes store password in the device.">
-                                            &nbsp;&nbsp;&nbsp;Require iTunes store password for all purchases
+                                            Require iTunes store password for all purchases
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3966,7 +3966,7 @@
                                                data-key="restrictionsAllowCloudBackup" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would enable iCloud backup in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow iCloud backup
+                                            Allow iCloud backup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -3980,7 +3980,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>
@@ -3994,7 +3994,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>
@@ -4008,7 +4008,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow managed apps in the device to store data in iCloud.">
-                                            &nbsp;&nbsp;&nbsp;Allow managed apps to store data in iCloud
+                                            Allow managed apps to store data in iCloud
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4022,7 +4022,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would allow backup of enterprise books in the device.">
-                                            &nbsp;&nbsp;&nbsp;Allow backup of enterprise books
+                                            Allow backup of enterprise books
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4036,7 +4036,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>
@@ -4050,7 +4050,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this checked would automatically submit diagnostic reports to Apple.">
-                                            &nbsp;&nbsp;&nbsp;Allow diagnostic submission
+                                            Allow diagnostic submission
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4064,7 +4064,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>
@@ -4078,7 +4078,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, changes to Find My Friends are disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Find My Friends modification
+                                            Allow Find My Friends modification
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4092,7 +4092,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would prevent Touch ID from unlocking a device.">
-                                            &nbsp;&nbsp;&nbsp;Allow fingerprint for unlock
+                                            Allow fingerprint for unlock
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4107,7 +4107,7 @@
                                                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>
@@ -4121,7 +4121,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would prevent Control Center from appearing on the Lock screen. Available in iOS 7 and later.">
-                                            &nbsp;&nbsp;&nbsp;Show Control Center in lock screen
+                                            Show Control Center in lock screen
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4135,7 +4135,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>
@@ -4149,7 +4149,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>
@@ -4162,7 +4162,7 @@
                                                data-key="restrictionsAllowHostPairing" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="Having this unchecked would disable host pairing with the exception of the supervision host. If no supervision host certificate has been configured, all pairing is disabled. Host pairing lets the administrator control which devices an iOS 7 device can pair with. Available only in iOS 7.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow Host Pairing ( Supervised only )
+                                            Allow Host Pairing ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4176,7 +4176,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>
@@ -4190,7 +4190,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>
@@ -4203,7 +4203,7 @@
                                                data-key="restrictionsAllowOTAPKIUpdates" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, over-the-air PKI updates are disabled. Setting this restriction to false does not disable CRL and OCSP checks. Available only in iOS 7.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow over-the-air PKI updates
+                                            Allow over-the-air PKI updates
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4217,7 +4217,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>
@@ -4230,7 +4230,7 @@
                                                data-key="restrictionsAllowPhotoStream" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Photo Stream is disabled. Available only in iOS 5.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow Photo Stream
+                                            Allow Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4243,7 +4243,7 @@
                                                data-key="restrictionsAllowSharedStream" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Shared Photo Stream will be disabled. Available only in iOS 6.0 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow Shared Photo Stream
+                                            Allow Shared Photo Stream
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4258,7 +4258,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>
@@ -4272,7 +4272,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>
@@ -4286,7 +4286,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, video conferencing is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow video conferencing
+                                            Allow video conferencing
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4299,7 +4299,7 @@
                                                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>
@@ -4313,7 +4313,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>
@@ -4327,7 +4327,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>
@@ -4342,7 +4342,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>
@@ -4357,7 +4357,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>
@@ -4371,7 +4371,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, “Erase All Content And Settings” option in the Reset UI is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Erase All Content And Settings ( Supervised only )
+                                            Allow Erase All Content And Settings ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4385,7 +4385,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Spotlight will not return Internet search results.">
-                                            &nbsp;&nbsp;&nbsp;Allow Spotlight Internet results ( Supervised only )
+                                            Allow Spotlight Internet results ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4399,7 +4399,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, “Enable Restrictions” option in the Restrictions UI in Settings is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Enable Restrictions option ( Supervised only )
+                                            Allow Enable Restrictions option ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4413,7 +4413,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, Activity Continuation will be disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow Activity Continuation
+                                            Allow Activity Continuation
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4427,7 +4427,7 @@
                                                data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, definition lookup is disabled.">
-                                            &nbsp;&nbsp;&nbsp;Allow definition lookup
+                                            Allow definition lookup
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4441,7 +4441,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>
@@ -4455,7 +4455,7 @@
                                                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>
@@ -4468,7 +4468,7 @@
                                                data-key="restrictionsAllowSpellCheck" data-default="true" checked="checked"/>
                                         <span class="helper"
                                               title="When unchecked, keyboard spell-check is disabled. Available in iOS 8.1.3 and later.">
-                                            &nbsp;&nbsp;&nbsp;Allow keyboard spell-check ( Supervised only )
+                                            Allow keyboard spell-check ( Supervised only )
                                             <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                         </span>
                                     </label>
@@ -4489,7 +4489,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>
@@ -4503,7 +4503,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>
@@ -4517,7 +4517,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>
@@ -4532,7 +4532,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>
@@ -4547,7 +4547,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>
@@ -4562,7 +4562,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>
@@ -4577,7 +4577,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>
@@ -4611,7 +4611,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>
@@ -4625,7 +4625,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>
@@ -4639,7 +4639,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>
@@ -4654,7 +4654,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>
@@ -4679,12 +4679,12 @@
                                         </span>
                                         <br>
                                         <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid"
-                                           class="grid-input-add" data-click-event="add-form">
+                                           class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                             <span class="icon fw-stack">
                                                 <i class="fw fw-add fw-stack-1x"></i>
                                                 <i class="fw fw-ring fw-stack-2x"></i>
                                             </span>
-                                            &nbsp;
+                                            
                                             Add Application Bundle ID
                                         </a>
                                     </label>
@@ -4788,13 +4788,13 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add"
+                            <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                 </span>
-                                &nbsp;
+                                
                                 Add Application
                             </a>
                         </label>
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 9b900c633..03be4923b 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
@@ -327,7 +327,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>