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/create.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/create.hbs
index be01bc306..a3ba6759b 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/create.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/create.hbs
@@ -34,7 +34,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered policy-message hidden">
+                <div class="col-centered policy-message hidden">
                     <div class="wr-form">
                         <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy creation is
                             successful.</h1>
@@ -56,7 +56,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-naming hidden">
+                <div class="col-centered wr-content policy-naming hidden">
                     <div class="wr-form">
                         <h1 id="policy-naming-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                         <hr>
@@ -69,7 +69,7 @@
                                 <div id="policy-naming-main-error-msg" class="alert alert-danger hidden" role="alert">
                                     <i class="icon fw fw-error"></i><span></span>
                                 </div>
-                                <div>
+                                <div class="clearfix">
                                     <label class="wr-input-label">Set a Name for your Policy *</label>
                                     <br/>
                                     <label class="wr-input-label">
@@ -114,7 +114,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-criteria hidden">
+                <div class="col-centered wr-content policy-criteria hidden">
                     <div class="wr-form">
                         <h1 id="policy-criteria-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                         <hr>
@@ -216,7 +216,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-profile hidden">
+                <div class="col-centered wr-content policy-profile hidden">
                     <div class="wr-form">
                         <h1 id="policy-profile-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                         <hr>
@@ -254,7 +254,7 @@
                     &nbsp;&nbsp;&nbsp;Loading policy creation wizard . . .
                     <br><br>
                 </div>
-                <div class="container col-centered wr-content policy-platform hidden">
+                <div class=" col-centered wr-content policy-platform hidden">
                     <div class="wr-form">
                         <h1 id="policy-platform-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                         <hr>
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.edit/edit.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.edit/edit.hbs
index 1dfdd599d..68cce57dd 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.edit/edit.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.edit/edit.hbs
@@ -27,7 +27,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-message hidden">
+                <div class="col-centered wr-content policy-message hidden">
                     <div class="wr-form">
                         <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy is successfully
                             re-configured.</h1>
@@ -48,7 +48,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-naming hidden">
+                <div class="col-centered wr-content policy-naming hidden">
                     <div class="wr-form">
                         <h1 id="policy-naming-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
                         <hr>
@@ -107,7 +107,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-criteria hidden">
+                <div class="col-centered wr-content policy-criteria hidden">
                     <div class="wr-form">
                         <h1 id="policy-criteria-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
                         <hr>
@@ -213,7 +213,7 @@
                     </div>
                 </div>
 
-                <div class="container col-centered wr-content policy-profile">
+                <div class="col-centered wr-content policy-profile">
                     <div class="wr-form">
                         <h1 id="policy-profile-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
                         <hr>
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.wizard/wizard.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.wizard/wizard.hbs
index b93a5ad1f..cd911ec9b 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.wizard/wizard.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.wizard/wizard.hbs
@@ -50,7 +50,7 @@
             </div>
         </div>
 
-        <div class="container col-centered wr-content policy-message hidden">
+        <div class="col-centered wr-content policy-message hidden">
             <div class="wr-form">
                 <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy creation is
                                                                                  successful.</h1>
@@ -72,7 +72,7 @@
             </div>
         </div>
 
-            <div class="container col-centered wr-content policy-naming hidden">
+            <div class="col-centered wr-content policy-naming hidden">
                 <div class="wr-form">
                     <h1 id="policy-naming-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                     <hr>
@@ -135,7 +135,7 @@
             </div>
         </div>
 
-        <div class="container col-centered wr-content policy-criteria hidden">
+        <div class="col-centered wr-content policy-criteria hidden">
             <div class="wr-form">
                 <h1 id="policy-criteria-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                 <hr>
@@ -236,7 +236,7 @@
             </div>
         </div>
 
-        <div class="container col-centered wr-content policy-profile">
+        <div class="col-centered wr-content policy-profile">
             <div class="wr-form">
                 <h1 id="policy-profile-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
                 <hr>