Team Member Profile: Remove button rebased

app/views/team_members/show.html.haml

@@ -2,12 +2,15 @@
 - user = @team_member.user
 
 .team_member_show
+  - if can? current_user, :admin_project, @project
+    = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "right btn btn-danger"
   .profile_avatar_holder
     = image_tag gravatar_icon(user.email, 60), :class => "borders"
   %h3
     = user.name
     %small
       = user.email
+
   %hr
   .back_link
     %br
@@ -48,12 +51,7 @@
             = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
               = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
   %hr
-  = render user.recent_events.limit(3)
-  - if can? current_user, :admin_project, @project
-    .form-horizontal
-      .form-actions
-        = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "btn btn-danger"
-
+  = render user.recent_events.limit(5)
 :javascript
   $(function(){
     $('.repo-access-select, .project-access-select').live("change", function() {