diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index ad911891c..ede385380 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -172,7 +172,7 @@
         </div>
     </div>
 
-    <div class="animateMe ng-hide" ng-show="initialized">
+    <div class="animateMe ng-hide layout-root" ng-show="initialized">
 
         <!-- Navigation -->
         <nav class="navbar navbar-default navbar-static-top shadow" role="navigation" style="margin-bottom: 0">
@@ -233,17 +233,17 @@
             </div>
         </nav>
 
-        <div class="page-wrapper">
+        <div class="layout-content">
             <div ng-view id="ng-view"></div>
         </div>
-    </div>
 
-    <footer class="text-center ng-cloak">
-        <span class="text-muted">&copy; 2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
-        <span class="text-muted"> v{{config.version}}</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>
+        <footer class="text-center ng-cloak">
+            <span class="text-muted">&copy; 2017 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
+            <span class="text-muted"> v{{config.version}}</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>
+    </div>
 
 </body>
 </html>
diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index 6f182630f..a66670369 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -124,22 +124,31 @@ html {
 }
 
 .content {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-.content-large {
     max-width: 970px;
     margin: 0 auto;
 }
 
-.navbar-brand-icon {
-    padding: 5px 15px;
-}
+.navbar {
+    display: block;
+    width: 100%;
+    flex-grow: 1;
+
+    .navbar-collapse {
+        background-color: #F8F8F8;
+    }
 
-.navbar-nav > li > a {
     @media(min-width:768px) {
-        padding: 13px 15px;
+        max-height: 50px;
+    }
+
+    .navbar-brand-icon {
+        padding: 5px 15px;
+    }
+
+    .navbar-nav > li > a {
+        @media(min-width:768px) {
+            padding: 13px 15px;
+        }
     }
 }
 
@@ -407,10 +416,6 @@ h1, h2, h3 {
     }
 }
 
-.page-wrapper {
-    padding: 0px 30px;
-}
-
 .loading-banner {
     padding-top: 150px;
     text-align: center;
@@ -662,24 +667,19 @@ h1, h2, h3 {
 }
 
 footer {
+    flex-grow: 1;
     background-color: #EFEFEF;
-    bottom: 0;
     width: 100%;
     color: #555;
+    max-height: 30px;
     font-size: 14px;
     padding: 5px;
-    z-index: 1000;
     text-align: center;
+    box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
 
     a {
         color: #62bdfc;
-        padding: 10px;
-    }
-}
-
-@media(min-width:767px) {
-    footer {
-        position: fixed;
+        padding: 0 10px;
     }
 }
 
@@ -981,20 +981,6 @@ $graphs-success-alt:    lighten(#27CE65, 20%);
     font-weight: normal;
 }
 
-// ----------------------------
-// Support
-// ----------------------------
-
-.support {
-
-    max-width: 600px;
-
-    h3 {
-        margin-top: 0;
-        margin-bottom: 20px;
-    }
-}
-
 // ----------------------------
 // Notification
 // ----------------------------
@@ -1171,3 +1157,21 @@ $graphs-success-alt:    lighten(#27CE65, 20%);
         color: #00FFFF;
     }
 }
+
+body {
+    height: 100%;
+    width: 100%;
+}
+
+.layout-root {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    max-height: 100%;
+    width: 100%;
+}
+
+.layout-content {
+    flex-grow: 2;
+    overflow: auto;
+}
diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index 2029f73a5..8cb6788a8 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -101,8 +101,6 @@
     </div>
 </div>
 
-<br/>
-
 <div class="section-header">
     <div class="text-left">
         <h1>Account</h1>
@@ -169,6 +167,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/activity.html b/webadmin/src/views/activity.html
index 9b1d74ff4..1540135dc 100644
--- a/webadmin/src/views/activity.html
+++ b/webadmin/src/views/activity.html
@@ -1,6 +1,4 @@
 
-<br/>
-
 <div class="row">
   <div class="col-md-10 col-md-offset-1">
       <h1>Activity Log</h1>
@@ -47,6 +45,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 3abcc025e..ad13c9d0c 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -376,15 +376,13 @@
 
 <div class="content">
 
-    <br/>
-
-    <div class="row animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
+    <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
         <div class="col-lg-12">
             <h1>Your Apps</h1>
         </div>
     </div>
 
-    <div class="row animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
+    <div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
         <div class="col-sm-1 grid-item" ng-repeat="app in installedApps | orderBy:'location'">
             <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.message | shortAppMessage }}">
                 <a ng-href="{{ app | applicationLink }}" ng-click="(app | installError) === true && showError(app)" target="_blank" ng-class="{ 'hand': !(app | installationActive) }">
