diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 220e720..82d75d3 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -2,8 +2,8 @@
 <h2>{{ .Title }}</h2>
 <div class="post-subscript">
     <p>
-        {{- range .Params.tags }}
-        <a class="button" href="{{ $.Site.BaseURL }}/tags/{{ . | urlize }}">{{ . }}</a>
+        {{- range (.GetTerms "tags") -}}
+        <a class="button" href="{{ .Permalink }}">{{ .Title }}</a>
         {{ end -}}
     </p>
     <p>{{ i18n "postedOn" (.Date.Format "January 2, 2006") }}.</p>
diff --git a/layouts/graph/single.html b/layouts/graph/single.html
index e0aeb3c..037a291 100644
--- a/layouts/graph/single.html
+++ b/layouts/graph/single.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
 <h2>{{ .Title }} </h2>
 <script src="{{ .Site.Params.visNetworkJsUrl }}"></script>
-<script type="module" src="{{ .Site.BaseURL }}/graph/graph.js"></script>
+<script type="module" src="{{ absLangURL "graph/graph.js" }}"></script>
 <style>
 #graph-container {
     width: 100%;
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3f570a8..2e9c486 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,18 +3,18 @@
 </div>
 <nav>
     <div class="container">
-        <a href="{{ .Site.BaseURL }}">{{ i18n "home" }}</a>
+        <a href="{{ .Site.Home.Permalink }}">{{ i18n "home" }}</a>
         <a href="{{ relref . "about" }}">{{ i18n "about" }}</a>
         {{ with .Site.Params.githubUsername }}
         <a href="https://github.com/{{ . }}">GitHub</a>
         {{ end }}
         {{ if .Site.Params.resumeStaticFile }}
-        <a href="{{ .Site.BaseURL }}/{{ .Site.Params.resumeStaticFile }}">{{ i18n "resume" }}</a>
+        <a href="{{ absLangURL .Site.Params.resumeStaticFile }}">{{ i18n "resume" }}</a>
         {{ end }}
-        <a href="{{ .Site.BaseURL }}/tags">{{ i18n "tags" }}</a>
-        <a href="{{ .Site.BaseURL }}/series">{{ i18n "series" }}</a>
-        <a href="{{ .Site.BaseURL }}/favorites">{{ i18n "favorites" }}</a>
-        <a href="{{ .Site.BaseURL }}/search">{{ i18n "search" }}</a>
+        <a href="{{ site.Taxonomies.tags.Page.Permalink }}">{{ i18n "tags" }}</a>
+        <a href="{{ site.Taxonomies.series.Page.Permalink }}">{{ i18n "series" }}</a>
+        <a href="{{ relref . "favorites" }}">{{ i18n "favorites" }}</a>
+        <a href="{{ relref . "search" }}">{{ i18n "search" }}</a>
         <a href="{{ relref . "blog" }}">{{ i18n "allPosts" }}</a>
     </div>
 </nav>