diff --git a/layouts/partials/content-details.html b/layouts/partials/content-details.html
new file mode 100644
index 0000000..717c40a
--- /dev/null
+++ b/layouts/partials/content-details.html
@@ -0,0 +1,9 @@
+  {{ if .Params.date }}
+  <span class="pr-1" title='{{ .Date.Format "January 2 2006" }}'>{{ .Date.Format "2006-01-02" }}</span>
+  {{ end }}
+
+  {{ if .Params.tags }}
+    {{ range $i, $e := .Params.tags }}
+      <a href="/tags/{{ urlize . }}" class="mr-1">#{{ . }}</a>
+    {{ end }}
+  {{ end }}
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index 4f308d4..2aa2b1e 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -3,17 +3,7 @@
 {{ end }}
 <h1 class="display-5">{{ .Title }}</h1>
 <h5 class="my-3">{{ partial "subtitle.html" . }}</h5>
-<p>
-  {{ if .Params.date }}
-    <span class="pr-4" title='{{ .Date.Format "January 2 2006" }}'>{{ .Date.Format "2006-01-02" }}</span>
-  {{ end }}
-
-  {{ range .Params.tags }}
-    <a href="/tags/{{ urlize . }}" class="badge badge-dark tag mr-2">
-      <i class="fa fa-tag"></i> {{ . }}
-    </a>
-  {{ end }}
-</p>
+<p>{{ partial "content-details.html" . }}</p>
 <hr />
 <div class="content mt-3">
   {{ if .TableOfContents }}
diff --git a/layouts/partials/list_item.html b/layouts/partials/list_item.html
index ebc40d7..1b4f608 100644
--- a/layouts/partials/list_item.html
+++ b/layouts/partials/list_item.html
@@ -8,8 +8,9 @@
   {{ end }}
   <div class="media-body">
     <a href="{{ .Permalink }}">
-      <h5 class="mt-0">{{ .Title }}</h5>
+      <h5 class="my-0">{{ .Title }}</h5>
     </a>
+    <small>{{ partial "content-details.html" . }}</small>
     <p>{{ partial "summary.html" . }}</p>
   </div>
 </div>