diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 6b99fa1b..74867492 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -15,67 +15,55 @@
             {{ block "extrameta" . }}{{ end }}
         </head>
         <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
-          {{ block "topbarLayout" . }}
-            <div class="px-1 grid grid-cols-1 md:grid-cols-12 gap-2">
-              <div class="{{ layoutSide }}">
-                {{ block "topbarLeft" . }} {{ end }}
-              </div>
-              <header style="z-index: 20" class="{{ layoutCenter }}">
-                {{ block "topbar" . }}
-                  {{ template "layouts/topbar" . }}
-                {{ end }}
+          <div class="px-1" style="z-index: 20">
+            {{ block "topbarLayout" . }}
+            <div class="grid grid-cols-1 md:grid-cols-12">
+              <header class="col-span-1 md:col-start-3 md:col-span-8">
+                {{ template "layouts/topbar" . }}
               </header>
-              <div class="{{ layoutSide }}">
-                {{ block "topbarRight" . }} {{ end }}
-              </div>
             </div>
-          {{ end }}
+            {{ end }}
+          </div>
 
-          <div class="flex flex-col min-h-screen">
+          <div class="px-1 flex flex-col min-h-screen gap-4">
             {{ block "contentLayout" . }}
-              <div class="px-1 grid grid-cols-1 md:grid-cols-12 gap-2">
-                <div class="{{ layoutSide }}">
+              <div class="grid grid-cols-1 md:grid-cols-12 gap-4">
+                <div class="col-span-1 md:col-span-2">
                   {{ block "contentLeft" . }} {{ end }}
                 </div>
-                <main class="{{ layoutCenter }}">
+                <main class="col-span-1 md:col-span-8">
                   {{ block "content" . }}{{ end }}
                 </main>
-                <div class="{{ layoutSide }}">
+                <div class="col-span-1 md:col-span-2">
                   {{ block "contentRight" . }} {{ end }}
                 </div>
               </div>
             {{ end }}
 
             {{ block "contentAfterLayout" . }}
-              <div class="px-1 grid grid-cols-1 md:grid-cols-12 gap-2">
-                <div class="{{ layoutSide }}">
+              <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="px-1 {{ layoutCenter }}">
+                <main class="col-span-1 md:col-span-8">
                   {{ block "contentAfter" . }}{{ end }}
                 </main>
-                <div class="{{ layoutSide }}">
+                <div class="col-span-1 md:col-span-2">
                   {{ block "contentAfterRight" . }} {{ end }}
                 </div>
               </div>
             {{ end }}
           </div>
 
-          {{ block "footerLayout" . }}
-            <div class="px-1 grid grid-cols-1 md:grid-cols-12 gap-2">
-              <div class="{{ layoutSide }}">
-                {{ block "footerLeft" . }} {{ end }}
-              </div>
-              <footer class="mt-16 {{ layoutCenter }}">
-                {{ block "footer" . }}
-                  {{ template "layouts/footer" . }}
-                {{ end }}
+          <div class="px-1 mt-16">
+            {{ block "footerLayout" . }}
+            <div class="grid grid-cols-1 md:grid-cols-12">
+              <footer class="col-span-1 md:col-start-3 md:col-span-8">
+                {{ template "layouts/footer" . }}
               </footer>
-              <div class="{{ layoutSide }}">
-                {{ block "footerRight" . }} {{ end }}
-              </div>
             </div>
-          {{ end }}
+            {{ end }}
+          </div>
 
         </body>
     </html>
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index 4186316f..d8d9d8bb 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -80,42 +80,26 @@
 {{end}}
 
 {{ define "topbarLayout" }}
-  <div class="px-1 grid grid-cols-1">
-    <header style="z-index: 20" class="col-span-1">
-      {{ block "topbar" . }}
-        {{ template "layouts/topbar" . }}
-      {{ end }}
-    </header>
-  </div>
+  {{ template "layouts/topbar" . }}
 {{ end }}
 
-{{ define "contentLayout" }}
-  <div class="grid grid-cols-1 md:grid-cols-1 gap-2">
-    <main class="px-1 col-span-1">
-      {{ block "content" . }}{{ end }}
-    </main>
-  </div>
+{{ define "contentLayout"  }}
+  {{ block "content" . }}{{ end }}
 {{ end }}
 
