diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 19e96de5..f2d81ce6 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -17,7 +17,7 @@
         <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" . }}
+              {{ template "layouts/fragments/topbar" . }}
             </header>
           {{ end }}
 
@@ -39,7 +39,7 @@
 
           {{ block "footerLayout" . }}
             <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">
-              {{ template "layouts/footer" . }}
+              {{ template "layouts/fragments/footer" . }}
             </footer>
           {{ end }}
         </body>
diff --git a/appview/pages/templates/layouts/footer.html b/appview/pages/templates/layouts/fragments/footer.html
similarity index 98%
rename from appview/pages/templates/layouts/footer.html
rename to appview/pages/templates/layouts/fragments/footer.html
index b7c9cb4c..84730865 100644
--- a/appview/pages/templates/layouts/footer.html
+++ b/appview/pages/templates/layouts/fragments/footer.html
@@ -1,4 +1,4 @@
-{{ define "layouts/footer" }}
+{{ define "layouts/fragments/footer" }}
 <div class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm">
   <div class="container mx-auto max-w-7xl px-4">
     <div class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8">
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/fragments/topbar.html
similarity index 98%
rename from appview/pages/templates/layouts/topbar.html
rename to appview/pages/templates/layouts/fragments/topbar.html
index 904b70c5..20da4098 100644
--- a/appview/pages/templates/layouts/topbar.html
+++ b/appview/pages/templates/layouts/fragments/topbar.html
@@ -1,4 +1,4 @@
-{{ define "layouts/topbar" }}
+{{ define "layouts/fragments/topbar" }}
     <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">
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index 6ca19e5f..3f504a7c 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -81,7 +81,7 @@
 
 {{ define "topbarLayout" }}
   <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/topbar" . }}
+    {{ template "layouts/fragments/topbar" . }}
   </header>
 {{ end }}
 
@@ -106,7 +106,7 @@
 
 {{ define "footerLayout" }}
   <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/footer" . }}
+    {{ template "layouts/fragments/footer" . }}
   </footer>
 {{ end }}
 
diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html
index 70acec06..d8380954 100644
--- a/appview/pages/templates/repo/compare/compare.html
+++ b/appview/pages/templates/repo/compare/compare.html
@@ -12,7 +12,7 @@
 
 {{ define "topbarLayout" }}
   <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/topbar" . }}
+    {{ template "layouts/fragments/topbar" . }}
   </header>
 {{ end }}
 
@@ -37,7 +37,7 @@
 
 {{ define "footerLayout" }}
   <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/footer" . }}
+    {{ 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 8f984122..c44204a9 100644
--- a/appview/pages/templates/repo/pulls/interdiff.html
+++ b/appview/pages/templates/repo/pulls/interdiff.html
@@ -30,7 +30,7 @@
 
 {{ define "topbarLayout" }}
   <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/topbar" . }}
+    {{ template "layouts/fragments/topbar" . }}
   </header>
 {{ end }}
 
@@ -55,7 +55,7 @@
 
 {{ define "footerLayout" }}
   <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/footer" . }}
+    {{ template "layouts/fragments/footer" . }}
   </footer>
 {{ end }}
 
diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html
index eb390b06..c02cc412 100644
--- a/appview/pages/templates/repo/pulls/patch.html
+++ b/appview/pages/templates/repo/pulls/patch.html
@@ -36,7 +36,7 @@
 
 {{ define "topbarLayout" }}
   <header class="px-1 col-span-full" style="z-index: 20;">
-    {{ template "layouts/topbar" . }}
+    {{ template "layouts/fragments/topbar" . }}
   </header>
 {{ end }}
 
@@ -61,7 +61,7 @@
 
 {{ define "footerLayout" }}
   <footer class="px-1 col-span-full mt-12">
-    {{ template "layouts/footer" . }}
+    {{ template "layouts/fragments/footer" . }}
   </footer>
 {{ end }}
 
diff --git a/appview/pages/templates/strings/put.html b/appview/pages/templates/strings/put.html
index a086715f..e5d4f2f2 100644
--- a/appview/pages/templates/strings/put.html
+++ b/appview/pages/templates/strings/put.html
@@ -1,9 +1,5 @@
 {{ define "title" }}publish a new string{{ end }}
 
-{{ define "topbar" }}
-  {{ template "layouts/topbar" $ }}
-{{ end }}
-
 {{ define "content" }}
   <div class="px-6 py-2 mb-4">
     {{ if eq .Action "new" }}
diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html
index 139c7abd..0e8a48ec 100644
--- a/appview/pages/templates/strings/string.html
+++ b/appview/pages/templates/strings/string.html
@@ -8,10 +8,6 @@
   <meta property="og:description" content="{{ .String.Description }}" />
 {{ end }}
 
-{{ define "topbar" }}
-  {{ template "layouts/topbar" $ }}
-{{ end }}
-
 {{ define "content" }}
 {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}
   <section id="string-header" class="mb-4 py-2 px-6 dark:text-white">
diff --git a/appview/pages/templates/strings/timeline.html b/appview/pages/templates/strings/timeline.html
index 1796cad6..dde7e929 100644
--- a/appview/pages/templates/strings/timeline.html
+++ b/appview/pages/templates/strings/timeline.html
@@ -1,9 +1,5 @@
 {{ define "title" }} all strings {{ end }}
 
-{{ define "topbar" }}
-  {{ template "layouts/topbar" $ }}
-{{ end }}
-
 {{ define "content" }}
   {{ block "timeline" $ }}{{ end }}
 {{ end }}
