diff --git a/public/templates/admin/_layout.html b/public/templates/admin/_layout.html
index 9a610319..5d1a4700 100644
--- a/public/templates/admin/_layout.html
+++ b/public/templates/admin/_layout.html
@@ -1,8 +1,8 @@
 <ul class="tabs">
-    <li ng-class="{active: stateIncludes('admin.tracks')}"><a href="/admin/tracks">All Tracks</a></li>
-    <li ng-class="{active: stateIncludes('admin.genres')}"><a href="/admin/genres">Genres</a></li>
-    <li ng-class="{active: stateIncludes('admin.showsongs')}"><a href="/admin/show-songs">Show Songs</a></li>
-    <li ng-class="{active: stateIncludes('admin.users')}"><a ui-sref="admin.users">Users</a></li>
+    <li ui-sref-active="active"><a ui-sref=".tracks">All Tracks</a></li>
+    <li ui-sref-active="active"><a ui-sref=".genres">Genres</a></li>
+    <li ui-sref-active="active"><a ui-sref=".showsongs">Show Songs</a></li>
+    <li ui-sref-active="active"><a ui-sref=".users">Users</a></li>
 </ul>
 
 <ui-view></ui-view>
diff --git a/public/templates/pages/_layout.html b/public/templates/pages/_layout.html
index bafa200a..6819533b 100644
--- a/public/templates/pages/_layout.html
+++ b/public/templates/pages/_layout.html
@@ -1,7 +1,7 @@
 <ul class="tabs">
-    <li ng-class="{active: stateIncludes('pages.about')}"><a href="/about">About Pony.fm</a></li>
-    <li ng-class="{active: stateIncludes('pages.faq')}"><a href="/faq">FAQ</a></li>
-    <li ng-class="{active: stateIncludes('pages.mlpforums-advertising-program')}"><a href="/mlpforums-advertising-program">MLP Forums Advertising Program</a></li>
+    <li ui-sref-active="active"><a ui-sref=".about">About Pony.fm</a></li>
+    <li ui-sref-active="active"><a ui-sref=".faq">FAQ</a></li>
+    <li ui-sref-active="active"><a ui-sref=".mlpforums-advertising-program">MLP Forums Advertising Program</a></li>
 </ul>
 
 <ui-view class="static-page"></ui-view>
diff --git a/resources/assets/scripts/app/services/artists.coffee b/resources/assets/scripts/app/services/artists.coffee
index b3af5da6..c76b4851 100644
--- a/resources/assets/scripts/app/services/artists.coffee
+++ b/resources/assets/scripts/app/services/artists.coffee
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module.exports = angular.module('ponyfm').factory('artists', [
-    '$rootScope', '$http', '$q'
-    ($rootScope, $http, $q) ->
+    '$rootScope', '$http'
+    ($rootScope, $http) ->
         artistPage = []
         artists = {}
         artistContent = {}
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 46f6a07c..3a0a5b8c 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -81,10 +81,10 @@
               <img src="/images/ponyfm-logo-white.svg" class="logo">
             </a>
             <li><pfm-search class="hidden-xs"></pfm-search></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>
+            <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a ui-sref="content.tracks.list">Tracks</a></li>
+            <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a ui-sref="content.albums.list">Albums</a></li>
+            <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a ui-sref="content.playlists.list">Playlists</a></li>
+            <li ng-class="{selected: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a ui-sref="content.artists.list">Artists</a></li>
 
 
             <li ng-class="{selected: stateIncludes('pages')}"><a href="/about">About / FAQ</a></li>