diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 797197fe..188a7730 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -33,9 +33,8 @@
         {% for job in job_list %}
             <div id="jobs-{{job.slug}}" class="tab-pane">
             <div class="grid-container">
-
-                
-                    <h2>{{job.0}}</h2>
+               
+                <h2>{{job.0}}</h2>
                 
                 {% with active_members=job.1 inactive_members=job.2 %}
                 {% include 'members/jobs_list.html' %}
diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html
index 0955a987..0fafba93 100644
--- a/fet2020/templates/members/jobs_list.html
+++ b/fet2020/templates/members/jobs_list.html
@@ -1,24 +1,11 @@
 
-Aktuelle Mitglieder: {{active_members.count}}
-<div class="grid-x">
-    {% for mem in active_members %}
-        <div class="medium-6 cell">
-        <h2>{{mem.get_job_role_display}} (seit {{mem.job_start}})</h2>
-        {% with member=mem.member %}
-            {% include 'members/partials/_member_details.html' %}
-        {% endwith %}
-        </div>
-    {% endfor %}
-</div>
+<b>Aktuelle Mitglieder:</b>
 
-Vergangene Mitglieder: {{inactive_members.count}}
-<div class="grid-x">
-    {% for mem in inactive_members %}
-        <div class="medium-6 cell">
-        <h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
-        {% with member=mem.member %}
-            {% include 'members/partials/_member_details.html' %}
-        {% endwith %}
-        </div>
-    {% endfor %}
-</div>
+{% with job_memberships=active_members %}
+    {% include 'members/partials/_job_membership_grid.html' %}
+{% endwith %}
+
+<b>Vergangene Mitglieder: </b>
+{% with job_memberships=inactive_members %}
+    {% include 'members/partials/_job_membership_grid.html' %}
+{% endwith %}
diff --git a/fet2020/templates/members/partials/_job_membership_grid.html b/fet2020/templates/members/partials/_job_membership_grid.html
new file mode 100644
index 00000000..ca4ad034
--- /dev/null
+++ b/fet2020/templates/members/partials/_job_membership_grid.html
@@ -0,0 +1,9 @@
+<div class="grid-x">
+    {% for mem in job_memberships %}
+     {% with member=mem.member %}
+        <div class="medium-3 large-2 small-6 cell">{{mem.get_job_role_display}} (seit {{mem.job_start}})
+        {% include 'members/partials/_member.html' %}
+        </div>
+    {%endwith %}
+    {% endfor %}
+</div>
\ No newline at end of file