diff --git a/src/app.html b/src/app.html
index 6b2ca34..701b0ed 100644
--- a/src/app.html
+++ b/src/app.html
@@ -4,8 +4,7 @@
 		<meta charset="utf-8" />
 		<meta name="description" content="" />
 		<link rel="stylesheet" href="/normalize.css" />
-		<link rel="stylesheet" href="/thomaswilson.css" />
-		<link rel="icon" href="%svelte.assets%/favicon.png" />
+		<link rel="icon" href="%svelte.assets%/tw-favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		%svelte.head%
 	</head>
diff --git a/src/components/Navbar.svelte b/src/components/Navbar.svelte
index a8c52e1..edadd34 100644
--- a/src/components/Navbar.svelte
+++ b/src/components/Navbar.svelte
@@ -38,8 +38,11 @@
 	}
 
 	.right {
+		display: flex;
 		flex: 1;
 		text-align: right;
+		align-items: center;
+		justify-content: flex-end;
 		padding: var(--spacing-base);
 	}
 
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
new file mode 100644
index 0000000..c7d818b
--- /dev/null
+++ b/src/routes/__layout.svelte
@@ -0,0 +1,5 @@
+<script>
+	import "../styles/thomaswilson.css";
+</script>
+
+<slot />
diff --git a/src/routes/blog.svelte b/src/routes/blog.svelte
index 363875b..db5c5ff 100644
--- a/src/routes/blog.svelte
+++ b/src/routes/blog.svelte
@@ -1,6 +1,7 @@
 <script lang="ts" context="module">
 	import type { Load, LoadInput, LoadOutput } from '@sveltejs/kit';
 	import { differenceInCalendarDays, intlFormat } from 'date-fns';
+	export const prerender=true
 
 	type BlogPost = {
 		filename: string;
diff --git a/src/routes/blog/[slug].svelte b/src/routes/blog/[slug].svelte
index 70af65e..a2c3d47 100644
--- a/src/routes/blog/[slug].svelte
+++ b/src/routes/blog/[slug].svelte
@@ -53,6 +53,12 @@
 		max-width: 65ch;
 	}
 
+	@media screen and (max-width: 700px) {
+		article {
+			padding: 12px;
+		}
+	}
+
 	.post-title {
 		text-align: center;
 		padding-bottom: 1rem;
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 2ac2ac8..3af13ba 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,3 +1,7 @@
+<script context="module">
+	export const prerender = true
+</script>
+
 <script lang="ts">
 	import { slide } from 'svelte/transition';
 	import Navbar from '../components/Navbar.svelte';
@@ -126,27 +130,31 @@
 		padding: var(--link-padding);
 		transition: var(--link-transition);
 		border-radius: var(--link-border-radius);
-		background: #0256f2;
-		color: white;
+		border: 1px solid #0256f2;
+		color: #0256f2;
+		text-decoration: none;
 	}
 
 	.oxwash:hover {
 		background: #6fbbec;
-		text-decoration: none;
+		border: 1px solid #6fbbec;
+		text-decoration: underline;
+		color: white;
 	}
 
 	.figma {
 		padding: var(--link-padding);
 		transition: var(--link-transition);
 		border-radius: var(--link-border-radius);
-		background: #c7b9ff;
+		border: 1px solid #c7b9ff;
 		color: #000000;
+		text-decoration: none;
 	}
 
 	.figma:hover {
-		background: #ffc700;
+		background: #c7b9ff;
 		color: #000000;
-		text-decoration: none;
+		text-decoration: underline;
 	}
 
 	.thesis {
diff --git a/static/thomaswilson.css b/src/styles/thomaswilson.css
similarity index 95%
rename from static/thomaswilson.css
rename to src/styles/thomaswilson.css
index d1da9e0..b09590e 100644
--- a/static/thomaswilson.css
+++ b/src/styles/thomaswilson.css
@@ -1,8 +1,3 @@
-@font-face {
-	font-family: 'SpaceGrotesk-Regular';
-	src: url('/SpaceGrotesk-Regular.woff2');
-}
-
 @font-face {
 	font-family: 'FivoSansModern-Regular';
 	src: url('/FivoSansModern-Regular.otf');
diff --git a/static/SpaceGrotesk-Regular.woff2 b/static/SpaceGrotesk-Regular.woff2
deleted file mode 100644
index 568d15a..0000000
Binary files a/static/SpaceGrotesk-Regular.woff2 and /dev/null differ
diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100644
index 825b9e6..0000000
Binary files a/static/favicon.png and /dev/null differ
diff --git a/static/tw-favicon.ico b/static/tw-favicon.ico
new file mode 100755
index 0000000..8c09467
Binary files /dev/null and b/static/tw-favicon.ico differ