diff --git a/index.html b/index.html
index 9fb1f1a..af5119e 100755
--- a/index.html
+++ b/index.html
@@ -20,11 +20,8 @@
     <script src="js/plugins/angular-cookies.min.js" type="text/javascript"></script>
     <script src="js/plugins/angular-resource.min.js" type="text/javascript"></script>
     <!--
-    <script src="../js/plugins/angular.min.js"></script>
-    <script src="../js/plugins/angular-cookies.min.js"></script>
-    <script src="../js/plugins/angular-resource.min.js"></script>
-    <script src="../js/plugins/angular-route.min.js"></script>
-        -->
+    <script src="js/plugins/angular-ui-router.min.js"></script>
+    -->
     <script src="js/plugins/jquery-ui-1.10.3.custom.min.js" type="text/javascript"></script>
     <script src="js/plugins/jquery-split-pane.js"></script>
     <script src="js/plugins/fancybox/jquery.fancybox.js" type="text/javascript"></script>
@@ -39,14 +36,11 @@
     <script src="js/utils.js" type="text/javascript"></script>
     <script src="js/controllers/main.js" type="text/javascript"></script>
     <script src="js/controllers/settings.js" type="text/javascript"></script>
-    <script src="js/controllers/playlists.js" type="text/javascript"></script>
-    <script src="js/controllers/podcasts.js" type="text/javascript"></script>
     <script src="js/controllers/library.js" type="text/javascript"></script>
     <script src="js/controllers/archive.js" type="text/javascript"></script>
     <script src="js/controllers/queue.js"></script>
     <script src="js/player.js" type="text/javascript"></script>
 </head>
-<!--<body ng-controller="AppCtrl" layout state="bodyState" ng-init="bodyState = 1">-->
 <body ng-controller="AppCtrl">
     <div id="container">
         <div id="header">
@@ -61,8 +55,8 @@
                 <ul class="tabs">
                     <li><a href="" class="first showQueue" id="action_Queue" title="Queue" class="active" ng-class="{'active': isActive('/queue')}"><img src="images/play_alt_gd_16x16.png"></a></li>
                     <li><a href="#/library" id="action_Library" title="Library" ng-class="{'active': isActive('/library')}"><img src="images/headphones_gd_16x14.png" /></a></li>
-                    <li><a href="#/playlists" id="action_Playlists" title="Playlists" ng-class="{'active': isActive('/playlists')}"><img src="images/list_gd_16x14.png" /></a></li>
-                    <li><a href="#/podcasts" id="action_Podcasts" title="Podcasts" ng-class="{'active': isActive('/podcasts')}"><img src="images/rss_16x16.png" /></a></li>
+                    <!--<li><a href="#/playlists" id="action_Playlists" title="Playlists" ng-class="{'active': isActive('/playlists')}"><img src="images/list_gd_16x14.png" /></a></li>-->
+                    <!--<li><a href="#/podcasts" id="action_Podcasts" title="Podcasts" ng-class="{'active': isActive('/podcasts')}"><img src="images/rss_16x16.png" /></a></li>-->
                     <li><a href="#/archive" id="action_Archive" class="" title="Archive.org - Live Music Archive" ng-class="{'active': isActive('/archive')}"><img src="images/archive_gd_16x16.png" /></a></li>
                     <li><a href="#/settings" id="action_Settings" class="last" title="Settings" ng-class="{'active': isActive('/settings')}"><img src="images/cog_16x16.png" /></a></li>
                 </ul>
@@ -89,15 +83,6 @@
             <div class="clear"></div>
         </div><!-- end #content -->
         <!-- Player -->
-        <ul id="QueuePreview" class="shadow" class="songlist noselect" sortable>
-            <li class="row song" ng-repeat="o in queue track by $index" ng-class="{'playing': o.playing, 'selected': o.selected}" ng-click="selectSong(o)" ng-dblclick="playSong(false, o)" id="{{o.id}}" parentid="{{o.parentid}}">
-                <div class="albumart"><a class="coverartfancy" href="{{o.coverartfull}}"><img class="" ng-src="{{o.coverartthumb}}" src="images/albumdefault_60.jpg" /></a></div>
-                <div class="clear"></div>
-                <div class="title" title="{{ o.track + ' - ' + o.name + ' - ' + o.time }}" ng-bind-html="o.name"></div>
-                <div class="albumtext" title="{{o.album}}" ng-bind-html="o.album"></div>
-                <div class="albumtext" title="{{o.artist}}" ng-bind-html="o.artist"></div>
-            </li>
-        </ul>
         <div id="player">
             <div id="playercontainer">
                 <div id="playerleft" class="floatleft">
@@ -157,10 +142,10 @@
             <a class="button" id="NextTrack" title="Next Track" ng-click="nextTrack()"><img src="images/last_12x12.png" /></a>
             <a class="button" title="Shuffle Queue" ng-click="queueShuffle()">Shuffle</a>
             <a class="button" id="action_Empty" title="Delete Queue" ng-click="queueEmpty()">Empty</a>
-            <a class="button" id="action_DeleteSelected" title="Remove Selected From Queue" ng-click="queueRemoveSelected()">Remove</a>
+            <a class="button" id="action_DeleteSelected" title="Remove Selected From Queue" ng-click="queueRemoveSelected()">Remove Song(s)</a>
         </div>
         <ul class="simplelist songlist noselect" style="width: 1200px;" ng-if="queue.length > 0">
-            <div ng-repeat="song in [queue]" class="songs" ng-include src="'js/partials/songs.html'" sortable></div>
+            <div ng-repeat="song in [queue] track by $index" class="songs" ng-include src="'js/partials/songs.html'" sortable></div>
         </ul>
     </div>
     <script>
diff --git a/js/partials/playlists.html b/js/_saved/playlists.html
similarity index 98%
rename from js/partials/playlists.html
rename to js/_saved/playlists.html
index bccc488..1228d73 100644
--- a/js/partials/playlists.html
+++ b/js/_saved/playlists.html
@@ -11,7 +11,7 @@
             <a href="" class="button" id="action_NewPlaylist" title="New Playlist" ng-click="newPlaylist()">+ New</a>
             <a href="" class="button" id="action_DeletePlaylist" title="Delete Selected Playlist" ng-click="deletePlaylist()">Delete</a>
             <a href="" class="button" id="action_SavePlaylist" title="Save Playlist" ng-click="savePlaylist()">Save</a>
-            <a href="" class="button" id="action_RemoveSongs" title="Remove selected song(s) from playlist" ng-click="removeSelectedSongs()">Remove Song(s)</a>
+            <a href="" class="button" id="action_RemoveSongs" title="Remove selected song(s) from playlist" ng-click="songsRemoveSelected()">Remove Song(s)</a>
         </div>
         <div class="clear"></div>
         <div id="LayoutContainer" class="section lgsection split-pane fixed-left" split>
