diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
index 84b616d30a..b094629b97 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/edit.hbs
@@ -39,7 +39,7 @@
                 <hr>
                 <button class="wr-btn wizard-stepper" data-current="policy-message"
                         data-direct="{{@app.context}}/policies/">
-                    &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
+                    View policy list
                 </button>
                 <a href="@{{@app.context}}/policies/add-policy" class="cu-btn-inner">
                         <span class="fw-stack">
@@ -91,19 +91,21 @@
                                 <br class="c-both"/>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-lg-12">
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-naming" data-next="policy-criteria">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="#" class="wr-btn wizard-stepper"
                                data-current="policy-naming-publish" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save & Publish&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save & Publish
                             </a>
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming"
                                data-next="policy-message" data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save
                             </a>
 
                         </div>
@@ -129,13 +131,13 @@
                                     <input id="user-roles-radio-btn" type="radio"
                                            name="select-users-radio-btn" class="select-users-radio"
                                            checked/>
-                                    <span class="helper">&nbsp;Set user role(s)</span>
+                                    <span class="helper"> Set user role(s)</span>
                                 </label>
                                 <label class="wr-input-control radio light" rel="assetfilter">
                                     <input id="users-radio-btn" type="radio"
                                            name="select-users-radio-btn"
                                            class="select-users-radio"/>
-                                    <span class="helper">&nbsp;Set user(s)</span>
+                                    <span class="helper"> Set user(s)</span>
                                 </label>
                             </div>
                             <div id="user-roles-select-field" class="select-users">
@@ -185,11 +187,11 @@
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-criteria" data-next="policy-profile">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                               Back
                             </a>
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-criteria"
                                data-next="policy-naming" data-validate="false">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
@@ -224,7 +226,7 @@
                         <div class="wr-input-control wr-btn-grp">
                             <a href="#" class="wr-btn wizard-stepper" data-current="policy-profile"
                                data-next="policy-criteria" data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
index 5f3040ff2c..ee0be02f1d 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/wizard.hbs
@@ -45,7 +45,7 @@
                 <hr>
                 <button class="wr-btn wizard-stepper" data-current="policy-message"
                         data-direct="{{@app.context}}/policies">
-                    &nbsp;&nbsp;&nbsp;&nbsp;View policy list&nbsp;&nbsp;&nbsp;&nbsp;
+                    View policy list
                 </button>
                 <a href="{{@app.context}}/policies/add-policy" class="cu-btn-inner">
                         <span class="fw-stack">
@@ -97,21 +97,23 @@
                                 <br class="c-both"/>
                             </div>
                         </div>
+                    </div>
+                    <div class="col-lg-12">
                         <div class="wr-input-control wr-btn-grp">
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-is-back-btn="true" data-current="policy-naming"
                                data-next="policy-criteria">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-naming-publish" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save & Publish&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save & Publish
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-naming" data-next="policy-message"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;
+                                Save
                             </a>
                         </div>
                     </div>
@@ -189,12 +191,12 @@
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-is-back-btn="true" data-current="policy-criteria"
                                data-next="policy-profile">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-criteria" data-next="policy-naming"
                                data-validate="false">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                                Continue
                             </a>
                         </div>
                     </div>
@@ -229,12 +231,12 @@
                             <a href="{{@app.context}}/policies/add-policy"
                                class="wr-btn wizard-stepper" data-is-back-btn="true"
                                data-current="policy-profile" data-next="policy-platform">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Back&nbsp;&nbsp;&nbsp;&nbsp;
+                                Back
                             </a>
                             <a href="javascript:void(0)" class="wr-btn wizard-stepper"
                                data-current="policy-profile" data-next="policy-criteria"
                                data-validate="true">
-                                &nbsp;&nbsp;&nbsp;&nbsp;Continue&nbsp;&nbsp;&nbsp;&nbsp;
+                               Continue
                             </a>
                         </div>
                     </div>