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 4c4f57fc58..8ca88a0a19 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -48,41 +48,41 @@ var operationModule = function () {
         "LOCK_OPERATION_CODE": "DEVICE_LOCK",
         "UPGRADE_FIRMWARE": "UPGRADE_FIRMWARE",
         "DISALLOW_ADJUST_VOLUME": "DISALLOW_ADJUST_VOLUME",
-        "DISALLOW_CONFIG_BLUETOOTH" : "DISALLOW_CONFIG_BLUETOOTH",
-        "DISALLOW_CONFIG_CELL_BROADCASTS" : "DISALLOW_CONFIG_CELL_BROADCASTS",
-        "DISALLOW_CONFIG_CREDENTIALS" : "DISALLOW_CONFIG_CREDENTIALS",
-        "DISALLOW_CONFIG_MOBILE_NETWORKS" : "DISALLOW_CONFIG_MOBILE_NETWORKS",
-        "DISALLOW_CONFIG_TETHERING" : "DISALLOW_CONFIG_TETHERING",
-        "DISALLOW_CONFIG_VPN" : "DISALLOW_CONFIG_VPN",
-        "DISALLOW_CONFIG_WIFI" : "DISALLOW_CONFIG_WIFI",
-        "DISALLOW_APPS_CONTROL" : "DISALLOW_APPS_CONTROL",
-        "DISALLOW_CREATE_WINDOWS" : "DISALLOW_CREATE_WINDOWS",
-        "DISALLOW_CROSS_PROFILE_COPY_PASTE" : "DISALLOW_CROSS_PROFILE_COPY_PASTE",
-        "DISALLOW_DEBUGGING_FEATURES" : "DISALLOW_DEBUGGING_FEATURES",
-        "DISALLOW_FACTORY_RESET" : "DISALLOW_FACTORY_RESET",
-        "DISALLOW_ADD_USER" : "DISALLOW_ADD_USER",
-        "DISALLOW_INSTALL_APPS" : "DISALLOW_INSTALL_APPS",
-        "DISALLOW_INSTALL_UNKNOWN_SOURCES" : "DISALLOW_INSTALL_UNKNOWN_SOURCES",
-        "DISALLOW_MODIFY_ACCOUNTS" : "DISALLOW_MODIFY_ACCOUNTS",
-        "DISALLOW_MOUNT_PHYSICAL_MEDIA" : "DISALLOW_MOUNT_PHYSICAL_MEDIA",
-        "DISALLOW_NETWORK_RESET" : "DISALLOW_NETWORK_RESET",
-        "DISALLOW_OUTGOING_BEAM" : "DISALLOW_OUTGOING_BEAM",
-        "DISALLOW_OUTGOING_CALLS" : "DISALLOW_OUTGOING_CALLS",
-        "DISALLOW_REMOVE_USER" : "DISALLOW_REMOVE_USER",
-        "DISALLOW_SAFE_BOOT" : "DISALLOW_SAFE_BOOT",
-        "DISALLOW_SHARE_LOCATION" : "DISALLOW_SHARE_LOCATION",
-        "DISALLOW_SMS" : "DISALLOW_SMS",
-        "DISALLOW_UNINSTALL_APPS" : "DISALLOW_UNINSTALL_APPS",
-        "DISALLOW_UNMUTE_MICROPHONE" : "DISALLOW_UNMUTE_MICROPHONE",
-        "DISALLOW_USB_FILE_TRANSFER" : "DISALLOW_USB_FILE_TRANSFER",
-        "ALLOW_PARENT_PROFILE_APP_LINKING" : "ALLOW_PARENT_PROFILE_APP_LINKING",
-        "ENSURE_VERIFY_APPS" : "ENSURE_VERIFY_APPS",
-        "AUTO_TIME" : "AUTO_TIME",
-        "SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
-        "SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
-        "APPLICATION_OPERATION_CODE" : "APP-RESTRICTION",
-        "SYSTEM_UPDATE_POLICY_CODE" : "SYSTEM_UPDATE_POLICY",
-        "KIOSK_APPS_CODE" : "KIOSK_APPS"
+        "DISALLOW_CONFIG_BLUETOOTH": "DISALLOW_CONFIG_BLUETOOTH",
+        "DISALLOW_CONFIG_CELL_BROADCASTS": "DISALLOW_CONFIG_CELL_BROADCASTS",
+        "DISALLOW_CONFIG_CREDENTIALS": "DISALLOW_CONFIG_CREDENTIALS",
+        "DISALLOW_CONFIG_MOBILE_NETWORKS": "DISALLOW_CONFIG_MOBILE_NETWORKS",
+        "DISALLOW_CONFIG_TETHERING": "DISALLOW_CONFIG_TETHERING",
+        "DISALLOW_CONFIG_VPN": "DISALLOW_CONFIG_VPN",
+        "DISALLOW_CONFIG_WIFI": "DISALLOW_CONFIG_WIFI",
+        "DISALLOW_APPS_CONTROL": "DISALLOW_APPS_CONTROL",
+        "DISALLOW_CREATE_WINDOWS": "DISALLOW_CREATE_WINDOWS",
+        "DISALLOW_CROSS_PROFILE_COPY_PASTE": "DISALLOW_CROSS_PROFILE_COPY_PASTE",
+        "DISALLOW_DEBUGGING_FEATURES": "DISALLOW_DEBUGGING_FEATURES",
+        "DISALLOW_FACTORY_RESET": "DISALLOW_FACTORY_RESET",
+        "DISALLOW_ADD_USER": "DISALLOW_ADD_USER",
+        "DISALLOW_INSTALL_APPS": "DISALLOW_INSTALL_APPS",
+        "DISALLOW_INSTALL_UNKNOWN_SOURCES": "DISALLOW_INSTALL_UNKNOWN_SOURCES",
+        "DISALLOW_MODIFY_ACCOUNTS": "DISALLOW_MODIFY_ACCOUNTS",
+        "DISALLOW_MOUNT_PHYSICAL_MEDIA": "DISALLOW_MOUNT_PHYSICAL_MEDIA",
+        "DISALLOW_NETWORK_RESET": "DISALLOW_NETWORK_RESET",
+        "DISALLOW_OUTGOING_BEAM": "DISALLOW_OUTGOING_BEAM",
+        "DISALLOW_OUTGOING_CALLS": "DISALLOW_OUTGOING_CALLS",
+        "DISALLOW_REMOVE_USER": "DISALLOW_REMOVE_USER",
+        "DISALLOW_SAFE_BOOT": "DISALLOW_SAFE_BOOT",
+        "DISALLOW_SHARE_LOCATION": "DISALLOW_SHARE_LOCATION",
+        "DISALLOW_SMS": "DISALLOW_SMS",
+        "DISALLOW_UNINSTALL_APPS": "DISALLOW_UNINSTALL_APPS",
+        "DISALLOW_UNMUTE_MICROPHONE": "DISALLOW_UNMUTE_MICROPHONE",
+        "DISALLOW_USB_FILE_TRANSFER": "DISALLOW_USB_FILE_TRANSFER",
+        "ALLOW_PARENT_PROFILE_APP_LINKING": "ALLOW_PARENT_PROFILE_APP_LINKING",
+        "ENSURE_VERIFY_APPS": "ENSURE_VERIFY_APPS",
+        "AUTO_TIME": "AUTO_TIME",
+        "SET_SCREEN_CAPTURE_DISABLED": "SET_SCREEN_CAPTURE_DISABLED",
+        "SET_STATUS_BAR_DISABLED": "SET_STATUS_BAR_DISABLED",
+        "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
+        "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
+        "KIOSK_APPS_CODE": "KIOSK_APPS"
     };
 
     // Constants to define Windows Operation Constants
