diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index be4760dd..02317607 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -14,20 +14,16 @@
             <title>{{ block "title" . }}{{ end }} · tangled</title>
             {{ block "extrameta" . }}{{ end }}
         </head>
-        <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
-          <div class="px-1">
-            {{ block "topbarLayout" . }}
-            <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-              <header class="col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">
-                {{ template "layouts/topbar" . }}
-              </header>
-            </div>
-            {{ end }}
-          </div>
+        <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
+          {{ block "topbarLayout" . }}
+            <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">
+              {{ template "layouts/topbar" . }}
+            </header>
+          {{ end }}
 
-          <div class="px-1 flex flex-col min-h-screen gap-4">
-            {{ block "contentLayout" . }}
-              <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+          {{ block "mainLayout" . }}
+            <div class="px-1 col-span-1 md:col-start-3 md:col-span-8 flex flex-col gap-4">
+              {{ block "contentLayout" . }}
                 <div class="col-span-1 md:col-span-2">
                   {{ block "contentLeft" . }} {{ end }}
                 </div>
@@ -37,11 +33,9 @@
                 <div class="col-span-1 md:col-span-2">
                   {{ block "contentRight" . }} {{ end }}
                 </div>
-              </div>
-            {{ end }}
-
-            {{ block "contentAfterLayout" . }}
-              <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+              {{ end }}
+  
+              {{ block "contentAfterLayout" . }}
                 <div class="col-span-1 md:col-span-2">
                   {{ block "contentAfterLeft" . }} {{ end }}
                 </div>
@@ -51,20 +45,15 @@
                 <div class="col-span-1 md:col-span-2">
                   {{ block "contentAfterRight" . }} {{ end }}
                 </div>
-              </div>
-            {{ end }}
-          </div>
-
-          <div class="px-1 mt-16">
-            {{ block "footerLayout" . }}
-            <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-              <footer class="col-span-1 md:col-start-3 md:col-span-8">
-                {{ template "layouts/footer" . }}
-              </footer>
+              {{ end }}
             </div>
-            {{ end }}
-          </div>
+          {{ end }}
 
+          {{ block "footerLayout" . }}
+            <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">
+              {{ template "layouts/footer" . }}
+            </footer>
+          {{ end }}
         </body>
     </html>
 {{ end }}
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html
index 34e6be8e..737ca6d5 100644
--- a/appview/pages/templates/layouts/topbar.html
+++ b/appview/pages/templates/layouts/topbar.html
@@ -1,5 +1,5 @@
 {{ define "layouts/topbar" }}
-    <nav class="space-x-4 mb-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">
+    <nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">
         <div class="flex justify-between p-0 items-center">
             <div id="left-items">
                 <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic">
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index bbdb29f2..38beef91 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -80,28 +80,34 @@
 {{end}}
 
 {{ define "topbarLayout" }}
-  <header style="z-index: 20;">
+  <header class="px-1 col-span-full" style="z-index: 20;">
     {{ template "layouts/topbar" . }}
   </header>
 {{ end }}
 
-{{ define "contentLayout"  }}
-  {{ block "content" . }}{{ end }}
-{{ end }}
+{{ define "mainLayout" }}
+  <div class="px-1 col-span-full flex flex-col gap-4">
+    {{ block "contentLayout" . }}
+      {{ block "content" . }}{{ end }}
+    {{ end }}
 
