diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index e761380..03bb39e 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -50,33 +50,29 @@ const { title = pageTitle, author = siteConfig.defaultAuthor.name,description =
     {spaEnabled && <ClientRouter fallback="animate" />}
     <!--transitional animation is broken in firefox though-->
   </head>
-  <body>
-    <main>
-      {noscript && <div id="top" style="visibility: hidden">Back To Top</div>}
-      <div class="container">
-        <div class="terminal-path">
-          {path}
-        </div>
-        <Navbar />
-        <Search />
-        
-        <div class="content-box">
-          <slot />
-        </div>
-      </div>
-    </main>
-    
-    <footer class="footer">
-      <div class="floating">
-        <BackToTop/>
+  <body class="container">
+        {noscript && <div id="top" style="visibility: hidden">Back To Top</div>}
+        <header>
+              <div class="terminal-path">
+                {path}
+              </div>
+              <Navbar />
+              <Search />
+        </header>
+        <main class="content-box">
+              <slot />
+        </main>
 
-        {noscript ? <ThemeSwitcher_CSSOnly/> : <ThemeSwitcher/>}
-      </div>
-      <div class="container">
-        <Fragment set:html={customFooter} />
-        <p>Powered by <a href="https://git.gb0.dev/gb/mercury" target="_blank"><Logo width={16} height={16} /> mercury</a></p>
-      </div>
-    </footer>
+      <footer class="footer">
+        <div class="floating">
+          <BackToTop/>
+          {noscript ? <ThemeSwitcher_CSSOnly/> : <ThemeSwitcher/>}
+        </div>
+        <div class="container">
+          <Fragment set:html={customFooter} />
+          <p>Powered by <a href="https://git.gb0.dev/gb/mercury" target="_blank"><Logo width={16} height={16} /> mercury</a></p>
+        </div>
+      </footer>
     {statisticsEnabled && <Statistics/>}
     { (siteConfig.neko.enabled && !noscript) &&
       <>
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index 3d3025d..5396a57 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -58,8 +58,8 @@ const cover = customFeaturedImage || matchedImage_src?.src || firstImageURL || `
         <div class="content">
             <Content />
         </div>
-
-        <div class="extra-post" style="margin-top: 2rem; border-top: 1px solid var(--border-color); padding-top: 1rem;">
+    </article>
+    <div class="extra-post" style="margin-top: 2rem; border-top: 1px solid var(--border-color); padding-top: 1rem;">
         <ReplyViaEmail title={entry.data.title} email={authorInfo[0].email} />
             <br>
         <a href="/blog">&larr; Back to posts</a>
@@ -69,8 +69,7 @@ const cover = customFeaturedImage || matchedImage_src?.src || firstImageURL || `
                 import "katex/dist/contrib/copy-tex.js"
             </script>
         }
-    </article>
-  </div>
+    </div>
 </Layout>
 <style>
     p.summary {
diff --git a/src/styles/global.css b/src/styles/global.css
index 95f55bf..ab0b697 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -70,7 +70,7 @@ a:hover {
   opacity: 0.8;
 }
 
-main {
+body {
   max-width: 1200px;
   margin: 0 auto;
   padding: 2rem 1rem;