@@ -465,6 +463,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 91b60e2ab..a4f2545a4 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -200,109 +200,102 @@
 
 <!-- appstore login -->
 <div ng-show="ready && !validAppstoreAccount" class="card card-small appstore-login ng-cloak">
-    <div class="row">
-        <div class="col-md-12">
-            <h1 ng-show="appstoreLogin.register">Sign up with Cloudron App Store</h1>
-            <h1 ng-hide="appstoreLogin.register">Login to Cloudron App Store</h1>
-        </div>
-        <div class="col-md-12">
-            <p>An App Store account gives you access to apps and updates.</p>
+    <div class="col-md-12">
+        <h1 ng-show="appstoreLogin.register">Sign up with Cloudron App Store</h1>
+        <h1 ng-hide="appstoreLogin.register">Login to Cloudron App Store</h1>
+    </div>
+    <div class="col-md-12">
+        <p>An App Store account gives you access to apps and updates.</p>
+        <br/>
+        <small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
+    </div>
+    <div class="col-md-12">
+        <form name="appstoreLoginForm" role="form" novalidate ng-submit="appstoreLogin.submit()" autocomplete="off">
+            <input type="password" style="display: none;">
+
+            <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
+                <label class="control-label">Email Address</label>
+                <input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
+                <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
+                    <small class="text-danger" ng-show="appstoreLogin.error.email">{{ appstoreLogin.error.email }}</small>
+                </div>
+            </div>
+
+            <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) || appstoreLogin.error.generic }">
+                <label class="control-label">Password</label>
+                <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required>
+                <div class="control-label" ng-show="(!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid)">
+                    <small ng-show="!appstoreLoginForm.password.$dirty && appstoreLogin.error.password">Wrong password</small>
+                </div>
+            </div>
+
+            <div class="checkbox" ng-show="appstoreLogin.register">
+                <label>
+                    <input type="checkbox" ng-model="appstoreLogin.termsAccepted">I agree to Cloudron <a href="https://cloudron.io/legal/terms.html" target="_blank">terms</a>
+                </label>
+            </div>
+
             <br/>
-            <small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
-        </div>
-        <div class="col-md-12">
-            <form name="appstoreLoginForm" role="form" novalidate ng-submit="appstoreLogin.submit()" autocomplete="off">
-                <input type="password" style="display: none;">
 
-                <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
-                    <label class="control-label">Email Address</label>
-                    <input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
-                    <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
-                        <small class="text-danger" ng-show="appstoreLogin.error.email">{{ appstoreLogin.error.email }}</small>
-                    </div>
-                </div>
+            <a class="pull-left" href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">Don't have an Account yet?</a>
+            <a class="pull-left" href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">Already have an Account?</a>
 
