diff --git a/issue/templates/issue/team_list.html b/issue/templates/issue/team_list.html
index 7c00f24..d95b6b2 100644
--- a/issue/templates/issue/team_list.html
+++ b/issue/templates/issue/team_list.html
@@ -22,19 +22,15 @@
   {% if teams.exists %}
   <table class="table table-hover">
     <tr>
-      <th>Name</th>
-      <th>Users</th>
-      <th>Groups</th>
+      <th class="col-md-2">Name</th>
+      <th class="col-md-5">Users</th>
+      <th class="col-md-5">Groups</th>
     </tr>
     {% for team in teams %}
     <tr>
       <td><a href="{% url 'show-team' team.pk %}"><b>{{ team }}</b></a></td>
       <td>{{ team.users|first_few:'user' }}</td>
       <td>{{ team.groups|first_few:'group' }}</td>
-      <td class="text-center">
-        <a href="{% url 'edit-team' team.pk %}" class="btn btn-primary btn-xs">Edit</a>
-        <a href="#" data-item="team" data-action="{% url 'delete-team' team.pk %}" data-toggle="modal" data-target="#confirm-delete" class="btn btn-danger btn-xs">Delete</a>
-      </td>
     </tr>
     {% endfor %}
   </table>
diff --git a/issue/templatetags/issue_filters.py b/issue/templatetags/issue_filters.py
index 5f2463b..68457e2 100644
--- a/issue/templatetags/issue_filters.py
+++ b/issue/templatetags/issue_filters.py
@@ -15,14 +15,16 @@ def boolean(value):
             + glyph + '" style="vertical-align: middle;"></span>')
 
 @register.filter
-def first_few(items, arg='item'):
+def first_few(items, arg='item', max_items=5):
     if items.exists():
-        if items.count() < 4:
+        if items.count() <= max_items:
             return ', '.join(map(lambda x: x.__str__(), items.all()))
         else:
-            r = ', '.join(map(lambda x: x.__str__(), items.all()[0:3]))
-            plural = 's' if items.count() > 4 else ''
-            r += ', ... (%s other%s)' % (items.count() - 3, plural)
+            r = ', '.join(map(lambda x: x.__str__(),
+                items.all()[0:max_items-1]))
+            plural = 's' if items.count() > max_items else ''
+            r += ', ... (%s other%s)' \
+                % (items.count() - max_items + 1, plural)
             return r
     else:
         return 'no ' + arg + 's'