diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index a21735e45..19df7bd01 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -1,17 +1,17 @@
 module AlbumsHelper
   def friends_albums_link
     if params[:friends]
-      "friends albums"
+      "Friends Albums"
     else
-      link_to 'friends albums', albums_path({:friends => true})
+      link_to 'Friends Albums', albums_path({:friends => true})
     end
   end
   
   def your_albums_link
     if params[:friends]
-      link_to 'your albums', albums_path
+      link_to 'Your Albums', albums_path
     else
-      'your albums'
+      'Your Albums'
     end
   end
   
@@ -23,4 +23,4 @@ module AlbumsHelper
       link_to person.real_name, person_path(person)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/authors/show.html.haml b/app/views/authors/show.html.haml
index 902682434..fd92e97c9 100644
--- a/app/views/authors/show.html.haml
+++ b/app/views/authors/show.html.haml
@@ -1,13 +1,18 @@
-.span-20.last
-  %h1= "#{@author.username}"
-  = link_to 'unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete
-.span-20
-  - if @author_ostatus_posts
+%h1.big_text
+  .back
+    = link_to '⇧ ostatus', ostatus_path
+  = "#{@author.username}'s stream"
+  .button.right
+    = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete
 
-    %h3 stream
-    %ul#stream
-      - for post in @author_ostatus_posts
-        = render type_partial(post), :post => post
-      = will_paginate @author_ostatus_posts
-  - else
-    %h3 no posts to display!
+- if @author_ostatus_posts
+  %ul#stream
+    - for post in @author_ostatus_posts
+      = render type_partial(post), :post => post
+    = will_paginate @author_ostatus_posts
+- else
+  %h3 no posts to display!
+
+#content_bottom
+  .back
+    = link_to "⇧ ostatus", ostatus_path