diff --git a/minecraftcodex/blog/templates/blog.html b/minecraftcodex/blog/templates/blog.html
index 4a9fe6d..54f5db4 100644
--- a/minecraftcodex/blog/templates/blog.html
+++ b/minecraftcodex/blog/templates/blog.html
@@ -1,5 +1,9 @@
 {% extends "layout.html" %}
 
+{% block head_title %}
+{{ super() }} | Blog
+{% endblock %}
+
 {% block content %}
 <div class="container">
     <h1>Blog</h1>
diff --git a/minecraftcodex/blog/templates/blog_entry.html b/minecraftcodex/blog/templates/blog_entry.html
index ea2806e..7a52a55 100644
--- a/minecraftcodex/blog/templates/blog_entry.html
+++ b/minecraftcodex/blog/templates/blog_entry.html
@@ -1,5 +1,9 @@
 {% extends "layout.html" %}
 
+{% block head_title %}
+{{ super() }} | Blog | {{ item.title }}
+{% endblock %}
+
 {% block content %}
 <div class="container">
     <p><a href="{{ url('blog_list') }}"><i class="icon-arrow-left"></i> Go back</a></p>
diff --git a/minecraftcodex/database/templates/layout.html b/minecraftcodex/database/templates/layout.html
index 0202cff..bd16784 100644
--- a/minecraftcodex/database/templates/layout.html
+++ b/minecraftcodex/database/templates/layout.html
@@ -66,7 +66,7 @@ Thank you!
                                 <a href="{{ url('items_list') }}">Items</a>
                             </li>
                             <li class="{% if section == 'versions' %}active{% endif %}">
-                                <a href="{{ url('version_list') }}">Versions</a>
+                                <a href="{{ url('versions_list') }}">Versions</a>
                             </li>
                         </ul>
                         <ul class="nav pull-right">
diff --git a/minecraftcodex/database/templates/version.html b/minecraftcodex/database/templates/version.html
index 23bdf80..6562956 100644
--- a/minecraftcodex/database/templates/version.html
+++ b/minecraftcodex/database/templates/version.html
@@ -8,7 +8,7 @@
 <div class="container">
     <h1>Minecraft versions</h1>
     <hr />
-    <a href="/versions/"><i class="icon-arrow-left"></i> Go back</a>
+    <a href="{{ url('versions_list') }}"><i class="icon-arrow-left"></i> Go back</a>
     <h2>{% if status != 'release' %}{{ status }}{% endif %} {{ version_number }}</h2>
     {% if results > 1 %}
     <div class="alert alert-info">This version contains more than one release.</div>
diff --git a/minecraftcodex/database/templates/versions.html b/minecraftcodex/database/templates/versions.html
index f5e4072..be8634c 100644
--- a/minecraftcodex/database/templates/versions.html
+++ b/minecraftcodex/database/templates/versions.html
@@ -8,6 +8,7 @@
 <div class="container">
     <h1>Minecraft versions</h1>
     <hr />
+    options
     <table class="table table-condensed table-hover">
         <thead>
             <tr>
@@ -54,7 +55,7 @@
         <ul>
             {% for p in range(1, paginator.num_pages+1) %}
             <li {% if p == page_number %}class="active"{% endif %}>
-                <a href="{{ url('version_list') }}?page={{ p }}">{{ p }}</a>
+                <a href="{{ url('versions_list') }}?page={{ p }}">{{ p }}</a>
             </li>
             {% endfor %}
         </ul>
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index 49e1117..874bec4 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -34,7 +34,7 @@ urlpatterns = patterns('',
         'database.views.version',
         name='version'
     ),
-    url(r'^versions/', 'database.views.versions', name='version_list'),
+    url(r'^versions/', 'database.views.versions', name='versions_list'),
 
     # Items
     url(r'^items/(?P<data_value>\d+)/', 'database.views.items_detail', name='items_detail'),