diff --git a/deluge/ui/webui/TODO b/deluge/ui/webui/TODO
index 312b555e0..c15cd9287 100644
--- a/deluge/ui/webui/TODO
+++ b/deluge/ui/webui/TODO
@@ -1,26 +1,30 @@
 After labels:
-*templates : remove advanced , rename deluge to classic , result ->classic template:no-javascript ; white -> static enhanced with js ; ajax-template -> damoxc.
+*templates : remove advanced , rename deluge to classic , result = classic-templ -> no-javascript ; white-templ -> static enhanced with js ; ajax-templ -> json api
 *white temnplate: add deluge icon.
 *fix all comments from IRC-nonicknamename2.
+*white-template : green-iframe ->make blue
 
-0.6 :
-*plugin-config + (re)enable webui plugins.
+0.6 RC:
 *Fix IE7 for advanced/white template.
 *white template : add auto-refresh (with a nice js-progress-bar)
 *gettext : update template_strings.py + add all .py files to gettext input files
 
-after 0.6 :
+after 0.6 /before 1.0:
 *hide-option for details iframe.
-*add new major features in available gtk ui but not in webui.
 *white template:better css fluid layout or switch to tables.
-*labels (organize-plugin)
-*checkboxes for multiple select.
 *rethink details iframe.
 *persistent sessions
 
 maybe/ideas/after 0.6.1:
+*checkboxes for multiple select?
 *switch to webpy 0.3
 *right-click menu on torrent-rows
 *multi row template like transmission etc.
 
+Half-done:
+*labels (organize-plugin)
+*add new major features in available gtk ui but not in webui.
+
+Done:
+*plugin-config + (re)enable webui plugins.
 
diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py
index 85bf467fb..73f1e1bf8 100644
--- a/deluge/ui/webui/pages.py
+++ b/deluge/ui/webui/pages.py
@@ -95,11 +95,8 @@ class index:
             vars.update(cookies())
         else: #has arguments:set cookies from arguments.
             for key in ["sort", "order", "filter_cat","filter_value"]:
-                value = getattr(vars, key)
-                if value:
-                    setcookie(key, value)
-                else:
-                   setcookie(key, "")
+                value = getattr(vars, key) or ""
+                setcookie(key, value)
 
         #organize-filters
         label_filters = {}
@@ -107,14 +104,7 @@ class index:
             filter_dict = {}
             if vars.filter_cat and vars.filter_value and vars.filter_value <> "All":
                 filter_dict = {vars.filter_cat:vars.filter_value}
-            """
-            TODO...
-            for filter_name in ["state","tracker","keyword"]:
-                value = getattr(vars, filter_name)
-                if value and value <> "All" and value <> "None":
-                    filter_dict[filter_name] = value
-            log.debug(filter_dict)
-            """
+
             torrent_ids =  proxy.label_get_filtered_ids(filter_dict)
             label_filters = proxy.label_filter_items()
 
diff --git a/deluge/ui/webui/static/images/tango/label.png b/deluge/ui/webui/static/images/tango/label.png
new file mode 100644
index 000000000..7dc15ea96
Binary files /dev/null and b/deluge/ui/webui/static/images/tango/label.png differ