diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 81d818e9..04348dc7 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -7,6 +7,8 @@ class TeamMembersController < ProjectResourceController
     @team = @project.users_projects.scoped
     @team = @team.send(params[:type]) if %w(masters developers reporters guests).include?(params[:type])
     @team = @team.sort_by(&:project_access).reverse.group_by(&:project_access)
+
+    @assigned_teams = @project.user_team_project_relationships
   end
 
   def show
diff --git a/app/views/team_members/_assigned_teams.html.haml b/app/views/team_members/_assigned_teams.html.haml
index c06b826f..91c6d8f7 100644
--- a/app/views/team_members/_assigned_teams.html.haml
+++ b/app/views/team_members/_assigned_teams.html.haml
@@ -1,4 +1,4 @@
 .ui-box
   %ul.well-list
-    - @project.user_team_project_relationships.sort_by(&:team_name).each do |team_relation|
+    - assigned_teams.sort_by(&:team_name).each do |team_relation|
       = render "team_members/assigned_team", team_relation: team_relation, team: team_relation.user_team
diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml
index 9f68fb78..2ec8c1a8 100644
--- a/app/views/team_members/_team.html.haml
+++ b/app/views/team_members/_team.html.haml
@@ -1,4 +1,4 @@
-- @team.each do |access, members|
+- team.each do |access, members|
   .ui-box
     %h5.title
       = Project.access_options.key(access).pluralize
@@ -6,11 +6,3 @@
     %ul.well-list
       - members.sort_by(&:user_name).each do |team_member|
         = render 'team_members/team_member', member: team_member
-
-
-:javascript
-  $(function(){
-    $('.repo-access-select, .project-access-select').live("change", function() {
-      $(this.form).submit();
-    });
-  })
diff --git a/app/views/team_members/_team_member.html.haml b/app/views/team_members/_team_member.html.haml
index 7ee51246..e7cba0b3 100644
--- a/app/views/team_members/_team_member.html.haml
+++ b/app/views/team_members/_team_member.html.haml
@@ -14,7 +14,7 @@
       - if allow_admin
         .left
           = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
-            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2"
+            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
       .pull-right
         - if current_user == user
           %span.label This is you!
diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index ac9e46a1..6958ec4c 100644
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -27,24 +27,30 @@
       %li{class: ("active" if params[:type] == 'masters')}
         = link_to project_team_members_path(type: 'masters') do
           Masters
+          %span.pull-right= @project.users_projects.masters.count
       %li{class: ("active" if params[:type] == 'developers')}
         = link_to project_team_members_path(type: 'developers') do
           Developers
+          %span.pull-right= @project.users_projects.developers.count
       %li{class: ("active" if params[:type] == 'reporters')}
         = link_to project_team_members_path(type: 'reporters') do
           Reporters
+          %span.pull-right= @project.users_projects.reporters.count
       %li{class: ("active" if params[:type] == 'guests')}
         = link_to project_team_members_path(type: 'guests') do
           Guests
-    %h5
-      Assigned teams
-      (#{@project.user_teams.count})
-    %div
-      = render "team_members/assigned_teams", project: @project
+          %span.pull-right= @project.users_projects.guests.count
+
+    - if @assigned_teams.present?
+      %h5
+        Assigned teams
+        (#{@project.user_teams.count})
+      %div
+        = render "team_members/assigned_teams", assigned_teams: @assigned_teams
 
   .span9
     %div.team-table
-      = render "team_members/team", project: @project
+      = render "team_members/team", team: @team