diff --git a/app/assets/sass/_status-page.scss b/app/assets/sass/_status-page.scss
index 79caae43..cccbccff 100644
--- a/app/assets/sass/_status-page.scss
+++ b/app/assets/sass/_status-page.scss
@@ -31,6 +31,7 @@ h1 {
 
 .container {
     max-width: 960px;
+    margin-bottom: 40px;
 }
 
 .page-header {
@@ -150,3 +151,12 @@ h1 {
         }
     }
 }
+
+footer.footer {
+    padding-top: 40px;
+    padding-bottom: 40px;
+    color: #777;
+    text-align: center;
+    border-top: 1px solid #e5e5e5;
+    background-color: lighten(#e5e5e5, 5%);
+}
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 38b8cbcb..d52f075b 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -21,6 +21,4 @@
     @for($i=0; $i <= 7; $i++)
     @include('partials.incident', array('i', $i))
     @endfor
-
-    @include('partials.support-link')
 @stop
diff --git a/app/views/layout/master.blade.php b/app/views/layout/master.blade.php
index 6dd5a4c9..22049d7e 100644
--- a/app/views/layout/master.blade.php
+++ b/app/views/layout/master.blade.php
@@ -18,5 +18,7 @@
     <div class='container'>
     @yield('content')
     </div>
+
+    @include('partials.support-link')
 </body>
 </html>
diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php
index 8a945e97..db314cd4 100644
--- a/app/views/partials/support-link.blade.php
+++ b/app/views/partials/support-link.blade.php
@@ -1,6 +1,5 @@
 @if(Setting::get('show_support'))
-<hr />
-<div class='footer'>
+<footer class='footer'>
     <p>{{ Lang::get('cachet.powered_by', array('app' => Setting::get('app_name'))) }}</p>
-</div>
+</footer>
 @endif
diff --git a/public/build/css/all-4ed12a32.css b/public/build/css/all-dbb960ea.css
similarity index 99%
rename from public/build/css/all-4ed12a32.css
rename to public/build/css/all-dbb960ea.css
index 69770add..d1d4e850 100644
--- a/public/build/css/all-4ed12a32.css
+++ b/public/build/css/all-dbb960ea.css
@@ -4400,7 +4400,8 @@ h1 {
   color: #D91E18; }
 
 .container {
-  max-width: 960px; }
+  max-width: 960px;
+  margin-bottom: 40px; }
 
 .page-header {
   margin-top: 10px; }
@@ -4482,3 +4483,11 @@ h1 {
       margin-bottom: 10px; }
     .list-group.components .badge {
       color: transparent; }
+
+footer.footer {
+  padding-top: 40px;
+  padding-bottom: 40px;
+  color: #777;
+  text-align: center;
+  border-top: 1px solid #e5e5e5;
+  background-color: #f2f2f2; }
diff --git a/public/build/css/all.css b/public/build/css/all.css
index 69770add..d1d4e850 100644
--- a/public/build/css/all.css
+++ b/public/build/css/all.css
@@ -4400,7 +4400,8 @@ h1 {
   color: #D91E18; }
 
 .container {
-  max-width: 960px; }
+  max-width: 960px;
+  margin-bottom: 40px; }
 
 .page-header {
   margin-top: 10px; }
@@ -4482,3 +4483,11 @@ h1 {
       margin-bottom: 10px; }
     .list-group.components .badge {
       color: transparent; }
+
+footer.footer {
+  padding-top: 40px;
+  padding-bottom: 40px;
+  color: #777;
+  text-align: center;
+  border-top: 1px solid #e5e5e5;
+  background-color: #f2f2f2; }
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
index 29a108c1..d0906a5b 100644
--- a/public/build/rev-manifest.json
+++ b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
-  "css/all.css": "css/all-4ed12a32.css",
+  "css/all.css": "css/all-dbb960ea.css",
   "js/all.js": "js/all-d8f5640f.js"
 }
\ No newline at end of file