diff --git a/src/lib/components/MentionList.svelte b/src/lib/components/MentionList.svelte
index 379d964..bfd33a0 100644
--- a/src/lib/components/MentionList.svelte
+++ b/src/lib/components/MentionList.svelte
@@ -60,6 +60,7 @@
 			gap: $unit-2x;
 			list-style: none;
 			padding: 0;
+			margin: 0;
 		}
 
 		@include breakpoint('phone') {
diff --git a/src/lib/components/Page.svelte b/src/lib/components/Page.svelte
index f52e3d2..96223eb 100644
--- a/src/lib/components/Page.svelte
+++ b/src/lib/components/Page.svelte
@@ -52,6 +52,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			gap: $unit-2x;
 		}
 	}
 </style>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 6729899..3934de3 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -6,7 +6,6 @@
 	import Page from '$components/Page.svelte'
 	import ProjectList from '$components/ProjectList.svelte'
 	import RecentAlbums from '$components/RecentAlbums.svelte'
-	import Squiggly from '$components/Squiggly.svelte'
 
 	import type { PageData } from './$types'
 
@@ -20,7 +19,7 @@
 		<h1 aria-label="@jedmund">
 			<Avatar />
 		</h1>
-		<Squiggly text="@jedmund is a software designer" />
+		<h2 class="subheader">@jedmund is a software designer</h2>
 	</svelte:fragment>
 
 	<ProjectList />
@@ -28,7 +27,7 @@
 
 <Page>
 	<svelte:fragment slot="header">
-		<Squiggly text="A little about me" />
+		<h2>A little about me</h2>
 	</svelte:fragment>
 
 	<section class="bio">
@@ -53,14 +52,14 @@
 </Page>
 <Page>
 	<svelte:fragment slot="header">
-		<Squiggly text="Notable mentions" />
+		<h2>Notable mentions</h2>
 	</svelte:fragment>
 
 	<MentionList />
 </Page>
 <Page noHorizontalPadding={true}>
 	<svelte:fragment slot="header">
-		<Squiggly text="Now playing" />
+		<h2>Now playing</h2>
 	</svelte:fragment>
 
 	<RecentAlbums {albums} />
@@ -104,10 +103,29 @@
 		margin-bottom: $unit-2x;
 	}
 
+	h1,
+	h2 {
+		margin: 0;
+	}
+
+	h2 {
+		color: $accent-color;
+		font-size: 1.2rem;
+		font-weight: 500;
+
+		&.subheader {
+			margin-bottom: $unit-2x;
+		}
+	}
+
 	.bio {
 		font-size: 1rem;
 		line-height: 1.3;
 
+		p:first-child {
+			margin-top: 0;
+		}
+
 		p:last-child {
 			margin-bottom: 0;
 		}