diff --git a/templates/_types/blog/_card.html b/templates/_types/blog/_card.html
index 1011676..d5b1347 100644
--- a/templates/_types/blog/_card.html
+++ b/templates/_types/blog/_card.html
@@ -76,14 +76,9 @@
           <div class="overflow-x-auto scrollbar-hide" style="scroll-behavior: smooth;">
             <div class="flex gap-2 px-2">
               {% for entry in post.associated_entries %}
+                {% set _entry_path = '/' + post.slug + '/calendars/' + entry.calendar.slug + '/' + entry.start_at.year|string + '/' + entry.start_at.month|string + '/' + entry.start_at.day|string + '/entries/' + entry.id|string + '/' %}
                 <a
-                  href="{{ url_for('blog.post.calendars.calendar.day.calendar_entries.calendar_entry.get',
-                                   slug=post.slug,
-                                   calendar_slug=entry.calendar.slug,
-                                   year=entry.start_at.year,
-                                   month=entry.start_at.month,
-                                   day=entry.start_at.day,
-                                   entry_id=entry.id) }}"
+                  href="{{ events_url(_entry_path) }}"
                   class="flex flex-col gap-1 px-3 py-2 bg-stone-50 hover:bg-stone-100 rounded border border-stone-200 transition text-sm whitespace-nowrap flex-shrink-0 min-w-[180px]">
                   <div class="font-medium text-stone-900 truncate">{{ entry.name }}</div>
                   <div class="text-xs text-stone-600">
diff --git a/templates/_types/post/_entry_items.html b/templates/_types/post/_entry_items.html
index d913fe3..3a7b04f 100644
--- a/templates/_types/post/_entry_items.html
+++ b/templates/_types/post/_entry_items.html
@@ -4,14 +4,9 @@
 {% set has_more_entries = has_more if has_more is defined else (associated_entries.has_more if associated_entries is defined else False) %}
 
 {% for entry in entry_list %}
+  {% set _entry_path = '/' + post.slug + '/calendars/' + entry.calendar.slug + '/' + entry.start_at.year|string + '/' + entry.start_at.month|string + '/' + entry.start_at.day|string + '/entries/' + entry.id|string + '/' %}
   <a
-    href="{{ url_for('blog.post.calendars.calendar.day.calendar_entries.calendar_entry.get',
-                     slug=entry.calendar.post.slug,
-                     calendar_slug=entry.calendar.slug,
-                     year=entry.start_at.year,
-                     month=entry.start_at.month,
-                     day=entry.start_at.day,
-                     entry_id=entry.id) }}"
+    href="{{ events_url(_entry_path) }}"
     class="{{styles.nav_button_less_pad}}"
   >
     {% if entry.calendar.post.feature_image %}
diff --git a/templates/_types/post/admin/_nav.html b/templates/_types/post/admin/_nav.html
index fc206fe..7296d15 100644
--- a/templates/_types/post/admin/_nav.html
+++ b/templates/_types/post/admin/_nav.html
@@ -1,7 +1,9 @@
 {% import 'macros/links.html' as links %}
-{% call links.link(url_for('blog.post.calendars.home', slug=post.slug), hx_select_search, select_colours, True, aclass=styles.nav_button) %}
-  calendars
-{% endcall %}
+<div class="relative nav-group">
+  <a href="{{ events_url('/' + post.slug + '/calendars/') }}" class="{{styles.nav_button}}">
+    calendars
+  </a>
+</div>
 {% call links.link(url_for('blog.post.admin.entries', slug=post.slug), hx_select_search, select_colours, True, aclass=styles.nav_button) %}
   entries
 {% endcall %}
diff --git a/templates/_types/post/admin/_nav_entries.html b/templates/_types/post/admin/_nav_entries.html
deleted file mode 100644
index 8d9cbd9..0000000
--- a/templates/_types/post/admin/_nav_entries.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-    {# Left scroll arrow - desktop only #}
-    <button
-      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      aria-label="Scroll left"
-      _="on click
-         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft - 200">
-      <i class="fa fa-chevron-left"></i>
-    </button>
-
-    {# Entries and Calendars container #}
-    <div id="associated-items-container"
-         class="overflow-y-auto sm:overflow-x-auto sm:overflow-y-visible scrollbar-hide max-h-[50vh] sm:max-h-none"
-         style="scroll-behavior: smooth;"
-         _="on load or scroll
-            -- Show arrows if content overflows (desktop only)
-            if window.innerWidth >= 640 and my.scrollWidth > my.clientWidth
-              remove .hidden from .entries-nav-arrow
-              add .flex to .entries-nav-arrow
-            else
-              add .hidden to .entries-nav-arrow
-              remove .flex from .entries-nav-arrow
-            end">
-      <div class="flex flex-col sm:flex-row gap-1">
-        {# Associated Entries #}
-        {% if associated_entries and associated_entries.entries %}
-          {% include '_types/post/_entry_items.html' with context %}
-        {% endif %}
-
-        {# Calendars #}
-        {% for calendar in calendars %}
-          {% set local_href=url_for('blog.post.calendars.calendar.get', slug=post.slug, calendar_slug=calendar.slug) %}
-          {% set href=local_href|host %}
-          <a
-            href="{{ local_href }}"
-            hx-get="{{ href }}"
-            hx-target="#main-panel"
-            hx-select="{{ hx_select_search }}"
-            hx-swap="outerHTML"
-            hx-push-url="true"
-            class="{{styles.nav_button_less_pad}}">
-            <i class="fa fa-calendar" aria-hidden="true"></i>
-            <div>{{calendar.name}}</div>
-          </a>
-        {% endfor %}
-      </div>
-    </div>
-
-    <style>
-    .scrollbar-hide::-webkit-scrollbar {
-      display: none;
-    }
-    .scrollbar-hide {
-      -ms-overflow-style: none;
-      scrollbar-width: none;
-    }
-    </style>
-
-    {# Right scroll arrow - desktop only #}
-    <button
-      class="entries-nav-arrow hidden flex-shrink-0 p-2 hover:bg-stone-200 rounded"
-      aria-label="Scroll right"
-      _="on click
-         set #associated-items-container.scrollLeft to #associated-items-container.scrollLeft + 200">
-      <i class="fa fa-chevron-right"></i>
-    </button>