diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index bbaf402251..c7de8aac7e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -86,7 +86,7 @@
                 {{#if deviceCount}}
                     <div id="loading-content" class="col-centered">
                         <i class="fw fw-settings fw-spin fw-2x"></i>
-                        &nbsp;&nbsp;&nbsp;
+
                         Loading devices . . .
                         <br>
                     </div>
@@ -196,11 +196,11 @@
                                 <div id="user-groups">Loading...</div>
                                 <div class="buttons">
                                     <a href="#" id="group-device-yes-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Assign&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Assign
                                     </a>
-                                    &nbsp;&nbsp;
+
                                     <a href="#" id="group-device-cancel-link" class="btn-operations btn-default">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Cancel
                                     </a>
                                 </div>
                             </div>
@@ -243,11 +243,11 @@
                     <div class="modal-footer">
                         <div class="buttons">
                             <a href="#" id="remove-device-yes-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Yes&nbsp;&nbsp;&nbsp;&nbsp;
+                                Yes
                             </a>
-                            &nbsp;&nbsp;
+
                             <a href="#" id="remove-device-cancel-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                Cancel
                             </a>
                         </div>
                     </div>
@@ -289,11 +289,11 @@
                     <div class="modal-footer">
                         <div class="buttons">
                             <a href="#" id="edit-device-yes-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Rename&nbsp;&nbsp;&nbsp;&nbsp;
+                                Rename
                             </a>
-                            &nbsp;&nbsp;
+
                             <a href="#" id="edit-device-cancel-link" class="btn-operations">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                Cancel
                             </a>
                         </div>
                     </div>
@@ -332,7 +332,7 @@
                                             <br />
                                             <div class="buttons">
                                                 <a href="#" id="device-400-link" class="btn-operations">
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                    Ok
                                                 </a>
                                             </div>
                                         </div>
@@ -348,7 +348,7 @@
                                             <br />
                                             <div class="buttons">
                                                 <a href="#" id="device-403-link" class="btn-operations">
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                    Ok
                                                 </a>
                                             </div>
                                         </div>
@@ -365,11 +365,11 @@
                                             <br />
                                             <div class="buttons">
                                                 <a href="{{@app.context}}/group/add" class="btn-operations">
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;Add New Group&nbsp;&nbsp;&nbsp;&nbsp;
+                                                    Add New Group
                                                 </a>
-                                                &nbsp;&nbsp;
+
                                                 <a href="#" id="cancel-link" class="btn-operations">
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                                    Cancel
                                                 </a>
                                             </div>
                                         </div>
@@ -385,7 +385,7 @@
                                             <br />
                                             <div class="buttons">
                                                 <a href="#" id="remove-device-409-link" class="btn-operations">
-                                                    &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                                    Ok
                                                 </a>
                                             </div>
                                         </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
index bcf105493b..fe9663f24f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
@@ -48,9 +48,9 @@
 
                 <div class="wr-input-control">
                     <button class="wr-btn" id="add-group-btn">
-                        &nbsp;&nbsp;&nbsp;&nbsp;Add&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                        Add</button>
                     <button class="wr-btn" onclick="window.location = '{{@app.context}}/groups';return false;">
-                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                        Cancel</button>
                 </div>
             </div>
         </div>
@@ -64,7 +64,7 @@
                     <br/>
                     <div class="buttons">
                         <a href="#" id="group-unexpected-error-link" class="btn-operations">
-                            &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                            Ok
                         </a>
                     </div>
                 </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
index 6f686d4a5f..7ad04791e1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
@@ -106,11 +106,11 @@
                                 </div>
                                 <div class="buttons">
                                     <a href="#" id="share-group-next-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Next
                                     </a>
-                                    &nbsp;&nbsp;
+
                                     <a href="#" id="share-group-w1-cancel-link" class="btn-operations btn-default">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Cancel
                                     </a>
                                 </div>
                             </div>
@@ -127,11 +127,11 @@
                                 <div id="user-roles">Loading...</div>
                                 <div class="buttons">
                                     <a href="#" id="share-group-yes-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
+                                        OK
                                     </a>
-                                    &nbsp;&nbsp;
+
                                     <a href="#" id="share-group-w2-cancel-link" class="btn-operations btn-default">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Cancel
                                     </a>
                                 </div>
                             </div>
@@ -157,11 +157,11 @@
 
                                 <div class="buttons">
                                     <a href="#" id="remove-group-yes-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Yes&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Yes
                                     </a>
-                                    &nbsp;&nbsp;
+
                                     <a href="#" id="remove-group-cancel-link" class="btn-operations btn-default">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Cancel
                                     </a>
                                 </div>
                             </div>
@@ -200,11 +200,11 @@
                                 </div>
                                 <div class="buttons">
                                     <a href="#" id="edit-group-yes-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Update&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Update
                                     </a>
-                                    &nbsp;&nbsp;
+
                                     <a href="#" id="edit-group-cancel-link" class="btn-operations btn-default">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Cancel
                                     </a>
                                 </div>
                             </div>
@@ -229,7 +229,7 @@
                                 <h3 id="error-msg">Bad Request. Please contact your administrator.</h3>
                                 <div class="buttons">
                                     <a href="#" id="group-400-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Ok
                                     </a>
                                 </div>
                             </div>
@@ -245,7 +245,7 @@
 
                                 <div class="buttons">
                                     <a href="#" id="group-403-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Ok
                                     </a>
                                 </div>
                             </div>
@@ -261,7 +261,7 @@
 
                                 <div class="buttons">
                                     <a href="#" id="group-404-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Ok
                                     </a>
                                 </div>
                             </div>
@@ -277,7 +277,7 @@
 
                                 <div class="buttons">
                                     <a href="#" id="group-409-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Ok
                                     </a>
                                 </div>
                             </div>
@@ -293,7 +293,7 @@
 
                                 <div class="buttons">
                                     <a href="#" id="group-unexpected-error-link" class="btn-operations">
-                                        &nbsp;&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;&nbsp;
+                                        Ok
                                     </a>
                                 </div>
                             </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index d3a5c5cc73..38df533d3e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -436,7 +436,7 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
                     }
                 }
                 str += '<label class="checkbox-text"><input type="checkbox" id="user-role-' + allRoles[i] + '" value="' + allRoles[i]
