diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index b1ac046d..3ac9c342 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -144,6 +144,7 @@ function initConfigCheckbox(elem) {
 function initActions() {
 	$("#subhead_menu #menu_link_refresh").button({ icons: { primary: "ui-icon-refresh" }  });
 	$("#subhead_menu #menu_link_edit").button({ icons: { primary: "ui-icon-pencil" }  });
+	$("#subhead_menu .menu_link_edit").button({ icons: { primary: "ui-icon-pencil" }  });
     $("#subhead_menu #menu_link_delete" ).button({ icons: { primary: "ui-icon-trash" } });
     $("#subhead_menu #menu_link_pauze").button({ icons: { primary: "ui-icon-pause"} });
     $("#subhead_menu #menu_link_resume").button({ icons: { primary: "ui-icon-play"} });
diff --git a/data/interfaces/default/manage.html b/data/interfaces/default/manage.html
index ed62e445..19cc9ac4 100644
--- a/data/interfaces/default/manage.html
+++ b/data/interfaces/default/manage.html
@@ -6,10 +6,21 @@
 <%def name="headerIncludes()">
 	<div id="subhead_container">
 		<div id="subhead_menu">
-			<a id="menu_link_edit" href="manageAlbums">Manage Albums</a>
-			<a id="menu_link_edit" href="manageArtists">Manage Artists</a>
+			<a class="menu_link_edit" id="manage_albums" href="#">Manage Albums</a>
+				<div id="dialog" title="Choose Album Filter" style="display:none" class="configtable">
+					<div class="links">
+						<a href="manageAlbums?Status=Downloaded"><span class="ui-icon ui-icon-check"></span>Manage Downloaded Albums</a><br>
+						<a href="manageAlbums?Status=Skipped"><span class="ui-icon ui-icon-flag"></span>Manage Skipped Albums</a><br>
+						<a href="manageAlbums?Status=Snatched"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span>Manage Snatched Albums</a><br>
+						<a href="manageAlbums?Status=Upcoming"><span class="ui-icon ui-icon-calendar"></span>Manage Upcoming Albums</a><br>
+						<a href="manageAlbums?Status=Wanted"><span class="ui-icon ui-icon-heart"></span>Manage Wanted Albums</a><br>
+						<br><br>
+						<a href="manageAlbums">Manage All Albums</a>
+					</div>
+				</div>
+			<a class="menu_link_edit" href="manageArtists">Manage Artists</a>
 			%if not headphones.ADD_ARTISTS:
-			<a id="menu_link_edit" href="manageNew">Manage New Artists</a>
+			<a class="menu_link_edit" href="manageNew">Manage New Artists</a>
 			%endif
 		</div>
 	</div>	
@@ -95,6 +106,10 @@
 <%def name="javascriptIncludes()">
 	<script>
 		function initThisPage() {
+			$('#manage_albums').click(function() {
+				$('#dialog').dialog();
+				return false;
+			});
 			jQuery( "#tabs" ).tabs();
 			initActions();
 		};
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 2b2e89fd..4ca14417 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -229,9 +229,14 @@ class WebInterface(object):
         return serve_template(templatename="manageartists.html", title="Manage Artists", artists=artists)
     manageArtists.exposed = True
     
-    def manageAlbums(self):
+    def manageAlbums(self, Status=None):
         myDB = db.DBConnection()
-        albums = myDB.select('SELECT * from albums')
+        if Status == "Upcoming":
+            albums = myDB.select("SELECT * from albums WHERE ReleaseDate > date('now')")
+        elif Status:
+            albums = myDB.select('SELECT * from albums WHERE Status=?', [Status])
+        else:
+            albums = myDB.select('SELECT * from albums')
         return serve_template(templatename="managealbums.html", title="Manage Albums", albums=albums)
     manageAlbums.exposed = True