diff --git a/NEWS b/NEWS
index b9acd51..c42e703 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
-1.4.8: June ??, 2008:
+1.4.8: June 23, 2008:
  * Replaced "add new notebook" link with new notebook button next to
    "notebooks" heading.
+ * Reorganized and renamed some notebook links on the right side of the page.
 
 1.4.7: June 21, 2008:
  * New favicon.ico image that looks slightly less dated.
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 6cc4eec..d049386 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -2357,7 +2357,7 @@ Wiki.prototype.end_notebook_rename = function () {
   // rename the notebook in the header
   var notebook_header_name = createDOM(
     "span",
-    { "id": "notebook_header_name" },
+    { "id": "notebook_header_name", "title": "Rename this notebook." },
     createDOM( "strong", {}, new_notebook_name )
   );
   replaceChildNodes( "notebook_header_area", notebook_header_name );
diff --git a/view/Link_area.py b/view/Link_area.py
index e489ac8..4ed223b 100644
--- a/view/Link_area.py
+++ b/view/Link_area.py
@@ -60,26 +60,6 @@ class Link_area( Div ):
           ) or None ),
 
           notebook.read_write and Span(
-            ( notebook.owner and notebook.name != u"trash" ) and Div(
-              A(
-                u"rename notebook",
-                href = u"#",
-                id = u"rename_notebook_link",
-                title = u"Change the name of this notebook.",
-              ),
-              class_ = u"link_area_item",
-            ) or None,
-
-            ( notebook.owner and notebook.name != u"trash" ) and Div(
-              A(
-                u"delete notebook",
-                href = u"#",
-                id = u"delete_notebook_link",
-                title = u"Move this notebook to the trash.",
-              ),
-              class_ = u"link_area_item",
-            ) or None,
-
             Div(
               A(
                 u"nothing but notes",
@@ -90,6 +70,26 @@ class Link_area( Div ):
               class_ = u"link_area_item",
             ),
 
+            ( notebook.owner and notebook.name != u"trash" ) and Div(
+              A(
+                u"rename",
+                href = u"#",
+                id = u"rename_notebook_link",
+                title = u"Change the name of this notebook.",
+              ),
+              class_ = u"link_area_item",
+            ) or None,
+
+            ( notebook.owner and notebook.name != u"trash" ) and Div(
+              A(
+                u"delete",
+                href = u"#",
+                id = u"delete_notebook_link",
+                title = u"Move this notebook to the trash.",
+              ),
+              class_ = u"link_area_item",
+            ) or None,
+
             ( notebook.owner and user.username ) and Div(
               A(
                 u"share",