diff --git a/public/templates/content/_layout.html b/public/templates/content/_layout.html
deleted file mode 100644
index df7b72a9..00000000
--- a/public/templates/content/_layout.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ul class="tabs">
-    <li ng-class="{active: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
-    <li ng-class="{active: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
-    <li ng-class="{active: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>
-    <li ng-class="{active: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a href="/artists">Artists</a></li>
-</ul>
-
-<ui-view></ui-view>
diff --git a/resources/assets/scripts/app/app.coffee b/resources/assets/scripts/app/app.coffee
index 62e184ca..ac7f8fc1 100644
--- a/resources/assets/scripts/app/app.coffee
+++ b/resources/assets/scripts/app/app.coffee
@@ -168,7 +168,7 @@ module.config [
 
         state.state 'content',
             abstract: true
-            templateUrl: '/templates/content/_layout.html'
+            template: '<ui-view/>'
 
         state.state 'content.tracks',
             templateUrl: '/templates/tracks/index.html'
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 06175a75..9970e97a 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -54,6 +54,8 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li><a href="{{Auth::user()->url}}">Your Profile</a></li>
+                        <li ng-class="{active: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
+                        <li ng-class="{active: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
                         <li><a href="#" pfm-eat-click ng-click="logout()">Logout</a></li>
                     </ul>
                 </div>
@@ -64,19 +66,11 @@
 
     <div class="site-body">
         <ul class="sidebar" ng-controller="sidebar">
-            @if (Auth::check())
-                <li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard</a></li>
-            @else
-                <li ng-class="{selected: stateIncludes('home')}"><a href="/">Home</a></li>
-            @endif
-            <li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
-                <a href="/tracks">Discover</a>
-            </li>
+            <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
+            <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
+            <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>
+            <li ng-class="{selected: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a href="/artists">Artists</a></li>
 
-            @if (Auth::check())
-                <li ng-class="{selected: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
-                <li ng-class="{selected: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
-            @endif
 
             <li ng-class="{selected: stateIncludes('pages')}"><a href="/about">About / FAQ</a></li>
             <li><a href="https://mlpforums.com/forum/62-ponyfm/" title="Pony.fm Forum" target="_blank">Forum</a></li>
@@ -95,7 +89,7 @@
                 <li>
                     <h3>
                         <a href="#" ng-click="createPlaylist()" pfm-eat-click title="Create Playlist"><i class="icon-plus"></i></a>
-                        Playlists
+                        My Playlists
                     </h3>
                 </li>
                 <li class="none" ng-show="!playlists.length"><span>no pinned playlists</span></li>