diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css
index 29cea76..e531ef7 100644
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@@ -29,8 +29,12 @@
   margin-top: 5px;
 }
 
+.wordcount {
+  margin-left: 5px;
+}
+
 .tags {
-  margin-left: 10px;
+  margin-top: 5px;
 }
 
 .tag {
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1721c4d..ffd4ddf 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,35 +3,7 @@
     <h1>{{ .Title | markdownify }}</h1>
 </div>
 
-{{ if or .Date (.GetTerms "tags") }}
-<div class="post-metadata">
-    {{ if .Date }}
-
-    <span class="date">
-        {{ partial "icon.html" "calendar" }}
-        <time datetime="{{ .Date.Format "2006-01-02" }}" pubdate>
-            {{ .Date.Format "January 2, 2006" }}
-        </time>
-
-        {{ if ne .Lastmod .Date }}
-        <time datetime="{{ .Lastmod.Format "2006-01-02" }}" pubdate>
-            (Modified {{ .Lastmod.Format "January 2, 2006" }})
-        </time>
-        {{ end }}
-
-        {{ end }}
-    </span>
-
-    <span class="tags">
-        {{ range (.GetTerms "tags") }}
-        <span class="tag">
-            {{ partial "icon.html" "tag" }}
-            <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-        </span>
-        {{ end }}
-    </span>
-</div>
-{{ end }}
+{{ partial "post-metadata.html" . }}
 
 {{ if .Params.Toc }}
 <div id="table-of-contents">
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 8726c5c..1cf4b54 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -3,35 +3,7 @@
         <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
     </h2>
 
-    {{ if or .Date (.GetTerms "tags") }}
-    <div class="post-metadata">
-        {{ if .Date }}
-
-        <span class="date">
-            {{ partial "icon.html" "calendar" }}
-            <time datetime="{{ .Date.Format "January 2, 2006" }}" pubdate>
-                {{ .Date.Format "January 2, 2006" }}
-            </time>
-
-            {{ if ne .Lastmod .Date }}
-            <time datetime="{{ .Lastmod.Format "2006-01-02" }}" pubdate>
-                (Modified {{ .Lastmod.Format "January 2, 2006" }})
-            </time>
-            {{ end }}
-
-            {{ end }}
-        </span>
-
-        <span class="tags">
-            {{ range (.GetTerms "tags") }}
-            <span class="tag">
-                {{ partial "icon.html" "tag" }}
-                <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-            </span>
-            {{ end }}
-        </span>
-    </div>
-    {{ end }}
+    {{ partial "post-metadata.html" . }}
 
     {{ with .Resources.GetMatch "feature" }}
     {{ if eq .MediaType.MainType "image" }}
diff --git a/layouts/partials/post-metadata.html b/layouts/partials/post-metadata.html
new file mode 100644
index 0000000..baaa872
--- /dev/null
+++ b/layouts/partials/post-metadata.html
@@ -0,0 +1,34 @@
+{{ if or .Date (.GetTerms "tags") }}
+<div class="post-metadata">
+    {{ if .Date }}
+
+    <span class="date">
+        {{ partial "icon.html" "calendar" }}
+        <time datetime="{{ .Date.Format "January 2, 2006" }}" pubdate>
+            {{ .Date.Format "January 2, 2006" }}
+        </time>
+
+        {{ if ne .Lastmod .Date }}
+        <time datetime="{{ .Lastmod.Format "2006-01-02" }}" pubdate>
+            (Modified {{ .Lastmod.Format "January 2, 2006" }})
+        </time>
+        {{ end }}
+
+        {{ end }}
+    </span>
+
+    <span class="wordcount">
+        {{ partial "icon.html" "type" }}
+        {{ .WordCount }} words
+    </span>
+
+    <div class="tags">
+        {{ range (.GetTerms "tags") }}
+        <span class="tag">
+            {{ partial "icon.html" "tag" }}
+            <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+        </span>
+        {{ end }}
+    </div>
+</div>
+{{ end }}