diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index c2a345f..9f06eec 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -391,17 +391,16 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri
       self.start_notebook_rename();
       event.stop();
     } );
-  }
 
-  // FIXME: don't do this (hide and show the links on hover) if this is the trash
-  var notebook_header_area = getElement( "notebook_header_area" );
-  if ( notebook_header_area ) {
-    connect( notebook_header_area, "onmouseover", function ( event ) {
-      removeElementClass( "notebook_header_links", "invisible" );
-    } );
-    connect( notebook_header_area, "onmouseout", function ( event ) {
-      setTimeout( function () { addElementClass( "notebook_header_links", "invisible" ); }, 1000 );
-    } );
+    var notebook_header_area = getElement( "notebook_header_area" );
+    if ( notebook_header_area ) {
+      connect( notebook_header_area, "onmouseover", function ( event ) {
+        removeElementClass( "notebook_header_links", "invisible" );
+      } );
+      connect( notebook_header_area, "onmouseout", function ( event ) {
+        setTimeout( function () { addElementClass( "notebook_header_links", "invisible" ); }, 1000 );
+      } );
+    }
   }
 
   var delete_notebook_link = getElement( "delete_notebook_link" );
diff --git a/view/Link_area.py b/view/Link_area.py
index f7b3efa..e67e58a 100644
--- a/view/Link_area.py
+++ b/view/Link_area.py
@@ -39,7 +39,7 @@ class Link_area( Div ):
 
           ( rate_plan.get( u"notebook_sharing" ) and notebook.name == u"Luminotes blog" ) and Div(
             A(
-              u"subscribe to rss",
+              u"follow",
               href = u"%s?rss" % notebook_path,
               id = u"blog_rss_link",
               title = u"Subscribe to the RSS feed for the Luminotes blog.",
@@ -52,7 +52,7 @@ class Link_area( Div ):
             class_ = u"link_area_item",
           ) or ( updates_path and rate_plan.get( u"notebook_sharing" ) and ( not forum_tag ) and Div(
             A(
-              u"subscribe to rss",
+              u"follow",
               href = updates_path,
               id = u"notebook_rss_link",
               title = u"Subscribe to the RSS feed for this %s." % notebook_word,
@@ -103,15 +103,22 @@ class Link_area( Div ):
               class_ = u"link_area_item",
             ) or None,
 
-            ( notebook.owner and notebook.name != u"trash" ) and Div(
-              A(
+            Div(
+              notebook.trash_id and A(
+                u"trash",
+                href = u"/notebooks/%s?parent_id=%s" % ( notebook.trash_id, notebook.object_id ),
+                id = u"trash_link",
+                title = u"Look here for %ss you've deleted." % note_word,
+              ) or None,
+              ( notebook.owner and notebook.name != u"trash" and notebook.trash_id ) and u"|" or None,
+              ( notebook.owner and notebook.name != u"trash" ) and A(
                 u"delete",
                 href = u"#",
                 id = u"delete_notebook_link",
                 title = u"Move this %s to the trash." % notebook_word,
-              ),
+              ) or None,
               class_ = u"link_area_item",
-            ) or None,
+            ),
 
             ( notebook.owner and user.username and rate_plan.get( u"notebook_sharing" ) ) and Div(
               A(
@@ -123,16 +130,6 @@ class Link_area( Div ):
               class_ = u"link_area_item",
             ) or None,
 
-            notebook.trash_id and Div(
-              A(
-                u"trash",
-                href = u"/notebooks/%s?parent_id=%s" % ( notebook.trash_id, notebook.object_id ),
-                id = u"trash_link",
-                title = u"Look here for %ss you've deleted." % note_word,
-              ),
-              class_ = u"link_area_item",
-            ) or None,
-
             ( notebook.name == u"trash" ) and Rounded_div(
               u"trash_notebook",
               A(