diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f5400aef9..44bce846b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,7 +11,7 @@
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142', 'rails', 'google'
     = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
-    = javascript_include_tag 'view', 'publisher', 'image_picker'
+    = javascript_include_tag 'view', 'publisher', 'image_picker', 'group_nav'
     = render 'js/websocket_js'
     
     = csrf_meta_tag
diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 813473c60..9ba2f6d67 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -1,21 +1,14 @@
 #group
   %ul
-    %li.selected= link_to "OTHER PRESIDENTS", root_path
-    %li= link_to "OSTATUS", ostatus_path
+    %li.other_presidents= link_to "OTHER PRESIDENTS", root_path(:g => "other_presidents")
+    %li.ostatus= link_to "OSTATUS", ostatus_path(:g => "ostatus")
+    %li.new_circle= link_to "NEW CIRCLE", "#"
+
   #friend_pictures
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
-    = link_to(person_image_tag(current_user), root_path)
     - for friend in @friends
       = person_image_link(friend)
+
+    -for author in @subscribed_persons
+      = link_to (image_tag author.avatar_thumbnail, :class => "person_picture"), author_path(author)
     .add_new
       = link_to "+", requests_path
diff --git a/public/javascripts/group_nav.js b/public/javascripts/group_nav.js
new file mode 100644
index 000000000..62b99e18c
--- /dev/null
+++ b/public/javascripts/group_nav.js
@@ -0,0 +1,13 @@
+$(document).ready( function() {
+
+  var vars = [], hash;
+  var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+  for(var i = 0; i < hashes.length; i++)
+  {
+      hash = hashes[i].split('=');
+      vars.push(hash[0]);
+      vars[hash[0]] = hash[1];
+  }
+
+  $("."+vars['g']).addClass('selected');
+});
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index dbb9964a0..1ba47cbca 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -431,8 +431,18 @@ h1.big_text {
     color: #333333;
     font-weight: normal; }
   #group #friend_pictures .add_new {
-    display: inline;
+    position: relative;
+    display: inline-block;
+    height: 40px;
+    width: 40px;
+    background-color: #222222;
+    text-align: center;
     font-size: 40px; }
+    #group #friend_pictures .add_new a {
+      display: block;
+      position: absolute;
+      top: -13px;
+      left: 7px; }
   #group #friend_pictures img {
     display: inline-block;
     height: 40px; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 13d2e6dca..bf3441940 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -539,9 +539,19 @@ h1.big_text
 
   #friend_pictures
     .add_new
-      :display inline
-      :font
-        :size 40px
+      :position relative
+      :display inline-block
+      :height 40px
+      :width 40px
+      :background
+        :color #222
+      :text-align center
+      :font-size 40px
+      a
+        :display block
+        :position absolute
+        :top -13px
+        :left 7px
     img
       :display inline-block
       :height 40px