diff --git a/src/main/resources/templates/students.html b/src/main/resources/templates/students.html
index 0dc3c9a..613a4f1 100644
--- a/src/main/resources/templates/students.html
+++ b/src/main/resources/templates/students.html
@@ -10,6 +10,13 @@
     <h1>All Students</h1>
 
     <table>
+        <tr>
+            <th>Student</th>
+            <th>Student Number</th>
+            <th>Email</th>
+            <th>Github Username</th>
+            <th>Teams</th>
+        </tr>
         <tr th:each="student: ${students}">
             <td>
                 <a th:href="@{/students/{id}(id=${student.getId()})}"><span th:text="${student.getFullName()}"></span></a>
@@ -17,6 +24,19 @@
             <td th:text="${student.getStudentNumber()}"></td>
             <td th:text="${student.getEmailAddress()}"></td>
             <td th:text="${student.getGithubUsername()}"></td>
+            <td>
+                <div th:each="team: ${student.getTeams()}">
+                    <a
+                            th:href="@{/courses/{code}/student_teams/{id}(code=${team.getCourse().getCode()}, id=${team.getId()})}"
+                            th:text="${'Student Team ' + team.getId()}"
+                    ></a>
+                    <span> from </span>
+                    <a
+                            th:href="@{/courses/{code}(code=${team.getCourse().getCode()})}"
+                            th:text="${team.getCourse().getName()}"
+                    ></a>
+                </div>
+            </td>
         </tr>
     </table>
 </div>