diff --git a/TODO b/TODO
index 0201455..c201143 100644
--- a/TODO
+++ b/TODO
@@ -1,20 +1,21 @@
+UI
+--
  * fix UI/Edje scale (enlarge the window to see problems)
- * fix zoom out (seems < 1.0 is not allowed)
  * fix padding around tab items title (edc, simple)
+ * bookmarks: fixed "<Back" label intead of "<$PREVIOUS_NAME"?
  * better error reporting page (for 404 and similar)
  * show visual zoom indication (zoom level? some icon?)
  * show page icon (listen to signal, create object, feed theme, remember to del it when done)
- * implement viewport tag support (good for mobile pages)
- * documentation: HTML, provided as a fixed bookmark item
- * getopt: disable touch-interface (immediately forward events to webkit)
  * change icon of Bookmarks (or name) to reflect History is there as well
- * bookmarks: fixed "<Back" label intead of "<$PREVIOUS_NAME"?
  * tabs/bookmarks: hide back/forward/reload? maybe hide url bar as well?
  * tabs: don't reload all grid on delete (faster close of multiple tabs)
  * move reload to URL bar?
  * url bar: clear button?
  * bookmarks: save page icon once it is known?
  * history: save icon
+
+Preferences / State
+-------------------
  * save state: opened pages, etc. restore on restart
  * preferences (runtime, save at eet):
    - toggle: disable mouse cursor
@@ -34,6 +35,16 @@
    - easy access to bookmarks (click and expand the list? root entries?)
    - most visited/recent links?
    - recently closed?
+ * getopt: disable touch-interface (immediately forward events to webkit)
+
+View
+----
+ * fix zoom out (seems < 1.0 is not allowed)
+ * implement viewport tag support (good for mobile pages)
+
+Misc
+----
+ * documentation: HTML, provided as a fixed bookmark item
  * download manager?
  * single instance? export dbus, try to acquire name, if not possible (already exists) send request to open url in the existing window and give it x11-focus
  * history + bookmark: remember if rss exist, and request it silently to display feedback when new content is available