diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 58c3828..496a564 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,23 +8,24 @@
 		<div class="post-header">
 			<h1 class="title">{{ .Title }}</h1>
 			<div class="meta">Posted at &mdash; {{ dateFormat "Jan 2, 2006" .Date }}</div>
-			<div class="post-tags">
-				<small>
-					{{ if ne .Type "page" }}
-						{{ if gt .Params.tags 0 }}
-							{{ range .Params.tags }}
-								<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> 
-							{{ end }}
-						{{ end }}
-					{{ end }}
-				</small>
-			</div>
 		</div>
 
 		<div class="markdown">
 			{{ .Content }}
 		</div>
 
+		<div class="post-tags">
+			<small>
+				{{ if ne .Type "page" }}
+					{{ if gt .Params.tags 0 }}
+						{{ range .Params.tags }}
+							<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> 
+						{{ end }}
+					{{ end }}
+				{{ end }}
+			</small>
+		</div>
+
 		{{- $.Scratch.Set "isDisqus" true -}}
 
 		{{- if and (isset .Params "type") (in .Site.Params.disableDisqusTypes .Params.type) -}}
diff --git a/static/css/main.css b/static/css/main.css
index 4e7a78a..62577ad 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -279,11 +279,7 @@ ul {
 	margin: 0;
 }
 
-.post .post-header .post-tags {
-	padding-left: 5px;
-}
-
-.post .post-header .post-tags a {
+.post-tags a {
 	margin-right: 5px;
 }