diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 02317607..19e96de5 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -24,27 +24,15 @@
           {{ 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>
                 <main class="col-span-1 md:col-span-8">
                   {{ block "content" . }}{{ end }}
                 </main>
-                <div class="col-span-1 md:col-span-2">
-                  {{ block "contentRight" . }} {{ end }}
-                </div>
               {{ end }}
   
               {{ block "contentAfterLayout" . }}
-                <div class="col-span-1 md:col-span-2">
-                  {{ block "contentAfterLeft" . }} {{ end }}
-                </div>
                 <main class="col-span-1 md:col-span-8">
                   {{ block "contentAfter" . }}{{ end }}
                 </main>
-                <div class="col-span-1 md:col-span-2">
-                  {{ block "contentAfterRight" . }} {{ end }}
-                </div>
               {{ end }}
             </div>
           {{ end }}
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index c3a67f8b..6ca19e5f 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -118,7 +118,7 @@
   <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 flex-grow max-h-screen">
+  <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html
index 384e0f52..70acec06 100644
--- a/appview/pages/templates/repo/compare/compare.html
+++ b/appview/pages/templates/repo/compare/compare.html
@@ -49,7 +49,7 @@
   <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 flex-grow max-h-screen">
+  <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/fragments/interdiffFiles.html b/appview/pages/templates/repo/fragments/interdiffFiles.html
index 26d3d995..f10e5b6b 100644
--- a/appview/pages/templates/repo/fragments/interdiffFiles.html
+++ b/appview/pages/templates/repo/fragments/interdiffFiles.html
@@ -1,6 +1,6 @@
 {{ define "repo/fragments/interdiffFiles" }}
 {{ $fileTree := fileTree .AffectedFiles }}
-<section class="mt-4 px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm min-h-full text-sm">
+<section class="px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm min-h-full text-sm">
   <div class="diff-stat">
     <div class="flex gap-2 items-center">
       <strong class="text-sm uppercase dark:text-gray-200">files</strong>
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 6a3bfb56..9361f102 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -139,8 +139,8 @@
     {{ $linkstyle := "no-underline hover:underline dark:text-white" }}
 
     {{ range .Files }}
-      <div class="grid grid-cols-2 gap-4 items-center py-1">
-        <div class="col-span-1">
+      <div class="grid grid-cols-3 gap-4 items-center py-1">
+        <div class="col-span-2">
           {{ $link := printf "/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (urlquery $.Ref) .Name }}
           {{ $icon := "folder" }}
           {{ $iconStyle := "size-4 fill-current" }}
@@ -158,7 +158,7 @@
           </a>
         </div>
 
-        <div class="text-xs col-span-1 text-right">
+        <div class="text-sm col-span-1 text-right">
           {{ with .LastCommit }}
             <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash }}" class="text-gray-500 dark:text-gray-400">{{ template "repo/fragments/time" .When }}</a>
           {{ end }}
diff --git a/appview/pages/templates/repo/pulls/interdiff.html b/appview/pages/templates/repo/pulls/interdiff.html
index 81da1b22..8f984122 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -68,7 +68,7 @@
   <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 flex-grow max-h-screen">
+  <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto">
     {{ template "repo/fragments/interdiffFiles" .Interdiff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index 3769c3af..eb390b06 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -73,7 +73,7 @@
   <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 flex-grow max-h-screen">
+  <div class="sticky top-0 flex-grow max-h-screen overflow-y-auto">
     {{ template "repo/fragments/diffChangedFiles" .Diff }}
   </div>
 {{end}}
diff --git a/appview/pages/templates/repo/tree.html b/appview/pages/templates/repo/tree.html
index 098a1358..75bd7e7c 100644
--- a/appview/pages/templates/repo/tree.html
+++ b/appview/pages/templates/repo/tree.html
@@ -54,7 +54,7 @@
 
     {{ range .Files }}
       <div class="grid grid-cols-12 gap-4 items-center py-1">
-        <div class="col-span-6 md:col-span-4">
+        <div class="col-span-8 md:col-span-4">
           {{ $link := printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (urlquery $.Ref) $.TreePath .Name }}
           {{ $icon := "folder" }}
           {{ $iconStyle := "size-4 fill-current" }}
@@ -77,7 +77,7 @@
           {{ end }}
         </div>
 
-        <div class="col-span-6 md:col-span-2 text-right">
+        <div class="col-span-4 md:col-span-2 text-sm text-right">
           {{ with .LastCommit }}
             <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash }}" class="text-gray-500 dark:text-gray-400">{{ template "repo/fragments/time" .When }}</a>
           {{ end }}