diff --git a/app/Http/Controllers/FavouritesController.php b/app/Http/Controllers/FavouritesController.php
deleted file mode 100644
index 54ffd501..00000000
--- a/app/Http/Controllers/FavouritesController.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Pony.fm - A community for pony fan music.
- * Copyright (C) 2015 Peter Deltchev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Poniverse\Ponyfm\Http\Controllers;
-
-use View;
-
-class FavouritesController extends Controller
-{
-    public function getTracks()
-    {
-        return View::make('shared.null');
-    }
-
-    public function getAlbums()
-    {
-        return View::make('shared.null');
-    }
-
-    public function getPlaylists()
-    {
-        return View::make('shared.null');
-    }
-}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 349c006d..cff6880d 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -158,22 +158,6 @@ Route::group(['prefix' => 'api/web'], function() {
     Route::post('/auth/logout', 'Api\Web\AuthController@postLogout');
 });
 
-Route::group(['prefix' => 'account', 'middleware' => 'auth'], function() {
-    Route::get('/favourites/tracks', 'FavouritesController@getTracks');
-    Route::get('/favourites/albums', 'FavouritesController@getAlbums');
-    Route::get('/favourites/playlists', 'FavouritesController@getPlaylists');
-
-    Route::get('/tracks', 'ContentController@getTracks');
-    Route::get('/tracks/edit/{id}', 'ContentController@getTracks');
-    Route::get('/albums', 'ContentController@getAlbums');
-    Route::get('/albums/edit/{id}', 'ContentController@getAlbums');
-    Route::get('/albums/create', 'ContentController@getAlbums');
-    Route::get('/playlists', 'ContentController@getPlaylists');
-
-    Route::get('/uploader', 'UploaderController@getIndex');
-
-    Route::get('/', 'AccountController@getIndex');
-});
 
 Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'can:access-admin-area']], function() {
     Route::get('/genres', 'AdminController@getGenres');
@@ -182,9 +166,27 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'can:access-admin-ar
 
 Route::get('u{id}', 'ArtistsController@getShortlink')->where('id', '\d+');
 Route::get('users/{id}-{slug}', 'ArtistsController@getShortlink')->where('id', '\d+');
-Route::get('{slug}', 'ArtistsController@getProfile');
-Route::get('{slug}/content', 'ArtistsController@getContent');
-Route::get('{slug}/favourites', 'ArtistsController@getFavourites');
+
+
+Route::group(['prefix' => '{slug}'], function() {
+    Route::get('/', 'ArtistsController@getProfile');
+    Route::get('/content', 'ArtistsController@getContent');
+    Route::get('/favourites', 'ArtistsController@getFavourites');
+
+
+    Route::group(['prefix' => 'account', 'middleware' => 'auth'], function() {
+        Route::get('/tracks', 'ContentController@getTracks');
+        Route::get('/tracks/edit/{id}', 'ContentController@getTracks');
+        Route::get('/albums', 'ContentController@getAlbums');
+        Route::get('/albums/edit/{id}', 'ContentController@getAlbums');
+        Route::get('/albums/create', 'ContentController@getAlbums');
+        Route::get('/playlists', 'ContentController@getPlaylists');
+
+        Route::get('/uploader', 'UploaderController@getIndex');
+
+        Route::get('/', 'AccountController@getIndex');
+    });
+});
 
 Route::get('/', 'HomeController@getIndex');
 
diff --git a/public/templates/account/_layout.html b/public/templates/account/_layout.html
index 0504e5c4..042b0ece 100644
--- a/public/templates/account/_layout.html
+++ b/public/templates/account/_layout.html
@@ -1,4 +1,7 @@
 <ul class="tabs">
+    <li ui-sref-active="active">
+        <a ui-sref=".uploader">Upload music!</a>
+    </li>
     <li ui-sref-active="active">
         <a ui-sref=".tracks">Tracks</a>
     </li>
diff --git a/public/templates/account/albums.html b/public/templates/account/albums.html
index b896d1b6..778976ee 100644
--- a/public/templates/account/albums.html
+++ b/public/templates/account/albums.html
@@ -1,7 +1,7 @@
 <div>
     <ul class="dropdowns">
         <li class="dropdown">
-            <a class="btn" href="/account/albums/create" ng-class="{'btn-primary': data.isEditorOpen && data.selectedAlbum == null}">
+            <a class="btn" ui-sref=".create" ng-class="{'btn-primary': data.isEditorOpen && data.selectedAlbum == null}">
                 <i class="icon-plus"></i> Create Album
             </a>
         </li>
@@ -11,7 +11,7 @@
         <div class="list">
             <ul class="account-albums-listing stretch-to-bottom">
                 <li ng-repeat="album in albums track by album.id" ng-class="{selected: album.id == data.selectedAlbum.id}">
-                    <a href="/account/albums/edit/{{album.id}}">
+                    <a ui-sref=".edit({album_id: {{::album.id}}})">
                         <img pfm-src-loader="album.covers.normal" pfm-src-size="normal" class="image" />
                         <span class="title">{{album.title}}</span>
                         <span class="published">{{album.created_at | date:'MM/dd/yyyy'}}</span>
diff --git a/public/templates/artists/_show_layout.html b/public/templates/artists/_show_layout.html
index 59e842fc..a580e778 100644
--- a/public/templates/artists/_show_layout.html
+++ b/public/templates/artists/_show_layout.html
@@ -15,7 +15,7 @@
             <li ng-if="::!artist.is_archived" ui-sref-active="active">
                 <a ui-sref=".favourites">Favourites</a>
             </li>
-            <li ng-if="::artist.permissions.edit" ui-sref-active="active" ui-sref=".account"><a ui-sref=".account.settings">Manage Account</a></li>
+            <li ng-if="::artist.permissions.edit" ui-sref-active="{active: '.account'}"><a ui-sref=".account.settings">Manage Account</a></li>
         </ul>
     </header>
     <div class="stretch-to-bottom">
diff --git a/public/templates/favourites/_layout.html b/public/templates/favourites/_layout.html
deleted file mode 100644
index 8c21650e..00000000
--- a/public/templates/favourites/_layout.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div>
-    <ul class="tabs">
-        <li ng-class="{active: stateIncludes('favourites.tracks')}"><a href="/account/favourites/tracks">Tracks</a></li>
-        <li ng-class="{active: stateIncludes('favourites.albums')}"><a href="/account/favourites/albums">Albums</a></li>
-        <li ng-class="{active: stateIncludes('favourites.playlists')}"><a href="/account/favourites/playlists">Playlists</a></li>
-    </ul>
-
-    <ui-view></ui-view>
-</div>
diff --git a/public/templates/favourites/albums.html b/public/templates/favourites/albums.html
deleted file mode 100644
index fb7e2ed1..00000000
--- a/public/templates/favourites/albums.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="stretch-to-bottom">
-    <pfm-albums-list albums="albums" />
-</div>
diff --git a/public/templates/favourites/playlists.html b/public/templates/favourites/playlists.html
deleted file mode 100644
index 76615fb0..00000000
--- a/public/templates/favourites/playlists.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="stretch-to-bottom">
-    <pfm-playlists-list playlists="playlists"></pfm-playlists-list>
-</div>
diff --git a/public/templates/favourites/tracks.html b/public/templates/favourites/tracks.html
deleted file mode 100644
index 6f12f17a..00000000
--- a/public/templates/favourites/tracks.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="stretch-to-bottom">
-    <pfm-tracks-list tracks="tracks" class="three-columns"></pfm-tracks-list>
-</div>
diff --git a/resources/assets/scripts/app/app.coffee b/resources/assets/scripts/app/app.coffee
index 4da6bcec..f223b598 100644
--- a/resources/assets/scripts/app/app.coffee
+++ b/resources/assets/scripts/app/app.coffee
@@ -141,33 +141,6 @@ ponyfm.config [
             url: '/errors/invalid'
             templateUrl: '/templates/errors/400.html'
 
-        # Upload
-
-        state.state 'uploader',
-            url: '/account/uploader'
-            templateUrl: '/templates/uploader/index.html'
-            controller: 'uploader'
-
-        state.state 'favourites',
-            url: '/account/favourites'
-            abstract: true
-            templateUrl: '/templates/favourites/_layout.html'
-
-        state.state 'favourites.tracks',
-            url: '/tracks'
-            templateUrl: '/templates/favourites/tracks.html'
-            controller: 'favourites-tracks'
-
-        state.state 'favourites.playlists',
-            url: '/playlists'
-            templateUrl: '/templates/favourites/playlists.html'
-            controller: 'favourites-playlists'
-
-        state.state 'favourites.albums',
-            url: '/albums'
-            templateUrl: '/templates/favourites/albums.html'
-            controller: 'favourites-albums'
-
         # Tracks
 
         state.state 'content',
@@ -334,6 +307,13 @@ ponyfm.config [
             abstract: true
             templateUrl: '/templates/account/_layout.html'
 
+        # Upload
+
+        state.state 'content.artist.account.uploader',
+            url: '/uploader'
+            templateUrl: '/templates/uploader/index.html'
+            controller: 'uploader'
+
         state.state 'content.artist.account.settings',
             url: ''
             templateUrl: '/templates/account/settings.html'
diff --git a/resources/assets/scripts/app/controllers/account-albums-edit.coffee b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
index 2cc5bf1d..b8dd052b 100644
--- a/resources/assets/scripts/app/controllers/account-albums-edit.coffee
+++ b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
@@ -89,7 +89,7 @@ module.exports = angular.module('ponyfm').controller "account-albums-edit", [
                 if $scope.isNew
                     $scope.isDirty = false
                     $scope.$emit 'album-created'
-                    $state.transitionTo 'account.albums.edit', {album_id: response.id}
+                    $state.go '^.edit', {album_id: response.id}
                 else
                     $scope.isDirty = false
                     $scope.data.selectedAlbum.title = $scope.album.title
@@ -120,7 +120,7 @@ module.exports = angular.module('ponyfm').controller "account-albums-edit", [
                 $.post('/api/web/albums/delete/' + $scope.album.id)
                     .then -> $scope.$apply ->
                         $scope.$emit 'album-deleted'
-                        $state.transitionTo 'account.albums'
+                        $state.go '^'
 
         $scope.setCover = (image, type) ->
             delete $scope.album.cover_id
diff --git a/resources/assets/scripts/app/controllers/account-tracks.coffee b/resources/assets/scripts/app/controllers/account-tracks.coffee
index 520abd48..1d0012d9 100644
--- a/resources/assets/scripts/app/controllers/account-tracks.coffee
+++ b/resources/assets/scripts/app/controllers/account-tracks.coffee
@@ -55,4 +55,8 @@ module.exports = angular.module('ponyfm').controller "account-tracks", [
             $state.transitionTo 'account.tracks'
             tracks.clearCache()
             tracks.refresh(null, true).done setTracks
+
+        $scope.$on 'track-updated', () ->
+            tracks.clearCache()
+            tracks.refresh(null, true).done setTracks
 ]
diff --git a/resources/assets/scripts/app/controllers/favourites-albums.coffee b/resources/assets/scripts/app/controllers/favourites-albums.coffee
deleted file mode 100644
index 3403b5da..00000000
--- a/resources/assets/scripts/app/controllers/favourites-albums.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-# Pony.fm - A community for pony fan music.
-# Copyright (C) 2015 Peter Deltchev
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-window.pfm.preloaders['favourites-albums'] = [
-    'favourites'
-    (favourites) ->
-        favourites.fetchAlbums(true)
-]
-
-module.exports = angular.module('ponyfm').controller "favourites-albums", [
-    '$scope', 'favourites'
-    ($scope, favourites) ->
-        favourites.fetchAlbums().done (res) ->
-            $scope.albums = res.albums
-]
diff --git a/resources/assets/scripts/app/controllers/favourites-playlists.coffee b/resources/assets/scripts/app/controllers/favourites-playlists.coffee
deleted file mode 100644
index b74de9bc..00000000
--- a/resources/assets/scripts/app/controllers/favourites-playlists.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-# Pony.fm - A community for pony fan music.
-# Copyright (C) 2015 Peter Deltchev
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-window.pfm.preloaders['favourites-playlists'] = [
-    'favourites'
-    (favourites) ->
-        favourites.fetchPlaylists(true)
-]
-
-module.exports = angular.module('ponyfm').controller "favourites-playlists", [
-    '$scope', 'favourites'
-    ($scope, favourites) ->
-        favourites.fetchPlaylists().done (res) ->
-            $scope.playlists = res.playlists
-]
diff --git a/resources/assets/scripts/app/controllers/favourites-tracks.coffee b/resources/assets/scripts/app/controllers/favourites-tracks.coffee
deleted file mode 100644
index 7c229ed2..00000000
--- a/resources/assets/scripts/app/controllers/favourites-tracks.coffee
+++ /dev/null
@@ -1,28 +0,0 @@
-# Pony.fm - A community for pony fan music.
-# Copyright (C) 2015 Peter Deltchev
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-window.pfm.preloaders['favourites-tracks'] = [
-    'favourites'
-    (favourites) ->
-        favourites.fetchTracks(true)
-]
-
-module.exports = angular.module('ponyfm').controller "favourites-tracks", [
-    '$scope', 'favourites'
-    ($scope, favourites) ->
-        favourites.fetchTracks().done (res) ->
-            $scope.tracks = res.tracks
-]
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 2902efec..6fb95a9b 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -77,8 +77,8 @@
             <li><a href="https://mlpforums.com/forum/62-ponyfm/" title="Pony.fm Forum" target="_blank">Forum</a></li>
 
             @if (Auth::check())
-                <li class="uploader" ng-class="{selected: stateIncludes('uploader')}">
-                    <a href="/account/uploader">Upload Music</a>
+                <li class="uploader" ui-sref-active="selected">
+                    <a ui-sref="content.artist.account.uploader({slug: auth.user.slug})">Upload Music</a>
                 </li>
 
                 @can('access-admin-area')