diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0176892a6..2cacb9e86 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -34,7 +34,7 @@ module ApplicationHelper
   end
 
   def link_to_person(person)
-    link_to person.real_name, person_url(person)
+    link_to person.real_name, person_path(person)
   end
 
   def owner_image_tag
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index f96369087..b81d0b93c 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,17 +1,26 @@
 
-%h3= "viewing photos from album #{@album.name}"
+%h3
+  viewing photos from album 
+  =link_to @album.name, album_path(@album)
 
-#show_photo
-  = link_to (image_tag @photo.image.url), photo_path(@album.next_photo(@photo))
+%div{:id => @photo.id}
 
-#photo_pagination
-  = link_to "<< previous", photo_path(@album.prev_photo(@photo))
-  = link_to "next >>", photo_path(@album.next_photo(@photo))
+  = link_to "full size", @photo.image.url
+  %br
 
-%h4= "comments (#{@photo.comments.count})"
-= render "comments/comments", :post => @photo
-  
-%p
-  = link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete
-  |
-  = link_to "<< back to album", album_path(@album)
+  #show_photo
+    = link_to (image_tag @photo.image.url), photo_path(@album.next_photo(@photo))
+
+  #photo_pagination
+    = link_to "<< previous", photo_path(@album.prev_photo(@photo))
+    = link_to "next >>", photo_path(@album.next_photo(@photo))
+
+  %p
+    = link_to "Destroy", @photo, :confirm => 'Are you sure?', :method => :delete
+    |
+    = link_to "<< back to album", album_path(@album)
+
+  %h4{:class => "show_post_comments"}
+    = "comments (#{@photo.comments.count})"
+  = render "comments/comments", :post => @photo
+    
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 724ad3413..be8df637c 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -6,6 +6,7 @@
       %li{ :class => "status_message" }= link_to "status message", "#"
       %li{ :class => "bookmark" }= link_to "bookmark", "#"
       %li{ :class => "blog" }= link_to "blog", "#"
+      %li= link_to "photos", albums_path
 
     #publisher_form
       = form_for StatusMessage.new, :remote => true do |f|