diff --git a/app/views/blogs/_blog.html.haml b/app/views/blogs/_blog.html.haml
index 0508f846e..79d0612b3 100644
--- a/app/views/blogs/_blog.html.haml
+++ b/app/views/blogs/_blog.html.haml
@@ -10,7 +10,7 @@
   %br
   = raw post.body
   %div.time
-    = link_to(how_long_ago(post), blog_path(post))
+    = link_to(how_long_ago(post), object_path(post))
     \--
     = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
   = render "comments/comments", :post => post 
diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml
index b8fbd7c91..8356bf91d 100644
--- a/app/views/bookmarks/_bookmark.html.haml
+++ b/app/views/bookmarks/_bookmark.html.haml
@@ -11,7 +11,7 @@
   %a{:href => "#{post.link}"}
     = post.link
   %div.time
-    = link_to(how_long_ago(post), bookmark_path(post))
+    = link_to(how_long_ago(post), object_path(post))
     \--
     = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
   = render "comments/comments", :post => post 
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index f66accc3c..34bad6081 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -6,7 +6,7 @@
     = link_to_person post.person
     %b posted a new photo
     %br
-  = link_to (image_tag post.image.url(:small_thumb)), photo_path(post)
+  = link_to (image_tag post.image.url(:small_thumb)), object_path(post)
     
   %div.time
     = link_to(how_long_ago(post), status_message_path(post))
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
deleted file mode 100644
index 1434ca0d2..000000000
--- a/app/views/status_messages/_status_message.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-%li.message{:id => post.id, :class => ("mine" if mine?(post))}
-  %span.from
-    = link_to post.person.real_name, post.person 
-    = auto_link post.message
-    
-  %div.time
-    = link_to(how_long_ago(post), status_message_path(post))
-    \--
-    = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
-  = render   "comments/comments", :post => post 
-
-  - if mine?(post)
-    .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index c2a0f4195..f3a44d3af 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -7,7 +7,7 @@
     = auto_link post.message
     
   %div.time
-    = link_to(how_long_ago(post), status_message_path(post))
+    = link_to(how_long_ago(post), object_path(post))
     \--
     = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
   = render   "comments/comments", :post => post