diff --git a/routes/class.js b/routes/class.js
index 7254e66..14c629f 100644
--- a/routes/class.js
+++ b/routes/class.js
@@ -13,7 +13,8 @@ router.get('/classes', async (req, res) => {
 		title: 'Stratos - Classes',
 		current: 'Classes',
 		name: req.session.fullName,
-		classes: await u.getClasses()
+		classes: await u.getClasses(),
+		userType: req.session.userType
 	});
 });
 
diff --git a/routes/test.js b/routes/test.js
index a282421..072ed56 100644
--- a/routes/test.js
+++ b/routes/test.js
@@ -13,7 +13,8 @@ router.get('/tests', async (req, res) => {
 		title: 'Stratos - Tests',
 		current: 'Tests',
 		name: req.session.fullName,
-		tests: await u.getTests()
+		tests: await u.getTests(),
+		userType: req.session.userType
 	});
 });
 
diff --git a/src/stylesheets/components/_admin.scss b/src/stylesheets/components/_admin.scss
index 70afe95..331d097 100644
--- a/src/stylesheets/components/_admin.scss
+++ b/src/stylesheets/components/_admin.scss
@@ -35,6 +35,13 @@
 .adminSection {
 	margin: 1rem 0;
 
+	&--buttons {
+		display: flex;
+		gap: 1rem;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
 	&:last-child {
 		margin-bottom: 0;
 		padding-bottom: 1rem;
diff --git a/src/stylesheets/components/_button.scss b/src/stylesheets/components/_button.scss
index 8d307aa..484a8de 100644
--- a/src/stylesheets/components/_button.scss
+++ b/src/stylesheets/components/_button.scss
@@ -14,6 +14,10 @@
 	}
 }
 
+.btn--lg {
+	padding: 1em 3em;
+}
+
 @each $name, $colour in $button-colours {
 	.btn.btn--#{$name}.btn--full {
 		background: $colour;
diff --git a/src/stylesheets/pages/_classes.scss b/src/stylesheets/pages/_classes.scss
index fbdb6de..4bbec76 100644
--- a/src/stylesheets/pages/_classes.scss
+++ b/src/stylesheets/pages/_classes.scss
@@ -1,14 +1,16 @@
 .classes {
-	display: grid;
-	column-gap: 1rem;
-	row-gap: 1.5rem;
-	margin-top: 1rem;
+	&__classes {
+		display: grid;
+		column-gap: 1rem;
+		row-gap: 1.5rem;
+		margin-top: 1rem;
 
-	@include respond-to('medium') {
-		grid-template-columns: repeat(2, 1fr);
-	}
+		@include respond-to('medium') {
+			grid-template-columns: repeat(2, 1fr);
+		}
 
-	@include respond-to('large') {
-		grid-template-columns: repeat(3, 1fr);
+		@include respond-to('large') {
+			grid-template-columns: repeat(3, 1fr);
+		}
 	}
 }
diff --git a/views/classes.hbs b/views/classes.hbs
index 739f959..a448a16 100644
--- a/views/classes.hbs
+++ b/views/classes.hbs
@@ -1,7 +1,17 @@
-<section class='classes'>
-	{{#each classes}}
-		{{> class name=name teacher=teachers.[0] id=id }}
-	{{/each}}
+<section class='adminSection adminSection--buttons'>
+	{{#eq userType 'account'}}
+	<div class='classes__buttons'>
+		{{> button style='full' colour='primary' to='/admin/class/add' content='Add a new class' size='lg' }}
+	</div>
+	{{/eq}}
+</section>
+
+<section class='adminSection classes'>
+	<div class='classes__classes'>
+		{{#each classes}}
+			{{> class name=name teacher=teachers.[0] id=id }}
+		{{/each}}
+	</div>
 </section>
 
 <script>
diff --git a/views/partials/button.hbs b/views/partials/button.hbs
index 3360083..602ec6d 100644
--- a/views/partials/button.hbs
+++ b/views/partials/button.hbs
@@ -1,3 +1,3 @@
-<a class='btn btn--{{ style }} btn--{{ colour }}' href='{{ to }}'>
+<a class='btn btn--{{ style }} btn--{{ colour }} btn--{{ size }}' href='{{ to }}'>
 	{{ content }}
 </a>
diff --git a/views/tests.hbs b/views/tests.hbs
index fa18670..277767b 100644
--- a/views/tests.hbs
+++ b/views/tests.hbs
@@ -1,4 +1,12 @@
-<section class='tests adminSection'>
+<section class='adminSection adminSection--buttons'>
+	{{#eq userType 'account'}}
+	<div class='classes__buttons'>
+		{{> button style='full' colour='primary' to='/admin/test/add' content='Add a new test' size='lg' }}
+	</div>
+	{{/eq}}
+</section>
+
+<section class='adminSection tests'>
 	<div class='adminItem'>
 		<h2>Tests</h2>
 		<div class='adminTable'>