diff --git a/deluge/ui/webui/TODO b/deluge/ui/webui/TODO
index 10607ded4..20eb6ee24 100644
--- a/deluge/ui/webui/TODO
+++ b/deluge/ui/webui/TODO
@@ -1,15 +1,22 @@
 0.6 :
 *plugin-config + (re)enable webui plugins.
 *Fix IE7 for advanced/white template.
-*split statistics tab into statistics , details like gtk-ui
 *details tabs : add css
-*white template : add auto-refresh
+*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 :
+*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:
+*switch to webpy 0.3
+*right-click menu on torrent-rows
+*multi row template like transmission etc.
 
 
diff --git a/deluge/ui/webui/deluge_webserver.py b/deluge/ui/webui/deluge_webserver.py
index 617aa11f9..0f207c3c6 100644
--- a/deluge/ui/webui/deluge_webserver.py
+++ b/deluge/ui/webui/deluge_webserver.py
@@ -100,7 +100,7 @@ def create_webserver(debug = False):
     utils.apply_config()
 
 
-    from lib.gtk_cherrypy_wsgiserver import CherryPyWSGIServer
+    from lib.webpy022.wsgiserver import CherryPyWSGIServer
 
     middleware = None
     if debug:
diff --git a/deluge/ui/webui/register_menu.py b/deluge/ui/webui/register_menu.py
index f0ef58fdf..552f6eccc 100644
--- a/deluge/ui/webui/register_menu.py
+++ b/deluge/ui/webui/register_menu.py
@@ -41,7 +41,8 @@ menu.register_admin_page("connect", _("Connect"), "/connect")
 menu.register_admin_page("about", _("About"), "/about")
 menu.register_admin_page("logout", _("Logout"), "/logout")
 
-menu.register_detail_tab("details", _("Statistics"), "tab_statistics")
+menu.register_detail_tab("statistics", _("Statistics"), "tab_statistics")
+menu.register_detail_tab("details", _("Details"), "tab_details")
 menu.register_detail_tab("options", _("Options"), "tab_options")
 menu.register_detail_tab("trackers", _("Trackers"), "tab_trackers")
 menu.register_detail_tab("peers", _("Peers"), "tab_peers")
diff --git a/deluge/ui/webui/templates/deluge/tab_details.html b/deluge/ui/webui/templates/deluge/tab_details.html
new file mode 100644
index 000000000..12aac2521
--- /dev/null
+++ b/deluge/ui/webui/templates/deluge/tab_details.html
@@ -0,0 +1,25 @@
+$def with (torrent)
+<table width="100%">
+<!--long values-->
+<tr><td>&nbsp;</td></tr>
+<tr colspan="3">
+    <table>
+    <tr><td class="info_label">$('Name'):</td>
+        <td class="info_value">$torrent.name</td>
+    </tr>
+    <tr><td class="info_label">$('Hash'):</td>
+        <td class="info_value">$torrent.id</td>
+    </tr>
+    <tr><td class="info_label">$_('Tracker'):</td>
+        <td class="info_value" title="$torrent.tracker">$(crop(torrent.tracker, 200))</td>
+    </tr>
+    <tr><td class="info_label">$_('Tracker Status'):</td>
+        <td class="info_value" title="$torrent.tracker_status">$(crop(torrent.tracker_status, 200)) </td>
+    </tr>
+
+    <tr>
+    <td class="info_label">$('Save Path'):</td>
+        <td class="info_value" title="$torrent.save_path">$crop_left(torrent.save_path, 200)</td>
+    </table>
+</tr>
+</table>
diff --git a/deluge/ui/webui/templates/deluge/tab_statistics.html b/deluge/ui/webui/templates/deluge/tab_statistics.html
index 09c8f919a..866d0c73d 100644
--- a/deluge/ui/webui/templates/deluge/tab_statistics.html
+++ b/deluge/ui/webui/templates/deluge/tab_statistics.html
@@ -29,7 +29,7 @@ $def with (torrent)
 
 
 </table>
-</td><td width=30%%>
+</td><td width=30%>
 
 <table>
 <tr><td class="info_label">$_('Speed'):</td><td class="info_value">
@@ -74,24 +74,4 @@ $else:
 </td></tr>
 
 </table>
-</tr>
-<!--long values-->
-<tr><td>&nbsp;</td></tr>
-<tr colspan="3">
-    <table>
-    <tr><td class="info_label">$('Hash'):</td>
-        <td class="info_value">$torrent.id</td>
-    </tr>
-    <tr><td class="info_label">$_('Tracker'):</td>
-        <td class="info_value" title="$torrent.tracker">$(crop(torrent.tracker, 200))</td>
-    </tr>
-    <tr><td class="info_label">$_('Tracker Status'):</td>
-        <td class="info_value" title="$torrent.tracker_status">$(crop(torrent.tracker_status, 200)) </td>
-    </tr>
-
-    <tr>
-    <td class="info_label">$('Save Path'):</td>
-        <td class="info_value" title="$torrent.save_path">$crop_left(torrent.save_path, 200)</td>
-    </table>
-</tr>
 </table>