diff --git a/_layouts/base.html b/_layouts/base.html
index dc7ecbc9a562..6d5503395f60 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -25,13 +25,11 @@
 {% include head.html %}
 
 <body>
-  <div>
-    {% include gtm_body.html %}
+  {% include gtm_body.html %}
 
-    {% include nav.html %}
+  {% include nav.html %}
 
-    {{ content }}
-  </div>
+  {{ content }}
 
   {% include footer.html %}
 
diff --git a/_layouts/post.html b/_layouts/post.html
index 7f438b3a34c7..9f27cc3109c0 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,7 +4,7 @@
 
 {% include header.html type="post" %}
 
-<div class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
+<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
   <div class="row">
     <div class="{% if page.full-width %} col {% else %} col-xl-8 offset-xl-2 col-lg-10 offset-lg-1 {% endif %}">
 
@@ -39,9 +39,9 @@
         </div>
       {% endif %}
 
-      <main class="blog-post">
+      <div class="blog-post">
         {{ content }}
-      </main>
+      </div>
 
       {% if page.tags.size > 0 %}
         <div class="blog-tags">
@@ -85,4 +85,4 @@
       {% include comments.html %}
     </div>
   </div>
-</div>
+</main>
diff --git a/assets/css/beautifuljekyll.css b/assets/css/beautifuljekyll.css
index f3b05853ca98..3980141ef054 100644
--- a/assets/css/beautifuljekyll.css
+++ b/assets/css/beautifuljekyll.css
@@ -22,8 +22,11 @@ body {
   {% endif %}
   overflow-wrap: break-word;
   min-height: 100vh;
-  display: grid;
-  grid-template-rows: 1fr auto;
+  display: flex;
+  flex-direction: column;
+}
+body > main {
+  flex: 1;
 }
 p {
   line-height: 1.5;