-                <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) || appstoreLogin.error.generic }">
-                    <label class="control-label">Password</label>
-                    <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required>
-                    <div class="control-label" ng-show="(!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid)">
-                        <small ng-show="!appstoreLoginForm.password.$dirty && appstoreLogin.error.password">Wrong password</small>
-                    </div>
-                </div>
-
-                <div class="checkbox" ng-show="appstoreLogin.register">
-                    <label>
-                        <input type="checkbox" ng-model="appstoreLogin.termsAccepted">I agree to Cloudron <a href="https://cloudron.io/legal/terms.html" target="_blank">terms</a>
-                    </label>
-                </div>
-
-                <br/>
-
-                <a class="pull-left" href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">Don't have an Account yet?</a>
-                <a class="pull-left" href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">Already have an Account?</a>
-
-                <button type="submit" class="btn btn-success pull-right" ng-disabled="appstoreLoginForm.$invalid || appstoreLogin.busy || (appstoreLogin.register && !appstoreLogin.termsAccepted)">
-                    <i class="fa fa-circle-o-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">Login</span><span ng-show="appstoreLogin.register">Sign up</span>
-                </button>
-            </form>
-        </div>
+            <button type="submit" class="btn btn-success pull-right" ng-disabled="appstoreLoginForm.$invalid || appstoreLogin.busy || (appstoreLogin.register && !appstoreLogin.termsAccepted)">
+                <i class="fa fa-circle-o-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">Login</span><span ng-show="appstoreLogin.register">Sign up</span>
+            </button>
+        </form>
     </div>
 </div>
 
 <div ng-show="ready && validAppstoreAccount" class="ng-cloak">
-    <div class="row">
-        <div class="col-md-2">
-            <br/>
-            <div>
-                <form ng-submit="search()">
-                    <div class="input-group">
-                        <input type="text" id="appstoreSearch" class="form-control" style="height: 40px" placeholder="Search" ng-model="searchString" ng-change="search()" autofocus>
-                    </div>
-                </form>
-            </div>
-            <br/>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === '' }" category="">All</a>
-            <br/>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'blog' }" category="blog"><i class="fa fa-font"></i> Blog</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'chat' }" category="chat"><i class="fa fa-comments-o"></i> Chat</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'git' }" category="git"><i class="fa fa-code-fork"></i> Code Hosting</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'email' }" category="email"><i class="fa fa-envelope-o"></i> Email</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'gallery' }" category="gallery"><i class="fa fa-picture-o"></i> Gallery</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'sync' }" category="sync"><i class="fa fa-refresh"></i> Sync</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'notes' }" category="notes"><i class="fa fa-sticky-note-o"></i> Notes</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'project' }" category="project"><i class="fa fa-line-chart"></i> Project Management</a>
-            <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'wiki' }" category="wiki"><i class="fa fa-wikipedia-w"></i> Wiki</a>
-            <br/>
-            <!-- <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'testing' }" category="testing" ng-show="config.developerMode">Testing</a> -->
-            <br/>
-            <br/>
-            <br/>
-            <a href="" ng-click="feedback.show()">Missing an app? Let us know.</a>
+    <div class="col-md-2">
+        <br/>
+        <div>
+            <form ng-submit="search()">
+                <div class="input-group">
+                    <input type="text" id="appstoreSearch" class="form-control" style="height: 40px" placeholder="Search" ng-model="searchString" ng-change="search()" autofocus>
+                </div>
+            </form>
         </div>
