diff --git a/src/templates/Entry.tsx b/src/templates/Entry.tsx
index ebfc819..bd70fd8 100644
--- a/src/templates/Entry.tsx
+++ b/src/templates/Entry.tsx
@@ -1,25 +1,7 @@
 import Main from "@/templates/Main"
 import { useParams } from "react-router"
-
+import Page from "./Page"
 export default function Entry() {
    const { entry } = useParams()
-   return (
-      <Main>
-         <div className="flex-1 flex flex-col overflow-auto">
-            <div className="@container/main flex flex-col">
-               <div className="flex flex-1">
-                  <div className="border-l-none w-full">
-                     <div className="border-b py-2 px-4 lg:px-6 bg-sidebar">
-                        <h2 className="scroll-m-20 font-semibold">
-                           <span>{entry?.replace(/_/g, " ")}</span>
-                        </h2>
-                     </div>
-
-                     <div className="p-4 lg:p-6"></div>
-                  </div>
-               </div>
-            </div>
-         </div>
-      </Main>
-   )
+   return <Page titleComponent={<span>{entry?.replace(/_/g, " ")}</span>} />
 }
diff --git a/src/templates/Page.tsx b/src/templates/Page.tsx
new file mode 100644
index 0000000..7f4bc02
--- /dev/null
+++ b/src/templates/Page.tsx
@@ -0,0 +1,23 @@
+import Main from "./Main"
+
+export default function Page({ pageTitle = null, pageBody = null, titleComponent = null }) {
+	return (
+		<Main>
+			<div className="flex-1 flex flex-col overflow-auto">
+				<div className="@container/main flex flex-col">
+					<div className="flex flex-1">
+						<div className="border-l-none w-full">
+							<div className="border-b py-2 px-4 lg:px-6 bg-sidebar">
+								<h2 className="scroll-m-20 font-semibold">
+									{titleComponent ? titleComponent : <span>{pageTitle}</span>}
+								</h2>
+							</div>
+
+							<div className="p-4 lg:p-6">{pageBody}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</Main>
+	)
+}
diff --git a/src/templates/Tag.tsx b/src/templates/Tag.tsx
index fcd5ba0..7b7fabd 100644
--- a/src/templates/Tag.tsx
+++ b/src/templates/Tag.tsx
@@ -1,26 +1,16 @@
 import Main from "@/templates/Main"
 import { useParams } from "react-router"
-
+import Page from "./Page"
 export default function Tag() {
    const { tag } = useParams()
    return (
-      <Main>
-         <div className="flex-1 flex flex-col overflow-auto">
-            <div className="@container/main flex flex-col">
-               <div className="flex flex-1">
-                  <div className="border-l-none w-full">
-                     <div className="border-b py-2 px-4 lg:px-6 bg-sidebar">
-                        <h2 className="scroll-m-20 font-semibold">
-                           <span className="mr-2 text-muted-foreground">Entries tagged:</span>
-                           <span>{tag}</span>
-                        </h2>
-                     </div>
-
-                     <div className="p-4 lg:p-6"></div>
-                  </div>
-               </div>
-            </div>
-         </div>
-      </Main>
+      <Page
+         titleComponent={
+            <>
+               <span className="mr-2 text-muted-foreground">Entries tagged:</span>
+               <span>{tag}</span>
+            </>
+         }
+      />
    )
 }