diff --git a/py/apigen/html.py b/py/apigen/html.py
index 0946251e9..d6b3b6e7a 100644
--- a/py/apigen/html.py
+++ b/py/apigen/html.py
@@ -63,15 +63,14 @@ class H(html):
             fd = H.FunctionDef(localname, argdesc,
                                onclick=('showhideel('
                                         'document.getElementById("%s")); '
-                                        'showhideel('
-                                        'document.getElementById("%s")); '
-                                        'this.scrollIntoView()' % (
-                                         infoid, docstringid)))
-            ds = H.Docstring(docstring or '*no docstring available*',
-                             id=docstringid)
-            fi = H.FunctionInfo(valuedesc, csource, callstack,
-                                id=infoid, style="display: none")
-            super(H.FunctionDescription, self).__init__(fd, ds, fi)
+                                         % (infoid,)))
+            infodiv = H.div(
+                H.Docstring(docstring or '*no docstring available*',
+                            id=docstringid),
+                H.FunctionInfo(valuedesc, csource, callstack,
+                               id=infoid, style="display: none"),
+                class_='funcdocinfo')
+            super(H.FunctionDescription, self).__init__(fd, infodiv)
 
     class FunctionDef(html.h2):
         style = html.Style(cursor='pointer')
diff --git a/py/apigen/style.css b/py/apigen/style.css
index 8dd7463c7..0b3154028 100644
--- a/py/apigen/style.css
+++ b/py/apigen/style.css
@@ -48,6 +48,10 @@ h2.funcdef {
   color: blue;
 }
 
+h2.funcdef:hover {
+  text-decoration: underline;
+}
+
 .code a {
   color: blue;
   font-weight: bold;
@@ -91,7 +95,7 @@ h2.funcdef {
   color: green;
 }
 
-.funcinfo {
+.funcdocinfo {
   border: 1px solid black;
   color: black;
   padding: 1em;
diff --git a/py/apigen/todo.txt b/py/apigen/todo.txt
index 18cb506a3..0bbc1a146 100644
--- a/py/apigen/todo.txt
+++ b/py/apigen/todo.txt
@@ -3,10 +3,14 @@
 
     py/apigen sources [rev XXX]
 
+    DONE
+
 * and "namespace" pages: 
 
     builtin namespace index [rev XXX]
 
+    DONE, except they're now called 'index of <dotted_name> [rev. XXX]'
+
 * get konqueror to display indents in source code better? 
   (currently it doesn't look like more than a single space)
 
@@ -29,6 +33,8 @@
   XXX it's nice but can you keep the docstring visible when
   more information is displayed/toggled? 
 
+  DONE too
+
 * allow for flexibility regarding linking from 
   py/doc/*.txt documents to apigen with respect
   to where apigen/ docs are located.