diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0dd7286b..89ced7aa 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -40,7 +40,7 @@
   <header class="entry-header">
     <h2>
       {{ .Title }}
-      {{- if .Draft }}<div class="entry-isdraft"><sup>&nbsp&nbsp[draft]</sup></div>{{- end }}
+      {{- if .Draft }}<div class="entry-isdraft"><sup>&nbsp;&nbsp;[draft]</sup></div>{{- end }}
     </h2>
   </header>
   {{if (ne .Site.Params.hideSummary true)}}
@@ -50,10 +50,10 @@
   {{ end }}
   <footer class="entry-footer">
     <time>{{ .Date.Format "January 2, 2006" }}</time>
-    {{ if $.Site.Params.ShowReadingTime }} .
-    {{ $default_txt := print .ReadingTime " " "min" }}
-    {{ i18n "read_time" .ReadingTime | default  $default_txt  }}{{ end }}
-    {{ if or .Params.author .Site.Params.author }} . {{ .Params.author | default .Site.Params.author }}{{ end }}
+    {{- if $.Site.Params.ShowReadingTime }}&nbsp;.&nbsp;
+    {{- $default_txt := print .ReadingTime " " "min" }}
+    {{- i18n "read_time" .ReadingTime | default  $default_txt  }}{{ end }}
+    {{- if or .Params.author .Site.Params.author }}&nbsp;.&nbsp;{{- .Params.author | default .Site.Params.author }}{{ end }}
   </footer>
   <a class="entry-link" aria-label="post link to {{ .Title | plainify }}" href="{{ .Permalink }}"></a>
 </article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6778345c..781a05d6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,11 +9,11 @@
     {{ if .Params.hideMeta }}{{ else }}
     <div class="post-meta">
       <time>{{ .Date.Format "January 2, 2006" }}</time>
-      {{ if $.Site.Params.ShowReadingTime }} .
-      {{ $default_txt := print .ReadingTime " " "min" }}
-      {{ i18n "read_time" .ReadingTime | default  $default_txt  }}{{ end }}
-      {{ if or .Params.author .Site.Params.author }} . {{ .Params.author | default .Site.Params.author }}{{ end }}
-      {{ if .IsTranslated -}}|
+      {{- if $.Site.Params.ShowReadingTime -}}&nbsp;.&nbsp;
+      {{- $default_txt := print .ReadingTime " " "min" }}
+      {{- i18n "read_time" .ReadingTime | default  $default_txt  }}{{ end }}
+      {{- if or .Params.author .Site.Params.author }}&nbsp;.&nbsp;{{- .Params.author | default .Site.Params.author }}{{ end }}
+      {{- if .IsTranslated -}}&nbsp;|&nbsp;
       <ul class="i18n_list">
         {{ i18n "translations" | default "Translations"}}:
         {{ range .Translations }}