@@ -151,10 +151,8 @@ var operationModule = function () {
                 break;
             case iosOperationConstants["DOMAIN_OPERATION_CODE"]:
                 payload = {
-                    "operation": {
-                        "emailDomains": operationData["emailDomains"],
-                        "webDomains": operationData["webDomains"]
-                    }
+                    "emailDomains": operationPayload["emailDomains"],
+                    "webDomains": operationPayload["webDomains"]
                 };
                 break;
             case iosOperationConstants["RESTRICTIONS_OPERATION_CODE"]:
@@ -1636,7 +1634,6 @@ var operationModule = function () {
                 generatedProfile[operationCode] = payload["operation"];
             }
         }
-        console.log(generatedProfile);
         return generatedProfile;
     };
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index b5c1287dda..5379eb8dbb 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -52,13 +52,13 @@
                                         <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                                         <td style="padding:10px 15px;">
                                             {{#equal deviceView.status "ACTIVE"}}<span><i
-                                                    class="fw fw-ok icon-success"></i>&nbsp;&nbsp;Active</span>{{/equal}}
+                                                    class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
                                             {{#equal deviceView.status "INACTIVE"}}<span><i
-                                                    class="fw fw-warning icon-warning"></i>&nbsp;&nbsp;Inactive</span>{{/equal}}
+                                                    class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                             {{#equal deviceView.status "BLOCKED"}}<span><i
-                                                    class="fw fw-remove icon-danger"></i>&nbsp;&nbsp;Blocked</span>{{/equal}}
+                                                    class="fw fw-remove icon-danger"></i>Blocked</span>{{/equal}}
                                             {{#equal deviceView.status "REMOVED"}}<span><i
-                                                    class="fw fw-delete icon-danger"></i>&nbsp;&nbsp;Removed</span>{{/equal}}
+                                                    class="fw fw-delete icon-danger"></i>Removed</span>{{/equal}}
                                         </td>
                                     </tr>
                                 {{/if}}
@@ -314,7 +314,7 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Policy Compliance
-                                        &nbsp;&nbsp;
+                                        
                                         <span>
                             <a href="javascript:void(0);" id="refresh-policy">
                                 <i class="fw fw-refresh"></i>
@@ -331,7 +331,7 @@
                             </span>
                                             <div id="policy-spinner"
                                                  class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
-                                                <i class="fw fw-settings fw-spin fw-2x"></i>&nbsp;&nbsp;Loading Policy
+                                                <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
                                                 Compliance...
                                             </div>
                                             <div id="policy-list-container">
@@ -364,7 +364,7 @@
                                                 <div id="map-error" class="message message-warning">
                                                     <h4 class="remove-margin">
                                                         <i class="icon fw fw-warning"></i>
-                                                        &nbsp;Device location information is not available.
+                                                        Device location information is not available.
                                                     </h4>
                                                 </div>
                                                 <p class="add-padding-5x"></p>
@@ -388,7 +388,7 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Installed Applications
-                                        &nbsp;&nbsp;
+                                        
                                         <span>
                             <a href="javascript:void(0);" id="refresh-apps">
                                 <i class="fw fw-refresh"></i>