diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ad637d6..7a135ee 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -11,31 +11,28 @@
 {{ define "pagination" }}
     {{ $paginator := .Paginate ((where $.Site.RegularPages "Section" .Section ).ByParam "top") }}
     {{ if $paginator.HasPrev }}
-    <li class="page-item">
-        <a class="page-link" href="{{$.Site.BaseURL}}/{{sub $paginator.PageNumber 1 }}" tabindex="-1">< Prev</a>
-    </li>
+        <a class="page-link" href="{{ $paginator.Prev.URL }}">
+            <div class="page-item">< Prev</div>
+        </a>
     {{ else }}
-    <li class="page-item disabled">
-        <a class="page-link" href="{{$.Site.BaseURL}}/{{sub $paginator.PageNumber 1 }}" tabindex="-1">< Prev</a>
-    </li>
+        <div class="page-item disabled">< Prev</div>
     {{ end }}
 
     {{ $current_num := $paginator.PageNumber }}
-    {{ range (seq 1 $paginator.TotalPages) }}
-        {{ if (eq $current_num .)}}
-            <li class="page-item active"><a class="page-link" href="{{$.Site.BaseURL}}/{{.}}">{{.}}</a></li>
+    {{ range $i, $pager := $paginator.Pagers }}
+        {{ $i = add $i 1}}
+        {{ if (eq $current_num $i)}}
+        <div class="page-item active">{{ $i }}</div>
         {{ else }}
-            <li class="page-item"><a class="page-link" href="{{$.Site.BaseURL}}/{{.}}">{{.}}</a></li>
+        <a class="page-link" href="{{ $pager.URL }}"><div class="page-item">{{ $i }}</div></a>
         {{ end }}
     {{end}}
 
     {{ if $paginator.HasNext }}
-    <li class="page-item">
-        <a class="page-link" href="{{$.Site.BaseURL}}/{{ add $paginator.PageNumber 1 }}">Next ></a>
-    </li>
+        <a class="page-link" href="{{ $paginator.Next.URL }}">
+            <div class="page-item">Next ></div>
+        </a>
     {{ else }}
-    <li class="page-item disabled">
-        <a class="page-link" href="{{$.Site.BaseURL}}/{{ add $paginator.PageNumber 1 }}">Next ></a>
-    </li>
+        <div class="page-item disabled">Next ></div>
     {{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/row.html b/layouts/partials/row.html
index 2085093..a66d5b9 100644
--- a/layouts/partials/row.html
+++ b/layouts/partials/row.html
@@ -38,7 +38,7 @@
                         {{ with $page.Params.name }}
                             {{ . }}
                         {{ else }}
-                            {{ $site.Params.name }}
+                            {{ $page.Site.Params.name }}
                         {{ end }}
                         </div>