diff --git a/themes/piratecare/layouts/_default/list.html b/themes/piratecare/layouts/_default/list.html
index b3c5052..261f11f 100644
--- a/themes/piratecare/layouts/_default/list.html
+++ b/themes/piratecare/layouts/_default/list.html
@@ -20,11 +20,11 @@
     <input id="toggly" type="checkbox">
     <label for="toggly" class="sidebar-title mb-1" tabindex="1">▒▒ has topics ▽</label>
     <div class="hiddendiv">
-    <ul class="mt-4">
+        <ul class="mt-4">
         {{ range split .Params.has_topics "," }}
-        {{ with $.GetPage (trim . " ") }}
-        <li><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></li>
-        {{ end }}
+          {{ with $.GetPage (printf "%s%s" "/topic/" (trim . " ")) }}
+            <li><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></li>
+          {{ end }}
         {{ end }}
     </ul>
     </div>
diff --git a/themes/piratecare/layouts/session/list.html b/themes/piratecare/layouts/session/list.html
index c5015f7..13dfcac 100644
--- a/themes/piratecare/layouts/session/list.html
+++ b/themes/piratecare/layouts/session/list.html
@@ -1,13 +1,7 @@
 {{ define "main" }}
-  {{ $relpermalink := "" }}
-  <div class="sidebar-title mb-1 pb-8">▒▒ all sessions:</div>
-  {{ range .Data.Pages }}
-    {{ with .Site.Data.myvars.edit }}
-        {{ $relpermalink = printf "%s%s" "_preview" .RelPermalink}}
-    {{ else }}
-        {{ $relpermalink = .RelPermalink }}
+<div class="sidebar-title mb-1 pb-8">▒▒ all sessions:</div>
+    {{ range .Data.Pages }}
+    <div><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></div>
     {{ end }}
-    <div><a class="sidebar-list text-base" href="{{ $relpermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></div>
-  {{ end }}
-  <div class="pb-8"></div>
+    <div class="pb-8"></div>
 {{ end }}
diff --git a/themes/piratecare/layouts/topic/list.html b/themes/piratecare/layouts/topic/list.html
index 86448e5..a4cecaa 100644
--- a/themes/piratecare/layouts/topic/list.html
+++ b/themes/piratecare/layouts/topic/list.html
@@ -1,13 +1,7 @@
 {{ define "main" }}
-  {{ $relpermalink := "" }}
-  <div class="sidebar-title mb-1 pb-8">▒▒ all topics:</div>
-  {{ range .Data.Pages }}
-    {{ with .Site.Data.myvars.edit }}
-      {{ $relpermalink = printf "%s%s" "_preview" .RelPermalink}}
-    {{ else }}
-      {{ $relpermalink = .RelPermalink }}
+    <div class="sidebar-title mb-1 pb-8">▒▒ all topics:</div>
+    {{ range .Data.Pages }}
+        <div><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></div>
     {{ end }}
-    <div><a class="sidebar-list text-base" href="{{ $relpermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></div>
-  {{ end }}
-  <div class="pb-8"></div>
+    <div class="pb-8"></div>
 {{ end }}
diff --git a/themes/piratecare/layouts/topic/single.html b/themes/piratecare/layouts/topic/single.html
index 8860f80..4ae3a8a 100644
--- a/themes/piratecare/layouts/topic/single.html
+++ b/themes/piratecare/layouts/topic/single.html
@@ -22,7 +22,7 @@
     <div class="hiddendiv">
 <ul class="mt-4">
     {{ range split .Params.has_sessions "," }}
-    {{ with $.GetPage (trim . " ") }}
+    {{ with $.GetPage (printf "%s%s" "/session/" (trim . " ")) }}
     <li><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></li>
         {{ end }}
     {{ end }}