diff --git a/core/templates/core/user_clubs.jinja b/core/templates/core/user_clubs.jinja
index 5e16fb93..2a6f75a5 100644
--- a/core/templates/core/user_clubs.jinja
+++ b/core/templates/core/user_clubs.jinja
@@ -6,19 +6,57 @@
 
 {% block content %}
 <h3>{% trans%}Club(s){% endtrans %}</h3>
-
+<br>
 <h4>{% trans%}Current club(s){% endtrans %}</h4>
-<ul>
-    {% for m in profile.memberships.filter(end_date=None).all() %}
-	<li><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></li>
-    {% endfor %}
-</ul>
+<br>
+<table>
+    <thead>
+    	<tr>
+    		<td>{% trans %}User{% endtrans %}</td>
+	        <td>{% trans %}Role{% endtrans %}</td>
+	        <td>{% trans %}Description{% endtrans %}</td>
+	        <td>{% trans %}Since{% endtrans %}</td>
+    	</tr>
+    </thead>
+    <tbody>
+	    {% for m in profile.memberships.filter(end_date=None).all() %}
+        <tr>
+            <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
+            <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+            <td>{{ m.description }}</td>
+            <td>{{ m.start_date }}</td>
+            {% if m.can_be_edited_by(user) %}
+            <td><a href="{{ url('club:membership_set_old', membership_id=m.id) }}">{% trans %}Mark as old{% endtrans %}</a></td>
+            {% endif %}
+        </tr>
+    	{% endfor %}
+    </tbody>
+</table>
 
 <h4>{% trans%}Old club(s){% endtrans %}</h4>
-<ul>
-    {% for m in profile.memberships.exclude(end_date=None).all() %}
-	<li><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></li>
-    {% endfor %}
-</ul>
+<br>
+<table>
+    <thead>
+    	<tr>
+    		<td>{% trans %}User{% endtrans %}</td>
+	        <td>{% trans %}Role{% endtrans %}</td>
+	        <td>{% trans %}Description{% endtrans %}</td>
+	        <td>{% trans %}From{% endtrans %}</td>
+	        <td>{% trans %}To{% endtrans %}</td>
+
+    	</tr>
+    </thead>
+    <tbody>
+	    {% for m in profile.memberships.exclude(end_date=None).all() %}
+        <tr>
+            <td><a href="{{ url('club:club_members', club_id=m.club.id) }}">{{ m.club }}</a></td>
+            <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+            <td>{{ m.description }}</td>
+            <td>{{ m.start_date }}</td>
+            <td>{{ m.end_date }}</td>
+        </tr>
+    	{% endfor %}
+    </tbody>
+</table>
 {% endblock %}