-                       + '" ' + isChecked + '/>' + allRoles[i] + '</label>&nbsp;&nbsp;&nbsp;&nbsp;';
+                       + '" ' + isChecked + '/>' + allRoles[i] + '</label>';
             }
 
             $('#user-roles').html(str);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index d5cb812ce2..8cc9567359 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -131,14 +131,14 @@ function loadRoles() {
             class: "fade-edge",
             data: "name",
             render: function (name, type, row, meta) {
-                return '<h4>&nbsp;&nbsp;' + name + '&nbsp;role</h4>';
+                return '<h4>' + name + 'role</h4>';
             }
         },
         {
             class: "text-right content-fill text-left-on-grid-view no-wrap",
             data: null,
             render: function (data, type, row, meta) {
-                return '&nbsp;' +
+                return '' +
                     '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
                     'data-click-event="edit-form" ' +
@@ -151,9 +151,9 @@ function loadRoles() {
                     '<i class="fw fw-circle fw-stack-2x"></i><i class="fw fw-edit fw-stack-1x fw-inverse"></i>' +
                     '</span>' +
                     '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">&nbsp;&nbsp;Edit</span>' +
+                    '<span class="hidden-xs hidden-on-grid-view">Edit</span>' +
                     '</a>' +
-                    '&nbsp;<a onclick="javascript:loadRoleBasedActionURL(\'edit-permission\', \'' + data.name + '\')" ' +
+                    '<a onclick="javascript:loadRoleBasedActionURL(\'edit-permission\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
                     'data-click-event="edit-form" ' +
                     'class="btn padding-reduce-on-grid-view edit-permission-link">' +
@@ -165,16 +165,16 @@ function loadRoles() {
                     '<i class="fw fw-circle fw-stack-2x"></i><i class="fw fw-edit fw-stack-1x fw-inverse"></i>' +
                     '</span>' +
                     '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">&nbsp;&nbsp;Edit Permission</span>' +
+                    '<span class="hidden-xs hidden-on-grid-view">Edit Permission</span>' +
                     '</a>' +
-                    '&nbsp;<a data-role="' + data.name + '" ' +
+                    '<a data-role="' + data.name + '" ' +
                     'data-click-event="remove-form" ' +
                     'class="btn padding-reduce-on-grid-view remove-role-link">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-ring fw-stack-2x"></i>' +
                     '<i class="fw fw-delete fw-stack-1x"></i>' +
                     '</span>' +
-                    '<span class="hidden-xs hidden-on-grid-view">&nbsp;&nbsp;Remove</span>' +
+                    '<span class="hidden-xs hidden-on-grid-view">Remove</span>' +
                     '</a>';
             }
         }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs
index 5d64021462..ae0ec631b8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.details/details.hbs
@@ -20,7 +20,7 @@
     <br>
     <br>
     <i class="fw fw-settings fw-spin fw-2x"></i>
-    &nbsp;&nbsp;&nbsp;
+
     Loading Device Details . . .
     <br>
 </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
index ea45adaf37..269f503a52 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
@@ -148,7 +148,7 @@ function loadDevices(searchType, searchParam){
             '<a href="https://docs.wso2.com/display/IoTS100/Quick+Start+Guide" target="_blank" ' +
             'class="btn-operations btn-default"><span class="fw-stack">' +
             '<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-document fw-stack-1x"></i></span>' +
-            '&nbsp;&nbsp;Quick Startup Guide</a></div>');
+            'Quick Startup Guide</a></div>');
     }
 
     $(".icon .text").res_text(0.2);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
