diff --git a/layouts/index.html b/layouts/index.html
index ac24597..e5ec1c5 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -30,10 +30,14 @@
             </ul>
             {{ end }}
         </div>
-        {{ .Summary }}
-        <div class="read-more">
-            <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+        <div class="content">
+            {{ .Summary | safeHTML }}
         </div>
+        {{ if .Truncated }}
+            <div class="read-more">
+                <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+            </div>
+        {{ end }}
 
     </article>
     {{ end }}
diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html
index 8b3b949..8f5e338 100644
--- a/layouts/taxonomy/category.html
+++ b/layouts/taxonomy/category.html
@@ -17,11 +17,14 @@
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
         </div>
-        {{ .Summary }}
-        <div class="read-more">
-            <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+        <div class="content">
+            {{ .Summary }}
         </div>
-
+        {{ if .Truncated }}
+            <div class="read-more">
+                <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+            </div>
+        {{ end }}
     </article>
     {{ end }}
 
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
index a9ad471..a11a33f 100644
--- a/layouts/taxonomy/tag.html
+++ b/layouts/taxonomy/tag.html
@@ -17,10 +17,14 @@
             <div class="article-date">{{ .Params.date.Format "2006-01-02" }}</div>
             {{ end }}
         </div>
-        {{ .Summary }}
-        <div class="read-more">
-            <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+        <div class="content">
+            {{ .Summary }}
         </div>
+        {{ if .Truncated }}
+            <div class="read-more">
+                <a href="{{ .RelPermalink }}">{{ i18n "readMore" | humanize }}</a>
+            </div>
+        {{ end }}
 
     </article>
     {{ end }}