diff --git a/layouts/partials/metadata.html b/layouts/partials/metadata.html
index 29ceb5f..c7a229c 100644
--- a/layouts/partials/metadata.html
+++ b/layouts/partials/metadata.html
@@ -4,19 +4,22 @@
 <section class="metadata">
 <i data-feather="calendar"></i>
 {{ if .PublishDate }}
-{{ if and (ne $lastmodTime $dateTime) (gt .Lastmod .Date) }}
-  <time datetime="{{ $lastmodTime }}">{{ .Lastmod.Format $dateFormat }}</time>
-  (first posted <time datetime="{{ $dateTime }}">{{ .PublishDate.Format $dateFormat }}</time>)
-{{ else }}
-Date Published:	<time datetime="{{ $dateTime }}">{{ .PublishDate.Format $dateFormat }}</time>
+  {{ if and (ne $lastmodTime $dateTime) (gt .Lastmod .Date) }}
+ 	 <time datetime="{{ $lastmodTime }}">{{ .Lastmod.Format $dateFormat }}</time>
+  	 (first posted <time datetime="{{ $dateTime }}">{{ .PublishDate.Format $dateFormat }}</time>)
+  	{{ else }}
+		Date Published:	<time datetime="{{ $dateTime }}">{{ .PublishDate.Format $dateFormat }}</time>
+  	{{ end }}
 {{ end }}
+	{{ with .Params.tags }}
+		<br>
+		Tags: <i data-feather="tag"></i>
+		{{ range . }}
+		{{ $href := print "/tags/" (urlize .) }}
+		<a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href }}">{{ . }}</a>
+	{{ end }}
+	</section>
+{{ else }} 
+	</section>
 {{ end }}
-{{ with .Params.tags }}
-<br>
-Tags: <i data-feather="tag"></i>
-{{ range . }}
-{{ $href := print "/tags/" (urlize .) }}
-<a class="btn btn-sm btn-outline-dark tag-btn" href="{{ $href }}">{{ . }}</a>
-{{ end }}
-</section>
-{{ end }}
+