diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2da00c2..bb011b3 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -22,7 +22,7 @@
   <header class="post-header">
     {{ safeHTML (.Scratch.Get `firstEmoji`) }}
     <a href="{{ .Permalink }}"><h2 class="post-title">{{ .Title }}</h2></a>
-    <p class="post-meta">{{ .Date.Format "Jan 2, 2006" }} . 
+    <p class="post-meta">{{ .Date.Format "Jan 2, 2006" }} · 
     {{ with .Params.categories }}
       {{ $categoriesLen := len . }}
         {{ if gt $categoriesLen 0 }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5892a67..c70448d 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,8 +5,16 @@
     <p class="post-meta">
       {{- if or .Params.author .Site.Params.author -}}
       {{ .Params.author | default .Site.Params.author }} · {{ end }}
-      {{- .Date.Format "Jan 2, 2006" -}}
-      
+      {{- .Date.Format "Jan 2, 2006" -}} · 
+      {{ with .Params.categories }}
+      {{ $categoriesLen := len . }}
+        {{ if gt $categoriesLen 0 }}
+        <span>{{ i18n "post.categorized_in" }}</span>
+          {{ range $k, $v := . }}
+            <a class="category-link" href="{{ . | printf "%s%s" "/categories/" | urlize | lower | relLangURL }}">{{ . }}</a>{{ if lt $k (sub $categoriesLen 1) }}, {{ end }}
+          {{ end }}
+        {{ end }}
+    {{ end }}
     </p>
   </header>
   <div class="post-content">{{ .Content }}</div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index c56f534..7db9a49 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -10,7 +10,8 @@
     {{- if not .IsHome }}
     {{- if eq .Kind "page" }}{{ .Title }}
     {{- else if eq .Data.Singular "tag" }}{{ .Data.Term }}
-    {{- else }}Posts
+    {{- else }}
+    {{ with .Title }}{{ . }}{{ end }}
     {{- end }} - {{ end }}
     {{- .Site.Title -}}
   </title>