-{{ define "contentAfterLayout"  }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-    <div class="col-span-1 md:col-span-2">
-      {{ block "contentAfterLeft" . }} {{ end }}
+    {{ block "contentAfterLayout" . }}
+    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="col-span-1 md:col-span-2">
+        {{ block "contentAfterLeft" . }} {{ end }}
+      </div>
+      <main class="col-span-1 md:col-span-10">
+        {{ block "contentAfter" . }}{{ end }}
+      </main>
     </div>
-    <main class="col-span-1 md:col-span-10">
-      {{ block "contentAfter" . }}{{ end }}
-    </main>
+    {{ end }}
   </div>
 {{ end }}
 
-{{ define "footerLayout"  }}
-  {{ template "layouts/footer" . }}
+{{ define "footerLayout" }}
+  <footer class="px-1 col-span-full mt-12">
+    {{ template "layouts/footer" . }}
+  </footer>
 {{ end }}
 
 {{ define "contentAfter" }}
diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html
index 9c5eacbf..a23ad38c 100644
--- a/appview/pages/templates/repo/compare/compare.html
+++ b/appview/pages/templates/repo/compare/compare.html
@@ -11,26 +11,34 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  {{ template "layouts/topbar" . }}
+  <header class="px-1 col-span-full" style="z-index: 20;">
+    {{ template "layouts/topbar" . }}
+  </header>
 {{ end }}
 
-{{ define "contentLayout"  }}
-  {{ block "content" . }}{{ end }}
-{{ end }}
+{{ define "mainLayout" }}
+  <div class="px-1 col-span-full flex flex-col gap-4">
+    {{ block "contentLayout" . }}
+      {{ block "content" . }}{{ end }}
+    {{ end }}
 
-{{ define "contentAfterLayout"  }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-    <div class="col-span-1 md:col-span-2">
-      {{ block "contentAfterLeft" . }} {{ end }}
+    {{ block "contentAfterLayout" . }}
+    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="col-span-1 md:col-span-2">
+        {{ block "contentAfterLeft" . }} {{ end }}
+      </div>
+      <main class="col-span-1 md:col-span-10">
+        {{ block "contentAfter" . }}{{ end }}
+      </main>
     </div>
-    <main class="col-span-1 md:col-span-10">
-      {{ block "contentAfter" . }}{{ end }}
-    </main>
+    {{ end }}
   </div>
 {{ end }}
 
-{{ define "footerLayout"  }}
-  {{ template "layouts/footer" . }}
+{{ define "footerLayout" }}
+  <footer class="px-1 col-span-full mt-12">
+    {{ template "layouts/footer" . }}
+  </footer>
 {{ end }}
 
 {{ define "contentAfter" }}
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index 22afd9f5..78b303c1 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -29,26 +29,34 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  {{ template "layouts/topbar" . }}
+  <header class="px-1 col-span-full" style="z-index: 20;">
+    {{ template "layouts/topbar" . }}
+  </header>
 {{ end }}
 
-{{ define "contentLayout"  }}
-  {{ block "content" . }}{{ end }}
-{{ end }}
+{{ define "mainLayout" }}
+  <div class="px-1 col-span-full flex flex-col gap-4">
+    {{ block "contentLayout" . }}
+      {{ block "content" . }}{{ end }}
+    {{ end }}
 
-{{ define "contentAfterLayout"  }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-    <div class="col-span-1 md:col-span-2">
-      {{ block "contentAfterLeft" . }} {{ end }}
+    {{ block "contentAfterLayout" . }}
+    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="col-span-1 md:col-span-2">
+        {{ block "contentAfterLeft" . }} {{ end }}
+      </div>
+      <main class="col-span-1 md:col-span-10">
+        {{ block "contentAfter" . }}{{ end }}
+      </main>
     </div>
-    <main class="col-span-1 md:col-span-10">
-      {{ block "contentAfter" . }}{{ end }}
-    </main>
+    {{ end }}
   </div>
 {{ end }}
 
-{{ define "footerLayout"  }}
-  {{ template "layouts/footer" . }}
+{{ define "footerLayout" }}
+  <footer class="px-1 col-span-full mt-12">
+    {{ template "layouts/footer" . }}
+  </footer>
 {{ end }}
 
 
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index 677ffac5..cd90c43c 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -35,26 +35,34 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  {{ template "layouts/topbar" . }}
+  <header class="px-1 col-span-full" style="z-index: 20;">
+    {{ template "layouts/topbar" . }}
+  </header>
 {{ end }}
 
-{{ define "contentLayout"  }}
-  {{ block "content" . }}{{ end }}
-{{ end }}
+{{ define "mainLayout" }}
+  <div class="px-1 col-span-full flex flex-col gap-4">
+    {{ block "contentLayout" . }}
+      {{ block "content" . }}{{ end }}
+    {{ end }}
 
-{{ define "contentAfterLayout"  }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
-    <div class="col-span-1 md:col-span-2">
-      {{ block "contentAfterLeft" . }} {{ end }}
+    {{ block "contentAfterLayout" . }}
+    <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+      <div class="col-span-1 md:col-span-2">
+        {{ block "contentAfterLeft" . }} {{ end }}
+      </div>
+      <main class="col-span-1 md:col-span-10">
+        {{ block "contentAfter" . }}{{ end }}
+      </main>
     </div>
-    <main class="col-span-1 md:col-span-10">
-      {{ block "contentAfter" . }}{{ end }}
-    </main>
+    {{ end }}
   </div>
 {{ end }}
 
-{{ define "footerLayout"  }}
-  {{ template "layouts/footer" . }}
+{{ define "footerLayout" }}
+  <footer class="px-1 col-span-full mt-12">
+    {{ template "layouts/footer" . }}
+  </footer>
 {{ end }}
 
 {{ define "contentAfter" }}
