diff --git a/app/views/memberships/index.rhtml b/app/views/memberships/index.rhtml
index c94c1e9..620479e 100644
--- a/app/views/memberships/index.rhtml
+++ b/app/views/memberships/index.rhtml
@@ -14,17 +14,19 @@
       <%= profile_image_link(membership, :portrait, 'div') %>
     </div>
     <span class='profile-details'>
-      <strong><%= membership.short_name %></strong><br/>
+      <strong><%= membership.name %></strong><br/>
       <%= _('Role: %s') % rolename_for(profile, membership) %> <br/>
       <%= _('Type: %s') % getterm(membership.class.name) %> <br/>
       <%= _('Description: %s') % membership.description  + '<br/>' if membership.community? %>
       <%= _('Members: %s') % membership.members.size.to_s %> <br/>
       <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
-      <%= [ link_to(_('Manage'), membership.admin_url),
-            lightbox_link_to(_('Leave'), membership.leave_url),
-            (membership.community? && user.has_permission?(:destroy_profile, membership) ? link_to(_('Remove'), { :action => 'destroy_community', :id => membership }) : nil)
-          ].compact.join(', ')
-      %>
+      <% button_bar do %>
+        <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
+        <%= lightbox_button 'menu-logout', _('Leave'), membership.leave_url %>
+        <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
+          <%= button 'delete', _('Remove'), { :action => 'destroy_community', :id => membership } %>
+        <% end %>
+      <% end %>
     </span>
     <br class="may-clear" />
   </li>
diff --git a/public/stylesheets/controller_memberships.css b/public/stylesheets/controller_memberships.css
index 0ea0690..00d1823 100644
--- a/public/stylesheets/controller_memberships.css
+++ b/public/stylesheets/controller_memberships.css
@@ -24,7 +24,7 @@
 
 #memberships-index li .profile-details {
   display: block;
-  padding: 3% 0px 3% 30px;
+  padding: 3% 0px 0px 30px;
 }
 
 #memberships-index li .vcard a.profile_link.url {
--
libgit2 0.21.2