diff --git a/umap/templates/umap/user_teams.html b/umap/templates/umap/user_teams.html
index d84296c3..159c2b60 100644
--- a/umap/templates/umap/user_teams.html
+++ b/umap/templates/umap/user_teams.html
@@ -6,14 +6,46 @@
   {% include "umap/dashboard_menu.html" with selected="teams" %}
   <div class="wrapper">
     <div class="row">
-      <ul>
-        {% for team in teams %}
-          <li>
-            <a href="{% url 'team_maps' team.pk %}">{{ team }}</a> <a href="{% url 'team_update' team.pk %}">({% trans "Edit" %})</a>
-          </li>
-        {% endfor %}
-      </ul>
-      <a href="{% url 'team_new' %}">{% trans "New team" %}</a>
+      <div class="table-wrapper">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                {% blocktrans %}Name{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Users{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Actions{% endblocktrans %}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for team in teams %}
+              <tr>
+                <th scope="row">
+                  <a href="{% url 'team_maps' team.pk %}">{{ team }}</a>
+                </th>
+                <td>
+                  {% for user in team.users.all %}
+                    {{ user }}{% if not forloop.last %}, {% endif %}
+                  {% endfor %}
+                </td>
+                <td>
+                  <a href="{% url 'team_update' team.pk %}"
+                     class="icon-link"
+                     title="{% translate "Edit" %}">
+                    <span class="icon-dashboard icon-edit"></span>
+                    <span class="sr-only">{% translate "Edit" %}</span>
+                  </a>
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      <a class="button" href="{% url 'team_new' %}">{% trans "New team" %}</a>
     </div>
   </div>
 {% endblock maincontent %}