diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.platform.configuration/configuration.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.platform.configuration/configuration.hbs
index 18f621a58d..94522b0bb8 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.platform.configuration/configuration.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.platform.configuration/configuration.hbs
@@ -46,7 +46,6 @@
                                     <div id="general-config-heading" class="panel-heading" role="tab">
                                         <h2 class="sub-title panel-title">
                                             Policy Monitoring
-                                            <hr>
                                         </h2>
                                     </div>
                                     <div id="email-config-body" class="panel-collapse panel-body" role="tabpanel">
@@ -66,7 +65,7 @@
                                         </div>
                                         <div class="wr-input-control wr-btn-grp">
                                             <button id="save-general-btn" class="wr-btn">
-                                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                                Save
                                             </button>
                                         </div>
                                     </div>
@@ -210,7 +209,7 @@
                                             <textarea id="android-eula" type="text" class="form-control"></textarea>
                                         </div>
                                         <div class="wr-input-control wr-btn-grp">
-                                            <button id="save-android-btn" class="wr-btn">&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                            <button id="save-android-btn" class="wr-btn">Save</button>
                                         </div>
                                     </div>
                                 </div>
@@ -422,7 +421,7 @@
                                             <textarea id="ios-eula" type="text" class="form-control"></textarea>
                                         </div>
                                         <div class="wr-input-control wr-btn-grp">
-                                            <button id="save-ios-btn" class="wr-btn">&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                            <button id="save-ios-btn" class="wr-btn">Save</button>
                                         </div>
                                     </div>
                                 </div>
@@ -463,7 +462,7 @@
                                             <textarea id="windows-eula" type="text" class="form-control"></textarea>
                                         </div>
                                         <div class="wr-input-control wr-btn-grp">
-                                            <button id="save-windows-btn" class="wr-btn">&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                            <button id="save-windows-btn" class="wr-btn">Save</button>
                                         </div>
                                     </div>
                                 </div>
@@ -482,7 +481,7 @@
                     <b>"Exit"</b> to complete the process and go back to the dashboard.
                     <hr />
                     <button class="wr-btn" onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to configurations</button>
-                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">Exit</button>
                 </div>
             </div>
             <!-- /content -->