-        <div class="col-md-10" ng-show="apps.length">
-            <div class="row-no-margin">
-                <div class="col-sm-1 appstore-item" ng-repeat="app in apps | orderBy:'installCount':true"">
-                    <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': (app.publishState === 'testing' || app.publishState === 'pending_approval') }">
-                        <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.publishState === 'testing'">Testing</span>
-                        <span class="badge badge-warning appstore-item-badge-testing" ng-show="app.publishState === 'pending_approval'">Pending Approval</span>
-                        <div class="appstore-item-content-icon col-same-height">
-                            <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
-                        </div>
-                        <div class="appstore-item-content-description col-same-height">
-                            <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
-                            <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
-                            <!-- <div class="appstore-item-rating"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i></div> -->
-                        </div>
+        <br/>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === '' }" category="">All</a>
+        <br/>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'blog' }" category="blog"><i class="fa fa-font"></i> Blog</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'chat' }" category="chat"><i class="fa fa-comments-o"></i> Chat</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'git' }" category="git"><i class="fa fa-code-fork"></i> Code Hosting</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'email' }" category="email"><i class="fa fa-envelope-o"></i> Email</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'gallery' }" category="gallery"><i class="fa fa-picture-o"></i> Gallery</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'sync' }" category="sync"><i class="fa fa-refresh"></i> Sync</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'notes' }" category="notes"><i class="fa fa-sticky-note-o"></i> Notes</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'project' }" category="project"><i class="fa fa-line-chart"></i> Project Management</a>
+        <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'wiki' }" category="wiki"><i class="fa fa-wikipedia-w"></i> Wiki</a>
+        <br/>
+        <!-- <a href="" class="appstore-category-link" ng-click="showCategory($event);" ng-class="{'category-active': category === 'testing' }" category="testing" ng-show="config.developerMode">Testing</a> -->
+        <br/>
+        <br/>
+        <br/>
+        <a href="" ng-click="feedback.show()">Missing an app? Let us know.</a>
+    </div>
+    <div class="col-md-10" ng-show="apps.length">
+        <div class="row-no-margin">
+            <div class="col-sm-1 appstore-item" ng-repeat="app in apps | orderBy:'installCount':true">
+                <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': (app.publishState === 'testing' || app.publishState === 'pending_approval') }">
+                    <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.publishState === 'testing'">Testing</span>
+                    <span class="badge badge-warning appstore-item-badge-testing" ng-show="app.publishState === 'pending_approval'">Pending Approval</span>
+                    <div class="appstore-item-content-icon col-same-height">
+                        <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
+                    </div>
+                    <div class="appstore-item-content-description col-same-height">
+                        <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
+                        <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
+                        <!-- <div class="appstore-item-rating"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i></div> -->
                     </div>
                 </div>
             </div>
         </div>
-        <div class="col-md-10 animateMeOpacity loading-banner" ng-show="!apps.length">
-            <h3 class="text-muted">No apps found.</h3>
-            <a href="" ng-click="feedback.show()"><h3>Let us know if you miss something.</h3></a>
-        </div>
+    </div>
+    <div class="col-md-10 animateMeOpacity loading-banner" ng-show="!apps.length">
+        <h3 class="text-muted">No apps found.</h3>
+        <a href="" ng-click="feedback.show()"><h3>Let us know if you miss something.</h3></a>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html
index 9797d14b1..32576b293 100644
--- a/webadmin/src/views/certs.html
+++ b/webadmin/src/views/certs.html
@@ -244,6 +244,3 @@
         </div>
     </div>
 </div>
-
-<br/>
-<br/>
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index e7743fe1c..0f4eb58a9 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -26,8 +26,6 @@
     </div>
 </div>
 
-<br/>
-
 <div class="section-header">
     <div class="text-left">
         <h1>Email</h1>
@@ -199,6 +197,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/graphs.html b/webadmin/src/views/graphs.html
index 894805c5d..1e2b0e67c 100644
--- a/webadmin/src/views/graphs.html
+++ b/webadmin/src/views/graphs.html
@@ -1,5 +1,4 @@
 
-<br/>
 
 <div class="graphs">
 
diff --git a/webadmin/src/views/logs.html b/webadmin/src/views/logs.html
index 81c90dfea..dfd867ef5 100644
--- a/webadmin/src/views/logs.html
+++ b/webadmin/src/views/logs.html
@@ -1,5 +1,3 @@
-<br/>
-
 <div class="row">
   <div class="col-md-10 col-md-offset-1">
     <h1>Logs</h1>
@@ -23,6 +21,3 @@
     </div>
   </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 3a6174553..1d1b41902 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -221,8 +221,6 @@
     </div>
 </div>
 
-<br/>
-
 <div class="section-header">
     <div class="text-left">
         <h1>Settings</h1>
