diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 92c560d..43ca626 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -9,6 +9,7 @@
                 </h2>
 
                 <div class="post-content">
+                    {{ partial "tags.html" . }}
                     <p>{{ .Summary | plainify | safeHTML }} {{ if .Truncated }} … {{ end }}</p>
                 </div>
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 28225f9..ee9a386 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,15 +3,7 @@
 		<h1 class="title"><a href="{{ .Permalink }}">{{ .Title }}</a> {{ if .Draft }}(Draft){{ end }}</h1>
 		<p class="meta">
             <span class="postdate">Posted {{ .Date.Format "January 02 2006" }}</span><br/>
-            {{ $taxo := "tags" }} <!-- Use the plural form here -->
-            <ul id="{{ $taxo }}" >
-                {{ range .Param $taxo }}
-                    {{ $name := . }}
-                    {{ with $.Site.GetPage (printf "/%s/%s" $taxo ($name | urlize)) }}
-                        <li><a href="{{ .Permalink }}">{{ $name }}</a></li>
-                    {{ end }}
-                {{ end }}
-            </ul>
+            {{ partial "tags.html" . }}
         </p>
 
 		<div class="post-content">{{ .Content | safeHTML }}</div>
diff --git a/layouts/partials/foot.html b/layouts/partials/foot.html
index 178bd79..4bd8d5b 100644
--- a/layouts/partials/foot.html
+++ b/layouts/partials/foot.html
@@ -1,9 +1,8 @@
 <div id="partial-footer">
     <p class="copyright">
         &copy; 2019 - {{ now.Format "2006"}} Adam Veldhousen.
-        <a href="https://creativecommons.org/licenses/by/3.0/" title="Creative Commons Attribution">
-            Some rights reserved
-        </a>. Powered by <a href="https://vdhsn.com">Hugo</a>.
+        <a href="https://creativecommons.org/licenses/by/3.0/" title="Creative Commons Attribution">Some rights reserved</a>. 
+        Powered by <a href="https://vdhsn.com">Hugo</a>.
     </p>
 </div>
 <script type="text/javascript">
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
new file mode 100644
index 0000000..6d06b74
--- /dev/null
+++ b/layouts/partials/tags.html
@@ -0,0 +1,9 @@
+{{ $taxo := "tags" }} <!-- Use the plural form here -->
+<ul id="{{ $taxo }}" >
+    {{ range .Param $taxo }}
+        {{ $name := . }}
+        {{ with $.Site.GetPage (printf "/%s/%s" $taxo ($name | urlize)) }}
+            <li><a href="{{ .Permalink }}">{{ $name }}</a></li>
+        {{ end }}
+    {{ end }}
+</ul>
\ No newline at end of file