diff --git a/js/ui-ready.js b/js/ui-ready.js
index a0fc391..e2f1f1f 100644
--- a/js/ui-ready.js
+++ b/js/ui-ready.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(document).ready(function () {
     //User config staff
     $('#Username').val($.cookie('username'));
     //$('#Password').val($.cookie('passwordenc'));
@@ -401,18 +401,24 @@
         return false;
     });
     // Playlist Click Events
-    $('#AutoPlaylistContainer li.item').live('click', function () {
+    $('#AutoPlaylistContainer li.item, #FolderContainer li.item').live('click', function () {
         $('#AutoPlaylistContainer li').removeClass('selected');
         $('#PlaylistContainer li').removeClass('selected');
         $(this).addClass('selected');
-        getRandomSongList('', '#TrackContainer');
+        var genre = $(this).data('genre');
+    	var folder = $(this).data('folder');
+        getRandomSongList('', '#TrackContainer', genre, folder);
     });
-    $('#AutoPlaylistContainer li.item a.play').live('click', function () {
-        getRandomSongList('autoplay', '#CurrentPlaylistContainer');
+    $('#AutoPlaylistContainer li.item a.play, #FolderContainer li.item a.play').live('click', function () {
+		var genre = $(this).data('genre');
+		var folder = $(this).data('folder');
+        getRandomSongList('autoplay', '#CurrentPlaylistContainer', genre, folder);
         return false;
     });
-    $('#AutoPlaylistContainer li.item a.add').live('click', function () {
-        getRandomSongList('', '#CurrentPlaylistContainer');
+    $('#AutoPlaylistContainer li.item a.add, #FolderContainer li.item a.add').live('click', function () {
+		var genre = $(this).data('genre');
+		var folder = $(this).data('folder');
+        getRandomSongList('', '#CurrentPlaylistContainer', genre, folder);
         return false;
     });
     $('#PlaylistContainer li.item').live('click', function () {
@@ -436,6 +442,7 @@
     });
     $('#action_RefreshPlaylists').click(function () {
         loadPlaylists(true);
+		loadFolders(true);
         return false;
     });
     $('#action_DeletePlaylist').click(function () {
@@ -653,4 +660,4 @@
         }
     }).disableSelection();
 
-});           // End document.ready
\ No newline at end of file
+});           // End document.ready