diff --git a/deluge/ui/webui/templates/white/index.html b/deluge/ui/webui/templates/white/index.html
index 443e31004..b49f333fa 100644
--- a/deluge/ui/webui/templates/white/index.html
+++ b/deluge/ui/webui/templates/white/index.html
@@ -19,10 +19,6 @@ $def with (torrent_list, organize_filters)
         <a class="tab_button" href='$url'>$title</a>
 
 
-</td><td>
-    <i style="color:#BBB">work in progress.. don't report bugs on this template</i>
-    $#:render.part_auto_refresh()
-
 </td><td>
 
 </td><td align="right" width="320px">
diff --git a/deluge/ui/webui/templates/white/part_organize.html b/deluge/ui/webui/templates/white/part_organize.html
index a3f0e0f28..164b09af9 100644
--- a/deluge/ui/webui/templates/white/part_organize.html
+++ b/deluge/ui/webui/templates/white/part_organize.html
@@ -8,13 +8,16 @@ $def with (filters)
 <div class="title">$_('State')</div>
 <ul>
 $for state, num in filters.state:
-    <li
-    $if state == get('state'):
-        class="selected"
-    >
-    <img src="/pixmaps/$state.lower() ">
-    <a href="$self_url(state=state)">$_(state) ($num)</a>
-    </li>
+    $if (num > 0) or (state == get('state')):
+        <li
+        $if state == get('state'):
+            class="selected"
+        >
+        <img src="/pixmaps/$state.lower() ">
+        <a href="$self_url(state=state)">$_(state) ($num)</a>
+        </li>
+    $else:
+        <!--ignore states with no count $state -->
 </ul>
 
 <div class="title">$_('Trackers')</div>
diff --git a/deluge/ui/webui/webserver_common.py b/deluge/ui/webui/webserver_common.py
index e41666f32..9b44b1096 100644
--- a/deluge/ui/webui/webserver_common.py
+++ b/deluge/ui/webui/webserver_common.py
@@ -98,10 +98,10 @@ CONFIG_DEFAULTS = {
     "button_style":2,
     "auto_refresh":False,
     "auto_refresh_secs": 10,
-    "template":"advanced",
+    "template":"white",
     "pwd_salt":"2\xe8\xc7\xa6(n\x81_\x8f\xfc\xdf\x8b\xd1\x1e\xd5\x90",
     "pwd_md5":".\xe8w\\+\xec\xdb\xf2id4F\xdb\rUc",
-    "cache_templates":False,
+    "cache_templates":True,
     "use_https":False
 }