diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 7e93b5a80..96e7f36ad 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -24,13 +24,14 @@
     });
 
 = content_for :page_title do
-  = link_to "Albums", albums_path
+  = link_to "Home", aspects_path
 
 - content_for :left_pane do
   = render "shared/aspect_friends"
 
 - content_for :publish do
-  %br
+  %h1
+    Albums
   = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"}
 
 .yo{:style => "display:none;" }
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index bf74d1ef3..b0d6710db 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -25,21 +25,19 @@
   });
 
 = content_for :page_title do
-  = link_to @album.name, @album
+  = link_to "Albums", albums_path
 
 - content_for :left_pane do
   = render "shared/aspect_friends"
 
 - content_for :publish do
-  -if current_user.owns? @album
-    =render 'photos/new_photo'
+  %h1
+    = @album.name
+  ="updated #{how_long_ago(@album)}"
 
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
-.sub_header
-  ="updated #{how_long_ago(@album)}"
-
 -unless current_user.owns? @album
   %h4= "by #{@album.person.real_name}"
 
@@ -47,6 +45,8 @@
   - for photo in @album_photos
     .image_thumb
       = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
+  -if current_user.owns? @album
+    =render 'photos/new_photo'
 
 #content_bottom
   .back
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3b823e54e..9275e8c17 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -56,9 +56,6 @@
           %span.sub_text
             PREVIEW
 
-          %span{:style => "padding-left:30px;"}
-            = link_to "photos", albums_path
-
         #session_action
           %ul
             %li#global_search