@@ -454,6 +452,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/support.html b/webadmin/src/views/support.html
index b44a9b936..f05e33f8a 100644
--- a/webadmin/src/views/support.html
+++ b/webadmin/src/views/support.html
@@ -1,80 +1,84 @@
-<div class="content support">
-    <br/>
-
-    <div>
-        <div class="text-left">
-            <h1>Support</h1>
-        </div>
+<div class="section-header">
+    <div class="text-left">
+        <h1>Support</h1>
     </div>
+</div>
 
-    <div class="card card-large">
-        <div class="grid-item-top">
-            <div class="row animateMeOpacity">
-                <div class="col-lg-12">
-                    <h3>Documentation and Chat</h3>
-                    For user manuals and app development related questions, please refer to our <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank"> documentation</a>.
-                    Cloudron is <a href="https://git.cloudron.io" target="_blank">open source</a> - use the <a href="https://git.cloudron.io/cloudron/box/issues" target="_blank">issue tracker</a>
-                    to report bugs and raise feature requests.
-                    <br/><br/>
-                    For any other questions, chat with us live at <a href="https://chat.cloudron.io/" target="_blank">chat.cloudron.io</a>.
-                </div>
-            </div>
-        </div>
+<div class="section-header">
+    <div class="text-left">
+        <h3>Documentation and Chat</h3>
     </div>
+</div>
 
-    <br/>
-
-    <div class="card card-large">
-        <div class="grid-item-top">
-            <div class="row animateMeOpacity">
-                <div class="col-lg-12">
-                    <h3>Feedback</h3>
-                    We would love to hear your feedback. Help us improve our product by reporting any bugs or feature requests.
-                    <br/>
-                    <br/>
-                    <form name="feedbackForm" ng-submit="submitFeedback()">
-                        <div class="form-group">
-                            <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.type" required>
-                                <option value="feedback">Enhancement / Idea</option>
-                                <option value="ticket">Bug Report</option>
-                                <option value="app_missing">Missing App</option>
-                                <option value="app_error">App Error/Failing</option>
-                            </select>
-                        </div>
-                        <div class="form-group" ng-class="{ 'has-error': (feedbackForm.subject.$dirty && feedbackForm.subject.$invalid) }">
-                            <input type="text" class="form-control" name="subject" placeholder="Enter your idea or issue" ng-model="feedback.subject" ng-maxlength="512" ng-minlength="1" required>
-                        </div>
-                        <div class="form-group" ng-class="{ 'has-error': (feedbackForm.description.$dirty && feedbackForm.description.$invalid) }">
-                            <textarea class="form-control" name="description" rows="3" placeholder="Describe your idea or issue" ng-model="feedback.description" ng-minlength="1" required></textarea>
-                        </div>
-                        <button type="submit" class="btn btn-primary" ng-disabled="feedbackForm.$invalid || feedback.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="feedback.busy"></i> Submit</button>
-                        <span ng-show="feedback.error" class="text-danger text-bold">{{feedback.error}}</span>
-                        <span ng-show="feedback.success" class="text-success text-bold">Thank You!</span>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <br/>
-
-    <div class="card card-large" ng-show="config.provider !== 'caas' && user.admin">
-        <div class="grid-item-top">
-            <div class="row animateMeOpacity">
-                <div class="col-lg-12">
-                    <h3>Remote Support</h3>
-                    Enable this option to allow Cloudron engineers to connect to this server via SSH.
-                    <br/>
-                    <br/>
-                    Do not enable this option before contacting us first at <a href="https://chat.cloudron.io/" target="_blank">chat.cloudron.io</a>.
-                    <br/>
-                    <br/>
-                    <button class="btn" ng-class="{ 'btn-danger': !sshSupportEnabled, 'btn-primary': sshSupportEnabled }" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? 'Disable SSH support access' : 'Enable SSH support access' }}</button>
-                </div>
+<div class="card">
+    <div class="grid-item-top">
+        <div class="row animateMeOpacity">
+            <div class="col-lg-12">
+                For user manuals and app development related questions, please refer to our <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank"> documentation</a>.
+                Cloudron is <a href="https://git.cloudron.io" target="_blank">open source</a> - use the <a href="https://git.cloudron.io/cloudron/box/issues" target="_blank">issue tracker</a>
+                to report bugs and raise feature requests.
+                <br/><br/>
+                For any other questions, chat with us live at <a href="https://chat.cloudron.io/" target="_blank">chat.cloudron.io</a>.
             </div>
         </div>
     </div>
 </div>
 
