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 61c0a85ce8..8ad212b5ca 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
@@ -33,7 +33,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>
             <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
@@ -53,7 +53,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>
@@ -66,7 +66,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">
@@ -108,7 +108,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>
@@ -200,7 +200,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>
@@ -237,7 +237,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 4f499fdddf..234a291a51 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
@@ -17,7 +17,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>
             <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
@@ -36,7 +36,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>
@@ -89,7 +89,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>
@@ -180,7 +180,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 b93a5ad1fb..cd911ec9b7 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>