diff --git a/sass/_base.scss b/sass/_base.scss
index 6cb0dbb2e..3fd94edab 100644
--- a/sass/_base.scss
+++ b/sass/_base.scss
@@ -29,9 +29,9 @@ html {
 
 body {
     margin: 0;
-    min-height: 100svh;
-    display: flex;
-    flex-direction: column;
+    min-height: 100dvh;
+    display: grid;
+    grid-template-rows: auto 1fr auto;
     background-color: #fff;
     color: var(--color-text);
 
@@ -52,11 +52,6 @@ body {
     line-height: 1.75;
 }
 
-main {
-    flex: 1;
-    padding-top: var(--navbar-height);
-}
-
 a {
     color: var(--color-link);
     text-decoration: none;
diff --git a/sass/_header.scss b/sass/_header.scss
index 87cf8ba27..bff33d7f7 100644
--- a/sass/_header.scss
+++ b/sass/_header.scss
@@ -1,11 +1,13 @@
 .site-header {
-    position: fixed;
+    position: sticky;
+    inset-block-start: 0;
+    inset-inline: 0;
+
     z-index: 1000;
     --header-padding: 1.5dvw;
     --header-vertical-padding: 8px;
 
     display: flex;
-    width: 100%;
     height: var(--navbar-height);
     padding-left: 20px;
     align-items: center;
@@ -189,7 +191,7 @@
             border-radius: 6px;
             padding-inline: 1rem;
             padding-block: 0.75rem;
-            
+
             display: flex;
             flex-direction: column;