diff --git a/views/dashboard.hbs b/views/dashboard.hbs
index 9ff1d12..d106fe3 100644
--- a/views/dashboard.hbs
+++ b/views/dashboard.hbs
@@ -11,15 +11,7 @@
 		<div class='adminItem'>
 			<h2>Recent Tests</h2>
 			<div class='adminTable'>
-				<table>
-					{{#each recentTests}}
-						{{> dashboardTest
-							id=id
-							name=template.name
-							date=date
-						}}
-					{{/each}}
-				</table>
+				{{> testTable tests=recentTests}}
 			</div>
 		</div>
 	</div>
@@ -27,26 +19,8 @@
 		<div class='adminItem'>
 			<h2>Upcoming Tests</h2>
 			<div class='adminTable'>
-				<table>
-					{{#each upcomingTests}}
-						{{> dashboardTest
-							id=id
-							name=template.name
-							date=date
-						}}
-					{{/each}}
-				</table>
+				{{> testTable tests=upcomingTests}}
 			</div>
 		</div>
 	</div>
 </section>
-
-<script>
-	const tests = document.querySelectorAll('.adminTable tr');
-	tests.forEach(test => {
-		test.addEventListener('click', () => {
-			window.location.href =
-				`/admin/test/${test.getAttribute('data-id')}`;
-		});
-	});
-</script>