diff --git a/author.hbs b/author.hbs
index f7093eb..f9e7c14 100644
--- a/author.hbs
+++ b/author.hbs
@@ -61,26 +61,9 @@
 {{/author}}
 
 <div class="container mx-auto px-4 pb-20">
-    <div id="posts-container" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-10">
-        {{#foreach posts}}
-            {{> "post-card"}}
-        {{/foreach}}
-
-        {{#if pagination.next}}
-            <div id="pagination-trigger" 
-                 hx-get="{{page_url pagination.next}}" 
-                 hx-trigger="revealed" 
-                 hx-select="#posts-container > *" 
-                 hx-target="this" 
-                 hx-swap="outerHTML"
-                 hx-indicator="#loading-spinner"
-                 class="col-span-full h-1">
-            </div>
-        {{/if}}
-    </div>
-
-    <div id="loading-spinner" class="htmx-indicator text-center py-12">
-        <div class="inline-block animate-spin rounded-full h-10 w-10 border-4 border-[var(--brand-primary)] border-t-transparent"></div>
-        <p class="text-[var(--text-secondary)] mt-4 font-medium tracking-wide">Loading more posts...</p>
-    </div>
+    {{#if posts}}
+        {{> "post-feed"}}
+    {{else}}
+        <p class="text-center text-[var(--text-secondary)] text-2xl py-20">No posts found.</p>
+    {{/if}}
 </div>
diff --git a/index.hbs b/index.hbs
index 8deba51..2b0b2b3 100644
--- a/index.hbs
+++ b/index.hbs
@@ -7,29 +7,7 @@
 
 <div class="container mx-auto px-4 pb-20">
     {{#if posts}}
-        <div id="posts-container" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-10">
-            {{#foreach posts}}
-                {{> "post-card"}}
-            {{/foreach}}
-
-            {{#if pagination.next}}
-                <div id="pagination-trigger" 
-                     hx-get="{{page_url pagination.next}}" 
-                     hx-trigger="revealed" 
-                     hx-select="#posts-container > *" 
-                     hx-target="this" 
-                     hx-swap="outerHTML"
-                     hx-indicator="#loading-spinner"
-                     class="col-span-full h-1">
-                </div>
-            {{/if}}
-        </div>
-
-        <div id="loading-spinner" class="htmx-indicator text-center py-12">
-            <div class="inline-block animate-spin rounded-full h-10 w-10 border-4 border-[var(--brand-primary)] border-t-transparent"></div>
-            <p class="text-[var(--text-secondary)] mt-4 font-medium tracking-wide">Loading more posts...</p>
-        </div>
-
+        {{> "post-feed"}}
     {{else}}
         <p class="text-center text-[var(--text-secondary)] text-2xl py-20">No posts found.</p>
     {{/if}}
diff --git a/partials/post-feed.hbs b/partials/post-feed.hbs
new file mode 100644
index 0000000..ddf1b03
--- /dev/null
+++ b/partials/post-feed.hbs
@@ -0,0 +1,22 @@
+<div id="posts-container" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-10">
+    {{#foreach posts}}
+        {{> "post-card"}}
+    {{/foreach}}
+
+    {{#if pagination.next}}
+        <div id="pagination-trigger" 
+             hx-get="{{page_url pagination.next}}" 
+             hx-trigger="revealed" 
+             hx-select="#posts-container > *" 
+             hx-target="this" 
+             hx-swap="outerHTML"
+             hx-indicator="#loading-spinner"
+             class="col-span-full h-1">
+        </div>
+    {{/if}}
+</div>
+
+<div id="loading-spinner" class="htmx-indicator text-center py-12">
+    <div class="inline-block animate-spin rounded-full h-10 w-10 border-4 border-[var(--brand-primary)] border-t-transparent"></div>
+    <p class="text-[var(--text-secondary)] mt-4 font-medium tracking-wide">Loading more posts...</p>
+</div>
diff --git a/tag.hbs b/tag.hbs
index 55c9426..799cfa2 100644
--- a/tag.hbs
+++ b/tag.hbs
@@ -18,29 +18,7 @@
 
 <div class="container mx-auto px-4 pb-20">
     {{#if posts}}
-        <div id="posts-container" class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-10">
-            {{#foreach posts}}
-                {{> "post-card"}}
-            {{/foreach}}
-
-            {{#if pagination.next}}
-                <div id="pagination-trigger" 
-                     hx-get="{{page_url pagination.next}}" 
-                     hx-trigger="revealed" 
-                     hx-select="#posts-container > *" 
-                     hx-target="this" 
-                     hx-swap="outerHTML"
-                     hx-indicator="#loading-spinner"
-                     class="col-span-full h-1">
-                </div>
-            {{/if}}
-        </div>
-
-        <div id="loading-spinner" class="htmx-indicator text-center py-12">
-            <div class="inline-block animate-spin rounded-full h-10 w-10 border-4 border-[var(--brand-primary)] border-t-transparent"></div>
-            <p class="text-[var(--text-secondary)] mt-4 font-medium tracking-wide">Loading more posts...</p>
-        </div>
-
+        {{> "post-feed"}}
     {{else}}
         <p class="text-center text-[var(--text-secondary)] text-2xl py-20">No posts found.</p>
     {{/if}}