diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 1d994e0d..9764e42f 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -1,18 +1,6 @@
 @extends('layout.master')
 
 @section('content')
-    @if(Auth::check())
-    <ul class='nav nav-pills'>
-        <li>
-            <a class="btn btn-default" href="{{ URL::route('dashboard') }}">{{ Lang::get('cachet.dashboard.dashboard') }}</a>
-        </li>
-        <li>
-            <a class="btn btn-danger" href="{{ URL::route('logout') }}">{{ Lang::get('cachet.logout') }}</a>
-        </li>
-    </ul>
-    <hr />
-    @endif
-
     <div class='alert alert-{{ $systemStatus }}'>{{ $systemMessage }}</div>
 
     @include('partials.components')
diff --git a/app/views/partials/support-link.blade.php b/app/views/partials/support-link.blade.php
index 7632d87c..207dfc01 100644
--- a/app/views/partials/support-link.blade.php
+++ b/app/views/partials/support-link.blade.php
@@ -2,5 +2,10 @@
 <footer class='footer'>
     <p>{{ Lang::get('cachet.powered_by', array('app' => Setting::get('app_name'))) }}</p>
     <p><a href='/rss'><i class='fa fa-rss'></i> RSS Feed</a></p>
+    @if(Auth::check())
+    <p>
+	    <a href="{{ URL::route('dashboard') }}">{{ Lang::get('cachet.dashboard.dashboard') }}</a> &ndash; <a href="{{ URL::route('logout') }}">{{ Lang::get('cachet.logout') }}</a>
+    </p>
+    @endif
 </footer>
 @endif