diff --git a/templates/pages/bag.html b/templates/pages/bag.html
index 9ed9ce7..5790cd6 100644
--- a/templates/pages/bag.html
+++ b/templates/pages/bag.html
@@ -19,8 +19,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ bag.roast_name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ bag.roaster_name }} · {{ bag.amount }} · Opened
-        {{ bag.created_date }}
+        <a
+          href="/data?type=bags"
+          class="text-accent hover:text-accent-hover transition"
+          >Bags</a
+        >
+        · {{ bag.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/brew.html b/templates/pages/brew.html
index 5108894..881f15c 100644
--- a/templates/pages/brew.html
+++ b/templates/pages/brew.html
@@ -21,8 +21,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ brew.roast_name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ brew.roaster_name }} · Brewed {{ brew.created_date }} at
-        {{ brew.created_time }}
+        <a
+          href="/data?type=brews"
+          class="text-accent hover:text-accent-hover transition"
+          >Brews</a
+        >
+        · {{ brew.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/cafe.html b/templates/pages/cafe.html
index e1d1b38..560e94f 100644
--- a/templates/pages/cafe.html
+++ b/templates/pages/cafe.html
@@ -15,8 +15,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ cafe.name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ cafe.city }}, {{ cafe.country_flag }} {{ cafe.country }} · Added
-        {{ cafe.created_date }}
+        <a
+          href="/data?type=cafes"
+          class="text-accent hover:text-accent-hover transition"
+          >Cafes</a
+        >
+        · {{ cafe.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/cup.html b/templates/pages/cup.html
index 375a80d..bb9b3e9 100644
--- a/templates/pages/cup.html
+++ b/templates/pages/cup.html
@@ -19,8 +19,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ cup.roast_name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ cup.roaster_name }} · {{ cup.cafe_name }}, {{ cup.cafe_city }} ·
-        {{ cup.created_date }}
+        <a
+          href="/data?type=cups"
+          class="text-accent hover:text-accent-hover transition"
+          >Cups</a
+        >
+        · {{ cup.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/gear.html b/templates/pages/gear.html
index b410794..6daaab8 100644
--- a/templates/pages/gear.html
+++ b/templates/pages/gear.html
@@ -15,7 +15,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ gear.make }} {{ gear.model }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ gear.category_label }} · Added {{ gear.created_date }}
+        <a
+          href="/data?type=gear"
+          class="text-accent hover:text-accent-hover transition"
+          >Gear</a
+        >
+        · {{ gear.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/roast.html b/templates/pages/roast.html
index 07ebb52..f79a5dc 100644
--- a/templates/pages/roast.html
+++ b/templates/pages/roast.html
@@ -15,8 +15,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ roast.name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ roast.roaster_name }} · {{ roast.origin_flag }} {{ roast.origin }} ·
-        Added {{ roast.created_date }}
+        <a
+          href="/data?type=roasts"
+          class="text-accent hover:text-accent-hover transition"
+          >Roasts</a
+        >
+        · {{ roast.created_date }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/roaster.html b/templates/pages/roaster.html
index c0eb0c8..6f75d35 100644
--- a/templates/pages/roaster.html
+++ b/templates/pages/roaster.html
@@ -16,9 +16,12 @@
     <div class="flex flex-col gap-2">
       <h1 class="text-3xl font-semibold">{{ roaster.name }}</h1>
       <p class="text-sm text-text-secondary">
-        {{ roaster.country_flag }}
-        {{ roaster.country }}{% if let Some(c) = roaster.city %}· {{ c }}{% endif %}
-        · Added {{ roaster.created_date }}
+        <a
+          href="/data?type=roasters"
+          class="text-accent hover:text-accent-hover transition"
+          >Roasters</a
+        >
+        · {{ roaster.created_date }}
       </p>
     </div>
   </header>