diff --git a/assets/_mixins.scss b/assets/_mixins.scss
new file mode 100644
index 0000000..070c862
--- /dev/null
+++ b/assets/_mixins.scss
@@ -0,0 +1,5 @@
+@mixin heading {
+	font-family: Orbitron, sans-serif;
+	font-weight: 900;
+	text-transform: uppercase;
+}
diff --git a/assets/style.scss b/assets/style.scss
index fb87af5..b1c44b0 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -1,5 +1,6 @@
 @import 'fonts';
 @import 'colors';
+@import 'mixins';
 
 * {
 	font-family: Montserrat, sans-serif;
@@ -22,8 +23,11 @@ header {
 }
 
 main {
+	width: 100%;
 	max-width: 1200px;
 	margin: auto;
+
+	flex-grow: 1;
 }
 
 footer {
@@ -37,9 +41,7 @@ h1, h2, h3, h4, h5, h6, p {
 }
 
 h1, h2, h3, h4, h5, h6 {
-	font-family: Orbitron, sans-serif;
-	font-weight: 900;
-	text-transform: uppercase;
+	@include heading;
 }
 
 h1 {
@@ -64,10 +66,6 @@ figure {
 	}
 }
 
-.wrapper {
-	flex: 1;
-}
-
 .nav {
 	max-width: 1200px;
 	margin: 0 auto;
@@ -91,9 +89,8 @@ figure {
 	}
 
 	.nav-logo {
-		font-family: Orbitron, sans-serif;
-		font-weight: 900;
-		text-transform: uppercase;
+		@include heading;
+
 		margin: 0 auto;
 
 		@media screen and (min-width: 800px) {
@@ -101,9 +98,9 @@ figure {
 		}
 
 		img {
-			width: 64px;
+			width: 48px;
 			display: inline-block;
-			padding-right: 1em;
+			margin-right: 1em;
 			vertical-align: middle;
 		}
 	}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index b7fa5de..46e69c7 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -26,10 +26,8 @@
 			{{ end }}
 		</nav>
 	</header>
-	<div class="wrapper">
 	{{ block "main" . }}
 	{{ end }}
-	</div>
 	<footer>
 		<a href="/imprint">{{ i18n "imprint" }}</a>
 	</footer>