diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 2be320629c695a3c84b2db50f9ae51e33c22298c..87902a523c13a9e88061aa600b7e89bb9eb090ee 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -4,7 +4,9 @@
       $("#add_album_button").fancybox();
     });
 
-.back= link_to "⇧ home", root_path
+= content_for :page_title do
+  = link_to "Albums", albums_path
+
 %h1.big_text
   Albums
   .right
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 80abbacd6e7605ecb19dbe7aac127940a4bcf6f3..5e6e64817687c30d9027942ede7503302990f2a4 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -5,19 +5,16 @@
     });
   });
 
+= content_for :page_title do
+  = link_to @album.name, @album
+
 
 .album_id{:id => @album.id, :style => "display:hidden;"}
-.back= link_to '⇧ albums', albums_path
-%h1.big_text
 
+%h1.big_text
   = @album.name 
 
-  -if current_user.owns? @album
-    .right
-      #add_photo_loader
-        = image_tag 'ajax-loader.gif'
-      = link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button"
-
+-if current_user.owns? @album
   =render 'photos/new_photo'
 
   .yo{:style => "display:none;"}
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 6c3039aef6b62995b4a15de5c855bb4376030ed3..e4e18829e671b268384ce4ff6d5e34cf68404247 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Home
+
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post unless post.class == Album
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 64a7a48a57fc70e4b0b483b13533420e46e39578..822a33ef43ca024969652587db4b0c79b7d8c743 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_title do
+  Home
+
 %ul#stream
   - for post in @posts
     = render type_partial(post), :post => post
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 63ef4736a13361f433ae9e6b725d067cd297bac6..c53434d9638b91140a02f11ffb70100d3e2e46fb 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -60,10 +60,14 @@
           .span-5.last
             - if @group == :all
               %h1
-                All Groups
+                = link_to "All Groups", root_path
             - else
               %h1
-                = @group.name
+                = link_to @group.name, @group
+
+            .page_title
+              = yield :page_title
+
           .span-19.last
             = render "shared/publisher", :group_ids => :all
 
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 27afac74ce595e2a50e224ddef30ef0d29f189c6..51c7234f5158bfd70a0e70b3ce417248cddb46e5 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -10,8 +10,10 @@
     }
   });
 
+= content_for :page_title do
+  = link_to "Photo", @photo
+
 
-.back= link_to "⇧ #{@album.name}", album_path(@album)
 %h1.big_text
   = @photo.image
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 65f6223214448cd3749f4efca37e3efd8f91068d..d5c0f5b909ba195ebdea9877ff3c0626221ae851 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -96,6 +96,7 @@ header {
     position: relative;
     display: inline;
     float: right;
+    z-index: 3;
     padding-right: 10px; }
     header #session_action a.new_requests {
       color: #df0101; }
@@ -107,7 +108,14 @@ header {
     height: 85px; }
     header #group_header h1 {
       margin-bottom: 0;
-      margin-top: 27px; }
+      margin-top: 15px; }
+    header #group_header a {
+      color: #111111; }
+      header #group_header a:hover {
+        background: none;
+        color: #333333; }
+    header #group_header .page_title {
+      text-transform: uppercase; }
 
 #show_filters {
   z-index: 100;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 278745ed4f05239c77615895f9aef0d4ebb3dbe8..c86603a279457fdc2b968841ca635864d68b569b 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -128,7 +128,18 @@ header
     h1
       :margin
         :bottom 0
-        :top 27px
+        :top 15px
+
+    a
+      :color #111
+      &:hover
+        :background none
+        :color #333
+
+    .page_title
+      :text
+        :transform uppercase
+
 
 #show_filters
   :z-index 100