diff --git a/src/oauth2views/account_setup.ejs b/src/oauth2views/account_setup.ejs
index c972b3770..8e2302a84 100644
--- a/src/oauth2views/account_setup.ejs
+++ b/src/oauth2views/account_setup.ejs
@@ -15,64 +15,67 @@ app.controller('Controller', ['$scope', function ($scope) {
 
 </script>
 
-<center>
+<div class="layout-content">
+
+  <center>
     <br/>
     <h4>Hello <%= (user && user.email) ? user.email : '' %>, welcome to <%= cloudronName %>.</h4>
     <h2>Setup your account and password.</h2>
-</center>
+  </center>
 
-<div class="container" ng-app="Application" ng-controller="Controller">
+  <div class="container" ng-app="Application" ng-controller="Controller">
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <form action="/api/v1/session/account/setup" method="post" name="setupForm" autocomplete="off" role="form" novalidate>
-                <input type="password" style="display: none;">
-                <input type="hidden" name="_csrf" value="<%= csrf %>"/>
-                <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
+      <div class="col-md-6 col-md-offset-3">
+        <form action="/api/v1/session/account/setup" method="post" name="setupForm" autocomplete="off" role="form" novalidate>
+          <input type="password" style="display: none;">
+          <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
 
-                <center><p class="has-error"><%= error %></p></center>
+          <center><p class="has-error"><%= error %></p></center>
 
 <% if (user && user.username) { %>
-                <div class="form-group"">
-                    <label class="control-label">Username</label>
-                    <input type="text" class="form-control" ng-model="username" name="username" readonly required>
-                </div>
+          <div class="form-group"">
+            <label class="control-label">Username</label>
+            <input type="text" class="form-control" ng-model="username" name="username" readonly required>
+          </div>
 <% } else { %>
-                <div class="form-group" ng-class="{ 'has-error': (setupForm.username.$dirty && setupForm.username.$invalid) }">
-                    <label class="control-label">Username</label>
-                    <div class="control-label" ng-show="setupForm.username.$dirty && setupForm.username.$invalid">
-                        <small ng-show="setupForm.username.$error.minlength">The username is too short</small>
-                        <small ng-show="setupForm.username.$error.maxlength">The username is too long</small>
-                        <small ng-show="setupForm.username.$dirty && setupForm.username.$invalid">Not a valid username</small>
-                    </div>
-                    <input type="text" class="form-control" ng-model="username" name="username" required autofocus>
-                </div>
+          <div class="form-group" ng-class="{ 'has-error': (setupForm.username.$dirty && setupForm.username.$invalid) }">
+            <label class="control-label">Username</label>
+            <div class="control-label" ng-show="setupForm.username.$dirty && setupForm.username.$invalid">
+              <small ng-show="setupForm.username.$error.minlength">The username is too short</small>
+              <small ng-show="setupForm.username.$error.maxlength">The username is too long</small>
+              <small ng-show="setupForm.username.$dirty && setupForm.username.$invalid">Not a valid username</small>
+            </div>
+            <input type="text" class="form-control" ng-model="username" name="username" required autofocus>
+          </div>
 <% } %>
 
-                <div class="form-group">
-                    <label class="control-label">Display Name</label>
-                    <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
-                </div>
+          <div class="form-group">
+            <label class="control-label">Display Name</label>
+            <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
+          </div>
 
-                <div class="form-group" ng-class="{ 'has-error': (setupForm.password.$dirty && setupForm.password.$invalid) }">
-                    <label class="control-label">New Password</label>
-                    <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
-                        <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
-                    </div>
-                    <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required>
-                </div>
+          <div class="form-group" ng-class="{ 'has-error': (setupForm.password.$dirty && setupForm.password.$invalid) }">
+            <label class="control-label">New Password</label>
+            <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
+              <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+            </div>
+            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required>
+          </div>
 
-                <div class="form-group" ng-class="{ 'has-error': (setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
-                    <label class="control-label">Repeat Password</label>
-                    <div class="control-label" ng-show="setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
-                        <small ng-show="setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
-                    </div>
-                    <input type="password" class="form-control" ng-model="passwordRepeat" name="passwordRepeat" required>
-                </div>
+          <div class="form-group" ng-class="{ 'has-error': (setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
+            <label class="control-label">Repeat Password</label>
+            <div class="control-label" ng-show="setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
+              <small ng-show="setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
+            </div>
+            <input type="password" class="form-control" ng-model="passwordRepeat" name="passwordRepeat" required>
+          </div>
 
-                <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="setupForm.$invalid || password !== passwordRepeat"/>
-            </form>
-        </div>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="setupForm.$invalid || password !== passwordRepeat"/>
+        </form>
+      </div>
     </div>
+  </div>
 </div>
 
 <% include footer %>
diff --git a/src/oauth2views/error.ejs b/src/oauth2views/error.ejs
index 598da4824..c65ef66e9 100644
--- a/src/oauth2views/error.ejs
+++ b/src/oauth2views/error.ejs
@@ -2,25 +2,26 @@
 
 <!-- error tester -->
 
-<br/>
+<div class="layout-content">
 
-<div class="container">
+  <div class="container" style="margin-top: 50px;">
     <div class="row">
-        <div class="col-md-2"></div>
-        <div class="col-md-8">
-            <div class="alert alert-danger">
-                <%- message %>
-            </div>
+      <div class="col-md-2"></div>
+      <div class="col-md-8">
+        <div class="alert alert-danger">
+          <%- message %>
         </div>
-        <div class="col-md-2"></div>
+      </div>
+      <div class="col-md-2"></div>
     </div>
     <div class="row">
-        <div class="col-md-2"></div>
-        <div class="col-md-8 text-center">
-            <a href="<%- adminOrigin %>">Back</a>
-        </div>
-        <div class="col-md-2"></div>
+      <div class="col-md-2"></div>
+      <div class="col-md-8 text-center">
+        <a href="<%- adminOrigin %>">Back</a>
+      </div>
+      <div class="col-md-2"></div>
     </div>
+  </div>
 </div>
 
 <% include footer %>
diff --git a/src/oauth2views/footer.ejs b/src/oauth2views/footer.ejs
index 5f9b6ae05..96a0c64a4 100644
--- a/src/oauth2views/footer.ejs
+++ b/src/oauth2views/footer.ejs
@@ -1,9 +1,11 @@
 
     <footer class="text-center">
-        <span class="text-muted">&copy; 2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
-        <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fa fa-twitter"></i></a></span>
-        <span class="text-muted"><a href="https://chat.cloudron.io" target="_blank">Chat <i class="fa fa-comments"></i></a></span>
+      <span class="text-muted">&copy; 2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
+      <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fa fa-twitter"></i></a></span>
+      <span class="text-muted"><a href="https://chat.cloudron.io" target="_blank">Chat <i class="fa fa-comments"></i></a></span>
     </footer>
 
-    </body>
+	</div>
+
+</body>
 </html>
diff --git a/src/oauth2views/header.ejs b/src/oauth2views/header.ejs
index 499de2153..acd63e57d 100644
--- a/src/oauth2views/header.ejs
+++ b/src/oauth2views/header.ejs
@@ -27,14 +27,15 @@
 
 </head>
 
-<body class="oauth">
+<body>
+
+  <div class="layout-root">
 
-    <!-- Navigation -->
     <nav class="navbar navbar-default navbar-static-top shadow" role="navigation" style="margin-bottom: 0">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                <a href="/" class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar?<%= Math.random() %>" width="40" height="40"/></a>
-                <a href="/" class="navbar-brand"><%= cloudronName %></a>
-            </div>
+      <div class="container-fluid">
+        <div class="navbar-header">
+          <a href="/" class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar?<%= Math.random() %>" width="40" height="40"/></a>
+          <a href="/" class="navbar-brand"><%= cloudronName %></a>
         </div>
+      </div>
     </nav>
diff --git a/src/oauth2views/login.ejs b/src/oauth2views/login.ejs
index a740cca21..b0a8712e6 100644
--- a/src/oauth2views/login.ejs
+++ b/src/oauth2views/login.ejs
@@ -2,45 +2,41 @@
 
 <!-- login tester -->
 
-<div class="container">
+<div class="layout-content">
+  <div class="card" style="padding: 20px; margin-top: 50px; max-width: 620px;">
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <div class="card">
-                <div class="row">
-                    <div class="col-md-12" style="text-align: center;">
-                        <img width="128" height="128" src="<%= applicationLogo %>?<%= Math.random() %>"/>
-                        <h1><small>Login to</small> <%= applicationName %></h1>
-                        <br/>
-                    </div>
-                </div>
-                <br/>
-            <% if (error) { %>
-                <div class="row">
-                    <div class="col-md-12">
-                        <h4 class="has-error"><%= error %></h4>
-                    </div>
-                </div>
-            <% } %>
-                <div class="row">
-                    <div class="col-md-12">
-                        <form id="loginForm" action="" method="post">
-                            <input type="hidden" name="_csrf" value="<%= csrf %>"/>
-                            <div class="form-group">
-                                <label class="control-label" for="inputUsername">Username or Email</label>
-                                <input type="text" class="form-control" id="inputUsername" name="username" value="<%= username %>" autofocus required>
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label" for="inputPassword">Password</label>
-                                <input type="password" class="form-control" name="password" id="inputPassword" value="<%= password %>" required>
-                            </div>
-                            <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in"/>
-                        </form>
-                        <a href="/api/v1/session/password/resetRequest.html">Reset your password</a>
-                    </div>
-                </div>
-            </div>
-        </div>
+      <div class="col-md-12" style="text-align: center;">
+        <img width="128" height="128" src="<%= applicationLogo %>?<%= Math.random() %>"/>
+        <h1><small>Login to</small> <%= applicationName %></h1>
+        <br/>
+      </div>
     </div>
+    <br/>
+<% if (error) { -%>
+    <div class="row">
+      <div class="col-md-12">
+        <h4 class="has-error"><%= error %></h4>
+      </div>
+    </div>
+<% } -%>
+    <div class="row">
+      <div class="col-md-12">
+        <form id="loginForm" action="" method="post">
+          <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <div class="form-group">
+            <label class="control-label" for="inputUsername">Username or Email</label>
+            <input type="text" class="form-control" id="inputUsername" name="username" value="<%= username %>" autofocus required>
+          </div>
+          <div class="form-group">
+            <label class="control-label" for="inputPassword">Password</label>
+            <input type="password" class="form-control" name="password" id="inputPassword" value="<%= password %>" required>
+          </div>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in"/>
+        </form>
+        <a href="/api/v1/session/password/resetRequest.html">Reset your password</a>
+      </div>
+    </div>
+  </div>
 </div>
 
 <script>
diff --git a/src/oauth2views/password_reset.ejs b/src/oauth2views/password_reset.ejs
index f49d0e390..a53043b46 100644
--- a/src/oauth2views/password_reset.ejs
+++ b/src/oauth2views/password_reset.ejs
@@ -12,36 +12,41 @@ app.controller('Controller', [function () {}]);
 
 </script>
 
-<center>
-    <h1>Hello <%= user.username %>, set a new password</h1>
-</center>
+<div class="layout-content">
 
-<div class="container" ng-app="Application" ng-controller="Controller">
+  <center>
+    <h2>Hello <%= user.username %>, set a new password</h2>
+  </center>
+
+  <br/>
+
+  <div class="container" ng-app="Application" ng-controller="Controller">
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <form action="/api/v1/session/password/reset" method="post" name="resetForm" autocomplete="off" role="form" novalidate>
-                <input type="password" style="display: none;">
-                <input type="hidden" name="_csrf" value="<%= csrf %>"/>
-                <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
+      <div class="col-md-6 col-md-offset-3">
+        <form action="/api/v1/session/password/reset" method="post" name="resetForm" autocomplete="off" role="form" novalidate>
+          <input type="password" style="display: none;">
+          <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <input type="hidden" name="resetToken" value="<%= resetToken %>"/>
 
-                <div class="form-group" ng-class="{ 'has-error': resetForm.password.$dirty && resetForm.password.$invalid }">
-                    <label class="control-label" for="inputPassword">New Password</label>
-                    <div class="control-label" ng-show="resetForm.password.$dirty && resetForm.password.$invalid">
-                        <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
-                    </div>
-                    <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" autofocus required>
-                </div>
-                <div class="form-group" ng-class="{ 'has-error': resetForm.passwordRepeat.$dirty && (password !== passwordRepeat) }">
-                    <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>
-                    <div class="control-label" ng-show="resetForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
-                        <small ng-show="resetForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
-                    </div>
-                    <input type="password" class="form-control" id="inputPasswordRepeat" ng-model="passwordRepeat" name="passwordRepeat" required>
-                </div>
-                <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
-            </form>
-        </div>
+          <div class="form-group" ng-class="{ 'has-error': resetForm.password.$dirty && resetForm.password.$invalid }">
+            <label class="control-label" for="inputPassword">New Password</label>
+            <div class="control-label" ng-show="resetForm.password.$dirty && resetForm.password.$invalid">
+              <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+            </div>
+            <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" autofocus required>
+          </div>
+          <div class="form-group" ng-class="{ 'has-error': resetForm.passwordRepeat.$dirty && (password !== passwordRepeat) }">
+            <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>
+            <div class="control-label" ng-show="resetForm.passwordRepeat.$dirty && (password !== passwordRepeat)">
+              <small ng-show="resetForm.passwordRepeat.$dirty && (password !== passwordRepeat)">Passwords don't match</small>
+            </div>
+            <input type="password" class="form-control" id="inputPasswordRepeat" ng-model="passwordRepeat" name="passwordRepeat" required>
+          </div>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Create" ng-disabled="resetForm.$invalid || password !== passwordRepeat"/>
+        </form>
+      </div>
     </div>
+  </div>
 </div>
 
 <% include footer %>
diff --git a/src/oauth2views/password_reset_request.ejs b/src/oauth2views/password_reset_request.ejs
index c6b4e67e5..7cb46cc4e 100644
--- a/src/oauth2views/password_reset_request.ejs
+++ b/src/oauth2views/password_reset_request.ejs
@@ -2,26 +2,29 @@
 
 <!-- tester -->
 
-<center>
-    <h1>Reset your password</h1>
-</center>
+<div class="layout-content">
 
-<br/>
+  <center>
+    <h2>Reset your password</h2>
+  </center>
 
-<div class="container">
+  <br/>
+
+  <div class="container">
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-            <form action="/api/v1/session/password/resetRequest" method="post" autocomplete="off">
-                <input type="hidden" name="_csrf" value="<%= csrf %>"/>
-                <div class="form-group">
-                    <label class="control-label" for="inputIdentifier">Username or Email</label>
-                    <input type="text" class="form-control" id="inputIdentifier" name="identifier" autofocus required>
-                </div>
-                <input class="btn btn-primary btn-outline pull-right" type="submit" value="Reset"/>
-            </form>
-            <a href="/api/v1/session/login">Login</a>
-        </div>
+      <div class="col-md-6 col-md-offset-3">
+        <form action="/api/v1/session/password/resetRequest" method="post" autocomplete="off">
+          <input type="hidden" name="_csrf" value="<%= csrf %>"/>
+          <div class="form-group">
+            <label class="control-label" for="inputIdentifier">Username or Email</label>
+            <input type="text" class="form-control" id="inputIdentifier" name="identifier" autofocus required>
+          </div>
+          <input class="btn btn-primary btn-outline pull-right" type="submit" value="Reset"/>
+        </form>
+        <a href="/api/v1/session/login">Login</a>
+      </div>
     </div>
+  </div>
 </div>
 
 <% include footer %>
diff --git a/src/oauth2views/password_reset_sent.ejs b/src/oauth2views/password_reset_sent.ejs
index 628bd3d88..a2a7fd091 100644
--- a/src/oauth2views/password_reset_sent.ejs
+++ b/src/oauth2views/password_reset_sent.ejs
@@ -2,21 +2,24 @@
 
 <!-- tester -->
 
-<center>
-    <h1>Password reset successful</h1>
-</center>
+<div class="layout-content">
 
-<br/>
+  <center>
+    <h2>Password reset successful</h2>
+  </center>
 
-<div class="container">
+  <br/>
+
+  <div class="container">
     <div class="row">
-        <center class="col-md-6 col-md-offset-3">
-            <p>An email was sent to you with a link to set a new password.</p>
-            <br/>
-            <br/>
-            If you have not received any email, simply <a href="/api/v1/session/password/resetRequest.html">try again</a>.
-        </center>
+        <div class="col-md-6 col-md-offset-3 text-center">
+          <p>An email was sent to you with a link to set a new password.</p>
+          <br/>
+          <br/>
+          If you have not received any email, simply <a href="/api/v1/session/password/resetRequest.html">try again</a>.
+        </div>
     </div>
+  </div>
 </div>
 
 <% include footer %>
diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index 9e0c23db1..655601520 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -121,7 +121,7 @@ html, body {
 }
 
 .layout-content {
-    flex-grow: 2;
+    flex-grow: 1;
     overflow: auto;
 }
 
@@ -144,7 +144,7 @@ html, body {
 .navbar {
     display: block;
     width: 100%;
-    flex-grow: 1;
+    flex-grow: 0;
 
     .navbar-collapse {
         background-color: #F8F8F8;
@@ -680,7 +680,7 @@ h1, h2, h3 {
 }
 
 footer {
-    flex-grow: 1;
+    flex-grow: 0;
     background-color: #f8f8f8;
     width: 100%;
     color: #555;
@@ -823,29 +823,6 @@ footer {
     }
 }
 
-// ----------------------------
-// Oauth classes
-// ----------------------------
-
-.oauth {
-    height: 100%;
-    width: 100%;
-    padding: 0;
-    background: #F7F7F7;
-
-    h1 {
-        font-size: 33px;
-    }
-
-    .card {
-        max-width: none;
-        padding: 20px;
-        text-align: left;
-        margin-top: 50px;
-    }
-}
-
-
 // ----------------------------
 // Graphs classes
 // ----------------------------