diff --git a/js/_saved/playlists.js b/js/_saved/playlists.js
new file mode 100644
index 0000000..502a6e5
--- /dev/null
+++ b/js/_saved/playlists.js
@@ -0,0 +1,24 @@
+﻿JamStash.controller('PlaylistCtrl',
+function PlaylistCtrl($scope, $rootScope, $location, utils, globals, model, notifications) {
+    $rootScope.song = [];
+    $scope.itemType = 'pl';
+    $scope.playlists = [];
+    $scope.playlistsPublic = [];
+    $scope.playlistsGenre = globals.SavedGenres;
+    $scope.selectedGenre = null;
+    $scope.$watch("selectedGenre", function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+            globals.SavedGenres.push(newValue);
+            //$scope.playlistsGenre.push();
+            utils.setValue('SavedGenres', globals.SavedGenres.join(), false);
+        }
+    });
+    
+    
+
+    /* Launch on Startup */
+    $scope.getPlaylists();
+    //$scope.getMusicFolders();
+    $scope.getGenres();
+    /* End Startup */
+});
\ No newline at end of file
diff --git a/js/app.js b/js/app.js
index 69cc400..7ff8df8 100755
--- a/js/app.js
+++ b/js/app.js
@@ -52,6 +52,47 @@ JamStash.config(function ($sceDelegateProvider) {
 // Then
 $routeParams ==> {chapterId:1, sectionId:2, search:'moby'}
 */
+/*
+JamStash.config(function ($stateProvider) {
+    $stateProvider
+    .state('root', {
+        url: '',
+        views: {
+            'settings': {
+                url: '/settings',
+                templateUrl: 'js/partials/settings.html',
+                controller: 'SettingsCtrl'
+            },
+            'library': {
+                url: '/library',
+                templateUrl: 'js/partials/library.html',
+                controller: 'SubsonicCtrl'
+            }
+        }
+    })
+});
+
+JamStash.config(function ($stateProvider) {
+    $stateProvider
+        .state('root', {
+            url: '/',
+            templateUrl: 'js/partials/library.html',
+            controller: 'SubsonicCtrl'
+        })
+        .state('settings', {
+            url: '/settings',
+            templateUrl: 'js/partials/settings.html',
+            controller: 'SettingsCtrl'
+        })
+        .state('library', {
+            url: '/library',
+            templateUrl: 'js/partials/library.html',
+            controller: 'SubsonicCtrl'
+        });
+})
+
+*/
+
 JamStash.config(function ($routeProvider) {
     $routeProvider
         .when('/index', { redirectTo: '/library' })
diff --git a/js/controllers/archive.js b/js/controllers/archive.js
index b583127..69a6f0a 100644
--- a/js/controllers/archive.js
+++ b/js/controllers/archive.js
@@ -1,7 +1,5 @@
 ﻿JamStash.controller('ArchiveCtrl',
 function ArchiveCtrl($scope, $rootScope, $location, $routeParams, $http, utils, globals, model, notifications, player, json) {
-    //$("#left-component").layout($scope.layoutThreeCol);
-
     $scope.settings = globals.settings;
     $scope.itemType = 'archive';
     $rootScope.song = [];
@@ -20,10 +18,6 @@ function ArchiveCtrl($scope, $rootScope, $location, $routeParams, $http, utils,
     });
     $scope.writeSavedCollection = function () {
         utils.setValue('SavedCollections', $scope.SavedCollections.join(), false);
-        /*
-        $scope.$apply(function () {
-        });
-        */
         globals.SavedCollections = $scope.SavedCollections;
     };
     $scope.addSavedCollection = function (newValue) {
diff --git a/js/controllers/library.js b/js/controllers/library.js
index a62eeb8..b679001 100644
--- a/js/controllers/library.js
+++ b/js/controllers/library.js
@@ -1,15 +1,12 @@
 ﻿JamStash.controller('SubsonicCtrl',
-function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, utils, globals, model, notifications, player) {
+function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, utils, globals, model, map, subsonic, notifications, player) {
     //$("#SubsonicAlbums").layout($scope.layoutThreeCol);
 
-    $rootScope.song = [];
+    //subsonic.song = [];
     //$scope.artistId = $routeParams.artistId;
     //$scope.albumId = $routeParams.albumId;
     $scope.settings = globals.settings;
     $scope.itemType = 'ss';
-    $scope.index = [];
-    $scope.shortcut = [];
-    $scope.album = [];
     $scope.Server = globals.settings.Server;
     $scope.playlistMenu = [];
     $scope.AutoAlbums = [
@@ -20,18 +17,75 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
         { id: "frequent", name: "Most Played" },
         { id: "recent", name: "Recently Played" }
     ];
-    $scope.selectedAutoAlbum = null;
-    $scope.selectedArtist = null;
-    $scope.selectedAlbum = null;
     $scope.SelectedAlbumSort = globals.settings.DefaultAlbumSort;
     $scope.AlbumSort = globals.AlbumSorts;
-    $scope.BreadCrumbs = [];
+    $scope.showIndex = subsonic.showIndex;
+    $scope.$watch("showIndex", function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+            subsonic.showIndex = $scope.showIndex;
+        }
+    });
+    $scope.toggleIndex = function () {
+        if ($scope.showIndex) {
+            $scope.showIndex = false;
+        } else {
+            $scope.showIndex = true;
+        }
+        $scope.saveDefaultSection('index');
+    };
+    $scope.showPlaylist = subsonic.showPlaylist;
+    $scope.$watch("showPlaylist", function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+            subsonic.showPlaylist = $scope.showPlaylist;
+        }
+    });
+    $scope.togglePlaylist = function () {
+        if ($scope.showPlaylist) {
+            $scope.showPlaylist = false;
+        } else {
+            $scope.showPlaylist = true;
+        }
+        $scope.saveDefaultSection('playlist');
+    };
+    $scope.showPodcast = subsonic.showPodcast;
+    $scope.$watch("showPodcast", function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+            subsonic.showPodcast = $scope.showPodcast;
+        }
+    });
+    $scope.togglePodcast = function () {
+        if ($scope.showPodcast) {
+            $scope.showPodcast = false;
+        } else {
+            $scope.showPodcast = true;
+        }
+        $scope.saveDefaultSection('podcast');
+    };
+    $scope.saveDefaultSection = function (val) {
+        utils.setValue('DefaultSection', val, false);
+    }
+    $scope.openDefaultSection = function (val) {
+        var section = utils.getValue('DefaultSection');
+        switch (section) {
+            case 'index':
+                $scope.showIndex = true;
+                break;
+            case 'playlist':
+                $scope.showPlaylist = true;
+                break;
+            case 'podcast':
+                $scope.showPodcast = true;
+                break;
+            default:
+                break;
+        }
+    }
     $scope.$watch("SelectedAlbumSort.id", function (newValue, oldValue) {
         if (newValue !== oldValue) {
-            if ($rootScope.song.length > 0) {
-                $scope.sortSubsonicSongs(newValue);
-            } else if ($scope.album.length > 0) {
-                $scope.sortSubsonicAlbums(newValue);
+            if (subsonic.song.length > 0) {
+                subsonic.sortSubsonicSongs(newValue);
+            } else if (subsonic.content.album.length > 0) {
+                subsonic.sortSubsonicAlbums(newValue);
                 indexes = $.map(globals.AlbumSorts, function (obj, index) {
                     if (obj.id == newValue) {
                         return index;
@@ -44,11 +98,18 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
     $rootScope.$watch("SelectedMusicFolder", function (newValue, oldValue) {
         if (newValue !== oldValue) {
             utils.setValue('MusicFolders', angular.toJson(newValue), true);
-            $scope.getArtists(newValue.id);
+            $scope.getArtists(newValue.id, true);
         }
     });
     $scope.SearchType = globals.settings.DefaultSearchType;
     $scope.SearchTypes = globals.SearchTypes;
+    $scope.playlistsGenre = globals.SavedGenres;
+    $scope.$watch("selectedGenre", function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+            globals.SavedGenres.push(newValue);
+            utils.setValue('SavedGenres', globals.SavedGenres.join(), false);
+        }
+    });
     $scope.rescanLibrary = function (data, event) {
         $.ajax({
             url: globals.BaseURL() + '/getUser.view?' + globals.BaseParams() + '&username=' + globals.settings.Username,
@@ -64,140 +125,63 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
             }
         });
     };
-    $scope.mapArtist = function (data) {
-        var name = '';
-        var artist = data.artist;
-        var artists = [];
-        if (artist.length > 0) {
-            artists = artist;
-        } else {
-            artists[0] = artist;
-        }
-        angular.forEach(artists, function (item, key) {
-            if (typeof item.name !== 'undefined') { item.name = item.name.toString(); }
+    $scope.selectAll = function () {
+        $rootScope.selectAll($scope.song);
+    };
+    $scope.selectNone = function () {
+        $rootScope.selectNone($scope.song);
+    };
+    $scope.playAll = function () {
+        $rootScope.playAll($scope.song);
+    };
+    $scope.playFrom = function (index) {
+        $rootScope.playFrom(index, $scope.song);
+    };
+    $scope.removeSong = function (item) {
+        $rootScope.removeSong(item, $scope.song);
+    };
+    $scope.songsRemoveSelected = function () {
+        subsonic.songsRemoveSelected($scope.selectedSongs).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
         });
-        if (typeof data.name !== 'undefined') { name = data.name.toString(); }
-        return new model.Index(name, artists);
     };
-    $scope.mapIndex = function (data) {
-        var name, id = '';
-        if (typeof data.id !== 'undefined') { id = data.id; }
-        if (typeof data.name !== 'undefined') { name = data.name.toString(); }
-        return new model.Artist(id, name);
-    };
-    $scope.mapPlaylist = function (data) {
-        return new model.Artist(data.id, data.name);
-    };
-    $scope.getArtists = function (id) {
-        var url;
-        if (utils.getValue('MusicFolders')) {
-            var folder = angular.fromJson(utils.getValue('MusicFolders'));
-            id = folder.id;
-        }
-        if (id) {
-            url = globals.BaseURL() + '/getIndexes.view?' + globals.BaseParams() + '&musicFolderId=' + id;
-        } else {
-            url = globals.BaseURL() + '/getIndexes.view?' + globals.BaseParams();
-        }
-        $.ajax({
-            url: url,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            done: function () { if (globals.settings.Debug) { console.log("DONE!"); } },
-            error: function () { if (globals.settings.Debug) { console.log("ERROR!"); } },
-            success: function (data) {
-                var indexes = [];
-                if (typeof data["subsonic-response"].indexes.index != 'undefined') {
-                    if (data["subsonic-response"].indexes.index.length > 0) {
-                        //angular.forEach(items, function(item, key) {
-                        //});
-                        //$.makeArray(obj)
-                        indexes = data["subsonic-response"].indexes.index;
-                    } else {
-                        indexes[0] = data["subsonic-response"].indexes.index;
-                    }
-                }
-                // TODO: AZIndex, build letters here. Make it a click button somewhere then a larger popup with letters finger friendly size
-                $scope.shortcut = [];
-                var items = [];
-                if (typeof data["subsonic-response"].indexes.shortcut != 'undefined') {
-                    if (data["subsonic-response"].indexes.shortcut.length > 0) {
-                        items = data["subsonic-response"].indexes.shortcut;
-                    } else {
-                        items[0] = data["subsonic-response"].indexes.shortcut;
-                    }
-                    angular.forEach(items, function (item, key) {
-                        $scope.shortcut.push($scope.mapIndex(item));
-                    });
-                }
-                $scope.index = [];
-                angular.forEach(indexes, function (item, key) {
-                    $scope.index.push($scope.mapArtist(item));
-                });
-                $scope.$apply();
-            }
+    $scope.getArtists = function (id, refresh) {
+        subsonic.getArtists(id, refresh).then(function (data) {
+            $scope.index = data.artists;
+            $scope.shortcut = data.shortcuts;
         });
     };
     $scope.refreshArtists = function (id) {
         utils.setValue('MusicFolders', null, true);
-        $scope.getArtists();
-    };
-
-    $scope.mapAlbum = function (data) {
-        var album = data;
-        var title, coverartthumb, coverartfull, starred;
-        if (typeof album.coverArt != 'undefined') {
-            coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=160&id=' + album.coverArt;
-            coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + album.coverArt;
-        }
-        if (typeof album.starred !== 'undefined') { starred = true; } else { starred = false; }
-        if (typeof album.title !== 'undefined') { title = album.title; } else { title = album.name; }
-        var type;
-        if (album.isDir) {
-            type = 'byfolder';
-        } else {
-            type = 'bytag';
-        }
-        return new model.Album(album.id, album.parent, title, album.artist.toString(), album.artistId, coverartthumb, coverartfull, $.format.date(new Date(album.created), "yyyy-MM-dd h:mm a"), starred, '', '', type);
+        $scope.getArtists(0, true);
+        $scope.getPlaylists(true);
     };
     $scope.getAlbums = function (id, name) {
-        $scope.selectedAutoAlbum = null;
-        $scope.selectedArtist = id;
-        $scope.BreadCrumbs = [];
-        $scope.BreadCrumbs.push({ 'type': 'artist', 'id': id, 'name': name });
-        var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
-        $.ajax({
-            url: url,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                var items = [];
-                if (typeof data["subsonic-response"].directory.child != 'undefined') {
-                    if (data["subsonic-response"].directory.child.length > 0) {
-                        items = data["subsonic-response"].directory.child;
-                    } else {
-                        items[0] = data["subsonic-response"].directory.child;
-                    }
-                    $scope.album = [];
-                    $rootScope.song = [];
-
-                    angular.forEach(items, function (item, key) {
-                        if (item.isDir) {
-                            $scope.album.push($scope.mapAlbum(item));
-                        } else {
-                            $rootScope.song.push(utils.mapSong(item));
-                        }
-                    });
-                    if ($scope.SelectedAlbumSort.id != "default") {
-                        $scope.sortSubsonicAlbums($scope.SelectedAlbumSort.id);
-                    }
-                    $scope.$apply();
-                } else {
-                    notifications.updateMessage('No Albums Returned :(', true);
-                }
-            }
+        subsonic.getAlbums(id, name).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.BreadCrumbs = data.breadcrumb;
+            $scope.selectedAutoAlbum = data.selectedAutoAlbum;
+            $scope.selectedArtist = data.selectedArtist;
+            $scope.selectedAlbum = data.selectedAlbum;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.getAlbumListBy = function (id, off) {
+        subsonic.getAlbumListBy(id, off).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.BreadCrumbs = data.breadcrumb;
+            $scope.selectedAutoAlbum = data.selectedAutoAlbum;
+            $scope.selectedArtist = data.selectedArtist;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.getSongs = function (id, action) {
+        subsonic.getSongs(id, action).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
         });
     };
     $scope.getArtistByTag = function (id) { // Gets Artist by ID3 tag
@@ -231,11 +215,11 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
                     } else {
                         items[0] = data["subsonic-response"].artist.album;
                     }
-                    $scope.album = [];
-                    $rootScope.song = [];
+                    subsonic.content.album = [];
+                    subsonic.song = [];
 
                     angular.forEach(items, function (item, key) {
-                        $scope.album.push($scope.mapAlbum(item));
+                        subsonic.content.album.push(map.mapAlbum(item));
                     });
                     $scope.$apply();
                 } else {
@@ -252,10 +236,10 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
             timeout: globals.settings.Timeout,
             success: function (data) {
                 if (typeof data["subsonic-response"].album != 'undefined') {
-                    $scope.album = [];
-                    $rootScope.song = [];
+                    subsonic.content.album = [];
+                    subsonic.song = [];
 
-                    //$scope.album.push($scope.mapAlbum(data["subsonic-response"].album));
+                    //subsonic.content.album.push(map.mapAlbum(data["subsonic-response"].album));
 
                     var items = [];
                     if (data["subsonic-response"].album.song.length > 0) {
@@ -264,203 +248,74 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
                         items[0] = data["subsonic-response"].album.song;
                     }
                     angular.forEach(items, function (item, key) {
-                        $rootScope.song.push(utils.mapSong(item));
+                        subsonic.song.push(map.mapSong(item));
                     });
                     $scope.$apply();
                 }
             }
         });
     };
-    $scope.offset = 0;
-    $scope.getAlbumListBy = function (id, offset) {
-        var size, url;
-        $scope.selectedArtist = null;
-        $scope.selectedAutoAlbum = id;
-        $scope.BreadCrumbs = [];
-        if (offset == 'next') {
-            $scope.offset = $scope.offset + globals.settings.AutoAlbumSize;
-        } else if (offset == 'prev') {
-            $scope.offset = $scope.offset - globals.settings.AutoAlbumSize;
-        }
-        if ($scope.offset > 0) {
-            url = globals.BaseURL() + '/getAlbumList.view?' + globals.BaseParams() + '&size=' + globals.settings.AutoAlbumSize.toString() + '&type=' + id + '&offset=' + $scope.offset;
-        } else {
-            url = globals.BaseURL() + '/getAlbumList.view?' + globals.BaseParams() + '&size=' + globals.settings.AutoAlbumSize.toString() + '&type=' + id;
-        }
-        $.ajax({
-            url: url,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                var items = [];
-                if (typeof data["subsonic-response"].albumList.album != 'undefined') {
-                    if (data["subsonic-response"].albumList.album.length > 0) {
-                        items = data["subsonic-response"].albumList.album;
-                    } else {
-                        items[0] = data["subsonic-response"].albumList.album;
-                    }
-                    $scope.album = [];
-                    $rootScope.song = [];
-                    angular.forEach(items, function (item, key) {
-                        if (item.isDir) {
-                            $scope.album.push($scope.mapAlbum(item));
-                        } else {
-                            $rootScope.song.push($scope.mapAlbum(item));
-                        }
-                    });
-                    if ($scope.SelectedAlbumSort.id != "default") {
-                        $scope.sortSubsonicAlbums($scope.SelectedAlbumSort.id);
-                    }
-                    $scope.$apply();
-                } else {
-                    notifications.updateMessage('No Albums Returned :(', true);
-                }
-            }
-        });
-    };
-    $scope.getSongs = function (id, action) {
-        $scope.selectedAlbum = id;
-        var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
-        $.ajax({
-            url: url,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                var items = [];
-                if (typeof data["subsonic-response"].directory.child != 'undefined') {
-                    if (data["subsonic-response"].directory.child.length > 0) {
-                        items = data["subsonic-response"].directory.child;
-                    } else {
-                        items[0] = data["subsonic-response"].directory.child;
-                    }
-                    if (action == 'add') {
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        $scope.$apply();
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else if (action == 'play') {
-                        $rootScope.queue = [];
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        var next = $rootScope.queue[0];
-                        $scope.$apply(function () {
-                            $rootScope.playSong(false, next);
-                        });
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else if (action == 'preview') {
-                        $scope.songpreview = [];
-                        angular.forEach(items, function (item, key) {
-                            if (!item.isDir) {
-                                $rootScope.songpreview.push(utils.mapSong(item));
-                            }
-                        });
-                        $scope.$apply();
-                    } else {
-                        if (typeof data["subsonic-response"].directory.id != 'undefined') {
-                            var albumId = data["subsonic-response"].directory.id;
-                            var albumName = data["subsonic-response"].directory.name;
-                            if ($scope.BreadCrumbs.length > 0) { $scope.BreadCrumbs.splice(1, ($scope.BreadCrumbs.length - 1)); }
-                            $scope.BreadCrumbs.push({ 'type': 'album', 'id': albumId, 'name': albumName });
-                        }
-                        $rootScope.song = [];
-                        $scope.album = [];
-                        var albums = [];
-                        angular.forEach(items, function (item, key) {
-                            if (item.isDir) {
-                                albums.push($scope.mapAlbum(item));
-                            } else {
-                                $rootScope.song.push(utils.mapSong(item));
-                            }
-                        });
-                        if (albums.length > 0) {
-                            $scope.album = albums;
-                            if ($scope.SelectedAlbumSort.id != "default") {
-                                $scope.sortSubsonicAlbums($scope.SelectedAlbumSort.id);
-                            }
-                        }
-                        $scope.$apply();
-                    }
-                } else {
-                    notifications.updateMessage('No Songs Returned :(', true);
-                }
-            }
-        });
-    };
     $scope.search = function () {
         var query = $('#Search').val();
-        if (query !== '') {
-            var type = $('#SearchType').val();
-            $.ajax({
-                url: globals.BaseURL() + '/search2.view?' + globals.BaseParams() + '&query=' + query,
-                method: 'GET',
-                dataType: globals.settings.Protocol,
-                timeout: globals.settings.Timeout,
-                success: function (data) {
-                    if (data["subsonic-response"].searchResult2 !== "") {
-                        var header;
-                        var items = [];
-                        if (type === '0') {
-                            if (data["subsonic-response"].searchResult2.song !== undefined) {
-                                if (data["subsonic-response"].searchResult2.song.length > 0) {
-                                    items = data["subsonic-response"].searchResult2.song;
-                                } else {
-                                    items[0] = data["subsonic-response"].searchResult2.song;
-                                }
-                                $scope.album = [];
-                                $rootScope.song = [];
-                                angular.forEach(items, function (item, key) {
-                                    $rootScope.song.push(utils.mapSong(item));
-                                });
-                                $scope.$apply();
-                            }
-                        }
-                        if (type === '1') {
-                            if (data["subsonic-response"].searchResult2.album !== undefined) {
-                                if (data["subsonic-response"].searchResult2.album.length > 0) {
-                                    items = data["subsonic-response"].searchResult2.album;
-                                } else {
-                                    items[0] = data["subsonic-response"].searchResult2.album;
-                                }
-                                $scope.album = [];
-                                $rootScope.song = [];
-                                angular.forEach(items, function (item, key) {
-                                    if (item.isDir) {
-                                        $scope.album.push($scope.mapAlbum(item));
-                                    } else {
-                                        $rootScope.song.push($scope.mapAlbum(item));
-                                    }
-                                });
-                                $scope.$apply();
-                            }
-                        }
-                        if (type === '2') {
-                            if (data["subsonic-response"].searchResult2.artist !== undefined) {
-                                if (data["subsonic-response"].searchResult2.artist.length > 0) {
-                                    items = data["subsonic-response"].searchResult2.artist;
-                                } else {
-                                    items[0] = data["subsonic-response"].searchResult2.artist;
-                                }
-                                angular.forEach(items, function (item, key) {
-                                    $scope.shortcut.push(item);
-                                });
-                                $scope.$apply();
-                            }
-                        }
-                    }
-                }
-            });
-            //$('#Search').val("");
-        }
+        var type = $('#SearchType').val();
+        subsonic.search(query, type).then(function (data) {
+            //$scope.shortcut = data.shortcuts;
+            $scope.album = data.album;
+            $scope.song = data.song;
+        });
     };
     $scope.toggleAZ = function (event) {
         $scope.toggleSubmenu('#submenu_AZIndex', '#AZIndex', 'right', 44);
     };
+    $scope.getPlaylists = function (refresh) {
+        subsonic.getPlaylists(refresh).then(function (data) {
+            $scope.playlists = data.playlists;
+            $scope.playlistsPublic = data.playlistsPublic;
+            $scope.selectedAutoPlaylist = data.selectedAutoPlaylist;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.getPlaylist = function (id, action) {
+        subsonic.getPlaylist(id, action).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.selectedAutoPlaylist = data.selectedAutoPlaylist;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.getStarred = function (action, type) {
+        subsonic.getStarred(action, type).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.selectedAutoPlaylist = data.selectedAutoPlaylist;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.getRandomSongs = function (action, genre, folder) {
+        subsonic.getRandomSongs(action, genre, folder).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.selectedAutoPlaylist = data.selectedAutoPlaylist;
+            $scope.selectedPlaylist = data.selectedPlaylist;
+        });
+    };
+    $scope.newPlaylist = function (data, event) {
+        subsonic.newPlaylist(data, event).then(function (data) {
+            $scope.getPlaylists(true);
+        });
+    };
+    $scope.deletePlaylist = function () {
+        subsonic.deletePlaylist().then(function (data) {
+            $scope.getPlaylists(true);
+        });
+    };
+    $scope.savePlaylist = function () {
+        var id = $scope.selectedPlaylist;
+        subsonic.savePlaylist().then(function (data) {
+            $scope.getPlaylist(id, '');
+            notifications.updateMessage('Playlist Updated!', true);
+        });
+    };
     $scope.loadPlaylistsForMenu = function (data, event) {
         $.ajax({
             url: globals.BaseURL() + '/getPlaylists.view?' + globals.BaseParams(),
@@ -478,7 +333,7 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
                     }
                     angular.forEach(playlists, function (item, key) {
                         if (item.owner == globals.settings.Username) {
-                            $scope.playlistMenu.push($scope.mapPlaylist(item));
+                            $scope.playlistMenu.push(map.mapPlaylist(item));
                         }
                     });
                     if ($scope.playlistMenu.length > 0) {
@@ -521,56 +376,32 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
             }
         }
     };
-    $scope.sortDateFunction = function (a, b) {
-        return a.date < b.date ? 1 : -1;
+    $scope.getGenres = function () {
+        subsonic.getGenres().then(function (data) {
+            $scope.Genres = data;
+        });
     };
-    $scope.sortArtistFunction = function (a, b) {
-        return a.artist.toLowerCase() < b.artist.toLowerCase() ? -1 : 1;
+    $scope.getPodcasts = function (refresh) {
+        subsonic.getPodcasts(refresh).then(function (data) {
+            $scope.podcasts = data;
+        });
     };
-    $scope.sortAlbumFunction = function (a, b) {
-        return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
-    };
-    $scope.sortTrackFunction = function (a, b) {
-        return parseInt(a.track) > parseInt(b.track) ? -1 : 1;
-    };
-    $scope.sortSubsonicAlbums = function (newValue) {
-        if (typeof newValue != 'undefined') {
-            //alert(newValue);
-            switch (newValue) {
-                case 'createdate desc':
-                    $scope.album.sort($scope.sortDateFunction);
-                    break;
-                case 'artist':
-                    $scope.album.sort($scope.sortArtistFunction);
-                    break;
-                case 'album':
-                    $scope.album.sort($scope.sortAlbumFunction);
-                    break;
-            }
-        }
-    };
-    $scope.sortSubsonicSongs = function (newValue) {
-        if (typeof newValue != 'undefined') {
-            //alert(newValue);
-            switch (newValue) {
-                case 'createdate desc':
-                    $rootScope.song.sort($scope.sortDateFunction);
-                    break;
-                case 'artist':
-                    $rootScope.song.sort($scope.sortArtistFunction);
-                    break;
-                case 'album':
-                    $rootScope.song.sort($scope.sortAlbumFunction);
-                    break;
-                case 'track':
-                    $rootScope.song.sort($scope.sortTrackFunction);
-                    break;
-            }
-        }
+    $scope.getPodcast = function (id, action) {
+        subsonic.getPodcast(id, action).then(function (data) {
+            $scope.album = data.album;
+            $scope.song = data.song;
+            $scope.selectedPodcast = data.selectedPodcast;
+        });
     };
 
+
     /* Launch on Startup */
     $scope.getArtists();
+    $scope.getAlbums();
+    $scope.getPlaylists();
+    $scope.getGenres();
+    $scope.getPodcasts();
+    $scope.openDefaultSection();
     if ($routeParams.artistId && $routeParams.albumId) {
         $scope.getAlbumByTag($routeParams.albumId);
     } else if ($routeParams.artistId) {
diff --git a/js/controllers/main.js b/js/controllers/main.js
index 7618a5a..7478bcc 100644
--- a/js/controllers/main.js
+++ b/js/controllers/main.js
@@ -6,8 +6,7 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
     $rootScope.playingSong = null;
     $rootScope.MusicFolders = [];
     $rootScope.Genres = [];
-    $rootScope.selectedPlaylist = "";
-    $rootScope.selectedAutoPlaylist = "";
+    
     $rootScope.SelectedMusicFolder = "";
     $rootScope.unity = null;
     $rootScope.loggedIn = function () {
@@ -244,13 +243,11 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
             } else if (unicode == 50) {
                 $('#action_Library').click();
             } else if (unicode == 51) {
-                $('#action_Playlists').click();
-            } else if (unicode == 52) {
-                $('#action_Podcasts').click();
-            } else if (unicode == 53) {
                 $('#action_Archive').click();
-            } else if (unicode == 54) { // 6
+            } else if (unicode == 52) {
                 $('#action_Settings').click();
+            } else if (unicode == 53) {
+            } else if (unicode == 54) { // 6
             }
             if (unicode >= 65 && unicode <= 90 && $('#tabLibrary').is(':visible')) { // a-z
                 var key = utils.findKeyForCode(unicode);
@@ -305,21 +302,27 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
     $scope.scrollToTop = function () {
         $('#Artists').stop().scrollTo('#auto', 400);
     };
-    $scope.selectAll = function () {
-        angular.forEach($rootScope.song, function (item, key) {
+    $rootScope.selectAll = function (songs) {
+        angular.forEach(songs, function (item, key) {
             $scope.selectedSongs.push(item);
             item.selected = true;
         });
     };
-    $scope.playAll = function () {
+    $rootScope.selectNone = function (songs) {
+        angular.forEach(songs, function (item, key) {
+            $scope.selectedSongs = [];
+            item.selected = false;
+        });
+    };
+    $rootScope.playAll = function (songs) {
         $rootScope.queue = [];
-        $scope.selectAll();
-        $scope.addSongsToQueue();
+        $rootScope.selectAll(songs);
+        $rootScope.addSongsToQueue();
         var next = $rootScope.queue[0];
         $rootScope.playSong(false, next);
     };
-    $scope.playFrom = function (index) {
-        var from = $rootScope.song.slice(index,$rootScope.song.length);
+    $rootScope.playFrom = function (index, songs) {
+        var from = songs.slice(index,songs.length);
         $scope.selectedSongs = [];
         angular.forEach(from, function (item, key) {
             $scope.selectedSongs.push(item);
@@ -327,36 +330,29 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
         });
         if ($scope.selectedSongs.length > 0) {
             $rootScope.queue = [];
-            $scope.addSongsToQueue();
+            $rootScope.addSongsToQueue();
             var next = $rootScope.queue[0];
             $rootScope.playSong(false, next);
         }
     };
-    $scope.selectNone = function () {
-        angular.forEach($rootScope.song, function (item, key) {
-            $scope.selectedSongs = [];
-            item.selected = false;
-        });
-    };
-    $scope.addSongsToQueue = function () {
+    $rootScope.addSongsToQueue = function () {
         if ($scope.selectedSongs.length !== 0) {
             angular.forEach($scope.selectedSongs, function (item, key) {
                 $rootScope.queue.push(item);
                 item.selected = false;
             });
-            //$rootScope.showQueue();
             notifications.updateMessage($scope.selectedSongs.length + ' Song(s) Added to Queue', true);
             $scope.selectedSongs.length = 0;
         }
     };
+    $rootScope.removeSong = function (item, songs) {
+        var index = songs.indexOf(item)
+        songs.splice(index, 1);
+    };
     $scope.removeSongFromQueue = function (item) {
         var index = $rootScope.queue.indexOf(item)
         $rootScope.queue.splice(index, 1);
     }
-    $scope.removeSong = function (item) {
-        var index = $rootScope.song.indexOf(item)
-        $rootScope.song.splice(index, 1);
-    };
     $scope.isActive = function (route) {
         return route === $location.path();
     };
@@ -398,31 +394,6 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
             }
         });
     };
-    $scope.getGenres = function () {
-        var genres = 'Acid Rock,Acoustic,Alt Country,Alt/Indie,Alternative & Punk,Alternative Metal,Alternative,AlternRock,Awesome,Bluegrass,Blues,Blues-Rock,Classic Hard Rock,Classic Rock,Comedy,Country,Country-Rock,Dance,Dance-Rock,Deep Funk,Easy Listening,Electronic,Electronica,Electronica/Dance,Folk,Folk/Rock,Funk,Grunge,Hard Rock,Heavy Metal,Holiday,House,Improg,Indie Rock,Indie,International,Irish,Jam Band,Jam,Jazz Fusion,Jazz,Latin,Live Albums,Metal,Music,Oldies,Other,Pop,Pop/Rock,Post Rock,Progressive Rock,Psychedelic Rock,Psychedelic,Punk,R&B,Rap & Hip-Hop,Reggae,Rock & Roll,Rock,Rock/Pop,Roots,Ska,Soft Rock,Soul,Southern Rock,Thrash Metal,Unknown,Vocal,World';
-        $rootScope.Genres = genres.split(',');
-        /* This is broken in version 4.8, unable to convert XML to JSON
-        $.ajax({
-        url: globals.BaseURL() + '/getGenres.view?' + globals.BaseParams(),
-        method: 'GET',
-        dataType: globals.settings.Protocol,
-        timeout: globals.settings.Timeout,
-        success: function (data) {
-        if (typeof data["subsonic-response"].genres != 'undefined') {
-        var items = [];
-        if (data["subsonic-response"].genres.length > 0) {
-        items = data["subsonic-response"].genres;
-        } else {
-        items[0] = data["subsonic-response"].genres;
-        }
-
-        $rootScope.Genres = items;
-        $scope.$apply();
-        }
-        }
-        });
-        */
-    };
     $scope.download = function (id) {
         $.ajax({
             url: globals.BaseURL() + '/getUser.view?' + globals.BaseParams() + '&username=' + globals.settings.Username,
@@ -502,72 +473,6 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
             $scope.selectedSongs.push(data);
             data.selected = true;
         }
-        //$scope.$apply();
-    };
-    $rootScope.getRandomSongs = function (action, genre, folder) {
-        if (globals.settings.Debug) { console.log('action:' + action + ', genre:' + genre + ', folder:' + folder); }
-        var size = globals.settings.AutoPlaylistSize;
-        $rootScope.selectedPlaylist = null;
-        if (typeof folder == 'number') {
-            $rootScope.selectedAutoPlaylist = folder;
-        } else if (genre !== '') {
-            $rootScope.selectedAutoPlaylist = genre;
-        } else {
-            $rootScope.selectedAutoPlaylist = 'random';
-        }
-        var genreParams = '';
-        if (genre !== '' && genre != 'Random') {
-            genreParams = '&genre=' + genre;
-        }
-        folderParams = '';
-        if (typeof folder == 'number' && folder !== '' && folder != 'all') {
-            //alert(folder);
-            folderParams = '&musicFolderId=' + folder;
-        } else if (typeof $rootScope.SelectedMusicFolder.id != 'undefined' && $rootScope.SelectedMusicFolder.id >= 0) {
-            //alert($rootScope.SelectedMusicFolder.id);
-            folderParams = '&musicFolderId=' + $rootScope.SelectedMusicFolder.id;
-        }
-        $.ajax({
-            url: globals.BaseURL() + '/getRandomSongs.view?' + globals.BaseParams() + '&size=' + size + genreParams + folderParams,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (typeof data["subsonic-response"].randomSongs.song != 'undefined') {
-                    var items = [];
-                    if (data["subsonic-response"].randomSongs.song.length > 0) {
-                        items = data["subsonic-response"].randomSongs.song;
-                    } else {
-                        items[0] = data["subsonic-response"].randomSongs.song;
-                    }
-                    if (action == 'add') {
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        $scope.$apply();
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else if (action == 'play') {
-                        $rootScope.queue = [];
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        var next = $rootScope.queue[0];
-                        $scope.$apply(function () {
-                            $rootScope.playSong(false, next);
-                        });
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else {
-                        $rootScope.song = [];
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.song.push(utils.mapSong(item));
-                        });
-                        $scope.$apply();
-                    }
-                }
-            }
-        });
     };
     $scope.updateFavorite = function (item) {
         var id = item.id;
diff --git a/js/controllers/playlists.js b/js/controllers/playlists.js
deleted file mode 100644
index fcb14b9..0000000
--- a/js/controllers/playlists.js
+++ /dev/null
@@ -1,231 +0,0 @@
-﻿JamStash.controller('PlaylistCtrl',
-function PlaylistCtrl($scope, $rootScope, $location, utils, globals, model, notifications) {
-    //$("#left-component").layout($scope.layoutTwoCol);
-
-    $rootScope.song = [];
-    $scope.itemType = 'pl';
-    $scope.playlists = [];
-    $scope.playlistsPublic = [];
-    $scope.playlistsGenre = globals.SavedGenres;
-    $scope.selectedGenre = null;
-    $scope.$watch("selectedGenre", function (newValue, oldValue) {
-        if (newValue !== oldValue) {
-            globals.SavedGenres.push(newValue);
-            //$scope.playlistsGenre.push();
-            utils.setValue('SavedGenres', globals.SavedGenres.join(), false);
-        }
-    });
-    $scope.getPlaylists = function (refresh) {
-        if (globals.settings.Debug) { console.log("LOAD PLAYLISTS"); }
-        $.ajax({
-            url: globals.BaseURL() + '/getPlaylists.view?' + globals.BaseParams(),
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (data["subsonic-response"].playlists.playlist !== undefined) {
-                    var items = [];
-                    if (data["subsonic-response"].playlists.playlist.length > 0) {
-                        items = data["subsonic-response"].playlists.playlist;
-                    } else {
-                        items[0] = data["subsonic-response"].playlists.playlist;
-                    }
-                    angular.forEach(items, function (item, key) {
-                        if (item.owner == globals.settings.Username) {
-                            $scope.playlists.push(item);
-                        } else if (item.public) {
-                            $scope.playlistsPublic.push(item);
-                        }
-                    });
-                    $scope.$apply();
-                }
-            }
-        });
-    };
-    $scope.getPlaylist = function (id, action) {
-        $rootScope.selectedAutoPlaylist = null;
-        $rootScope.selectedPlaylist = id;
-        $.ajax({
-            url: globals.BaseURL() + '/getPlaylist.view?' + globals.BaseParams() + '&id=' + id,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (typeof data["subsonic-response"].playlist.entry != 'undefined') {
-                    var items = [];
-                    var playlist = data["subsonic-response"].playlist;
-                    if (playlist.entry.length > 0) {
-                        items = playlist.entry;
-                    } else {
-                        items[0] = playlist.entry;
-                    }
-                    if (action == 'add') {
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        $scope.$apply();
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else if (action == 'play') {
-                        $rootScope.queue = [];
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.queue.push(utils.mapSong(item));
-                        });
-                        var next = $rootScope.queue[0];
-                        $scope.$apply(function () {
-                            $rootScope.playSong(false, next);
-                        });
-                        //$rootScope.showQueue();
-                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                    } else {
-                        $scope.album = [];
-                        $rootScope.song = [];
-                        angular.forEach(items, function (item, key) {
-                            $rootScope.song.push(utils.mapSong(item));
-                        });
-                        $scope.$apply();
-                    }
-                } else {
-                    $rootScope.song = [];
-                }
-            }
-        });
-    };
-    $scope.getStarred = function (action, type) {
-        var size = globals.settings.AutoPlaylistSize;
-        $rootScope.selectedPlaylist = null;
-        $rootScope.selectedAutoPlaylist = 'starred';
-        $.ajax({
-            url: globals.BaseURL() + '/getStarred.view?' + globals.BaseParams() + '&size=' + size,
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (typeof data["subsonic-response"].starred !== 'undefined') {
-                    var items = [];
-                    switch (type) {
-                        case 'artist':
-                            if (typeof data["subsonic-response"].starred.artist !== 'undefined') {
-                                if (data["subsonic-response"].starred.artist.length > 0) {
-                                    items = data["subsonic-response"].starred.artist;
-                                } else {
-                                    items[0] = data["subsonic-response"].starred.artist;
-                                }
-                            }
-                            break;
-                        case 'album':
-                            if (typeof data["subsonic-response"].starred.album !== 'undefined') {
-                                if (data["subsonic-response"].starred.album.length > 0) {
-                                    items = data["subsonic-response"].starred.album;
-                                } else {
-                                    items[0] = data["subsonic-response"].starred.album;
-                                }
-                            }
-                            break;
-                        case 'song':
-                            if (typeof data["subsonic-response"].starred.song !== 'undefined') {
-                                if (data["subsonic-response"].starred.song.length > 0) {
-                                    items = data["subsonic-response"].starred.song;
-                                } else {
-                                    items[0] = data["subsonic-response"].starred.song;
-                                }
-                                if (action == 'add') {
-                                    angular.forEach(items, function (item, key) {
-                                        $rootScope.queue.push(utils.mapSong(item));
-                                    });
-                                    $scope.$apply();
-                                    //$rootScope.showQueue();
-                                    notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                                } else if (action == 'play') {
-                                    $rootScope.queue = [];
-                                    angular.forEach(items, function (item, key) {
-                                        $rootScope.queue.push(utils.mapSong(item));
-                                    });
-                                    var next = $rootScope.queue[0];
-                                    $scope.$apply(function () {
-                                        $rootScope.playSong(false, next);
-                                    });
-                                    //$rootScope.showQueue();
-                                    notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                                } else {
-                                    $rootScope.song = [];
-                                    angular.forEach(items, function (item, key) {
-                                        $rootScope.song.push(utils.mapSong(item));
-                                    });
-                                    $scope.$apply();
-                                }
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-        });
-    };
-    $scope.newPlaylist = function (data, event) {
-        var reply = prompt("Choose a name for your new playlist.", "");
-        if (reply != 'null' && reply !== null && reply !== '') {
-            $.ajax({
-                url: globals.BaseURL() + '/createPlaylist.view?' + globals.BaseParams() + '&name=' + reply,
-                method: 'GET',
-                dataType: globals.settings.Protocol,
-                timeout: globals.settings.Timeout,
-                success: function (data) {
-                    loadPlaylists(true);
-                }
-            });
-        }
-    };
-    $scope.deletePlaylist = function () {
-        if ($rootScope.selectedPlaylist !== null) {
-            var id = $rootScope.selectedPlaylist;
-            if (utils.confirmDelete('Are you sure you want to delete the selected playlist?')) {
-                $.ajax({
-                    url: globals.BaseURL() + '/deletePlaylist.view?' + globals.BaseParams() + '&id=' + id,
-                    method: 'GET',
-                    dataType: globals.settings.Protocol,
-                    timeout: globals.settings.Timeout,
-                    success: function (data) {
-                        $scope.getPlaylists();
-                    }
-                });
-            }
-        }
-    };
-    $scope.savePlaylist = function () {
-        if ($rootScope.selectedPlaylist() !== null) {
-            var id = $rootScope.selectedPlaylist().id();
-            var songs = [];
-            ko.utils.arrayForEach($rootScope.song(), function (item) {
-                songs.push(item.id);
-            });
-            if (songs.length > 0) {
-                $.ajax({
-                    type: 'GET',
-                    url: globals.BaseURL() + '/createPlaylist.view?' + globals.BaseParams(),
-                    dataType: globals.settings.Protocol,
-                    timeout: globals.settings.Timeout,
-                    data: { playlistId: id, songId: songs },
-                    success: function () {
-                        $scope.getPlaylist(id);
-                        notifications.updateMessage('Playlist Updated!', true);
-                    },
-                    traditional: true // Fixes POST with an array in JQuery 1.4
-                });
-            }
-        }
-    };
-    $scope.removeSelectedSongs = function (data, event) {
-        ko.utils.arrayForEach($scope.selectedSongs(), function (item) {
-            $rootScope.song.remove(item);
-        });
-    };
-    /* End Playlists */
-
-    /* Launch on Startup */
-    $scope.getPlaylists();
-    //$scope.getMusicFolders();
-    $scope.getGenres();
-    /* End Startup */
-});
\ No newline at end of file
diff --git a/js/controllers/podcasts.js b/js/controllers/podcasts.js
index cb52e2a..0b03529 100644
--- a/js/controllers/podcasts.js
+++ b/js/controllers/podcasts.js
@@ -1,110 +1,7 @@
 ﻿JamStash.controller('PodcastCtrl',
 function PodcastCtrl($scope, $rootScope, $location, utils, globals, model, notifications) {
-    //$("#left-component").layout($scope.layoutTwoCol);
-
     $rootScope.song = [];
-    $scope.podcasts = [];
-    $scope.selectedPodcast = null;
-    $scope.getPodcasts = function (refresh) {
-        if (globals.settings.Debug) { console.log("LOAD PODCASTS"); }
-        $.ajax({
-            url: globals.BaseURL() + '/getPodcasts.view?' + globals.BaseParams(),
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (data["subsonic-response"].podcasts.channel !== undefined) {
-                    var items = [];
-                    if (data["subsonic-response"].podcasts.channel.length > 0) {
-                        items = data["subsonic-response"].podcasts.channel;
-                    } else {
-                        items[0] = data["subsonic-response"].podcasts.channel;
-                    }
-                    $scope.podcasts = items;
-                    $scope.$apply();
-                }
-            }
-        });
-    };
-    $scope.getPodcast = function (id, action) {
-        $scope.selectedPodcast = id;
-        var map = function (data) {
-            var song = data;
-            var url, track, rating, starred, contenttype, suffix, description;
-            var specs = '', coverartthumb = '', coverartfull = '';
-            if (typeof song.coverArt != 'undefined') {
-                coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=60&id=' + song.coverArt;
-                coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt;
-            }
-            if (typeof song.description == 'undefined') { description = ''; } else { description = song.description; }
-            if (typeof song.track == 'undefined') { track = '&nbsp;'; } else { track = song.track; }
-            if (typeof song.starred !== 'undefined') { starred = true; } else { starred = false; }
-            if (song.bitRate !== undefined) { specs += song.bitRate + ' Kbps'; }
-            if (song.transcodedSuffix !== undefined) { specs += ', transcoding:' + song.suffix + ' > ' + song.transcodedSuffix; } else { specs += ', ' + song.suffix; }
-            if (song.transcodedSuffix !== undefined) { suffix = song.transcodedSuffix; } else { suffix = song.suffix; }
-            if (suffix == 'ogg') { suffix = 'oga'; }
-            var salt = Math.floor(Math.random() * 100000);
-            url = globals.BaseURL() + '/stream.view?' + globals.BaseParams() + '&id=' + song.streamId + '&salt=' + salt;
-            return new model.Song(song.streamId, song.parent, track, song.title, song.artist, song.artistId, song.album, song.albumId, coverartthumb, coverartfull, song.duration, song.userRating, starred, suffix, specs, url, 0, description);
-        };
-        $.ajax({
-            url: globals.BaseURL() + '/getPodcasts.view?' + globals.BaseParams(),
-            method: 'GET',
-            dataType: globals.settings.Protocol,
-            timeout: globals.settings.Timeout,
-            success: function (data) {
-                if (data["subsonic-response"].podcasts.channel !== undefined) {
-                    var podcasts = [];
-                    if (data["subsonic-response"].podcasts.channel.length > 0) {
-                        podcasts = data["subsonic-response"].podcasts.channel;
-                    } else {
-                        podcasts[0] = data["subsonic-response"].podcasts.channel;
-                    }
-                    var items = [];
-                    $.each(podcasts, function (i, item) {
-                        if (item.id == id) {
-                            items = item.episode;
-                        }
-                    });
-
-                    if (typeof items != 'undefined') {
-                        if (action == 'add') {
-                            angular.forEach(items, function (item, key) {
-                                if (item.status != "skipped") {
-                                    $rootScope.queue.push(map(item));
-                                }
-                            });
-                            $scope.$apply();
-                            //$rootScope.showQueue();
-                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                        } else if (action == 'play') {
-                            $rootScope.queue = [];
-                            angular.forEach(items, function (item, key) {
-                                if (item.status != "skipped") {
-                                    $rootScope.queue.push(map(item));
-                                }
-                            });
-                            var next = $rootScope.queue[0];
-                            $scope.$apply(function () {
-                                $rootScope.playSong(false, next);
-                            });
-                            //$rootScope.showQueue();
-                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
-                        } else {
-                            $scope.album = [];
-                            $rootScope.song = [];
-                            angular.forEach(items, function (item, key) {
-                                if (item.status != "skipped") {
-                                    $rootScope.song.push(map(item));
-                                }
-                            });
-                            $scope.$apply();
-                        }
-                    }
-                }
-            }
-        });
-    };
+    
 
     /* Launch on Startup */
     $scope.getPodcasts();
diff --git a/js/json_changelog.js b/js/json_changelog.js
index 7a1a63e..ed8e6e7 100644
--- a/js/json_changelog.js
+++ b/js/json_changelog.js
@@ -1,4 +1,10 @@
 ﻿[
+    {
+        "date": "5/2/2014", "version": "3.4",
+        "changes": [
+        { "text": "- Tab state saved, consolidated Subsonic artists, playlist and podcasts" }
+        ]
+    },
     {
         "date": "4/11/2014", "version": "3.3.1",
         "changes": [
diff --git a/js/partials/library.html b/js/partials/library.html
index 50656d3..56fa7bb 100644
--- a/js/partials/library.html
+++ b/js/partials/library.html
@@ -2,15 +2,22 @@
 <div id="tab1" class="tabcontent">
     <div id="tabLibrary">
         <div class="actions floatleft">
-            <a href="" class="button" id="action_RefreshArtists" title="Refresh Artists" ng-click="refreshArtists()"><img class="pad" src="images/reload_9x11.png" /></a>
+            <a href="" class="button" id="action_RefreshArtists" title="Refresh List" ng-click="refreshArtists()"><img class="pad" src="images/reload_9x11.png" /></a>
             <a href="" class="button" id="action_RescanLibrary" title="Rescan Library" ng-click="rescanLibrary()"><img class="pad" src="images/loop_alt1_gd_12x9.png" /></a>
         </div>
         <div id="search">
-            <input type="text" id="Search" class="medium" title="Wildcards (*) supported" placeholder="Search..." ng-enter="search()"/>
+            <input type="text" id="Search" name="Search" class="medium" title="Wildcards (*) supported" placeholder="Search..." ng-enter="search()"/>
             <select id="SearchType" name="SearchType" ng-model="SearchType.id" ng-options="o.id as o.name for o in SearchTypes"></select>
             <a href="" class="button" id="action_Search" title="Search" ng-click="search()"><img class="pad" src="images/magnifying_glass_alt_12x12.png" /></a>
         </div>
         <div class="subactions">
+            <div class="floatleft" ng-show="selectedPlaylist">
+                <label>Playlist Actions</label>
+                <a href="" class="button" id="action_DeletePlaylist" title="Delete Selected Playlist" ng-click="deletePlaylist()">Delete</a>
+                <a href="" class="button" id="action_SavePlaylist" title="Save Playlist" ng-click="savePlaylist()">Save</a>
+                <a href="" class="button" id="action_RemoveSongs" title="Remove selected song(s) from playlist" ng-click="songsRemoveSelected()">Remove Song(s)</a>
+                &nbsp;
+            </div>
             <a href="" class="button" id="action_PlayAlbum" title="Play Album" ng-click="playAll()"><img src="images/play_gl_6x8.png"></a>
             <a href="" class="button" id="action_SelectAll" title="Select All" ng-click="selectAll()">All</a>
             <a href="" class="button" id="action_SelectNone" title="Select None" ng-click="selectNone()">None</a>
@@ -19,6 +26,7 @@
             <div id="submenu_AddToPlaylist" class="submenu shadow" style="display: none;">
                 <a href="" ng-repeat="o in playlistMenu" ng-click="addToPlaylist(o.id)">{{o.name}}</a>
             </div>
+            <a href="" class="button" id="action_NewPlaylist" title="New Playlist" ng-click="newPlaylist()">+ New</a>
         </div>
         <div id="SubsonicAlbums" class="section lgsection split-pane fixed-left" split>
             <div id="left-component" class="split-pane-component smcolumn noselect" tabindex="0">
@@ -27,30 +35,101 @@
                 </div>
                 <select id="MusicFolders" class="folders" ng-model="$root.SelectedMusicFolder" ng-options="o.name for o in MusicFolders">
                 </select>
-                <ul id="AutoAlbumContainer" class="simplelist mainlist noselect">
-                    <li class="index" id="auto">Auto Albums</li>
-                    <li class="item" ng-repeat="o in AutoAlbums" id="{{o.id}}" ng-click="getAlbumListBy(o.id)" ng-class="{'selected': selectedAutoAlbum == o.id }">
-                        <span>{{o.name}}</span>
-                        <div class="floatright">
-                            <a href="" class="nextprev hover" id="random" title="Previous" ng-click="getAlbumListBy(o.id, 'prev')" stop-event="click">&lsaquo;</a>
-                            <a href="" class="nextprev hover" id="random" title="Next" ng-click="getAlbumListBy(o.id, 'next')" stop-event="click">&rsaquo;</a>
-                        </div>
-                    </li>
-                </ul>
-                <!-- Shortcut -->
-                <ul class="simplelist mainlist noselect" ng-show="shortcut.length">
-                    <li class="index" title="Scroll to Top" data-bind="click: $root.scrollToTop"><a>Shortcuts</a></li>
-                    <ul class="simplelist mainlist noselect" ng-repeat="o in shortcut">
-                        <li class="item" id="{{o.id}}" ng-click="getAlbums(o.id, o.name)" ng-class="{'selected': selectedArtist == o.id}"><span ng-bind-html="o.name"></span></li>
+                <ul class="simplelist"><li class="heading" ng-click="toggleIndex()"><a href="">Artists</a></li></ul>
+                <div id="IndexContainer" ng-show="showIndex">
+                    <ul id="AutoAlbumContainer" class="simplelist mainlist noselect">
+                        <li class="index" id="auto">Auto Albums</li>
+                        <li class="item" ng-repeat="o in AutoAlbums" id="{{o.id}}" ng-click="getAlbumListBy(o.id)" ng-class="{'selected': selectedAutoAlbum == o.id }">
+                            <span>{{o.name}}</span>
+                            <div class="floatright">
+                                <a href="" class="nextprev hover" id="random" title="Previous" ng-click="getAlbumListBy(o.id, 'prev')" stop-event="click">&lsaquo;</a>
+                                <a href="" class="nextprev hover" id="random" title="Next" ng-click="getAlbumListBy(o.id, 'next')" stop-event="click">&rsaquo;</a>
+                            </div>
+                        </li>
                     </ul>
-                </ul>
-                <!-- Artist -->
-                <ul class="simplelist mainlist noselect" ng-repeat="o in index">
-                    <li class="index" title="Scroll to Top" id="{{o.name}}" ng-click="scrollToTop()"><a>{{o.name}}</a><span class="floatright">?</span></li>
+                    <!-- Shortcut -->
+                    <ul class="simplelist mainlist noselect" ng-show="shortcut.length">
+                        <li class="index" title="Scroll to Top" data-bind="click: $root.scrollToTop"><a>Shortcuts</a></li>
+                        <ul class="simplelist mainlist noselect" ng-repeat="o in shortcut">
+                            <li class="item" id="{{o.id}}" ng-click="getAlbums(o.id, o.name)" ng-class="{'selected': selectedArtist == o.id}"><span ng-bind-html="o.name"></span></li>
+                        </ul>
+                    </ul>
+                    <!-- Artist -->
+                    <ul class="simplelist mainlist noselect" ng-repeat="o in index">
+                        <li class="index" title="Scroll to Top" id="{{o.name}}" ng-click="scrollToTop()"><a>{{o.name}}</a><span class="floatright">?</span></li>
+                        <ul class="simplelist mainlist noselect">
+                            <li class="item" id="{{a.id}}" ng-repeat="a in o.artist" ng-class="{'selected': selectedArtist == a.id}" ng-click="getAlbums(a.id, a.name)"><a ng-href="" ng-bind-html="a.name"></a></li>
+                        </ul>
+                    </ul>
+                </div>
+                <!-- Playlist -->
+                <ul class="simplelist"><li class="heading" ng-click="togglePlaylist()"><a href="">Playlists</a></li></ul>
+                <div id="PlaylistContainer" ng-show="showPlaylist">
                     <ul class="simplelist mainlist noselect">
-                        <li class="item" id="{{a.id}}" ng-repeat="a in o.artist" ng-class="{'selected': selectedArtist == a.id}" ng-click="getAlbums(a.id, a.name)"><a ng-href="" ng-bind-html="a.name"></a></li>
+                        <li class="index" id="auto">Auto Playlists</li>
+                        <li class="item" ng-click="getStarred('', 'song')" ng-class="{'selected': selectedAutoPlaylist == 'starred'}">
+                            <div class="itemactions">
+                                <a class="add" href="" ng-click="getStarred('add', 'song')" title="Add To Play Queue" stop-event="click"></a><a class="play" href="" ng-click="getStarred('play', 'song')" title="Play" stop-event="click"></a>
+                            </div>
+                            <div class="title">Starred</div>
+                        </li>
+                        <li class="item" ng-click="getRandomSongs('', '', '')" ng-class="{'selected': selectedAutoPlaylist == 'random'}">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getRandomSongs('add', '', '')" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getRandomSongs('play', '', '')" stop-event="click"></a>
+                            </div>
+                            <div class="title">Random</div>
+                        </li>
+                        <li class="index" id="auto">Genre Playlists</li>
+                        <select id="Genres" name="Genres" class="large" ng-model="selectedGenre" ng-options="o for o in Genres">
+                            <option value="">[Select Genre]</option>
+                        </select>
+                        <li class="item" ng-repeat="o in playlistsGenre" ng-click="getRandomSongs('', o, '')" ng-class="{'selected': selectedAutoPlaylist == o}">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getRandomSongs('add', o, '')" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getRandomSongs('play', o, '')" stop-event="click"></a>
+                            </div>
+                            <div class="title">{{o}}</div>
+                        </li>
                     </ul>
-                </ul>
+                    <ul class="simplelist mainlist noselect">
+                        <li class="index" id="folder">Folder Playlists</li>
+                        <li class="item" ng-repeat="o in MusicFolders | musicfolder" ng-click=" getRandomSongs('', '' , o.id)" ng-class="{'selected': o.id == selectedAutoPlaylist}">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getRandomSongs('add', '', o.id)" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getRandomSongs('play', '', o.id)" stop-event="click"></a>
+                            </div>
+                            <div class="title">{{o.name}}</div>
+                        </li>
+                    </ul>
+                    <ul class="simplelist mainlist noselect">
+                        <li class="index" id="auto">My Playlists</li>
+                        <li class="item" ng-repeat="o in playlists" ng-click="getPlaylist(o.id, '')" ng-class="{'selected': o.id == selectedPlaylist}">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getPlaylist(o.id, 'add')" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getPlaylist(o.id, 'play')" stop-event="click"></a>
+                            </div>
+                            <div class="title" title="{{'Songs: ' + o.songCount + ', Public: ' + o.public}}">{{o.name}}</div>
+                        </li>
+                    </ul>
+                    <ul class="simplelist mainlist noselect">
+                        <li class="index" id="auto">Shared Playlists</li>
+                        <li class="item" ng-repeat="o in playlistsPublic" ng-click="getPlaylist(o.id, '')" ng-class="{'selected': o.id == selectedPlaylist}">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getPlaylist(o.id, 'add')" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getPlaylist(o.id, 'play')" stop-event="click"></a>
+                            </div>
+                            <div class="title" title="{{'Owner: ' + o.owner + ' Songs: ' + o.songCount}}">{{o.name}}</div>
+                        </li>
+                    </ul>
+                </div>
+                <!-- Podcasts -->
+                <ul class="simplelist"><li class="heading" ng-click="togglePodcast()"><a href="">Podcasts</a></li></ul>
+                <div id="PodcastContainer" ng-show="showPodcast">
+                    <ul class="simplelist mainlist noselect">
+                        <li class="item" ng-repeat="o in podcasts" ng-click="getPodcast(o.id, '')" ng-class="{ 'selected': o.id == selectedPodcast }">
+                            <div class="itemactions">
+                                <a class="add" href="" title="Add To Play Queue" ng-click="getPodcast(o.id, 'add')" stop-event="click"></a><a class="play" href="" title="Play" ng-click="getPodcast(o.id, 'play')" stop-event="click"></a>
+                            </div>
+                            <div class="title" title="{{o.description}}">{{o.title}}</div>
+                        </li>
+                    </ul>
+                </div>
             </div>
             <div class="split-pane-divider" id="my-divider"></div>
             <!-- Album -->
@@ -106,7 +185,6 @@
                 <li><a href="" class="close" ng-click="toggleAZ()">[Close]</a></li>
             </ul>
         </div>
-        <!--<songpreview class="songpreview"></songpreview>-->
     </div>
 <div class="clear"></div>
 </div>
diff --git a/js/partials/songs.html b/js/partials/songs.html
index 6c1e926..8a6edf9 100644
--- a/js/partials/songs.html
+++ b/js/partials/songs.html
@@ -1,7 +1,7 @@
 ﻿<li class="row song" ng-repeat="o in song" ng-click="selectSong(o)" ng-dblclick="playSong(false, o)" ng-class="{'selected': o.selected, 'playing': o.playing}">
     <div class="itemactions">
         <a class="add" href="" title="Add To Queue" ng-click="addSongToQueue(o)" stop-event="click"></a>
-        <a class="remove" href="" title="Remove From Queue" ng-click="removeSongFromQueue(o)" stop-event="click"></a>
+        <!--<a class="remove" href="" title="Remove Song" ng-click="removeSongFromQueue(o)" stop-event="click"></a>-->
         <a class="play" href="" title="Start Playing From This Song" ng-click="playFrom($index)" stop-event="click"></a>
         <a class="download" href="" title="Download Song" ng-click="download(o.id)"></a>
         <a href="" title="Favorite" ng-class="{'favorite': o.starred, 'rate': !o.starred}" ng-click="updateFavorite(o)" stop-event="click"></a>
diff --git a/js/partials/template.html b/js/partials/template.html
deleted file mode 100644
index ff815b8..0000000
--- a/js/partials/template.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- Start: Template Tab -->
-<div class="tabcontent">
-    <div id="tabTemplate">
-        <div class="actions floatleft">
-            <a href="" class="button" id="action_RefreshArtists" title="Refresh Artist List" ng-click="getArtists()"><img class="pad" src="images/reload_9x11.png" /></a>
-        </div>
-        <div class="subactions">
-            <a href="" class="button" id="action_SelectAll" title="Select All" ng-click="selectAll()">All</a>
-        </div>
-        <div class="clear"></div>
-        <div id="left-component" class="section lgsection">
-            <!-- Artist -->
-            <div class="ui-layout-west noselect hide" tabindex="0">
-                <ul class="simplelist mainlist noselect">
-                <li class="index" id="auto">Auto Albums</li>
-                <li class="item" ng-repeat="o in AutoAlbums" id="{{o.id}}" ng-click="getAlbumListBy(o.id)" ng-class="{'selected': selectedAutoAlbum == o.id }"><span>{{o.name}}</span> 
-                    <div class="floatright">
-                    <a href="" class="nextprev hover" id="random" title="Previous" ng-click="getAlbumListBy(o.id, 'prev')" stop-event="click">&lsaquo;</a> 
-                    <a href="" class="nextprev hover" id="random" title="Next" ng-click="getAlbumListBy(o.id, 'next')" stop-event="click">&rsaquo;</a>
-                    </div>
-                </li>
-                </ul>
-            </div>
-            <!-- Album -->
-            <div class="ui-layout-center">
-                <ul class="simplelist songlist noselect">
-                <li class="album" id="{{o.id}}" ng-class="{'selected': selectedAlbum == o.id}" ng-click="getSongs(o.id, '')" ng-repeat="o in album" parentid="{{o.parentid}}">
-                    <div class="itemactions">
-                        <a class="add" href="" title="Add To Play Queue" ng-click="getSongs(o.id, 'add')" stop-event="click"></a>
-                        <a class="play" href="" title="Play" ng-click="getSongs(o.id, 'play')" stop-event="click"></a>
-                        <a class="download" href="" title="Download"></a>
-                        <a href="" title="Favorite" ng-class="{'favorite': o.starred, 'rate': !o.starred}" ng-click="updateFavorite(o)" stop-event="click"></a>
-                    </div>
-                    <div class="albumart"><img ng-src="{{o.coverart}}" src="images/albumdefault_50.jpg"></div>
-                    <div class="title">{{o.name}}</div>
-                    <div class="artist"><a href="" id="{{o.parentid}}" ng-click="getAlbums(o.parentid)" stop-event="click">{{o.artist}}</a></div>
-                    <div class="clear"></div>
-                </li>
-                </ul>
-            </div>
-            <!-- Song -->
-            <div class="ui-layout-east noselect hide" ng-if="song.length > 0" ng-include src="'js/partials/songs.html'"></div>
-        </div>
-    </div>
-<div class="clear"></div>
-</div>
-<!-- End: Library Tab -->
\ No newline at end of file
diff --git a/js/player.js b/js/player.js
index 0c08004..6b30890 100644
--- a/js/player.js
+++ b/js/player.js
@@ -18,6 +18,8 @@
         var next = getNextSong(true);
         if (next) {
             $rootScope.playSong(false, next);
+        } else {
+            $rootScope.restartSong();
         }
     };
     getNextSong = function (previous) {
@@ -133,6 +135,10 @@
             if (globals.settings.Debug) { console.log('HTML5::loadStorage not supported on your browser, ' + html.length + ' characters'); }
         }
     };
+    $rootScope.restartSong = function (loadonly, data) {
+        var audio = $(player1).data("jPlayer");
+        audio.play(0);
+    };
     $rootScope.playSong = function (loadonly, data) {
         if (globals.settings.Debug) { console.log('Play: ' + JSON.stringify(data, null, 2)); }
         angular.forEach($rootScope.queue, function(item, key) {
diff --git a/js/plugins/angular-ui-router.min.js b/js/plugins/angular-ui-router.min.js
new file mode 100644
index 0000000..f065ecc
--- /dev/null
+++ b/js/plugins/angular-ui-router.min.js
@@ -0,0 +1,7 @@
+/**
+ * State-based routing for AngularJS
+ * @version v0.2.10
+ * @link http://angular-ui.github.com/
+ * @license MIT License, http://www.opensource.org/licenses/MIT
+ */
+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return I(new(I(function(){},{prototype:a})),b)}function e(a){return H(arguments,function(b){b!==a&&H(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function h(a,b,c,d){var e,h=f(c,d),i={},j=[];for(var k in h)if(h[k].params&&h[k].params.length){e=h[k].params;for(var l in e)g(j,e[l])>=0||(j.push(e[l]),i[e[l]]=a[e[l]])}return I({},i,b)}function i(a,b){var c={};return H(a,function(a){var d=b[a];c[a]=null!=d?String(d):null}),c}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return H(a,function(a){c[a]=b[a]}),c}function l(a,b){var d=1,f=2,g={},h=[],i=g,j=I(a.when(g),{$$promises:g,$$values:g});this.study=function(g){function k(a,c){if(o[c]!==f){if(n.push(c),o[c]===d)throw n.splice(0,n.indexOf(c)),new Error("Cyclic dependency: "+n.join(" -> "));if(o[c]=d,E(a))m.push(c,[function(){return b.get(a)}],h);else{var e=b.annotate(a);H(e,function(a){a!==c&&g.hasOwnProperty(a)&&k(g[a],a)}),m.push(c,a,e)}n.pop(),o[c]=f}}function l(a){return F(a)&&a.then&&a.$$promises}if(!F(g))throw new Error("'invocables' must be an object");var m=[],n=[],o={};return H(g,k),g=n=o=null,function(d,f,g){function h(){--s||(t||e(r,f.$$values),p.$$values=r,p.$$promises=!0,o.resolve(r))}function k(a){p.$$failure=a,o.reject(a)}function n(c,e,f){function i(a){l.reject(a),k(a)}function j(){if(!C(p.$$failure))try{l.resolve(b.invoke(e,g,r)),l.promise.then(function(a){r[c]=a,h()},i)}catch(a){i(a)}}var l=a.defer(),m=0;H(f,function(a){q.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,q[a].then(function(b){r[a]=b,--m||j()},i))}),m||j(),q[c]=l.promise}if(l(d)&&g===c&&(g=f,f=d,d=null),d){if(!F(d))throw new Error("'locals' must be an object")}else d=i;if(f){if(!l(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=j;var o=a.defer(),p=o.promise,q=p.$$promises={},r=I({},d),s=1+m.length/3,t=!1;if(C(f.$$failure))return k(f.$$failure),p;f.$$values?(t=e(r,f.$$values),h()):(I(q,f.$$promises),f.then(h,k));for(var u=0,v=m.length;v>u;u+=3)d.hasOwnProperty(m[u])?h():n(m[u],m[u+1],m[u+2]);return p}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function m(a,b,c){this.fromConfig=function(a,b,c){return C(a.template)?this.fromString(a.template,b):C(a.templateUrl)?this.fromUrl(a.templateUrl,b):C(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return D(a)?a(b):a},this.fromUrl=function(c,d){return D(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function n(a){function b(b){if(!/^\w+(-+\w+)*$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(f[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");f[b]=!0,j.push(b)}function c(a){return a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&")}var d,e=/([:*])(\w+)|\{(\w+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,f={},g="^",h=0,i=this.segments=[],j=this.params=[];this.source=a;for(var k,l,m;(d=e.exec(a))&&(k=d[2]||d[3],l=d[4]||("*"==d[1]?".*":"[^/]*"),m=a.substring(h,d.index),!(m.indexOf("?")>=0));)g+=c(m)+"("+l+")",b(k),i.push(m),h=e.lastIndex;m=a.substring(h);var n=m.indexOf("?");if(n>=0){var o=this.sourceSearch=m.substring(n);m=m.substring(0,n),this.sourcePath=a.substring(0,h+n),H(o.substring(1).split(/[&?]/),b)}else this.sourcePath=a,this.sourceSearch="";g+=c(m)+"$",i.push(m),this.regexp=new RegExp(g),this.prefix=i[0]}function o(){this.compile=function(a){return new n(a)},this.isMatcher=function(a){return F(a)&&D(a.exec)&&D(a.format)&&D(a.concat)},this.$get=function(){return this}}function p(a){function b(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function c(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function d(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return C(d)?d:!0}var e=[],f=null;this.rule=function(a){if(!D(a))throw new Error("'rule' must be a function");return e.push(a),this},this.otherwise=function(a){if(E(a)){var b=a;a=function(){return b}}else if(!D(a))throw new Error("'rule' must be a function");return f=a,this},this.when=function(e,f){var g,h=E(f);if(E(e)&&(e=a.compile(e)),!h&&!D(f)&&!G(f))throw new Error("invalid 'handler' in when()");var i={matcher:function(b,c){return h&&(g=a.compile(c),c=["$match",function(a){return g.format(a)}]),I(function(a,e){return d(a,c,b.exec(e.path(),e.search()))},{prefix:E(b.prefix)?b.prefix:""})},regex:function(a,e){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(g=e,e=["$match",function(a){return c(g,a)}]),I(function(b,c){return d(b,e,a.exec(c.path()))},{prefix:b(a)})}},j={matcher:a.isMatcher(e),regex:e instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](e,f));throw new Error("invalid 'what' in when()")},this.$get=["$location","$rootScope","$injector",function(a,b,c){function d(b){function d(b){var d=b(c,a);return d?(E(d)&&a.replace().url(d),!0):!1}if(!b||!b.defaultPrevented){var g,h=e.length;for(g=0;h>g;g++)if(d(e[g]))return;f&&d(f)}}return b.$on("$locationChangeSuccess",d),{sync:function(){d()}}}]}function q(a,e,f){function g(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function l(a,b){var d=E(a),e=d?a:a.name,f=g(e);if(f){if(!b)throw new Error("No reference point given for path '"+e+"'");for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=w[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function m(a,b){x[a]||(x[a]=[]),x[a].push(b)}function n(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!E(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(w.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):E(b.parent)?b.parent:"";if(e&&!w[e])return m(e,b.self);for(var f in z)D(z[f])&&(b[f]=z[f](b,z.$delegates[f]));if(w[c]=b,!b[y]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){v.$current.navigable==b&&j(a,c)||v.transitionTo(b,a,{location:!1})}]),x[c])for(var g=0;g<x[c].length;g++)n(x[c][g]);return b}function o(a){return a.indexOf("*")>-1}function p(a){var b=a.split("."),c=v.$current.name.split(".");if("**"===b[0]&&(c=c.slice(c.indexOf(b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(c.indexOf(b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length)return!1;for(var d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return c.join("")===b.join("")}function q(a,b){return E(a)&&!C(b)?z[a]:D(b)&&E(a)?(z[a]&&!z.$delegates[a]&&(z.$delegates[a]=z[a]),z[a]=b,this):this}function r(a,b){return F(a)?b=a:b.name=a,n(b),this}function s(a,e,g,m,n,q,r,s,x){function z(){r.url()!==M&&(r.url(M),r.replace())}function A(a,c,d,f,h){var i=d?c:k(a.params,c),j={$stateParams:i};h.resolve=n.resolve(a.resolve,j,h.resolve,a);var l=[h.resolve.then(function(a){h.globals=a})];return f&&l.push(f),H(a.views,function(c,d){var e=c.resolve&&c.resolve!==a.resolve?c.resolve:{};e.$template=[function(){return g.load(d,{view:c,locals:j,params:i,notify:!1})||""}],l.push(n.resolve(e,j,h.resolve,a).then(function(f){if(D(c.controllerProvider)||G(c.controllerProvider)){var g=b.extend({},e,j);f.$$controller=m.invoke(c.controllerProvider,null,g)}else f.$$controller=c.controller;f.$$state=a,f.$$controllerAs=c.controllerAs,h[d]=f}))}),e.all(l).then(function(){return h})}var B=e.reject(new Error("transition superseded")),F=e.reject(new Error("transition prevented")),K=e.reject(new Error("transition aborted")),L=e.reject(new Error("transition failed")),M=r.url(),N=x.baseHref();return u.locals={resolve:null,globals:{$stateParams:{}}},v={params:{},current:u.self,$current:u,transition:null},v.reload=function(){v.transitionTo(v.current,q,{reload:!0,inherit:!1,notify:!1})},v.go=function(a,b,c){return this.transitionTo(a,b,I({inherit:!0,relative:v.$current},c))},v.transitionTo=function(b,c,f){c=c||{},f=I({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,k=v.$current,n=v.params,o=k.path,p=l(b,f.relative);if(!C(p)){var s={to:b,toParams:c,options:f};if(g=a.$broadcast("$stateNotFound",s,k.self,n),g.defaultPrevented)return z(),K;if(g.retry){if(f.$retry)return z(),L;var w=v.transition=e.when(g.retry);return w.then(function(){return w!==v.transition?B:(s.options.$retry=!0,v.transitionTo(s.to,s.toParams,s.options))},function(){return K}),z(),w}if(b=s.to,c=s.toParams,f=s.options,p=l(b,f.relative),!C(p)){if(f.relative)throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'");throw new Error("No such state '"+b+"'")}}if(p[y])throw new Error("Cannot transition to abstract state '"+b+"'");f.inherit&&(c=h(q,c||{},v.$current,p)),b=p;var x,D,E=b.path,G=u.locals,H=[];for(x=0,D=E[x];D&&D===o[x]&&j(c,n,D.ownParams)&&!f.reload;x++,D=E[x])G=H[x]=D.locals;if(t(b,k,G,f))return b.self.reloadOnSearch!==!1&&z(),v.transition=null,e.when(v.current);if(c=i(b.params,c||{}),f.notify&&(g=a.$broadcast("$stateChangeStart",b.self,c,k.self,n),g.defaultPrevented))return z(),F;for(var N=e.when(G),O=x;O<E.length;O++,D=E[O])G=H[O]=d(G),N=A(D,c,D===b,N,G);var P=v.transition=N.then(function(){var d,e,g;if(v.transition!==P)return B;for(d=o.length-1;d>=x;d--)g=o[d],g.self.onExit&&m.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=x;d<E.length;d++)e=E[d],e.locals=H[d],e.self.onEnter&&m.invoke(e.self.onEnter,e.self,e.locals.globals);if(v.transition!==P)return B;v.$current=b,v.current=b.self,v.params=c,J(v.params,q),v.transition=null;var h=b.navigable;return f.location&&h&&(r.url(h.url.format(h.locals.globals.$stateParams)),"replace"===f.location&&r.replace()),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,k.self,n),M=r.url(),v.current},function(d){return v.transition!==P?B:(v.transition=null,a.$broadcast("$stateChangeError",b.self,c,k.self,n,d),z(),e.reject(d))});return P},v.is=function(a,d){var e=l(a);return C(e)?v.$current!==e?!1:C(d)&&null!==d?b.equals(q,d):!0:c},v.includes=function(a,d){if(E(a)&&o(a)){if(!p(a))return!1;a=v.$current.name}var e=l(a);if(!C(e))return c;if(!C(v.$current.includes[e.name]))return!1;var f=!0;return b.forEach(d,function(a,b){C(q[b])&&q[b]===a||(f=!1)}),f},v.href=function(a,b,c){c=I({lossy:!0,inherit:!1,absolute:!1,relative:v.$current},c||{});var d=l(a,c.relative);if(!C(d))return null;b=h(q,b||{},v.$current,d);var e=d&&c.lossy?d.navigable:d,g=e&&e.url?e.url.format(i(d.params,b||{})):null;return!f.html5Mode()&&g&&(g="#"+f.hashPrefix()+g),"/"!==N&&(f.html5Mode()?g=N.slice(0,-1)+g:c.absolute&&(g=N.slice(1)+g)),c.absolute&&g&&(g=r.protocol()+"://"+r.host()+(80==r.port()||443==r.port()?"":":"+r.port())+(!f.html5Mode()&&g?"/":"")+g),g},v.get=function(a,b){if(!C(a)){var c=[];return H(w,function(a){c.push(a.self)}),c}var d=l(a,b);return d&&d.self?d.self:null},v}function t(a,b,c,d){return a!==b||(c!==b.locals||d.reload)&&a.self.reloadOnSearch!==!1?void 0:!0}var u,v,w={},x={},y="abstract",z={parent:function(a){if(C(a.parent)&&a.parent)return l(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?l(b[1]):u},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=I({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url;if(E(b))return"^"==b.charAt(0)?e.compile(b.substring(1)):(a.parent.navigable||u).url.concat(b);if(e.isMatcher(b)||null==b)return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},params:function(a){if(!a.params)return a.url?a.url.parameters():a.parent.params;if(!G(a.params))throw new Error("Invalid params in state '"+a+"'");if(a.url)throw new Error("Both params and url specicified in state '"+a+"'");return a.params},views:function(a){var b={};return H(C(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},ownParams:function(a){if(!a.parent)return a.params;var b={};H(a.params,function(a){b[a]=!0}),H(a.parent.params,function(c){if(!b[c])throw new Error("Missing required parameter '"+c+"' in state '"+a.name+"'");b[c]=!1});var c=[];return H(b,function(a,b){a&&c.push(b)}),c},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?I({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};u=n({name:"",url:"^",views:null,"abstract":!0}),u.navigable=null,this.decorator=q,this.state=r,this.$get=s,s.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$location","$urlRouter","$browser"]}function r(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=I(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function s(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){c(function(){a[0].scrollIntoView()},0,!1)}}]}function t(a,c,d){function e(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function f(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(i)return{enter:function(a,b,c){i.enter(a,null,b,c)},leave:function(a,b){i.leave(a,b)}};if(h){var d=h&&h(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var g=e(),h=g("$animator"),i=g("$animate"),j={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,e,g){return function(c,e,h){function i(){k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),l&&(q.leave(l,function(){k=null}),k=l,l=null)}function j(f){var h=c.$new(),j=l&&l.data("$uiViewName"),k=j&&a.$current&&a.$current.locals[j];if(f||k!==n){var r=g(h,function(a){q.enter(a,e,function(){(b.isDefined(p)&&!p||c.$eval(p))&&d(a)}),i()});n=a.$current.locals[r.data("$uiViewName")],l=r,m=h,m.$emit("$viewContentLoaded"),m.$eval(o)}}var k,l,m,n,o=h.onload||"",p=h.autoscroll,q=f(h,c);c.$on("$stateChangeSuccess",function(){j(!1)}),c.$on("$viewContentLoading",function(){j(!1)}),j(!0)}}};return j}function u(a,b,c){return{restrict:"ECA",priority:-400,compile:function(d){var e=d.html();return function(d,f,g){var h=g.uiView||g.name||"",i=f.inheritedData("$uiView");h.indexOf("@")<0&&(h=h+"@"+(i?i.state.name:"")),f.data("$uiViewName",h);var j=c.$current,k=j&&j.locals[h];if(k){f.data("$uiView",{name:h,state:k.$$state}),f.html(k.$template?k.$template:e);var l=a(f.contents());if(k.$$controller){k.$scope=d;var m=b(k.$$controller,k);k.$$controllerAs&&(d[k.$$controllerAs]=m),f.data("$ngControllerController",m),f.children().data("$ngControllerController",m)}l(d)}}}}}function v(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function w(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function x(a,c){var d=["location","inherit","reload"];return{restrict:"A",require:"?^uiSrefActive",link:function(e,f,g,h){var i=v(g.uiSref),j=null,k=w(f)||a.$current,l="FORM"===f[0].nodeName,m=l?"action":"href",n=!0,o={relative:k},p=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in p&&(o[a]=p[a])});var q=function(b){if(b&&(j=b),n){var c=a.href(i.state,j,o);return h&&h.$$setStateInfo(i.state,j),c?void(f[0][m]=c):(n=!1,!1)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a){a!==j&&q(a)},!0),j=e.$eval(i.paramExpr)),q(),l||f.bind("click",function(b){var d=b.which||b.button;d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target")||(c(function(){a.go(i.state,j,o)}),b.preventDefault())})}}}function y(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(d,e,f){function g(){a.$current.self===i&&h()?e.addClass(l):e.removeClass(l)}function h(){return!k||j(k,b)}var i,k,l;l=c(f.uiSrefActive||"",!1)(d),this.$$setStateInfo=function(b,c){i=a.get(b,w(e)),k=c,g()},d.$on("$stateChangeSuccess",g)}]}}function z(a){return function(b){return a.is(b)}}function A(a){return function(b){return a.includes(b)}}function B(a,b){function e(a){this.locals=a.locals.globals,this.params=this.locals.$stateParams}function f(){this.locals=null,this.params=null}function g(c,g){if(null!=g.redirectTo){var h,j=g.redirectTo;if(E(j))h=j;else{if(!D(j))throw new Error("Invalid 'redirectTo' in when()");h=function(a,b){return j(a,b.path(),b.search())}}b.when(c,h)}else a.state(d(g,{parent:null,name:"route:"+encodeURIComponent(c),url:c,onEnter:e,onExit:f}));return i.push(g),this}function h(a,b,d){function e(a){return""!==a.name?a:c}var f={routes:i,params:d,current:c};return b.$on("$stateChangeStart",function(a,c,d,f){b.$broadcast("$routeChangeStart",e(c),e(f))}),b.$on("$stateChangeSuccess",function(a,c,d,g){f.current=e(c),b.$broadcast("$routeChangeSuccess",e(c),e(g)),J(d,f.params)}),b.$on("$stateChangeError",function(a,c,d,f,g,h){b.$broadcast("$routeChangeError",e(c),e(f),h)}),f}var i=[];e.$inject=["$$state"],this.when=g,this.$get=h,h.$inject=["$state","$rootScope","$routeParams"]}var C=b.isDefined,D=b.isFunction,E=b.isString,F=b.isObject,G=b.isArray,H=b.forEach,I=b.extend,J=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),l.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",l),m.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",m),n.prototype.concat=function(a){return new n(this.sourcePath+a+this.sourceSearch)},n.prototype.toString=function(){return this.source},n.prototype.exec=function(a,b){var c=this.regexp.exec(a);if(!c)return null;var d,e=this.params,f=e.length,g=this.segments.length-1,h={};if(g!==c.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(d=0;g>d;d++)h[e[d]]=c[d+1];for(;f>d;d++)h[e[d]]=b[e[d]];return h},n.prototype.parameters=function(){return this.params},n.prototype.format=function(a){var b=this.segments,c=this.params;if(!a)return b.join("");var d,e,f,g=b.length-1,h=c.length,i=b[0];for(d=0;g>d;d++)f=a[c[d]],null!=f&&(i+=encodeURIComponent(f)),i+=b[d+1];for(;h>d;d++)f=a[c[d]],null!=f&&(i+=(e?"&":"?")+c[d]+"="+encodeURIComponent(f),e=!0);return i},b.module("ui.router.util").provider("$urlMatcherFactory",o),p.$inject=["$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",p),q.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider","$locationProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",q),r.$inject=[],b.module("ui.router.state").provider("$view",r),b.module("ui.router.state").provider("$uiViewScroll",s),t.$inject=["$state","$injector","$uiViewScroll"],u.$inject=["$compile","$controller","$state"],b.module("ui.router.state").directive("uiView",t),b.module("ui.router.state").directive("uiView",u),x.$inject=["$state","$timeout"],y.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",x).directive("uiSrefActive",y),z.$inject=["$state"],A.$inject=["$state"],b.module("ui.router.state").filter("isState",z).filter("includedByState",A),B.$inject=["$stateProvider","$urlRouterProvider"],b.module("ui.router.compat").provider("$route",B).directive("ngView",t)}(window,window.angular);
\ No newline at end of file
diff --git a/js/service.js b/js/service.js
index 748949c..738016f 100644
--- a/js/service.js
+++ b/js/service.js
@@ -202,82 +202,6 @@ JamStash.service('notifications', function ($rootScope, globals) {
 });
 
 // Directives
-JamStash.directive('layout', function () {
-    return {
-
-        link: function (scope, elm, attrs) {
-
-            var pageLayoutOptions = {
-                name: 'pageLayout', // only for debugging
-                resizeWithWindowDelay: 250, 	// delay calling resizeAll when window is *still* resizing
-                //,	resizeWithWindowMaxDelay: 2000	// force resize every XX ms while window is being resized
-                //center__children: {},
-                //north__paneSelector: "#container",
-                center__paneSelector: "#container",
-                south__paneSelector: "#QueuePreview",
-                south__resizable: false, // No resize
-                //south__closable: false, // No close handle
-                //south__spacing_open: 0, // No resize bar
-                south__size: 145,
-                south__initClosed: true,
-                south__minWidth: 145,
-                south__maxWidth: 145
-            };
-
-            var layoutThreeCol = {
-                east__size: 0.42,
-                east__minSize: 400,
-                east__maxSize: 0.5, // 50% of layout width
-                east__initClosed: false,
-                east__initHidden: false,
-                //center__size: 'auto',
-                center__minWidth: 0.38,
-                center__initClosed: false,
-                center__initHidden: false,
-                west__size: 0.2,
-                west__minSize: 200,
-                west__initClosed: false,
-                west__initHidden: false,
-                //stateManagement__enabled: true, // automatic cookie load & save enabled by default
-                showDebugMessages: true // log and/or display messages from debugging & testing code
-                //applyDefaultStyles: true
-            };
-
-            var layoutTwoCol = {
-                center__size: 0.8,
-                center__minSize: 400,
-                center__maxSize: 0.5, // 50% of layout width
-                center__initClosed: false,
-                center__initHidden: false,
-                west__size: 0.2,
-                west__minSize: 200,
-                west__initClosed: false,
-                west__initHidden: false,
-                //stateManagement__enabled: true, // automatic cookie load & save enabled by default
-                showDebugMessages: true // log and/or display messages from debugging & testing code
-                //applyDefaultStyles: true
-            };
-
-            scope.$watch(attrs.state, function (state) {
-                if (state == 1) {
-                    var layout = elm.layout(pageLayoutOptions);
-                }
-                if (state == 2) {
-                    var layout = elm.layout(layoutTwoCol);
-                    //scope.layout.sizePane('east', 120);
-                    //scope.layout.show('west');
-                    //scope.layout.show('south');
-                } else if (state == 3) {
-                    var layout = elm.layout(layoutThreeCol);
-                    //scope.layout.sizePane('east', 60);
-                    //scope.layout.hide('west');
-                    //scope.layout.hide('south');
-                }
-                scope.layout = layout;
-            });
-        }
-    };
-});
 JamStash.directive('sortable', function () {
     return {
         link: function (scope, elm, attrs) {
@@ -291,43 +215,8 @@ JamStash.directive('sortable', function () {
 });
 JamStash.directive('split', function () {
     return {
-
         link: function (scope, elm, attrs) {
             elm.splitPane();
-            /*
-            //elm.first().resizable({
-            $('#SubsonicAlbums > div:first').resizable({
-                handles: 'e',
-                minWidth: '100',
-                maxWidth: '400',
-                resize: function () {
-                    alert('foo');
-                    var remainingSpace = $(this).parent().width() - $(this).outerWidth();
-                    var divTwo = $(this).next();
-                    var divTwoWidth = remainingSpace - (divTwo.outerWidth() - divTwo.width());
-                    divTwo.css('width', divTwoWidth + 'px');
-                }
-            });
-            */
-            /*
-            scope.$watch(attrs.state, function (state) {
-                if (state == 1) {
-                    var layout = elm.layout(pageLayoutOptions);
-                }
-                if (state == 2) {
-                    var layout = elm.layout(layoutTwoCol);
-                    //scope.layout.sizePane('east', 120);
-                    //scope.layout.show('west');
-                    //scope.layout.show('south');
-                } else if (state == 3) {
-                    var layout = elm.layout(layoutThreeCol);
-                    //scope.layout.sizePane('east', 60);
-                    //scope.layout.hide('west');
-                    //scope.layout.hide('south');
-                }
-                scope.layout = layout;
-            });
-            */
         }
     };
 });
@@ -383,17 +272,18 @@ JamStash.directive('stopEvent', function () {
     };
 });
 JamStash.directive('ngEnter', function () {
-    return function (scope, element, attrs) {
-        element.bind("keydown keypress", function (event) {
-            if (event.which === 13) {
-                scope.$apply(function () {
-                    scope.$eval(attrs.ngEnter);
-                });
-
-                event.preventDefault();
-            }
-        });
-    };
+    return {
+        scope: { onEnter: '&' },
+        link: function (scope, element) {
+            console.log(scope);
+            element.bind("keydown keypress", function (event) {
+                if (event.which === 13) {
+                    scope.onEnter();
+                    scope.$apply();
+                }
+            });
+        }
+    }
 });
 JamStash.directive('ngDownload', function ($compile) {
     return {
@@ -469,8 +359,160 @@ JamStash.factory('template', function ($http, $compile, $http, $templateCache) {
     };
 });
 */
-JamStash.factory('subsonic', function ($http, globals, utils) {
+
+JamStash.service('map', function ($http, globals, utils, model) {
+    this.mapArtist = function (data) {
+        var name = '';
+        var artist = data.artist;
+        var artists = [];
+        if (artist.length > 0) {
+            artists = artist;
+        } else {
+            artists[0] = artist;
+        }
+        angular.forEach(artists, function (item, key) {
+            if (typeof item.name !== 'undefined') { item.name = item.name.toString(); }
+        });
+        if (typeof data.name !== 'undefined') { name = data.name.toString(); }
+        return new model.Index(name, artists);
+    };
+    this.mapIndex = function (data) {
+        var name, id = '';
+        if (typeof data.id !== 'undefined') { id = data.id; }
+        if (typeof data.name !== 'undefined') { name = data.name.toString(); }
+        return new model.Artist(id, name);
+    };
+    this.mapAlbum = function (data) {
+        var album = data;
+        var title, coverartthumb, coverartfull, starred;
+        if (typeof album.coverArt != 'undefined') {
+            coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=160&id=' + album.coverArt;
+            coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + album.coverArt;
+        }
+        if (typeof album.starred !== 'undefined') { starred = true; } else { starred = false; }
+        if (typeof album.title !== 'undefined') { title = album.title; } else { title = album.name; }
+        var type;
+        if (album.isDir) {
+            type = 'byfolder';
+        } else {
+            type = 'bytag';
+        }
+        return new model.Album(album.id, album.parent, title, album.artist.toString(), album.artistId, coverartthumb, coverartfull, $.format.date(new Date(album.created), "yyyy-MM-dd h:mm a"), starred, '', '', type);
+    };
+    this.mapSong = function (data) {
+        var song = data;
+        var url, title, artist, track, rating, starred, contenttype, suffix, description;
+        var specs = '', coverartthumb = '', coverartfull = '';
+        if (typeof song.coverArt != 'undefined') {
+            coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=60&id=' + song.coverArt;
+            coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt;
+        } else {
+            coverartthumb = 'images/albumdefault_60.jpg';
+            coverartfull = 'images/albumdefault_160.jpg';
+        }
+        if (typeof song.description == 'undefined') { description = ''; } else { description = song.description; }
+        if (typeof song.artist == 'undefined') { artist = '&nbsp;'; } else { artist = song.artist.toString(); }
+        if (typeof song.title == 'undefined') { title = '&nbsp;'; } else { title = song.title.toString(); }
+        if (typeof song.track == 'undefined') { track = '&nbsp;'; } else { track = song.track.toString(); }
+        if (typeof song.starred !== 'undefined') { starred = true; } else { starred = false; }
+        if (song.bitRate !== undefined) { specs += song.bitRate + ' Kbps'; }
+        if (song.transcodedSuffix !== undefined) { specs += ', transcoding:' + song.suffix + ' > ' + song.transcodedSuffix; } else { specs += ', ' + song.suffix; }
+        if (song.transcodedSuffix !== undefined) { suffix = song.transcodedSuffix; } else { suffix = song.suffix; }
+        if (suffix == 'ogg') { suffix = 'oga'; }
+        var salt = Math.floor(Math.random() * 100000);
+        url = globals.BaseURL() + '/stream.view?' + globals.BaseParams() + '&id=' + song.id + '&salt=' + salt;
+        return new model.Song(song.id, song.parent, track, title, artist, song.artistId, song.album, song.albumId, coverartthumb, coverartfull, song.duration, song.userRating, starred, suffix, specs, url, 0, description);
+    };
+    this.mapPlaylist = function (data) {
+        return new model.Artist(data.id, data.name);
+    };
+    this.mapPodcast = function (data) {
+        var song = data;
+        var url, track, rating, starred, contenttype, suffix, description, artist, album, title;
+        var specs = '', coverartthumb = '', coverartfull = '';
+        if (typeof song.coverArt != 'undefined') {
+            coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=60&id=' + song.coverArt;
+            coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt;
+        }
+        if (typeof song.album == 'undefined') { album = '&nbsp;'; } else { album = song.album.toString(); }
+        if (typeof song.artist == 'undefined') { artist = '&nbsp;'; } else { artist = song.artist.toString(); }
+        if (typeof song.title == 'undefined') { title = '&nbsp;'; } else { title = song.title.toString(); }
+        if (typeof song.description == 'undefined') { description = ''; } else { description = song.description; }
+        if (typeof song.track == 'undefined') { track = '&nbsp;'; } else { track = song.track.toString(); }
+        if (typeof song.starred !== 'undefined') { starred = true; } else { starred = false; }
+        if (song.bitRate !== undefined) { specs += song.bitRate + ' Kbps'; }
+        if (song.transcodedSuffix !== undefined) { specs += ', transcoding:' + song.suffix + ' > ' + song.transcodedSuffix; } else { specs += ', ' + song.suffix; }
+        if (song.transcodedSuffix !== undefined) { suffix = song.transcodedSuffix; } else { suffix = song.suffix; }
+        if (suffix == 'ogg') { suffix = 'oga'; }
+        var salt = Math.floor(Math.random() * 100000);
+        url = globals.BaseURL() + '/stream.view?' + globals.BaseParams() + '&id=' + song.streamId + '&salt=' + salt;
+        return new model.Song(song.streamId, song.parent, track, title, artist, song.artistId, album, song.albumId, coverartthumb, coverartfull, song.duration, song.userRating, starred, suffix, specs, url, 0, description);
+    };
+});
+
+JamStash.factory('subsonic', function ($rootScope, $http, $q, globals, utils, map, notifications) {
+    var index = { shortcuts: [], artists: [] };
+    var content = {
+        album: [],
+        song: [],
+        playlists: [],
+        breadcrumb: [],
+        playlistsPublic: [],
+        playlistsGenre: globals.SavedGenres,
+        selectedAutoAlbum: null,
+        selectedArtist: null,
+        selectedAlbum: null,
+        selectedPlaylist: null,
+        selectedAutoPlaylist: null,    
+        selectedGenre: null,
+        selectedPodcast: null
+    };
+    var genres = [];
+    var podcasts = [];
+    var offset = 0;
+    var showIndex = false;
+    var showPlaylist = false;
+    var showPodcast = false;
+
+    var sortSubsonicAlbums = function (newValue) {
+        if (typeof newValue != 'undefined') {
+            //alert(newValue);
+            switch (newValue) {
+                case 'createdate desc':
+                    content.album.sort(utils.sortDateFunction);
+                    break;
+                case 'artist':
+                    content.album.sort(utils.sortArtistFunction);
+                    break;
+                case 'album':
+                    content.album.sort(utils.sortAlbumFunction);
+                    break;
+            }
+        }
+    };
+    var sortSubsonicSongs = function (newValue) {
+        if (typeof newValue != 'undefined') {
+            //alert(newValue);
+            switch (newValue) {
+                case 'createdate desc':
+                    content.song.sort(utils.sortDateFunction);
+                    break;
+                case 'artist':
+                    content.song.sort(utils.sortArtistFunction);
+                    break;
+                case 'album':
+                    content.song.sort(utils.sortAlbumFunction);
+                    break;
+                case 'track':
+                    content.song.sort(utils.sortTrackFunction);
+                    break;
+            }
+        }
+    };
+    
     return {
+        showIndex: showIndex,
+        showPlaylist: showPlaylist,
         getSongTemplate: function (callback) {
             var id = '16608';
             var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
@@ -496,15 +538,694 @@ JamStash.factory('subsonic', function ($http, globals, utils) {
                     }
                     angular.forEach(items, function (item, key) {
                         if (!item.isDir) {
-                            song.push(utils.mapSong(item));
+                            song.push(map.mapSong(item));
                         }
                     });
                     callback(song);
                 }
             });
+        },
+        getArtists: function (id, refresh) {
+            var deferred = $q.defer();
+            if (refresh || index.artists.length == 0) {
+                var url;
+                if (utils.getValue('MusicFolders')) {
+                    var folder = angular.fromJson(utils.getValue('MusicFolders'));
+                    id = folder.id;
+                }
+                if (id) {
+                    url = globals.BaseURL() + '/getIndexes.view?' + globals.BaseParams() + '&musicFolderId=' + id;
+                } else {
+                    url = globals.BaseURL() + '/getIndexes.view?' + globals.BaseParams();
+                }
+
+                /*
+                $http.get(url).success(function (data) {
+                });
+                */
+                $.ajax({
+                    url: url,
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        var indexes = [];
+                        if (typeof data["subsonic-response"].indexes.index != 'undefined') {
+                            if (data["subsonic-response"].indexes.index.length > 0) {
+                                indexes = data["subsonic-response"].indexes.index;
+                            } else {
+                                indexes[0] = data["subsonic-response"].indexes.index;
+                            }
+                        }
+                        index.artists = [];
+                        index.shortcuts = [];
+                        var items = [];
+                        if (typeof data["subsonic-response"].indexes.shortcut != 'undefined') {
+                            if (data["subsonic-response"].indexes.shortcut.length > 0) {
+                                items = data["subsonic-response"].indexes.shortcut;
+                            } else {
+                                items[0] = data["subsonic-response"].indexes.shortcut;
+                            }
+                            angular.forEach(items, function (item, key) {
+                                index.shortcuts.push(map.mapIndex(item));
+                            });
+                        }
+                        angular.forEach(indexes, function (item, key) {
+                            index.artists.push(map.mapArtist(item));
+                        });
+                        deferred.resolve(index);
+                    }
+                });
+            } else {
+                deferred.resolve(index);
+            }
+            return deferred.promise;
+        },
+        getAlbums: function (id, name) {
+            var deferred = $q.defer();
+            if (id) {
+                content.selectedAutoAlbum = null;
+                content.selectedPlaylist = null;
+                content.selectedArtist = id;
+                content.breadcrumb = [];
+                content.breadcrumb.push({ 'type': 'artist', 'id': id, 'name': name });
+                var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
+                /*
+                $http.get(url).success(function (data) {
+                });
+                */
+                $.ajax({
+                    url: url,
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        var items = [];
+                        if (typeof data["subsonic-response"].directory.child != 'undefined') {
+                            if (data["subsonic-response"].directory.child.length > 0) {
+                                items = data["subsonic-response"].directory.child;
+                            } else {
+                                items[0] = data["subsonic-response"].directory.child;
+                            }
+                            content.album = [];
+                            content.song = [];
+
+                            angular.forEach(items, function (item, key) {
+                                if (item.isDir) {
+                                    content.album.push(map.mapAlbum(item));
+                                } else {
+                                    content.song.push(map.mapSong(item));
+                                }
+                            });
+                            if (SelectedAlbumSort.id != "default") {
+                                sortSubsonicAlbums(SelectedAlbumSort.id);
+                            }
+                        } else {
+                            notifications.updateMessage('No Albums Returned :(', true);
+                        }
+                        deferred.resolve(content);
+                    }
+                });
+            } else {
+                deferred.resolve(content);
+            }
+            return deferred.promise;
+        },
+        getAlbumListBy: function (id, off) {
+            var deferred = $q.defer();
+            var size, url;
+            content.selectedArtist = null;
+            content.selectedPlaylist = null;
+            content.selectedAutoAlbum = id;
+            content.breadcrumb = [];
+            if (off == 'next') {
+                offset = offset + globals.settings.AutoAlbumSize;
+            } else if (offset == 'prev') {
+                offset = offset - globals.settings.AutoAlbumSize;
+            } else {
+                offset = 0;
+            }
+            if (offset > 0) {
+                url = globals.BaseURL() + '/getAlbumList.view?' + globals.BaseParams() + '&size=' + globals.settings.AutoAlbumSize.toString() + '&type=' + id + '&offset=' + offset;
+            } else {
+                url = globals.BaseURL() + '/getAlbumList.view?' + globals.BaseParams() + '&size=' + globals.settings.AutoAlbumSize.toString() + '&type=' + id;
+            }
+            $.ajax({
+                url: url,
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    var items = [];
+                    if (typeof data["subsonic-response"].albumList.album != 'undefined') {
+                        if (data["subsonic-response"].albumList.album.length > 0) {
+                            items = data["subsonic-response"].albumList.album;
+                        } else {
+                            items[0] = data["subsonic-response"].albumList.album;
+                        }
+                        content.album = [];
+                        content.song = [];
+                        angular.forEach(items, function (item, key) {
+                            if (item.isDir) {
+                                content.album.push(map.mapAlbum(item));
+                            } else {
+                                content.song.push(map.mapSong(item));
+                            }
+                        });
+                        if (SelectedAlbumSort.id != "default") {
+                            sortSubsonicAlbums(SelectedAlbumSort.id);
+                        }
+                        deferred.resolve(content);
+                    } else {
+                        notifications.updateMessage('No Albums Returned :(', true);
+                    }
+                }
+            });
+            return deferred.promise;
+        },
+        getSongs: function (id, action) {
+            var deferred = $q.defer();
+            if (id) {
+                content.selectedAlbum = id;
+                var url = globals.BaseURL() + '/getMusicDirectory.view?' + globals.BaseParams() + '&id=' + id;
+                $.ajax({
+                    url: url,
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        var items = [];
+                        if (typeof data["subsonic-response"].directory.child != 'undefined') {
+                            if (data["subsonic-response"].directory.child.length > 0) {
+                                items = data["subsonic-response"].directory.child;
+                            } else {
+                                items[0] = data["subsonic-response"].directory.child;
+                            }
+                            if (action == 'add') {
+                                angular.forEach(items, function (item, key) {
+                                    $rootScope.queue.push(map.mapSong(item));
+                                });
+                                notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                            } else if (action == 'play') {
+                                $rootScope.queue = [];
+                                angular.forEach(items, function (item, key) {
+                                    $rootScope.queue.push(map.mapSong(item));
+                                });
+                                var next = $rootScope.queue[0];
+                                $rootScope.playSong(false, next);
+                                notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                            } else {
+                                if (typeof data["subsonic-response"].directory.id != 'undefined') {
+                                    var albumId = data["subsonic-response"].directory.id;
+                                    var albumName = data["subsonic-response"].directory.name;
+                                    if (content.breadcrumb.length > 0) { content.breadcrumb.splice(1, (content.breadcrumb.length - 1)); }
+                                    content.breadcrumb.push({ 'type': 'album', 'id': albumId, 'name': albumName });
+                                }
+                                content.song = [];
+                                content.album = [];
+                                var albums = [];
+                                angular.forEach(items, function (item, key) {
+                                    if (item.isDir) {
+                                        albums.push(map.mapAlbum(item));
+                                    } else {
+                                        content.song.push(map.mapSong(item));
+                                    }
+                                });
+                                if (albums.length > 0) {
+                                    content.album = albums;
+                                    if ($scope.SelectedAlbumSort.id != "default") {
+                                        sortSubsonicAlbums(SelectedAlbumSort.id);
+                                    }
+                                }
+                            }
+                            deferred.resolve(content);
+                        } else {
+                            notifications.updateMessage('No Songs Returned :(', true);
+                        }
+                    }
+                });
+        } else {
+            deferred.resolve(content);
         }
+        return deferred.promise;
+        },
+        search: function (query, type) {
+            var deferred = $q.defer();
+            if (query !== '') {
+                $.ajax({
+                    url: globals.BaseURL() + '/search2.view?' + globals.BaseParams() + '&query=' + query,
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        if (data["subsonic-response"].searchResult2 !== "") {
+                            var items = [];
+                            if (type === '0') {
+                                if (data["subsonic-response"].searchResult2.song !== undefined) {
+                                    if (data["subsonic-response"].searchResult2.song.length > 0) {
+                                        items = data["subsonic-response"].searchResult2.song;
+                                    } else {
+                                        items[0] = data["subsonic-response"].searchResult2.song;
+                                    }
+                                    content.album = [];
+                                    content.song = [];
+                                    angular.forEach(items, function (item, key) {
+                                        content.song.push(map.mapSong(item));
+                                    });
+                                }
+                            }
+                            if (type === '1') {
+                                if (data["subsonic-response"].searchResult2.album !== undefined) {
+                                    if (data["subsonic-response"].searchResult2.album.length > 0) {
+                                        items = data["subsonic-response"].searchResult2.album;
+                                    } else {
+                                        items[0] = data["subsonic-response"].searchResult2.album;
+                                    }
+                                    content.album = [];
+                                    content.song = [];
+                                    angular.forEach(items, function (item, key) {
+                                        if (item.isDir) {
+                                            content.album.push(map.mapAlbum(item));
+                                        } else {
+                                            content.song.push(map.mapAlbum(item));
+                                        }
+                                    });
+                                }
+                            }
+                            if (type === '2') {
+                                if (data["subsonic-response"].searchResult2.artist !== undefined) {
+                                    if (data["subsonic-response"].searchResult2.artist.length > 0) {
+                                        items = data["subsonic-response"].searchResult2.artist;
+                                    } else {
+                                        items[0] = data["subsonic-response"].searchResult2.artist;
+                                    }
+                                    angular.forEach(items, function (item, key) {
+                                        index.shortcuts.push(item);
+                                    });
+                                }
+                            }
+                            deferred.resolve(content);
+                        }
+                    }
+                });
+                //$('#Search').val("");
+            }
+            return deferred.promise;
+        },
+        getRandomSongs: function (action, genre, folder) {
+            var deferred = $q.defer();
+            if (globals.settings.Debug) { console.log('action:' + action + ', genre:' + genre + ', folder:' + folder); }
+            var size = globals.settings.AutoPlaylistSize;
+            content.selectedPlaylist = null;
+            if (typeof folder == 'number') {
+                content.selectedAutoPlaylist = folder;
+            } else if (genre !== '') {
+                content.selectedAutoPlaylist = genre;
+            } else {
+                content.selectedAutoPlaylist = 'random';
+            }
+            var genreParams = '';
+            if (genre !== '' && genre != 'Random') {
+                genreParams = '&genre=' + genre;
+            }
+            folderParams = '';
+            if (typeof folder == 'number' && folder !== '' && folder != 'all') {
+                //alert(folder);
+                folderParams = '&musicFolderId=' + folder;
+            } else if (typeof $rootScope.SelectedMusicFolder.id != 'undefined' && $rootScope.SelectedMusicFolder.id >= 0) {
+                //alert($rootScope.SelectedMusicFolder.id);
+                folderParams = '&musicFolderId=' + $rootScope.SelectedMusicFolder.id;
+            }
+            $.ajax({
+                url: globals.BaseURL() + '/getRandomSongs.view?' + globals.BaseParams() + '&size=' + size + genreParams + folderParams,
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    if (typeof data["subsonic-response"].randomSongs.song != 'undefined') {
+                        var items = [];
+                        if (data["subsonic-response"].randomSongs.song.length > 0) {
+                            items = data["subsonic-response"].randomSongs.song;
+                        } else {
+                            items[0] = data["subsonic-response"].randomSongs.song;
+                        }
+                        if (action == 'add') {
+                            angular.forEach(items, function (item, key) {
+                                $rootScope.queue.push(map.mapSong(item));
+                            });
+                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                        } else if (action == 'play') {
+                            $rootScope.queue = [];
+                            angular.forEach(items, function (item, key) {
+                                $rootScope.queue.push(map.mapSong(item));
+                            });
+                            var next = $rootScope.queue[0];
+                            $rootScope.playSong(false, next);
+                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                        } else {
+                            content.album = [];
+                            content.song = [];
+                            angular.forEach(items, function (item, key) {
+                                content.song.push(map.mapSong(item));
+                            });
+                        }
+                    }
+                    deferred.resolve(content);
+                }
+            });
+            return deferred.promise;
+        },
+        getPlaylists: function (refresh) {
+            var deferred = $q.defer();
+            if (globals.settings.Debug) { console.log("LOAD PLAYLISTS"); }
+            if (refresh || content.playlists.length == 0) {
+                $.ajax({
+                    url: globals.BaseURL() + '/getPlaylists.view?' + globals.BaseParams(),
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        if (data["subsonic-response"].playlists.playlist !== undefined) {
+                            var items = [];
+                            if (data["subsonic-response"].playlists.playlist.length > 0) {
+                                items = data["subsonic-response"].playlists.playlist;
+                            } else {
+                                items[0] = data["subsonic-response"].playlists.playlist;
+                            }
+                            content.playlists = [];
+                            content.playlistsPublic = [];
+                            angular.forEach(items, function (item, key) {
+                                if (item.owner == globals.settings.Username) {
+                                    content.playlists.push(item);
+                                } else if (item.public) {
+                                    content.playlistsPublic.push(item);
+                                }
+                            });
+                            deferred.resolve(content);
+                        }
+                    }
+                });
+            } else {
+                deferred.resolve(content);
+            }
+            return deferred.promise;
+        },
+        getPlaylist: function (id, action) {
+            var deferred = $q.defer();
+            content.selectedAutoPlaylist = null;
+            content.selectedPlaylist = id;
+            $.ajax({
+                url: globals.BaseURL() + '/getPlaylist.view?' + globals.BaseParams() + '&id=' + id,
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    if (typeof data["subsonic-response"].playlist.entry != 'undefined') {
+                        var items = [];
+                        var playlist = data["subsonic-response"].playlist;
+                        if (playlist.entry.length > 0) {
+                            items = playlist.entry;
+                        } else {
+                            items[0] = playlist.entry;
+                        }
+                        if (action == 'add') {
+                            angular.forEach(items, function (item, key) {
+                                $rootScope.queue.push(map.mapSong(item));
+                            });
+                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                        } else if (action == 'play') {
+                            $rootScope.queue = [];
+                            angular.forEach(items, function (item, key) {
+                                $rootScope.queue.push(map.mapSong(item));
+                            });
+                            var next = $rootScope.queue[0];
+                            $rootScope.playSong(false, next);
+                            notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                        } else {
+                            content.album = [];
+                            content.song = [];
+                            angular.forEach(items, function (item, key) {
+                                content.song.push(map.mapSong(item));
+                            });
+                            notifications.updateMessage(items.length + ' Song(s) in Playlist', true);
+                        }
+                    } else {
+                        content.song = [];
+                    }
+                    deferred.resolve(content);
+                }
+            });
+            return deferred.promise;
+        },
+        getStarred: function (action, type) {
+            var deferred = $q.defer();
+            var size = globals.settings.AutoPlaylistSize;
+            content.selectedPlaylist = null;
+            content.selectedAutoPlaylist = 'starred';
+            $.ajax({
+                url: globals.BaseURL() + '/getStarred.view?' + globals.BaseParams() + '&size=' + size,
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    if (typeof data["subsonic-response"].starred !== 'undefined') {
+                        var items = [];
+                        switch (type) {
+                            case 'artist':
+                                if (typeof data["subsonic-response"].starred.artist !== 'undefined') {
+                                    if (data["subsonic-response"].starred.artist.length > 0) {
+                                        items = data["subsonic-response"].starred.artist;
+                                    } else {
+                                        items[0] = data["subsonic-response"].starred.artist;
+                                    }
+                                }
+                                break;
+                            case 'album':
+                                if (typeof data["subsonic-response"].starred.album !== 'undefined') {
+                                    if (data["subsonic-response"].starred.album.length > 0) {
+                                        items = data["subsonic-response"].starred.album;
+                                    } else {
+                                        items[0] = data["subsonic-response"].starred.album;
+                                    }
+                                }
+                                break;
+                            case 'song':
+                                if (typeof data["subsonic-response"].starred.song !== 'undefined') {
+                                    if (data["subsonic-response"].starred.song.length > 0) {
+                                        items = data["subsonic-response"].starred.song;
+                                    } else {
+                                        items[0] = data["subsonic-response"].starred.song;
+                                    }
+                                    if (action == 'add') {
+                                        angular.forEach(items, function (item, key) {
+                                            $rootScope.queue.push(map.mapSong(item));
+                                        });
+                                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                                    } else if (action == 'play') {
+                                        $rootScope.queue = [];
+                                        angular.forEach(items, function (item, key) {
+                                            $rootScope.queue.push(map.mapSong(item));
+                                        });
+                                        var next = $rootScope.queue[0];
+                                        $rootScope.playSong(false, next);
+                                        notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                                    } else {
+                                        content.album = [];
+                                        content.song = [];
+                                        angular.forEach(items, function (item, key) {
+                                            content.song.push(map.mapSong(item));
+                                        });
+                                    }
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    deferred.resolve(content);
+                }
+            });
+            return deferred.promise;
+        },
+        newPlaylist: function (data, event) {
+            var deferred = $q.defer();
+            var reply = prompt("Choose a name for your new playlist.", "");
+            if (reply != 'null' && reply !== null && reply !== '') {
+                $.ajax({
+                    url: globals.BaseURL() + '/createPlaylist.view?' + globals.BaseParams() + '&name=' + reply,
+                    method: 'GET',
+                    dataType: globals.settings.Protocol,
+                    timeout: globals.settings.Timeout,
+                    success: function (data) {
+                        deferred.resolve();
+                    }
+                });
+            }
+            return deferred.promise;
+        },
+        deletePlaylist: function () {
+            var deferred = $q.defer();
+            if (content.selectedPlaylist !== null) {
+                var id = content.selectedPlaylist;
+                if (utils.confirmDelete('Are you sure you want to delete the selected playlist?')) {
+                    $.ajax({
+                        url: globals.BaseURL() + '/deletePlaylist.view?' + globals.BaseParams() + '&id=' + id,
+                        method: 'GET',
+                        dataType: globals.settings.Protocol,
+                        timeout: globals.settings.Timeout,
+                        success: function (data) {
+                            deferred.resolve();
+                        }
+                    });
+                }
+            }
+            return deferred.promise;
+        },
+        savePlaylist: function () {
+            var deferred = $q.defer();
+            if (content.selectedPlaylist !== null) {
+                var id = content.selectedPlaylist;
+                var songs = [];
+                angular.forEach(content.song, function (item, key) {
+                    songs.push(item.id);
+                });
+                if (songs.length > 0) {
+                    $.ajax({
+                        type: 'GET',
+                        url: globals.BaseURL() + '/createPlaylist.view?' + globals.BaseParams(),
+                        dataType: globals.settings.Protocol,
+                        timeout: globals.settings.Timeout,
+                        data: { playlistId: id, songId: songs },
+                        success: function () {
+                            deferred.resolve();
+                        },
+                        traditional: true // Fixes POST with an array in JQuery 1.4
+                    });
+                }
+            }
+            return deferred.promise;
+        },
+        songsRemoveSelected: function (songs) {
+            var deferred = $q.defer();
+            angular.forEach(songs, function (item, key) {
+                var index = content.song.indexOf(item)
+                content.song.splice(index, 1);
+            });
+            deferred.resolve(content);
+            return deferred.promise;
+        },
+        getGenres: function () {
+            var deferred = $q.defer();
+            var genresStr = 'Acid Rock,Acoustic,Alt Country,Alt/Indie,Alternative & Punk,Alternative Metal,Alternative,AlternRock,Awesome,Bluegrass,Blues,Blues-Rock,Classic Hard Rock,Classic Rock,Comedy,Country,Country-Rock,Dance,Dance-Rock,Deep Funk,Easy Listening,Electronic,Electronica,Electronica/Dance,Folk,Folk/Rock,Funk,Grunge,Hard Rock,Heavy Metal,Holiday,House,Improg,Indie Rock,Indie,International,Irish,Jam Band,Jam,Jazz Fusion,Jazz,Latin,Live Albums,Metal,Music,Oldies,Other,Pop,Pop/Rock,Post Rock,Progressive Rock,Psychedelic Rock,Psychedelic,Punk,R&B,Rap & Hip-Hop,Reggae,Rock & Roll,Rock,Rock/Pop,Roots,Ska,Soft Rock,Soul,Southern Rock,Thrash Metal,Unknown,Vocal,World';
+            genres = genresStr.split(',');
+            /* This is broken in version 4.8, unable to convert XML to JSON
+            $.ajax({
+            url: globals.BaseURL() + '/getGenres.view?' + globals.BaseParams(),
+            method: 'GET',
+            dataType: globals.settings.Protocol,
+            timeout: globals.settings.Timeout,
+            success: function (data) {
+            if (typeof data["subsonic-response"].genres != 'undefined') {
+            var items = [];
+            if (data["subsonic-response"].genres.length > 0) {
+            items = data["subsonic-response"].genres;
+            } else {
+            items[0] = data["subsonic-response"].genres;
+            }
+    
+            $rootScope.Genres = items;
+            $scope.$apply();
+            }
+            }
+            });
+            */
+            deferred.resolve(genres);
+            return deferred.promise;
+        },
+        getPodcasts: function (refresh) {
+            var deferred = $q.defer();
+            if (globals.settings.Debug) { console.log("LOAD PODCASTS"); }
+            $.ajax({
+                url: globals.BaseURL() + '/getPodcasts.view?' + globals.BaseParams(),
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    if (data["subsonic-response"].podcasts.channel !== undefined) {
+                        var items = [];
+                        if (data["subsonic-response"].podcasts.channel.length > 0) {
+                            items = data["subsonic-response"].podcasts.channel;
+                        } else {
+                            items[0] = data["subsonic-response"].podcasts.channel;
+                        }
+                        podcasts = items;
+                    }
+                    deferred.resolve(podcasts);
+                }
+            });
+            return deferred.promise;
+        },
+        getPodcast: function (id, action) {
+            var deferred = $q.defer();
+            content.selectedPodcast = id;
+            $.ajax({
+                url: globals.BaseURL() + '/getPodcasts.view?' + globals.BaseParams(),
+                method: 'GET',
+                dataType: globals.settings.Protocol,
+                timeout: globals.settings.Timeout,
+                success: function (data) {
+                    if (data["subsonic-response"].podcasts.channel !== undefined) {
+                        var podcasts = [];
+                        if (data["subsonic-response"].podcasts.channel.length > 0) {
+                            podcasts = data["subsonic-response"].podcasts.channel;
+                        } else {
+                            podcasts[0] = data["subsonic-response"].podcasts.channel;
+                        }
+                        var items = [];
+                        $.each(podcasts, function (i, item) {
+                            if (item.id == id) {
+                                items = item.episode;
+                            }
+                        });
+
+                        if (typeof items != 'undefined') {
+                            if (action == 'add') {
+                                angular.forEach(items, function (item, key) {
+                                    if (item.status != "skipped") {
+                                        $rootScope.queue.push(map.mapPodcast(item));
+                                    }
+                                });
+                                notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                            } else if (action == 'play') {
+                                $rootScope.queue = [];
+                                angular.forEach(items, function (item, key) {
+                                    if (item.status != "skipped") {
+                                        $rootScope.queue.push(map.mapPodcast(item));
+                                    }
+                                });
+                                var next = $rootScope.queue[0];
+                                $rootScope.playSong(false, next);
+                                notifications.updateMessage(items.length + ' Song(s) Added to Queue', true);
+                            } else {
+                                content.album = [];
+                                content.song = [];
+                                angular.forEach(items, function (item, key) {
+                                    if (item.status != "skipped") {
+                                        content.song.push(map.mapPodcast(item));
+                                    }
+                                });
+                            }
+                        }
+                    }
+                    deferred.resolve(content);
+                }
+            });
+            return deferred.promise;
+        }
+        // End subsonic
     };
 });
+
 JamStash.factory('json', function ($http) { // Deferred loading
     return {
         getCollections: function (callback) {
diff --git a/js/utils.js b/js/utils.js
index 4b8fef5..16257f5 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -44,29 +44,17 @@ JamStash.service('utils', function ($cookieStore, globals, model) {
             if (globals.settings.Debug) { console.log(e); }
         }
     };
-    this.mapSong = function (data) {
-        var song = data;
-        var url, title, artist, track, rating, starred, contenttype, suffix, description;
-        var specs = '', coverartthumb = '', coverartfull = '';
-        if (typeof song.coverArt != 'undefined') {
-            coverartthumb = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&size=60&id=' + song.coverArt;
-            coverartfull = globals.BaseURL() + '/getCoverArt.view?' + globals.BaseParams() + '&id=' + song.coverArt;
-        } else {
-            coverartthumb = 'images/albumdefault_60.jpg';
-            coverartfull = 'images/albumdefault_160.jpg';
-        }
-        if (typeof song.description == 'undefined') { description = ''; } else { description = song.description; }
-        if (typeof song.artist == 'undefined') { artist = '&nbsp;'; } else { artist = song.artist.toString(); }
-        if (typeof song.title == 'undefined') { title = '&nbsp;'; } else { title = song.title.toString(); }
-        if (typeof song.track == 'undefined') { track = '&nbsp;'; } else { track = song.track.toString(); }
-        if (typeof song.starred !== 'undefined') { starred = true; } else { starred = false; }
-        if (song.bitRate !== undefined) { specs += song.bitRate + ' Kbps'; }
-        if (song.transcodedSuffix !== undefined) { specs += ', transcoding:' + song.suffix + ' > ' + song.transcodedSuffix; } else { specs += ', ' + song.suffix; }
-        if (song.transcodedSuffix !== undefined) { suffix = song.transcodedSuffix; } else { suffix = song.suffix; }
-        if (suffix == 'ogg') { suffix = 'oga'; }
-        var salt = Math.floor(Math.random() * 100000);
-        url = globals.BaseURL() + '/stream.view?' + globals.BaseParams() + '&id=' + song.id + '&salt=' + salt;
-        return new model.Song(song.id, song.parent, track, title, artist, song.artistId, song.album, song.albumId, coverartthumb, coverartfull, song.duration, song.userRating, starred, suffix, specs, url, 0, description);
+    this.sortDateFunction = function (a, b) {
+        return a.date < b.date ? 1 : -1;
+    };
+    this.sortArtistFunction = function (a, b) {
+        return a.artist.toLowerCase() < b.artist.toLowerCase() ? -1 : 1;
+    };
+    this.sortAlbumFunction = function (a, b) {
+        return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
+    };
+    this.sortTrackFunction = function (a, b) {
+        return parseInt(a.track) > parseInt(b.track) ? -1 : 1;
     };
     this.confirmDelete = function (text) {
         var question = confirm(text);
diff --git a/style/Style.css b/style/Style.css
index 46a5c8b..4be41d2 100755
--- a/style/Style.css
+++ b/style/Style.css
@@ -463,6 +463,23 @@ ul.simplelist li.index a
 {
     color: #A7A7A7;
 }
+ul.simplelist li.heading
+{
+    background: #F0F0F0;
+    border-left: 1px solid #DDDDDD;
+    border-bottom: 1px solid #DDDDDD;
+    color: #A7A7A7;
+    font-size: 13px;
+    font-weight: bold;
+    margin: 0px 4px 2px 4px;
+    padding: 8px 4px;
+}
+ul.simplelist li.heading a
+{
+    color: #7EA8D5;
+    font-variant: small-caps;
+    font-size: 15px;
+}
 ul.mainlist
 {
     padding: 0 4px;
@@ -472,6 +489,10 @@ ul.mainlist li.selected
     color: #f2f2f2;
     background-color: #528AC6;
 }
+ul.mainlist li.selected a
+{
+    color: #f2f2f2;
+}
 ul.mainlist li.item a.play
 {
     width: 20px;
@@ -539,7 +560,7 @@ ul.mainlist li.item a.add:hover
     float: left;
 }
 
-#TrackContainer, #PodcastContainer
+#TrackContainer
 {
     margin: 5px 5px 5px 0;
     width: 60%;
