diff --git a/src/main/resources/templates/header.html b/src/main/resources/templates/header.html
index 1567bd8..1536988 100644
--- a/src/main/resources/templates/header.html
+++ b/src/main/resources/templates/header.html
@@ -46,7 +46,7 @@
 
     <ul id="nav-mobile" class="sidenav">
         <li class="center">
-            <a class="brand-logo" href="/" style="font-weight: bold"><h3 class="blue-grey-text text-darken-4" style="font-weight: bold">Claptrap Bot</h3></a>
+            <a class="brand-logo" href="/" style="font-weight: bold"><h3 class="blue-grey-text text-darken-4" style="font-weight: bold">Claptrap</h3></a>
         </li>
         <li><div class="divider"></div></li>
         <li class="center ">
@@ -66,19 +66,19 @@
 
 
         <li><div class="divider"></div></li>
-        <li><a class="center nav-change-guild">Change Server</a></li>
+        <li><a class="center nav-change-guild" href="#">Change Server</a></li>
         <li class="center bot-settings" th:classappend="(${page} == 'settings')? 'active' : ''" th:style="${isAdmin} ? '' : 'visibility: hidden; display: none;'">
             <a class="waves-effect waves-light" href="/settings">Bot Settings</a>
         </li>
         <li>
-            <a class="center tooltipped" data-position="left" data-delay="50" data-tooltip="Under Development!">My Account</a>
+            <a class="center tooltipped" data-position="bottom" data-delay="50" data-tooltip="Under Development!">My Account</a>
         </li>
         <li>
-            <a class="center tooltipped" data-position="left" data-delay="50" data-tooltip="Under Development!">My Playlists</a>
+            <a class="center tooltipped" data-position="bottom" data-delay="50" data-tooltip="Under Development!">My Playlists</a>
         </li>
         <li class="divider"></li>
 
-        <li><a class="center red-text nav-disconnect" style="font-weight: bold">Disconnect</a></li>
+        <li><a class="center red-text nav-disconnect" href="#" style="font-weight: bold">Disconnect</a></li>
 
     </ul>
 
@@ -102,7 +102,7 @@
             <a class="center blue-grey-text text-darken-4 tooltipped" data-position="left" data-delay="50" data-tooltip="It's you !" id="nav-name" style="font-weight: bold"></a>
         </li>
         <li class="divider"></li>
-        <li><a class="center nav-change-guild" >Change Server</a></li>
+        <li><a class="center nav-change-guild" href="#">Change Server</a></li>
         <li class="bot-settings" th:style="${isAdmin} ? '' : 'visibility: hidden; display: none;'">
             <a class=" center waves-effect waves-light " href="/settings" >Bot Settings</a>
         </li>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index ded8d3f..8b61558 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -86,7 +86,7 @@
             </div>
             <div th:if="${noMutualGuilds} == false">
                 <div class="row">
-                    <div class="col m6 offset-s2 s8 center">
+                    <div class="col l6 offset-s2 s8 center">
                         <img src="/favicon.png" class="responsive-img"/>
                         <h2 class="flow-text">Home Page Comming soon!</h2>
                         <div class="card blue-grey">
@@ -96,9 +96,8 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col m6 s12">
-
-                        <div class="z-depth-2" id="feed" style="height: 80vh"></div>
+                    <div class="col l6 xl5 offset-xl1 s12">
+                        <div class="z-depth-2" id="feed" style="height: 80vh; box-sizing: content-box"></div>
                     </div>
 
                 </div>