diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ef6869b..ca50994 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -21,7 +21,7 @@
       {{ partial "card.html" . }}
     {{ end }}
   </div>
-    
+
   <div class="row">
     {{ partial "pagination.html" . }}
   </div>
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 60ad9b6..e717987 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,35 +1,22 @@
+{{ if gt .Paginator.TotalPages 1 }}
     <div class="col-md-4"> </div>
     <div class="col-md-4">
-        {{ if gt .Paginator.TotalPages 1 }}
-        <ul class="pagination">
-          {{ if .Paginator.HasPrev }}
-            <li><a href="{{ .Paginator.Prev.URL }}"
-                   class="text-decoration-none">&laquo; Prev</a></li>
-          {{ else }}
-            <li><span>&laquo; Prev</span></li>
-          {{ end }}
+      <ul class="pagination">
+        <li class="page-item{{if not .Paginator.HasPrev}} disabled{{end}}">
+          <a class="previous page-link" 
+             href="{{if .Paginator.HasPrev}}{{.Paginator.Prev.URL}}{{end}}">&laquo;</a></li>
 
-          {{ $scratch := newScratch }}
-          {{ $scratch.Set "current" .Paginator.PageNumber }} 
-
-          {{ range .Paginator.Pagers }}
-            {{ if eq .PageNumber ($scratch.Get "current") }}
-              <li class="active"><span><em>{{ .PageNumber }}</em></span></li>
-            {{ else }}
-            <li><a href="{{ .URL }}"
-                   class="page-link">{{ .PageNumber }}</a></li>
-            {{ end }}
-          {{ end }}
-
-          {{ if .Paginator.HasNext }}
-            <li><a href="{{ .Paginator.Next.URL }}"
-                   class="page-link">Next &raquo;</a></li>
-          {{ else }}
-            <li><span >Next &raquo;</span></li>
-          {{ end }}
-          </ul>
+        {{ $current := .Paginator.PageNumber }} 
+        {{ range .Paginator.Pagers }}
+        <li class="page-item {{if eq .PageNumber $current}}disabled{{end}}">
+            <a href="{{ .URL }}"
+               class="page-link">{{ .PageNumber }}</a></li>
         {{ end }}
 
+        <li class="page-item{{if not .Paginator.HasNext}} disabled{{end}}">
+          <a class="next page-link" 
+             href="{{if .Paginator.HasNext}}{{.Paginator.Next.URL}}{{end}}"> &raquo;</a></li>
+      </ul>
     </div>
     <div class="col-md-4"> </div>
-
+{{end}}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 792f69d..c81ad4c 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -3,8 +3,15 @@
 <div class="home">
 
   <div class="row">
-    <div class="col-md-12 mt-3 mb-3">
-      <h2 class="site-title">{{i18n "topic"}}: {{.Title | title}}</h2>
+    <div class="col-md-12">
+      <div class="card mt-3 mb-3">
+        <div class="card-header">
+          <h2 class="card-title">{{i18n "topic"}}: {{ .Title }}</h2>
+        </div>
+        <div class="card-body">
+          <p class="card-text">{{ .Content }}</p>
+        </div>
+      </div>
     </div>
   </div>