-<!-- Offset the footer -->
-<br/><br/>
+<div class="section-header">
+    <div class="text-left">
+        <h3>Feedback</h3>
+    </div>
+</div>
+
+<div class="card">
+    <div class="grid-item-top">
+        <div class="row animateMeOpacity">
+            <div class="col-lg-12">
+                We would love to hear your feedback. Help us improve our product by reporting any bugs or feature requests.
+                <br/>
+                <br/>
+                <form name="feedbackForm" ng-submit="submitFeedback()">
+                    <div class="form-group">
+                        <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.type" required>
+                            <option value="feedback">Enhancement / Idea</option>
+                            <option value="ticket">Bug Report</option>
+                            <option value="app_missing">Missing App</option>
+                            <option value="app_error">App Error/Failing</option>
+                        </select>
+                    </div>
+                    <div class="form-group" ng-class="{ 'has-error': (feedbackForm.subject.$dirty && feedbackForm.subject.$invalid) }">
+                        <input type="text" class="form-control" name="subject" placeholder="Enter your idea or issue" ng-model="feedback.subject" ng-maxlength="512" ng-minlength="1" required>
+                    </div>
+                    <div class="form-group" ng-class="{ 'has-error': (feedbackForm.description.$dirty && feedbackForm.description.$invalid) }">
+                        <textarea class="form-control" name="description" rows="3" placeholder="Describe your idea or issue" ng-model="feedback.description" ng-minlength="1" required></textarea>
+                    </div>
+                    <button type="submit" class="btn btn-primary" ng-disabled="feedbackForm.$invalid || feedback.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="feedback.busy"></i> Submit</button>
+                    <span ng-show="feedback.error" class="text-danger text-bold">{{feedback.error}}</span>
+                    <span ng-show="feedback.success" class="text-success text-bold">Thank You!</span>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="section-header">
+    <div class="text-left">
+        <h3>Remote Support</h3>
+    </div>
+</div>
+
+<div class="card" ng-show="config.provider !== 'caas' && user.admin">
+    <div class="grid-item-top">
+        <div class="row animateMeOpacity">
+            <div class="col-lg-12">
+                Enable this option to allow Cloudron engineers to connect to this server via SSH.
+                <br/>
+                <br/>
+                Do not enable this option before contacting us first at <a href="https://chat.cloudron.io/" target="_blank">chat.cloudron.io</a>.
+                <br/>
+                <br/>
+                <button class="btn" ng-class="{ 'btn-danger': !sshSupportEnabled, 'btn-primary': sshSupportEnabled }" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? 'Disable SSH support access' : 'Enable SSH support access' }}</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/webadmin/src/views/tokens.html b/webadmin/src/views/tokens.html
index 07f26f6ac..af5a325da 100644
--- a/webadmin/src/views/tokens.html
+++ b/webadmin/src/views/tokens.html
@@ -78,12 +78,9 @@
     </div>
 </div>
 
-<br/>
-
-
 <div class="section-header" ng-show="user.admin">
     <div class="text-left">
-        <h3>API</h3>
+        <h1>API</h1>
     </div>
 </div>
 
@@ -183,6 +180,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index ba206c977..ef015ede6 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -231,9 +231,7 @@
     </div>
 </div>
 
-<div class="content-large">
-
-    <br/>
+<div class="content">
 
     <div>
         <div class="text-left">
@@ -344,6 +342,3 @@
         </div>
     </div>
 </div>
-
-<!-- Offset the footer -->
-<br/><br/>