diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index c69e3714..09e00401 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -136,54 +136,91 @@ TeamFiltersDirective = () ->
 
 module.directive("tgTeamFilters", [TeamFiltersDirective])
 
+#############################################################################
+## Team Member Stats Directive
+#############################################################################
+
+TeamMemberStatsDirective = () ->
+    template = """
+        <div class="attribute">
+            <span class="icon icon-briefcase" ng-style="{'opacity': stats.closed_bugs[user.user]}" ng-class="{'top': stats.closed_bugs[user.user] == 1}"></span>
+        </div>
+        <div class="attribute">
+            <span class="icon icon-iocaine" ng-style="{'opacity': stats.iocaine_tasks[user.user]}" ng-class="{'top': stats.iocaine_tasks[user.user] == 1}"></span>
+        </div>
+        <div class="attribute">
+            <span class="icon icon-writer" ng-style="{'opacity': stats.wiki_changes[user.user]}" ng-class="{'top': stats.wiki_changes[user.user] == 1}"></span>
+        </div>
+        <div class="attribute">
+            <span class="icon icon-bug" ng-style="{'opacity': stats.created_bugs[user.user]}" ng-class="{'top': stats.created_bugs[user.user] == 1}"></span>
+        </div>
+        <div class="attribute">
+            <span class="icon icon-tasks" ng-style="{'opacity': stats.closed_tasks[user.user]}" ng-class="{'top': stats.closed_tasks[user.user] == 1}"></span>
+        </div>
+        <div class="attribute">
+            <span class="points"></span>
+        </div>
+    """
+    return {
+        template: template
+    }
+
+module.directive("tgTeamMemberStats", TeamMemberStatsDirective)
+
+#############################################################################
+## Team Member Directive
+#############################################################################
+
+TeamMemberCurrentUserDirective = () ->
+    template = """
+        <div class="row">
+            <div class="username">
+                <figure class="avatar">
+                    <img tg-bo-src="currentUser.photo", tg-bo-alt="currentUser.username" />
+                    <figcaption>
+                        <span class="name" tg-bo-bind="currentUser.username"></span>
+                        <div tg-leave-project></div>
+                    </figcaption>
+                </figure>
+            </div>
+            <div class="member-stats" tg-team-member-stats></div>
+        </div>
+    """
+    return {
+        template: template
+        scope: {
+            currentUser: "=currentuser",
+            stats: "="
+        }
+    }
+
+module.directive("tgTeamCurrentUser", TeamMemberCurrentUserDirective)
+
 #############################################################################
 ## Team Members Directive
 #############################################################################
 
 TeamMembersDirective = () ->
     template = """
-        <div class="row" ng-repeat="user in memberships | filter:filtersQ | filter:{role: filtersRole.id}">
+        <div class="row member" ng-repeat="user in memberships | filter:filtersQ | filter:{role: filtersRole.id}">
             <div class="username">
                 <figure class="avatar">
                     <img tg-bo-src="user.photo", tg-bo-alt="user.full_name" />
                     <figcaption>
                         <span class="name" tg-bo-bind="user.full_name"></span>
                         <span class="position" tg-bo-bind="user.role_name"></span>
-                        <tg-leave-project ng-if="currentUser"></tg-leave-project>
                     </figcaption>
                 </figure>
             </div>
-            <div class="attribute">
-                <span class="icon icon-briefcase" ng-style="{'opacity': stats.closed_bugs[user.user]}" ng-class="{'top': stats.closed_bugs[user.user] == 1}"></span>
-            </div>
-            <div class="attribute">
-                <span class="icon icon-iocaine" ng-style="{'opacity': stats.iocaine_tasks[user.user]}" ng-class="{'top': stats.iocaine_tasks[user.user] == 1}"></span>
-            </div>
-            <div class="attribute">
-                <span class="icon icon-writer" ng-style="{'opacity': stats.wiki_changes[user.user]}" ng-class="{'top': stats.wiki_changes[user.user] == 1}"></span>
-            </div>
-            <div class="attribute">
-                <span class="icon icon-bug" ng-style="{'opacity': stats.created_bugs[user.user]}" ng-class="{'top': stats.created_bugs[user.user] == 1}"></span>
-            </div>
-            <div class="attribute">
-                <span class="icon icon-tasks" ng-style="{'opacity': stats.closed_tasks[user.user]}" ng-class="{'top': stats.closed_tasks[user.user] == 1}"></span>
-            </div>
-            <div class="attribute">
-                <span class="points"></span>
-            </div>
+            <div class="member-stats" tg-team-member-stats></div>
         </div>
     """
     return {
-        link: (scope) ->
-            if not _.isArray(scope.memberships)
-                scope.memberships = [scope.memberships]
-
         template: template
         scope: {
             memberships: "=",
             filtersQ: "=filtersq",
             filtersRole: "=filtersrole",
-            currentUser: "@currentuser",
             stats: "="
         }
     }
@@ -208,8 +245,6 @@ LeaveProjectDirective = ($repo, $confirm, $location) ->
                     console.log "TODO"
     return {
         scope: {},
-        restrict: "EA",
-        replace: true,
         template: template,
         link: link
     }
diff --git a/app/partials/views/modules/team/team-table.jade b/app/partials/views/modules/team/team-table.jade
index 166a615e..43056945 100644
--- a/app/partials/views/modules/team/team-table.jade
+++ b/app/partials/views/modules/team/team-table.jade
@@ -26,7 +26,7 @@ section.table-team.basic-table
             div.popover.attribute-explanation
                 span How far did you go into this Taiga?
 
-    div.hero(tg-team-members, memberships="currentUser" currentuser=true)
+    div.hero(tg-team-current-user, currentuser="currentUser")
 
 h2
     span Team >
diff --git a/app/styles/modules/admin/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss
index 6e15db4d..adbadf9d 100644
--- a/app/styles/modules/admin/admin-membership-table.scss
+++ b/app/styles/modules/admin/admin-membership-table.scss
@@ -90,7 +90,6 @@
     .header-status {
         @include table-flex-child(1, 50px, 0);
     }
-
     .check {
         background-color: darken($whitish, 10%);
         border-radius: 2px;
diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss
index e9e4f3e7..bed23da5 100644
--- a/app/styles/modules/team/team-table.scss
+++ b/app/styles/modules/team/team-table.scss
@@ -5,6 +5,10 @@
     .username {
         @include table-flex-child(3, 0, 0);
     }
+    .member-stats {
+        @include table-flex(stretch, center, flex, row, wrap, flex-start);
+        @include table-flex-child(6, 0, 0);
+    }
     .attribute {
         @include table-flex-child(1, 0, 0);
         position: relative;