diff --git a/templates/base.html b/templates/base.html
index 8866dbd..d821cc5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,6 +14,14 @@
       {% endif %}
       {{ config.extra.site_title }}
     </title>
+    <meta property="og:title" content="
+      {% if section is defined and section.title is defined and section.title is string %}
+        {{ section.title }} -
+        {% elif page is defined and page.title is defined and page.title is string %}
+        {{ page.title }} -
+      {% endif %}
+      {{ config.extra.site_title }}
+    " />
     {% include "head.html" %}
   </head>
 
diff --git a/templates/head.html b/templates/head.html
index 6b4c5fd..8d5c9db 100644
--- a/templates/head.html
+++ b/templates/head.html
@@ -1,7 +1,5 @@
 <meta charset="utf-8">
-<title>{{ config.extra.site_title }}</title>
 <link rel="stylesheet" type="text/css" href="/stylesheet.css">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta property="og:title" content="{{ config.extra.site_title }}" />
 <meta property="og:type" content="website" />
 <meta property="og:url" content="{{ current_url }}" />
diff --git a/templates/page.html b/templates/page.html
index d64bd1c..6f8b1b1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -4,6 +4,28 @@
 <h1 class="title">
   {{ page.title }}
 </h1>
+
+{% if page.toc %}
+  <h2>Table of Contents</h2>
+  <ul>
+    {% for h1 in page.toc %}
+        <li>
+            <a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
+            {% if h1.children %}
+                <ul>
+                    {% for h2 in h1.children %}
+                        <li>
+                            <a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        </li>
+    {% endfor %}
+    </ul>
+  <h2>Content</h2>
+{% endif %}
+
 <p class="subtitle"><strong><time>Posted: {{ page.date }}</time></strong></p>
 {{ page.content | safe }}
 {% endblock content %}