diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
index 1b839d3cdb..7961b2b65b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
@@ -19,38 +19,40 @@
 {{unit "cdmf.unit.ui.title" pageTitle="Login"}}
 
 {{#zone "content"}}
-    <div class="container col-xs-12 col-sm-6 col-md-6 col-lg-3 col-centered wr-content wr-login col-centered">
+    <div class="row">
+        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 col-sm-offset-3 col-md-offset-3 col-lg-offset-4">
 
-        <p class="page-sub-title">Login</p>
-        <hr />
-        {{#if message}}
-            <div class="alert alert-danger" style="padding-right: 15px;">
-                <i class="icon fw fw-warning"></i> {{message}}!
-            </div>
-        {{/if}}
-
-        <div class="panel-body">
-            <form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
-                <div class="form-group">
-                    <label for="username">Username *</label>
-                    <input type="text" name="username" class="form-control" placeholder="Enter your username"
-                           autofocus="autofocus" required="required" />
-                </div>
-                <div class="form-group">
-                    <label for="password">Password *</label>
-                    <input type="password" name="password" class="form-control" placeholder="Enter your password"
-                           required="required" />
+            <p class="page-sub-title">Login</p>
+            <hr />
+            {{#if message}}
+                <div class="alert alert-danger" style="padding-right: 15px;">
+                    <i class="icon fw fw-warning"></i> {{message}}!
                 </div>
-                {{#if referer}}
-                    <input type="hidden" name="referer" value="{{referer}}" />
-                {{/if}}
-                <div class="wr-input-control wr-btn-grp">
-                    <button class="wr-btn btn-download-agent">
-                        Login
-                    </button>
-                    {{defineZone "signInForm-below" scope="protected"}}
-                </div>
-            </form>
+            {{/if}}
+
+            <div class="panel-body">
+                <form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
+                    <div class="form-group">
+                        <label for="username">Username *</label>
+                        <input type="text" name="username" class="form-control" placeholder="Enter your username"
+                               autofocus="autofocus" required="required" />
+                    </div>
+                    <div class="form-group">
+                        <label for="password">Password *</label>
+                        <input type="password" name="password" class="form-control" placeholder="Enter your password"
+                               required="required" />
+                    </div>
+                    {{#if referer}}
+                        <input type="hidden" name="referer" value="{{referer}}" />
+                    {{/if}}
+                    <div class="wr-input-control wr-btn-grp">
+                        <button class="wr-btn btn-download-agent">
+                            Login
+                        </button>
+                        {{defineZone "signInForm-below" scope="protected"}}
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.default.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.default.hbs
index 7ab7c0454c..a67a3e63eb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.default.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.default.hbs
@@ -46,8 +46,10 @@
 <!-- page-content-wrapper -->
 <div class="page-content-wrapper">
     {{defineZone "contentTitle"}}
-    <div class="container-fluid body-wrapper">
-        {{defineZone "content"}}
+    <div class="container-fluid ">
+        <div class="body-wrapper">
+            {{defineZone "content"}}
+        </div>
     </div>
 </div>
 <!-- /page-content-wrapper -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.sign-in.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.sign-in.hbs
index 7cf1821b87..3283927e56 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.sign-in.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.sign-in.hbs
@@ -35,8 +35,10 @@
 
 <!-- page-content-wrapper -->
 <div class="page-content-wrapper">
-    <div class="container-fluid body-wrapper">
-        {{defineZone "content"}}
+    <div class="container-fluid ">
+        <div class="body-wrapper">
+            {{defineZone "content"}}
+        </div>
     </div>
 </div>
 <!-- /page-content-wrapper -->