diff --git a/_includes/post-single.html b/_includes/post-single.html
index e391187f..37390567 100644
--- a/_includes/post-single.html
+++ b/_includes/post-single.html
@@ -1,8 +1,8 @@
 <article itemscope itemtype="http://schema.org/CreativeWork">
   {% if post.link %}
-    <h2 class="link-post" itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}</a> <a href="{{ post.link }}" target="_blank"><i class="fa fa-link"></i></a></h2>
+    <h2 class="link-post" itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{{ post.title }}</a> <a href="{{ post.link }}" target="_blank"><i class="fa fa-link"></i></a></h2>
   {% else %}
-    <h2 itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{{ post.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h2>
-    {% if post.excerpt %}<p itemprop="description">{{ post.excerpt | strip_html | truncate: 160 }}</p>{% endif %}
+    <h2 itemprop="headline"><a href="{{ absurl }}{{ post.url }}">{{ post.title }}</a></h2>
   {% endif %}
+  {% if post.excerpt %}<p itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
 </article>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index afbb02e6..f91d37ea 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -12,14 +12,14 @@ layout: default
   <div class="article-wrap">
     <header>
       {% if page.link %}
-        <h1 itemprop="headline"><a href="{{ page.link }}">{{ page.title }}</a></h1>
+        <h1 itemprop="headline"><a href="{{ page.link }}">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h1>
       {% else %}
-        <h1 itemprop="headline"><a href="{{ absurl }}{{ page.url }}" rel="bookmark" title="{{ page.title }}">{{ page.title }}</a></h1>
+        <h1 itemprop="headline"><a href="{{ absurl }}{{ page.url }}" rel="bookmark">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</a></h1>
       {% endif %}
     </header>
 
     <section itemprop="text">
-    {{ content }}
+      {{ content }}
     </section>
 
     <hr />