diff --git a/binder/templates/base.htm b/binder/templates/base.htm
index 9dfe9bd..474fc0f 100644
--- a/binder/templates/base.htm
+++ b/binder/templates/base.htm
@@ -1,42 +1,53 @@
-
+
{% block header %}
+
+{% block navigation %}
+
+{% endblock navigation %}
+
+
+
+
+
+
+
+
{% block pageheader %}
{% endblock pageheader %}
-
{% block errors %}
+
{% if errors %}
-
Errors were encountered:
-
{{ errors }}
{% if error_context %}
-
{{ error_context }}
{% endif %}
-
{% endif %}
+
{% endblock errors %}
-
{% block body %}
{% endblock body %}
+
+
{% block footer %}
{% endblock footer %}
diff --git a/binder/templates/bcommon/list_server_zones.htm b/binder/templates/bcommon/list_server_zones.htm
index aba4023..5721cb5 100644
--- a/binder/templates/bcommon/list_server_zones.htm
+++ b/binder/templates/bcommon/list_server_zones.htm
@@ -1,14 +1,21 @@
{% extends "base.htm" %}
-{% block body %}
-{% if not errors %}
-DNS Server Zone List for {{ dns_server }}:
+{% block pageheader %}
+
+{% endblock pageheader %}
-
-{% endif %}
+
+{% block body %}
+
{% endblock body %}
diff --git a/binder/templates/bcommon/list_servers.htm b/binder/templates/bcommon/list_servers.htm
index b43d121..d55c2db 100644
--- a/binder/templates/bcommon/list_servers.htm
+++ b/binder/templates/bcommon/list_servers.htm
@@ -2,13 +2,20 @@
{% block pageheader %}
-Server List:
+
{% endblock pageheader %}
{% block body %}
-
+
+
{% endblock body %}
diff --git a/binder/templates/index.htm b/binder/templates/index.htm
index 1d9c70e..2704bbb 100644
--- a/binder/templates/index.htm
+++ b/binder/templates/index.htm
@@ -1,7 +1,7 @@
-{% include "base.htm" %}
+{% extends "base.htm" %}
{% block body %}
-
Server List
+TODO(jforman): Build some sort of dashboard here
{% endblock body %}