diff --git a/views/class.hbs b/views/class.hbs
index 8abec4d..39606a2 100644
--- a/views/class.hbs
+++ b/views/class.hbs
@@ -11,13 +11,13 @@
 			<h2>Class Overview - {{ className }}</h2>
 			<div class='adminOverview'>
 				<div>
-					<h3>Teachers</h3>
+					<h3><a href='{{teachersLink}}'>Teachers</a></h3>
 					{{#each teachers}}
 						{{> classTeacher name=shortName email=email }}
 					{{/each}}
 				</div>
 				<div>
-					<h3>Members</h3>
+					<h3><a href='{{membersLink}}'>Members</a></h3>
 					{{> classMembers members=members }}
 				</div>
 				<div class='adminOverview__buttons'>
diff --git a/views/classUsers.hbs b/views/classUsers.hbs
new file mode 100644
index 0000000..ea8b9d4
--- /dev/null
+++ b/views/classUsers.hbs
@@ -0,0 +1,16 @@
+<section class='adminSection adminSection--buttons'>
+	{{#eq userType 'account'}}
+	<div class='classes__buttons'>
+		{{> button style='full' colour='primary' to=addLink content=addContent size='lg' }}
+	</div>
+	{{/eq}}
+</section>
+
+<section class='adminSection classUsers'>
+	<div class="adminItem">
+		<h2>{{pageTitle}}</h2>
+		{{#each users as |user|}}
+			{{> classUser user=user }}
+		{{/each}}
+	</div>
+</section>
diff --git a/views/partials/classUser.hbs b/views/partials/classUser.hbs
new file mode 100644
index 0000000..d225722
--- /dev/null
+++ b/views/partials/classUser.hbs
@@ -0,0 +1,5 @@
+<div class='classUser'>
+	<a href='/admin/user/{{user.id}}'>
+		{{user.fullName}}
+	</a>
+</div>