diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 87902a523..2be4bace9 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -7,6 +7,9 @@
= content_for :page_title do
= link_to "Albums", albums_path
+- content_for :left_pane do
+ = render "shared/group_friends"
+
%h1.big_text
Albums
.right
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 5e6e64817..3d24b1c09 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -8,6 +8,9 @@
= content_for :page_title do
= link_to @album.name, @album
+- content_for :left_pane do
+ = render "shared/group_friends"
+
.album_id{:id => @album.id, :style => "display:hidden;"}
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index e4e18829e..d41f596e1 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,6 +1,9 @@
- content_for :page_title do
Home
+- content_for :left_pane do
+ = render "shared/group_friends"
+
%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 822a33ef4..4163d118d 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,6 +1,9 @@
- content_for :page_title do
Home
+- content_for :left_pane do
+ = render "shared/group_friends"
+
%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 3c70d3a8a..dc687861f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -73,7 +73,8 @@
.container
.span-5.last
- = render "shared/group_friends"
+
+ = yield :left_pane
.span-19.last
= yield
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 4d75df57e..acd52eef3 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -1,14 +1,10 @@
-.span-20.last
- #profile.span-19.last
+- content_for :page_title do
+ = @person.real_name
+
+- content_for :left_pane do
+ #profile
.profile_photo
= person_image_link(@person)
-
- %h1
- = @person.real_name
- - if @person != current_user.person && current_user.friends.include?(@person)
- .right
- = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
-
%ul
-unless @posts.first.nil?
%li
@@ -22,19 +18,14 @@
= hidden_field_tag :from, :from, :value => @groups_with_person.first.id
= hidden_field_tag :friend_id, :friend_id, :value => @person.id
= submit_tag "save"
- %li
- url:
- = @person.url
-
- - unless @latest_status_message.nil?
- %h1.pinched
- %span
- = "\"#{@latest_status_message.message}\""
- %span="posted: #{how_long_ago(@latest_status_message)}"
+
+ - if @person != current_user.person && current_user.friends.include?(@person)
+ = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
+
+.span-20.last
- .span-20.last
+ .span-19.last
- if @posts
- %h3= "stream - #{@post_count} item(s)"
%ul#stream
- for post in @posts
= render type_partial(post), :post => post unless post.class == Album
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 51c7234f5..d582bc095 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -13,6 +13,9 @@
= content_for :page_title do
= link_to "Photo", @photo
+- content_for :left_pane do
+ = render "shared/group_friends"
+
%h1.big_text
= @photo.image