diff --git a/_includes/header.html b/_includes/header.html
index 34354ef..c1417e7 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -3,7 +3,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     
-        <title>{% if page.title != "Home" %}{{ page.title }} &ndash; {% endif %}{{ site.title }}</title>
+        <title>{% if page.title != "Home" and page.title %}{{ page.title }} &ndash; {% endif %}{{ site.title }}</title>
 
         <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css" />
         <link href="{{ site.static_prefix }}/style/default-common.css" rel="stylesheet" type="text/css" />
diff --git a/_includes/post-detail.html b/_includes/post.html
similarity index 100%
rename from _includes/post-detail.html
rename to _includes/post.html
diff --git a/_layouts/gallery-index.html b/_layouts/gallery-index.html
index 9ee5deb..47e8720 100644
--- a/_layouts/gallery-index.html
+++ b/_layouts/gallery-index.html
@@ -5,11 +5,11 @@ layout: default
     <header>
         <div class="timeline">
             {% if page.date %}
-                <time datetime="{{ page.date|date_to_xmlschema }}" title="{{ page.date|date_to_xmlschema }}"><strong>{{ page.date|date:"%b %d"|upcase }}</strong><br />{{ page.date|date:"%Y" }}</time>
+                <time datetime="{{ page.date | date_to_xmlschema }}" title="{{ page.date | date_to_xmlschema }}"><strong>{{ page.date|date:"%b %d"|upcase }}</strong><br />{{ page.date|date:"%Y" }}</time>
             {% endif %}
         </div>        
         <h1>
-            <span itemprop="name">{{ page.title }}</span>
+            <a href="/{{ site.baseurl }}{{ page.url }}"><span itemprop="name">{{ page.title }}</span></a>
             <small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
         </h1>
         {% if page.end_date %}
diff --git a/_layouts/post.html b/_layouts/post.html
index 582f409..3a2c686 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -26,7 +26,7 @@
             {% endif %}
         </ul>
         <h1>
-            <span itemprop="name">{{ page.title }}</span>
+            <a href="/{{ site.baseurl }}{{ page.url }}"><span itemprop="name">{{ page.title }}</span></a>
             <small class="print-only" itemprop="datePublished" content="{{ page.date|date:'%F') }}">{{ page.date|date:'%A, %B %d, %Y' }}</small>
         </h1>
         {% if page.end_date %}
diff --git a/index.html b/index.html
index 442f1ff..956be61 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@ layout: default
     </p>
 </section>
 {% for post in paginator.posts %}
-    {% include post-detail.html %}
+    {% include post.html %}
 {% endfor %}
 {% if paginator.total_pages > 1 %}
 <section>
