diff --git a/content/contact.md b/content/contact.md
index 78317db..7daedea 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -10,24 +10,22 @@ description: "Need to get in touch?"
 
 Email me at daniel@lyte.dev or use the form below.
 
-<p>
-	<form action="https://formspree.io/daniel@lyte.dev" method="POST">
-		<fieldset>
-			<label name="name">Full Name</label>
-			<input type="text" name="name" placeholder="Daniel Flanagan" />
-		</fieldset>
-		<fieldset>
-			<label name="_replyto">Email</label>
-			<input type="email" name="_replyto" placeholder="you@example.com" />
-		</fieldset>
-		<fieldset>
-			<label name="content">Message</label>
-			<textarea name="content" rows="4"></textarea>
-		</fieldset>
-		<fieldset>
-			<input class="button primary" type="submit" value="Send" />
-		</fieldset>
-		<input type="hidden" name="_next" value="/thanks" />
-		<input type="hidden" name="_subject" value="Contact Form Submission - lytedev" />
-	</form>
-</p>
+<form action="https://formspree.io/daniel@lyte.dev" method="POST">
+	<fieldset>
+		<label name="name">Full Name</label>
+		<input type="text" name="name" placeholder="Daniel Flanagan" />
+	</fieldset>
+	<fieldset>
+		<label name="_replyto">Email</label>
+		<input type="email" name="_replyto" placeholder="you@example.com" />
+	</fieldset>
+	<fieldset>
+		<label name="content">Message</label>
+		<textarea name="content" rows="4"></textarea>
+	</fieldset>
+	<fieldset>
+		<input class="button primary" type="submit" value="Send" />
+	</fieldset>
+	<input type="hidden" name="_next" value="/thanks" />
+	<input type="hidden" name="_subject" value="Contact Form Submission - lytedev" />
+</form>
diff --git a/themes/lyte/layouts/_default/baseof.html b/themes/lyte/layouts/_default/baseof.html
index 1691e01..4de9e4c 100644
--- a/themes/lyte/layouts/_default/baseof.html
+++ b/themes/lyte/layouts/_default/baseof.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		{{ block "head-begin" . }}{{ end }}
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>{{ block "title" . }}
-			{{ .Site.Title }}
-		{{ end }}</title>
+		{{ block "head-begin" . }}{{ end }}
+		<title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
 		<link rel="shortcut icon" href="/icon.png" />
 		<link rel="stylesheet" href="/styles.css" />
 		{{ block "head-end" . }}{{ end }}
 	</head>
 	<body>
+		{{ block "body-begin" . }}{{ end }}
 		<header>
 			<section>
 				<a href="/"><img src="/icon.png" /></a>
@@ -28,11 +27,8 @@
 				{{ end }}
 			</section>
 		</header>
-		{{ block "body-begin" . }}{{ end }}
 		<main>
-			{{ block "main" . }}
-				{{ .Content }}
-			{{ end }}
+			{{ block "main" . }}{{ .Content }}{{ end }}
 		</main>
 		{{ block "body-end" . }}{{ end }}
 	</body>
