diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2f388f7..83209d5 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ partial "header.html" . }}
-{{ $baseurl := .Site.BaseURL | sanitizeurl }}
+{{ $baseurl := .Site.BaseURL }}
 {{ $author := .Site.Params.Author }}
 {{ if .Params.Author }}
 {{ $author = .Params.Author }}
@@ -41,4 +41,4 @@ <h1 class="post-title p-name">{{ .Title }}</h1>
         </footer>
     </article>
 </div>
-{{ partial "footer.html" . }}
\ No newline at end of file
+{{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 35f8718..71fed43 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -14,11 +14,11 @@ <h2 class="card-name"><a class="p-name u-url" href="{{ .Site.BaseURL }}" rel="me
     </div>
     {{ end }}
     <div id="footer">
-      {{ if or (.NextPage) (.PrevPage) }}
+      {{ if or (.Page.Next) (.Page.Prev) }}
       <nav id="article-skip">
         <div class="next">
-          {{ if and (.NextPage) (not .Params.Menu) }}
-          <a alt="Newer article" href="{{ .NextPage.Permalink }}">&larr; Newer</a>
+          {{ if and (.Page.Next) (not .Params.Menu) }}
+          <a alt="Newer article" href="{{ .Page.Next.Permalink }}">&larr; Newer</a>
           {{ else }}
           <p>&nbsp;</p>
           {{ end }}
@@ -27,8 +27,8 @@ <h2 class="card-name"><a class="p-name u-url" href="{{ .Site.BaseURL }}" rel="me
           <a alt="Top of page" href="#">Top</a>
         </div>
         <div class="prev">
-          {{ if and (.PrevPage) (not .Params.Menu) }}
-          <a alt="Older article" href="{{ .PrevPage.Permalink }}">Older &rarr;</a>
+          {{ if and (.Page.Prev) (not .Params.Menu) }}
+          <a alt="Older article" href="{{ .Page.Prev.Permalink }}">Older &rarr;</a>
           {{ else }}
           <p>&nbsp;</p>
           {{ end }}
@@ -45,4 +45,4 @@ <h2 class="card-name"><a class="p-name u-url" href="{{ .Site.BaseURL }}" rel="me
 
 <!-- Close the body/html document -->
 </body>
-</html>
\ No newline at end of file
+</html>