diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 27f5ae782..f3da1ec8a 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -31,7 +31,6 @@ class GroupsController < ApplicationController
     @people_ids = @group.people.map {|p| p.id}
     @posts = Post.paginate :person_id => @people_ids, :order => 'created_at DESC'
     @group = Group.first(:id => params[:id])
-    render :index
   end
 
   def edit
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index daaaaaabc..b3b4d2acb 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,3 +1,7 @@
+%h1
+  welcome home,
+  = current_user.profile.first_name
+
 = render "shared/publisher"
 %ul#stream
   - for post in @posts
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
new file mode 100644
index 000000000..daaaaaabc
--- /dev/null
+++ b/app/views/groups/show.html.haml
@@ -0,0 +1,7 @@
+= render "shared/publisher"
+%ul#stream
+  - for post in @posts
+    = render type_partial(post), :post => post
+#pagination
+  = will_paginate @posts
+