diff --git a/.eleventy.js b/.eleventy.js
index 6835dd78..2c787f5d 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -37,6 +37,9 @@ module.exports = function (eleventyConfig) {
 
   // quiet build output
   eleventyConfig.setQuietMode(true)
+  eleventyConfig.setLiquidOptions({
+    jsTruthy: true,
+  })
 
   // tailwind watches
   eleventyConfig.addWatchTarget('./tailwind.config.js')
@@ -49,24 +52,6 @@ module.exports = function (eleventyConfig) {
   // shortcodes
   eleventyConfig.addShortcode('version', () => now)
 
-  // filters
-  Object.keys(filters).forEach((filterName) => {
-    eleventyConfig.addLiquidFilter(filterName, filters[filterName])
-  })
-
-  // date filters
-  Object.keys(dateFilters).forEach((filterName) => {
-    eleventyConfig.addLiquidFilter(filterName, dateFilters[filterName])
-  })
-
-  // media filters
-  Object.keys(mediaFilters).forEach((filterName) => {
-    eleventyConfig.addLiquidFilter(filterName, mediaFilters[filterName])
-  })
-
-  // css filters
-  eleventyConfig.addFilter('cssmin', (code) => new CleanCSS({}).minify(code).styles)
-
   // enable merging of tags
   eleventyConfig.setDataDeepMerge(true)
 
@@ -107,6 +92,24 @@ module.exports = function (eleventyConfig) {
     return md.render(content)
   })
 
+  // filters
+  Object.keys(filters).forEach((filterName) => {
+    eleventyConfig.addLiquidFilter(filterName, filters[filterName])
+  })
+
+  // date filters
+  Object.keys(dateFilters).forEach((filterName) => {
+    eleventyConfig.addLiquidFilter(filterName, dateFilters[filterName])
+  })
+
+  // media filters
+  Object.keys(mediaFilters).forEach((filterName) => {
+    eleventyConfig.addLiquidFilter(filterName, mediaFilters[filterName])
+  })
+
+  // css filters
+  eleventyConfig.addFilter('cssmin', (code) => new CleanCSS({}).minify(code).styles)
+
   // image shortcode
   eleventyConfig.addShortcode('image', async function (src, alt, css, sizes, loading) {
     let metadata = await Image(src, {
diff --git a/src/_includes/partials/footer.liquid b/src/_includes/partials/footer.liquid
index d36adc10..3a3eecab 100644
--- a/src/_includes/partials/footer.liquid
+++ b/src/_includes/partials/footer.liquid
@@ -1,7 +1,7 @@
 <footer>
   <div class="mt-8 pt-8 pb-4 flex gap-2 md:gap-3 justify-center w-full">
     {% for link in nav.social %}
-      {% render "partials/linked-icon.liquid", name: link.name, link: link.url, icon: link.icon %}
+      {% render "partials/nav/linked-icon.liquid", name: link.name, link: link.url, icon: link.icon %}
     {% endfor %}
   </div>
   <div class="flex justify-center text-sm text-gray-500 dark:text-gray-100 pb-8 text-center">
diff --git a/src/_includes/partials/linked-icon.liquid b/src/_includes/partials/nav/linked-icon.liquid
similarity index 100%
rename from src/_includes/partials/linked-icon.liquid
rename to src/_includes/partials/nav/linked-icon.liquid
diff --git a/src/_includes/partials/nav/menu.liquid b/src/_includes/partials/nav/menu.liquid
index 8ecffd9b..cd388a57 100644
--- a/src/_includes/partials/nav/menu.liquid
+++ b/src/_includes/partials/nav/menu.liquid
@@ -1,7 +1,7 @@
 <nav>
   <ul class="flex">
     {% for link in nav.menu %}
-      <li class="mr-6">
+      <li{% if not forloop.last %} class="mr-6"{% endif %}>
         {% render "partials/nav/link.liquid", page: page, link: link.name, icon: link.icon %}
       </li>
     {% endfor %}
diff --git a/src/_includes/partials/webmentions.liquid b/src/_includes/partials/webmentions.liquid
deleted file mode 100644
index f7152b2d..00000000
--- a/src/_includes/partials/webmentions.liquid
+++ /dev/null
@@ -1,49 +0,0 @@
-{% if webmentions %}
-  <div class="border-t border-gray-200 mt-12 pt-14 dark:border-gray-700">
-    {% assign mentions = webmentions.mentions | webmentionsByUrl: page.url %}
-    {% if mentions['repost-of'].size > 0 %}
-      <h2 class="text-lg md:text-xl font-black leading-tight dark:text-gray-200">Reposts</h2>
-      <div class="flex flex-row items-center mt-4 mb-6">
-        <ul class="ml-3 flex flex-row flex-wrap">
-          {% for mention in mentions['repost-of'] %}
-            <li class="-ml-3 inline">
-              <a href={{mention.url}}>
-                {% image mention.author.photo, mention.author.name, 'bg-gray-900 dark:bg-white h-14 w-14 rounded-full border-4 border-white dark:border-gray-900 transition-all hover:border-pink-500 dark:hover:border-pink-500', '56px' %}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-    {% if mentions['like-of'].size > 0 %}
-      <h2 class="text-lg md:text-xl font-black leading-tight dark:text-gray-200">Likes</h2>
-      <div class="flex flex-row items-center mt-4 mb-6">
-        <ul class="ml-3 flex flex-row flex-wrap">
-          {% for mention in mentions['like-of'] %}
-            <li class="-ml-3 inline">
-              <a href={{mention.url}}>
-                {% image mention.author.photo, mention.author.name, 'bg-gray-900 dark:bg-white h-14 w-14 rounded-full border-4 border-white dark:border-gray-900 transition-all ease-in-out duration-300 hover:border-pink-500 dark:hover:border-pink-500', '56px' %}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-    {% if mentions['in-reply-to'].size > 0 %}
-      <h2 class="text-lg md:text-xl font-black leading-tight dark:text-gray-200">Comments</h2>
-      <div class="mt-4 flex flex-col items-center not-prose">
-        {% for mention in mentions['in-reply-to'] %}
-          <div class="border-bottom flex flex-row items-center border-gray-100 pb-4 w-full">
-            <a class="text-gray-700 dark:text-gray-200 group flex flex-row space-between items-center" href={{mention.url}}>
-              {% image mention.author.photo, mention.author.name, 'bg-gray-900 dark:bg-white h-14 w-14 rounded-full border-4 border-white dark:border-gray-900 transition-all ease-in-out duration-300 group-hover:border-pink-500 dark:group-hover:border-pink-500', '56px' %}
-              <div class="ml-3">
-                <p class="text-sm group-hover:text-pink-500 dark:group-hover:text-pink-500">{{ mention.content.text }}</p>
-                <p class="mt-1 text-xs group-hover:text-pink-500 dark:group-hover:text-pink-500">{{ mention.published | isoDateOnly }}</p>
-              </div>
-            </a>
-          </div>
-        {% endfor %}
-      </div>
-    {% endif %}
-  </div>
-{% endif %}
diff --git a/src/_includes/partials/webmentions/comments.liquid b/src/_includes/partials/webmentions/comments.liquid
new file mode 100644
index 00000000..9768bee3
--- /dev/null
+++ b/src/_includes/partials/webmentions/comments.liquid
@@ -0,0 +1,16 @@
+{% if mentions['in-reply-to'].size > 0 %}
+  <h2 class="text-lg md:text-xl font-black leading-tight dark:text-gray-200">Comments</h2>
+  <div class="mt-4 flex flex-col items-center not-prose">
+    {% for mention in mentions['in-reply-to'] %}
+      <div class="border-bottom flex flex-row items-center border-gray-100 pb-4 w-full">
+        <a class="text-gray-700 dark:text-gray-200 group flex flex-row space-between items-center" href={{mention.url}}>
+          {% image mention.author.photo, mention.author.name, 'bg-gray-900 dark:bg-white h-14 w-14 rounded-full border-4 border-white dark:border-gray-900 transition-all ease-in-out duration-300 group-hover:border-pink-500 dark:group-hover:border-pink-500', '56px' %}
+          <div class="ml-3">
+            <p class="text-sm group-hover:text-pink-500 dark:group-hover:text-pink-500">{{ mention.content.text }}</p>
+            <p class="mt-1 text-xs group-hover:text-pink-500 dark:group-hover:text-pink-500">{{ mention.published | isoDateOnly }}</p>
+          </div>
+        </a>
+      </div>
+    {% endfor %}
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/src/_includes/partials/webmentions/container.liquid b/src/_includes/partials/webmentions/container.liquid
new file mode 100644
index 00000000..d4906dd8
--- /dev/null
+++ b/src/_includes/partials/webmentions/container.liquid
@@ -0,0 +1,8 @@
+{% if webmentions %}
+  <div class="border-t border-gray-200 mt-12 pt-14 dark:border-gray-700">
+    {% assign mentions = webmentions.mentions | webmentionsByUrl: page.url %}
+    {% render "partials/webmentions/interaction.liquid", mentions: mentions, type: 'repost-of' %}
+    {% render "partials/webmentions/interaction.liquid", mentions: mentions, type: 'like-of' %}
+    {% render "partials/webmentions/comments.liquid", mentions: mentions %}
+  </div>
+{% endif %}
diff --git a/src/_includes/partials/webmentions/interaction.liquid b/src/_includes/partials/webmentions/interaction.liquid
new file mode 100644
index 00000000..253f33c7
--- /dev/null
+++ b/src/_includes/partials/webmentions/interaction.liquid
@@ -0,0 +1,21 @@
+{%- capture title %}
+  {% if type == 'repost-of' %}
+    Reposts
+  {% elsif type == 'like-of' %}
+    Likes
+  {% endif %}
+{% endcapture -%}
+{% if mentions[type].size > 0 %}
+  <h2 class="text-lg md:text-xl font-black leading-tight dark:text-gray-200">{{ title }}</h2>
+  <div class="flex flex-row items-center mt-4 mb-6">
+    <ul class="ml-3 flex flex-row flex-wrap">
+      {% for mention in mentions[type] %}
+        <li class="-ml-3 inline">
+          <a href={{mention.url}}>
+            {% image mention.author.photo, mention.author.name, 'bg-gray-900 dark:bg-white h-14 w-14 rounded-full border-4 border-white dark:border-gray-900 transition-all hover:border-pink-500 dark:hover:border-pink-500', '56px' %}
+          </a>
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endif %}
\ No newline at end of file
diff --git a/src/_includes/post.liquid b/src/_includes/post.liquid
index 86123f00..677a57a9 100644
--- a/src/_includes/post.liquid
+++ b/src/_includes/post.liquid
@@ -12,6 +12,6 @@ layout: main
   </div>
 </article>
 {% render "partials/post-tags.liquid", tags: tags %}
-{% render "partials/webmentions.liquid", webmentions: webmentions, page: page %}
+{% render "partials/webmentions/container.liquid", webmentions: webmentions, page: page %}
 {% render "partials/author.liquid", site: site %}
 {% render "partials/popular-posts.liquid", posts: collections.posts, analytics: analytics %}
\ No newline at end of file
diff --git a/src/resume.md b/src/resume.md
index 9598487f..d5eb33c3 100644
--- a/src/resume.md
+++ b/src/resume.md
@@ -21,7 +21,7 @@ Software engineer with a wide range of experience covering frontend and mobile a
 
 <div class="flex gap-3 not-prose">
   {% for link in nav.resume %}
-    {% render "partials/linked-icon.liquid", name: link.name, link: link.url, icon: link.icon %}
+    {% render "partials/nav/linked-icon.liquid", name: link.name, link: link.url, icon: link.icon %}
   {% endfor %}
 </div>