index 5a9a302a77..1252ce7565 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
@@ -98,9 +98,9 @@
                                     <div class="panel-body">
                                         <div id="policy-spinner" class="wr-advance-operations-init hidden">
                                             <br>
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                                            &nbsp;&nbsp;&nbsp;
+
                                             Loading Policies . . .
                                             <br>
                                             <br>
@@ -129,9 +129,9 @@
                                         <div id="policy-spinner"
                                              class="wr-advance-operations-init hidden">
                                             <br>
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                                            &nbsp;&nbsp;&nbsp;
+
                                             Loading Policy Compliance . . .
                                             <br>
                                             <br>
@@ -168,9 +168,9 @@
                                         <div id="operations-spinner"
                                              class="wr-advance-operations-init hidden">
                                             <br>
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
                                             <i class="fw fw-settings fw-spin fw-2x"></i>
-                                            &nbsp;&nbsp;&nbsp;
+
                                             Loading Operations Log . . .
                                             <br>
                                             <br>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
index b9b97f1822..c960d9e158 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
@@ -138,12 +138,12 @@
                                         <label class="wr-input-control radio light">
                                             <input id="user-roles-radio-btn" type="radio" name="select-users-radio-btn"
                                                    class="select-users-radio" checked/>
-                                            <span class="helper">&nbsp;Set user role(s)</span>
+                                            <span class="helper">Set user role(s)</span>
                                         </label>
                                         <label class="wr-input-control radio light" rel="assetfilter">
                                             <input id="users-radio-btn" type="radio" name="select-users-radio-btn"
                                                    class="select-users-radio"/>
-                                            <span class="helper">&nbsp;Set user(s)</span>
+                                            <span class="helper">Set user(s)</span>
                                         </label>
                                     </div>
                                     <div id="user-roles-select-field" class="select-users">
@@ -220,9 +220,9 @@
                                 <div class="wr-advance-operations">
                                     <div class="wr-advance-operations-init">
                                         <br>
-                                        &nbsp;&nbsp;
+
                                         <i class="fw fw-settings fw-spin fw-2x"></i>
-                                        &nbsp;Loading platform features . . .
+                                        Loading platform features . . .
                                         <br>
                                         <br>
                                     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
index 1b99826718..e03d228846 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
@@ -19,7 +19,7 @@
 <div class="row wr-device-board">
     <div class="col-lg-12 wr-secondary-bar">
             <span class="page-sub-title">
-                &nbsp;Policy List by priority order
+                Policy List by priority order
             </span>
     </div>
     <div class="row">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
index 60ac43c41e..8d8e73dbb1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
@@ -53,7 +53,7 @@
                       <i class="fw fw-edit fw-stack-1x fw-inverse"></i>
                    </span>
                 </span>
-                            &nbsp;&nbsp;Change password
+                            Change password
                         </h4>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
                                 class="fw fw-cancel"></i></button>
@@ -100,7 +100,7 @@
                     <i class="fw fw-circle fw-stack-2x fw-stroke text-success"></i>
                     <i class="fw fw-check fw-stack-1x fw-inverse"></i>
                 </span>
-                            &nbsp;&nbsp;Password has been successfully updated
+                            Password has been successfully updated
                         </h4>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
                                 class="fw fw-cancel"></i></button>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
index aa18aaf814..3a700a0713 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
@@ -17,7 +17,6 @@
 }}
 
 {{#zone "content"}}
-
     <div id="basic-modal-view" class="hidden modal modal-content">
         <div class="modal-header">
             <h3 class="pull-left modal-title">
@@ -42,8 +41,6 @@
         <div id="modal-footer-content" class="modal-footer">
         </div>
     </div>
-
-
 {{/zone}}
 
 {{#zone "topJs"}}