-{{ block "contentAfterLayout" . }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-2">
+{{ 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 }}
     </div>
-    <main class="px-1 col-span-1 md:col-span-10">
+    <main class="col-span-1 md:col-span-10">
       {{ block "contentAfter" . }}{{ end }}
     </main>
   </div>
 {{ end }}
 
-{{ block "footerLayout" . }}
-  <div class="px-1 grid grid-cols-1">
-    <footer class="mt-16 col-span-1">
-      {{ block "footer" . }}
-        {{ template "layouts/footer" . }}
-      {{ end }}
-    </footer>
-  </div>
+{{ define "footerLayout"  }}
+  {{ template "layouts/footer" . }}
 {{ end }}
 
 {{ define "contentAfter" }}
@@ -123,7 +107,7 @@
 {{end}}
 
 {{ define "contentAfterLeft" }}
-  <div class="flex flex-col gap-4 col-span-1 md:col-span-2 mt-4">
+  <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
   <div class="sticky top-0 mt-4">
diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html
index 3ac29cad..9c5eacbf 100644
--- a/appview/pages/templates/repo/compare/compare.html
+++ b/appview/pages/templates/repo/compare/compare.html
@@ -11,42 +11,26 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  <div class="px-1 grid grid-cols-1">
-    <header style="z-index: 20" class="col-span-1">
-      {{ block "topbar" . }}
-        {{ template "layouts/topbar" . }}
-      {{ end }}
-    </header>
-  </div>
+  {{ template "layouts/topbar" . }}
 {{ end }}
 
-{{ define "contentLayout" }}
-  <div class="grid grid-cols-1 md:grid-cols-1 gap-2">
-    <main class="px-1 col-span-1">
-      {{ block "content" . }}{{ end }}
-    </main>
-  </div>
+{{ define "contentLayout"  }}
+  {{ block "content" . }}{{ end }}
 {{ end }}
 
-{{ block "contentAfterLayout" . }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-2">
+{{ 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 }}
     </div>
-    <main class="px-1 col-span-1 md:col-span-10">
+    <main class="col-span-1 md:col-span-10">
       {{ block "contentAfter" . }}{{ end }}
     </main>
   </div>
 {{ end }}
 
-{{ block "footerLayout" . }}
-  <div class="px-1 grid grid-cols-1">
-    <footer class="mt-16 col-span-1">
-      {{ block "footer" . }}
-        {{ template "layouts/footer" . }}
-      {{ end }}
-    </footer>
-  </div>
+{{ define "footerLayout"  }}
+  {{ template "layouts/footer" . }}
 {{ end }}
 
 {{ define "contentAfter" }}
@@ -54,7 +38,7 @@
 {{end}}
 
 {{ define "contentAfterLeft" }}
-  <div class="flex flex-col gap-4 col-span-1 md:col-span-2 mt-4">
+  <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
   <div class="sticky top-0 mt-4">
diff --git a/appview/pages/templates/repo/fragments/diff.html b/appview/pages/templates/repo/fragments/diff.html
index f3ebdf2b..34da43cf 100644
--- a/appview/pages/templates/repo/fragments/diff.html
+++ b/appview/pages/templates/repo/fragments/diff.html
@@ -1,18 +1,19 @@
 {{ define "repo/fragments/diff" }}
-{{ $repo := index . 0 }}
-{{ $diff := index . 1 }}
-{{ $opts := index . 2 }}
-
-{{ $commit := $diff.Commit }}
-{{ $diff := $diff.Diff }}
-{{ $isSplit := $opts.Split }}
-{{ $this := $commit.This }}
-{{ $parent := $commit.Parent }}
+  {{ $repo := index . 0 }}
+  {{ $diff := index . 1 }}
+  {{ $opts := index . 2 }}
 
+  {{ $commit := $diff.Commit }}
+  {{ $diff := $diff.Diff }}
+  {{ $isSplit := $opts.Split }}
+  {{ $this := $commit.This }}
+  {{ $parent := $commit.Parent }}
   {{ $last := sub (len $diff) 1 }}
+
+  <div class="flex flex-col gap-4">
     {{ range $idx, $hunk := $diff }}
       {{ with $hunk }}
-      <section class="mt-4 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">
+      <section class="border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">
         <div id="file-{{ .Name.New }}">
           <div id="diff-file">
             <details open>
@@ -103,4 +104,5 @@
       </section>
       {{ end }}
     {{ end }}
+  </div>
 {{ end }}
diff --git a/appview/pages/templates/repo/fragments/interdiff.html b/appview/pages/templates/repo/fragments/interdiff.html
index f3825c35..d66d73c9 100644
--- a/appview/pages/templates/repo/fragments/interdiff.html
+++ b/appview/pages/templates/repo/fragments/interdiff.html
@@ -7,9 +7,10 @@
 {{ $last := sub (len $diff) 1 }}
 {{ $isSplit := $opts.Split }}
 
+<div class="flex flex-col gap-4">
   {{ range $idx, $hunk := $diff }}
     {{ with $hunk }}
-    <section class="mt-4 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">
+    <section class="border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">
       <div id="file-{{ .Name }}">
         <div id="diff-file">
           <details {{ if not (.Status.IsOnlyInOne) }}open{{end}}>
@@ -86,5 +87,6 @@
     </section>
     {{ end }}
   {{ end }}
+</div>
 {{ end }}
 
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index 95769684..22afd9f5 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -29,50 +29,35 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  <div class="px-1 grid grid-cols-1">
-    <header style="z-index: 20" class="col-span-1">
-      {{ block "topbar" . }}
-        {{ template "layouts/topbar" . }}
-      {{ end }}
-    </header>
-  </div>
+  {{ template "layouts/topbar" . }}
 {{ end }}
 
-{{ define "contentLayout" }}
-  <div class="grid grid-cols-1 md:grid-cols-1 gap-2">
-    <main class="px-1 col-span-1">
-      {{ block "content" . }}{{ end }}
-    </main>
-  </div>
+{{ define "contentLayout"  }}
+  {{ block "content" . }}{{ end }}
 {{ end }}
 
-{{ block "contentAfterLayout" . }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-2">
+{{ 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 }}
     </div>
-    <main class="px-1 col-span-1 md:col-span-10">
+    <main class="col-span-1 md:col-span-10">
       {{ block "contentAfter" . }}{{ end }}
     </main>
   </div>
 {{ end }}
 
-{{ block "footerLayout" . }}
-  <div class="px-1 grid grid-cols-1">
-    <footer class="mt-16 col-span-1">
-      {{ block "footer" . }}
-        {{ template "layouts/footer" . }}
-      {{ end }}
-    </footer>
-  </div>
+{{ define "footerLayout"  }}
+  {{ template "layouts/footer" . }}
 {{ end }}
 
+
 {{ define "contentAfter" }}
   {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff .DiffOpts) }}
 {{end}}
 
 {{ define "contentAfterLeft" }}
-  <div class="flex flex-col gap-4 col-span-1 md:col-span-2 mt-4">
+  <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
   <div class="sticky top-0 mt-4">
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index a92b8c77..677ffac5 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -35,42 +35,26 @@
 {{ end }}
 
 {{ define "topbarLayout" }}
-  <div class="px-1 grid grid-cols-1">
-    <header style="z-index: 20" class="col-span-1">
-      {{ block "topbar" . }}
-        {{ template "layouts/topbar" . }}
-      {{ end }}
-    </header>
-  </div>
+  {{ template "layouts/topbar" . }}
 {{ end }}
 
-{{ define "contentLayout" }}
-  <div class="grid grid-cols-1 md:grid-cols-1 gap-2">
-    <main class="px-1 col-span-1">
-      {{ block "content" . }}{{ end }}
-    </main>
-  </div>
+{{ define "contentLayout"  }}
+  {{ block "content" . }}{{ end }}
 {{ end }}
 
-{{ block "contentAfterLayout" . }}
-  <div class="grid grid-cols-1 md:grid-cols-12 gap-2">
+{{ 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 }}
     </div>
-    <main class="px-1 col-span-1 md:col-span-10">
+    <main class="col-span-1 md:col-span-10">
       {{ block "contentAfter" . }}{{ end }}
     </main>
   </div>
 {{ end }}
 
-{{ block "footerLayout" . }}
-  <div class="px-1 grid grid-cols-1">
-    <footer class="mt-16 col-span-1">
-      {{ block "footer" . }}
-        {{ template "layouts/footer" . }}
-      {{ end }}
-    </footer>
-  </div>
+{{ define "footerLayout"  }}
+  {{ template "layouts/footer" . }}
 {{ end }}
 
 {{ define "contentAfter" }}
@@ -78,7 +62,7 @@
 {{end}}
 
 {{ define "contentAfterLeft" }}
-  <div class="flex flex-col gap-4 col-span-1 md:col-span-2 mt-4">
+  <div class="flex flex-col gap-4 col-span-1 md:col-span-2">
     {{ template "repo/fragments/diffOpts" .DiffOpts }}
   </div>
   <div class="sticky top-0 mt-4">
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index 907d2dcd..18d1df0d 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -467,10 +467,6 @@ func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) {
 
 	interdiff := patchutil.Interdiff(previousPatch, currentPatch)
 
-	for _, f := range interdiff.Files {
-		log.Println("", "", f.Split())
-	}
-
 	s.pages.RepoPullInterdiffPage(w, pages.RepoPullInterdiffParams{
 		LoggedInUser: s.oauth.GetUser(r),
 		RepoInfo:     f.RepoInfo(user),
