diff --git a/templates/article.html b/templates/article.html
index 60ddc6d447dd37df29abd2ea383a3ee6fd33ad9c..c6a64217d621221519740ecc7fd1e149bed087de 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 
+{% block title %}{{ SITENAME }} · {{ article.title }}{% endblock %}
 {% block content %}
 {% include "article_stub.html" %}
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index b54b4231e06d52abd1d6d5183de33672ec3bf466..55267ae0525ff7280c319e1d39069c0cce2c0f4d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,7 +25,7 @@
 
                 <li {%- if output_file == "index.html" %} class="selected"{% endif %}><a href="{{ SITEURL }}">Home</a></li>
                 {% for page in PAGES -%}
-                <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+				<li {%- if output_file == page.url %} class="selected"{% endif %}><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
                 {% endfor -%}
                 <li {%- if output_file == "archives.html" %} class="selected"{% endif %}><a href="{{ SITEURL }}/archives.html">Archives</a></li>
             </ul>
diff --git a/templates/page.html b/templates/page.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa9cedc079b0bf21788d50b225a1b52db4b323f4
--- /dev/null
+++ b/templates/page.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} &middot; {{ page.title }}{% endblock %}
+{% block content %}
+
+                <div class="page">
+                    <h1>{{ page.title }}</h1>
+                    {{ page.content }}
+                </div>
+{% endblock %}