diff --git a/_config.yml b/_config.yml
index cd88b18..d66ca47 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,10 +11,17 @@ disqus: boukefalos
 analytics: UA-46375339-1
 maps: AIzaSyCyIwGR-F48dFjAbwNr9JdOsfUYaUQxz1s
 
+# pagination
+paginate: 3
+all_posts: 'Alle posts →'
+all_posts_description: 'Bekijk alle # posts.'
+read_more: '» Verder lezen...'
+previous_page: '← Vorige pagina'
+next_page: 'Volgende pagina →'
+
 # other
 gems: [jekyll-paginate]
 markdown: redcarpet
-paginate: 7
 highlighter: pygments
 safe: false
 environment: dev
diff --git a/_includes/post.html b/_includes/post.html
new file mode 100644
index 0000000..ab7a496
--- /dev/null
+++ b/_includes/post.html
@@ -0,0 +1,22 @@
+<section itemscope itemtype="http://schema.org/BlogPosting">
+    <header>
+        <div class="timeline">
+            {% if post.date %}
+                <time datetime="{{ post.date|date_to_xmlschema }}" title="{{ post.date|date_to_xmlschema }}"><strong>{{ post.date|date:"%b %d"|upcase }}</strong><br />{{ post.date|date:"%Y" }}</time>
+            {% endif %}
+            {% if post.location %}
+                <a href="https://maps.google.com/maps?hl=en&amp;ll={{ post.location.latitude }},{{ post.location.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ post.location.latitude }},{{ post.location.longitude }}&amp;zoom=9&amp;size=98x98&amp;sensor=false" title="{{ post.location.title }}" width="49" /></a>
+            {% endif %}
+            {% if post.code %}
+                <a href="{{ post.code }}"><img alt="code" height="49" src="{{ site.static_prefix }}/icon/code.png" width="49" /></a>
+            {% endif %}
+        </div>
+        <h1>
+            <span itemprop="name">{{ post.title }}</span>
+            <small class="print-only" itemprop="datePublished" content="{{ post.date|date:'%F') }}">{{ post.date|date:'%A, %B %d, %Y' }}</small>
+        </h1>
+    </header>
+    <section class="post-content" itemprop="articleBody">
+        {{ post.content }}
+    </section>
+</section>
diff --git a/_includes/post_detail.html b/_includes/post_detail.html
new file mode 100644
index 0000000..4c070a8
--- /dev/null
+++ b/_includes/post_detail.html
@@ -0,0 +1,33 @@
+<section itemscope itemtype="http://schema.org/BlogPosting">
+    <header>
+        <div class="timeline">
+            {% if post.date %}
+                <time datetime="{{ post.date|date_to_xmlschema }}" title="{{ post.date|date_to_xmlschema }}"><strong>{{ post.date|date:"%b %d"|upcase }}</strong><br />{{ post.date|date:"%Y" }}</time>
+            {% endif %}
+            {% if post.location %}
+                <a href="https://maps.google.com/maps?hl=en&amp;ll={{ post.location.latitude }},{{ post.location.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ post.location.latitude }},{{ post.location.longitude }}&amp;zoom=9&amp;size=98x98&amp;sensor=false" title="{{ post.location.title }}" width="49" /></a>
+            {% endif %}
+            {% if post.code %}
+                <a href="{{ post.code }}"><img alt="code" height="49" src="{{ site.static_prefix }}/icon/code.png" width="49" /></a>
+            {% endif %}
+        </div>
+        <h1>
+            <span itemprop="name">{{ post.title }}</span>
+            <small class="print-only" itemprop="datePublished" content="{{ post.date|date:'%F') }}">{{ post.date|date:'%A, %B %d, %Y' }}</small>
+        </h1>
+    </header>
+    <section class="post-content" itemprop="articleBody">
+        {{ post.excerpt }}
+        {% capture content_words %} 
+            {{ post.content | number_of_words }} 
+        {% endcapture %} 
+        {% capture excerpt_words %} 
+            {{ post.excerpt | number_of_words }} 
+        {% endcapture %} 
+        {% if excerpt_words != content_words %}
+            <p>
+                <a href="/{{ site.baseurl }}{{ post.url }}" role="button">{{ site.read_more }}</a>
+            </p>
+        {% endif %}
+    </section>
+</section>
diff --git a/_layouts/post.html b/_layouts/post.html
index 603cd6a..7b61151 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -20,12 +20,6 @@
     <section class="post-content" itemprop="articleBody">
         {{ content }}
     </section>
-    <div class="meta">
-        <div class="meta-social screen-only">
-            <a href="https://twitter.com/share" class="twitter-share-button" data-via="dpb587">Tweet</a>
-            <div class="g-plusone" data-size="medium" data-width="300"></div>
-        </div>
-    </div>
     {% if false != page.comments %}
         {% include disqus.html %}
     {% endif %}
diff --git a/_scripts/generate-gallery.php b/_scripts/generate-gallery.php
index 2321428..dea8542 100644
--- a/_scripts/generate-gallery.php
+++ b/_scripts/generate-gallery.php
@@ -316,7 +316,7 @@ $oConsole
 </div>
 {%% include gallery_list.html gallery='%s' %%}
 EOF
-        , (empty($aGallery['description']) ? '' : $aGallery['description']), implode(' &middot; ', $aLinks), $sGallery);
+        , (empty($aGallery['description']) ? '' : $aGallery['description']), implode('&nbsp;|&nbsp;', $aLinks), $sGallery);
         file_put_contents(
             $sRenderPath . '/index.html',
             '---' . "\n" . yamlDump($aMatter) . '---' . "\n" . $sContents
diff --git a/index.html b/index.html
index a4dfb0f..5e2099a 100644
--- a/index.html
+++ b/index.html
@@ -13,24 +13,28 @@ tags: blog scotland chemistry phd
 </section>
 
 {% for post in paginator.posts %}
-    <section>
-        <header>
-            <div class="timeline">
-                <time datetime="{{ post.date|date_to_xmlschema }}"><strong>{{ post.date|date:"%b %d"|upcase }}</strong><br />{{ post.date|date:"%Y" }}</time>
-            </div>
-            <h1><a href="/{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h1>
-            {% if post.description %}
-                <div class="meta" style="margin-bottom:0;margin-top:0;">{{ post.description }}</div>
-            {% endif %}
-        </header>
-    </section>
+    {% include post_detail.html %}
 {% endfor %}
 
+{% if paginator.total_pages > 1 %}
+<ul class="pager">
+    {% if paginator.previous_page %}
+    <a href="/{{ site.baseurl }}{{ paginator.previous_page_path }}">{{ site.previous_page }}</a>
+    {% endif %}
+    {% if paginator.previous_page and paginator.next_page %}
+    &nbsp;|&nbsp;
+    {% endif %}
+    {% if paginator.next_page %}
+    <a href="/{{ site.baseurl }}{{ paginator.next_page_path }}">{{ site.next_page }}</a>
+    {% endif %}
+</ul>
+{% endif %}
+
 {% if paginator.next_page %}
     <section>
         <header>
-            <h1><a href="/blog/">more posts &rarr;</a></h1>
-            <div class="meta" style="margin-bottom:0;margin-top:0;">See the full list of {{ site.posts.size }} posts.</div>
+            <h1><a href="/{{ site.baseurl }}/blog/">{{ site.all_posts }}</a></h1>
+            <div class="meta">{{ site.all_posts_description | replace:'#',site.posts.size }}</div>
         </header>
     </section>
 {% endif %}