diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 4e24662b..466a3854 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -26,7 +26,7 @@
         </head>
         <body class="min-h-screen flex flex-col gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
           {{ block "topbarLayout" . }}
-            <header class="w-full bg-white dark:bg-gray-800 col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;">
+            <header class="w-full col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;">
 
                {{ if .LoggedInUser }}
                 <div id="upgrade-banner"
@@ -58,7 +58,7 @@
           {{ end }}
 
           {{ block "footerLayout" . }}
-            <footer class="bg-white dark:bg-gray-800 mt-12">
+            <footer class="mt-12">
               {{ template "layouts/fragments/footer" . }}
             </footer>
           {{ end }}
diff --git a/appview/pages/templates/layouts/fragments/footer.html b/appview/pages/templates/layouts/fragments/footer.html
index 0730da33..5440b21a 100644
--- a/appview/pages/templates/layouts/fragments/footer.html
+++ b/appview/pages/templates/layouts/fragments/footer.html
@@ -1,5 +1,5 @@
 {{ define "layouts/fragments/footer" }}
-<div class="w-full p-8">
+<div class="w-full p-8 bg-white dark:bg-gray-800">
   <div class="mx-auto px-4">
     <div class="flex flex-col text-gray-600 dark:text-gray-400 gap-8">
       <!-- Desktop layout: grid with 3 columns -->
diff --git a/appview/pages/templates/layouts/fragments/topbar.html b/appview/pages/templates/layouts/fragments/topbar.html
index 74d5815f..205c544b 100644
--- a/appview/pages/templates/layouts/fragments/topbar.html
+++ b/appview/pages/templates/layouts/fragments/topbar.html
@@ -1,5 +1,5 @@
 {{ define "layouts/fragments/topbar" }}
-    <nav class="mx-auto space-x-4 px-6 py-2 rounded-b dark:text-white drop-shadow-sm">
+    <nav class="mx-auto space-x-4 px-6 py-2 rounded-b dark:text-white drop-shadow-sm bg-white dark:bg-gray-800">
         <div class="flex justify-between p-0 items-center">
             <div id="left-items">
               <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2">
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index dc9ebba6..4a5525b2 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -80,13 +80,13 @@
 {{end}}
 
 {{ define "topbarLayout" }}
-  <header class="px-1 col-span-full" style="z-index: 20;">
+  <header class="col-span-full" style="z-index: 20;">
     {{ template "layouts/fragments/topbar" . }}
   </header>
 {{ end }}
 
 {{ define "mainLayout" }}
-  <div class="px-1 col-span-full flex flex-col gap-4">
+  <div class="px-1 flex-grow col-span-full flex flex-col gap-4">
     {{ block "contentLayout" . }}
       {{ block "content" . }}{{ end }}
     {{ end }}
@@ -105,7 +105,7 @@
 {{ end }}
 
 {{ define "footerLayout" }}
-  <footer class="px-1 col-span-full mt-12">
+  <footer class="col-span-full mt-12">
     {{ template "layouts/fragments/footer" . }}
   </footer>
 {{ end }}
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index d14e3ea7..9b207f83 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -28,14 +28,8 @@
 
 {{ end }}
 
-{{ define "topbarLayout" }}
-  <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/fragments/topbar" . }}
-  </header>
-{{ end }}
-
 {{ define "mainLayout" }}
-  <div class="px-1 col-span-full flex flex-col gap-4">
+  <div class="px-1 col-span-full flex-grow flex flex-col gap-4">
     {{ block "contentLayout" . }}
       {{ block "content" . }}{{ end }}
     {{ end }}
@@ -53,13 +47,6 @@
   </div>
 {{ end }}
 
-{{ define "footerLayout" }}
-  <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/fragments/footer" . }}
-  </footer>
-{{ end }}
-
-
 {{ define "contentAfter" }}
   {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff .DiffOpts) }}
 {{end}}
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index 219fb02e..3bb580f2 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -34,14 +34,8 @@
 </section>
 {{ end }}
 
-{{ define "topbarLayout" }}
-  <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/fragments/topbar" . }}
-  </header>
-{{ end }}
-
 {{ define "mainLayout" }}
-  <div class="px-1 col-span-full flex flex-col gap-4">
+  <div class="px-1 col-span-full flex-grow flex flex-col gap-4">
     {{ block "contentLayout" . }}
       {{ block "content" . }}{{ end }}
     {{ end }}
@@ -59,12 +53,6 @@
   </div>
 {{ end }}
 
-{{ define "footerLayout" }}
-  <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/fragments/footer" . }}
-  </footer>
-{{ end }}
-
 {{ define "contentAfter" }}
   {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }}
 {{end}}
