diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk
index 026e7c3..ff1140a 100644
--- a/src/_includes/partials/footer.njk
+++ b/src/_includes/partials/footer.njk
@@ -1,8 +1,8 @@
 {% set activePage = page.url | url %}
 
-<footer>
+<footer class="wrapper repel justify-center">
   <nav id="footernav" aria-label="Footer">
-    <ul>
+    <ul role="list" class="cluster">
       {% for item in navigation.bottom %}
       <li><a
         href="{{ item.url }}"
diff --git a/src/_includes/partials/header.njk b/src/_includes/partials/header.njk
index 2906ae0..50de255 100644
--- a/src/_includes/partials/header.njk
+++ b/src/_includes/partials/header.njk
@@ -1,6 +1,8 @@
 <a href="#main" class="skip-link">{{ meta.skipContent }}</a>
 
-<header>
-    <div></div>
-    {% include "partials/menu.njk" %}
+<header role="banner" class="wrapper">
+    <div class="repel">
+        <a class="brand" href="/" aria-label="{{meta.siteName}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12.0006 18.26L4.94715 22.2082L6.52248 14.2799L0.587891 8.7918L8.61493 7.84006L12.0006 0.5L15.3862 7.84006L23.4132 8.7918L17.4787 14.2799L19.054 22.2082L12.0006 18.26Z"></path></svg></a>
+        {% include "partials/menu.njk" %}
+    </div>
 </header>
\ No newline at end of file
diff --git a/src/_includes/partials/menu.njk b/src/_includes/partials/menu.njk
index b78a027..b744eeb 100644
--- a/src/_includes/partials/menu.njk
+++ b/src/_includes/partials/menu.njk
@@ -1,5 +1,5 @@
-<nav id="mainnav" aria-label="Main">
-  <ul>
+<nav id="mainnav" aria-label="primary">
+  <ul role="list" class="cluster text-base">
     {% for item in navigation.top %}
     <li>
       <a
diff --git a/src/_includes/partials/posts-light.njk b/src/_includes/partials/posts-light.njk
index 1f9238e..55ff157 100644
--- a/src/_includes/partials/posts-light.njk
+++ b/src/_includes/partials/posts-light.njk
@@ -1,5 +1,5 @@
 {% if postslist %}
-<ul role="list">
+<ul class="flow">
     {% asyncEach post in postslist %}
         <li>{% set definedDate = post.date %}
             <a href="{{ post.url | url }}">{{ post.data.title }} ({% include "partials/date.njk" %})</a>
diff --git a/src/_layouts/base.njk b/src/_layouts/base.njk
index 6d4f1d2..83a36d5 100644
--- a/src/_layouts/base.njk
+++ b/src/_layouts/base.njk
@@ -25,7 +25,11 @@
   <body>
     {% include "partials/header.njk" %}
 
-    <main id="main">{{ content | safe }}</main>
+    <main id="main">
+      <div class="wrapper flow prose region">
+        {{ content | safe }}
+      </div>
+    </main>
 
     {% include "partials/footer.njk" %}
   </body>
diff --git a/src/_layouts/blog.njk b/src/_layouts/blog.njk
index 7808416..f8ddc1d 100644
--- a/src/_layouts/blog.njk
+++ b/src/_layouts/blog.njk
@@ -1,16 +1,13 @@
 ---
 layout: base
 ---
-
-<header>
-    <section>
-        <h1>{{ title }}</h1>
-    </section>
-</header>
-
-<article>
+<div>
+  <h1>{{ title }}</h1>
 
   {{ content | safe }}
+</div>
+
+<article>
     
   {% set postslist = collections.posts %} {% include "partials/posts-light.njk" %}
 
diff --git a/src/_layouts/post.njk b/src/_layouts/post.njk
index f47aa02..b5852ae 100644
--- a/src/_layouts/post.njk
+++ b/src/_layouts/post.njk
@@ -1,11 +1,8 @@
 ---
 layout: base
 ---
-
+<h1>{{ title }}</h1>
+{% set definedDate = date %} {% include "partials/date.njk" %}
 <article>
-    <h1>{{ title }}</h1>
-
-    {% set definedDate = date %} {% include "partials/date.njk" %}
-
     {{ content | safe }}
 </article>
\ No newline at end of file
