diff --git a/src/postorius/context_processors.py b/src/postorius/context_processors.py
index ec4bf58..ce7bf6c 100644
--- a/src/postorius/context_processors.py
+++ b/src/postorius/context_processors.py
@@ -23,13 +23,13 @@
 def postorius(request):
     """Add template variables to context.
     """
-    # extend_template (no page header/footer when requested via AJAX)
+    # Use a template so that the page header/footer is suppressed when requested via AJAX
     if request.is_ajax():
-        extend_template = "postorius/base_ajax.html"
+        template_to_extend = "postorius/base_ajax.html"
     else:
-        extend_template = "postorius/base.html"
+        template_to_extend = "postorius/base.html"
 
     return {
-        'extend_template': extend_template,
+        'postorius_base_template': template_to_extend,
         'request': request,
     }
diff --git a/src/postorius/templates/postorius/confirm_dialog.html b/src/postorius/templates/postorius/confirm_dialog.html
index 108df9d..29d7acc 100644
--- a/src/postorius/templates/postorius/confirm_dialog.html
+++ b/src/postorius/templates/postorius/confirm_dialog.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html
index 9745984..a33cc84 100644
--- a/src/postorius/templates/postorius/domain_confirm_delete.html
+++ b/src/postorius/templates/postorius/domain_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html
index 2a72eca..b03e3cf 100644
--- a/src/postorius/templates/postorius/domain_index.html
+++ b/src/postorius/templates/postorius/domain_index.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html
index fba137a..f2c5089 100644
--- a/src/postorius/templates/postorius/domain_new.html
+++ b/src/postorius/templates/postorius/domain_new.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}    
 
diff --git a/src/postorius/templates/postorius/errors/generic.html b/src/postorius/templates/postorius/errors/generic.html
index ba5a62b..3716562 100644
--- a/src/postorius/templates/postorius/errors/generic.html
+++ b/src/postorius/templates/postorius/errors/generic.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html
index be8b0a9..5886d0d 100644
--- a/src/postorius/templates/postorius/lists/confirm_delete.html
+++ b/src/postorius/templates/postorius/lists/confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html
index eef19ef..d2b3444 100644
--- a/src/postorius/templates/postorius/lists/held_messages.html
+++ b/src/postorius/templates/postorius/lists/held_messages.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index a79ecbd..ef50af4 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index 4a50595..985997a 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html
index 90b1179..2d36343 100644
--- a/src/postorius/templates/postorius/lists/members.html
+++ b/src/postorius/templates/postorius/lists/members.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/metrics.html b/src/postorius/templates/postorius/lists/metrics.html
index cfd3437..402a7f9 100644
--- a/src/postorius/templates/postorius/lists/metrics.html
+++ b/src/postorius/templates/postorius/lists/metrics.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index dbe162b..7091031 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index 59e72f7..ceb1466 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/subscribe.html b/src/postorius/templates/postorius/lists/subscribe.html
index 483f66a..66bba21 100644
--- a/src/postorius/templates/postorius/lists/subscribe.html
+++ b/src/postorius/templates/postorius/lists/subscribe.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/subscriptions.html b/src/postorius/templates/postorius/lists/subscriptions.html
index a8413b6..9372d44 100644
--- a/src/postorius/templates/postorius/lists/subscriptions.html
+++ b/src/postorius/templates/postorius/lists/subscriptions.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 40dbd8b..fc76ac0 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -1,4 +1,4 @@
-{% extends "postorius/base.html" %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load nav_helpers %}
diff --git a/src/postorius/templates/postorius/lists/unsubscribe.html b/src/postorius/templates/postorius/lists/unsubscribe.html
index 216d6db..29644e1 100644
--- a/src/postorius/templates/postorius/lists/unsubscribe.html
+++ b/src/postorius/templates/postorius/lists/unsubscribe.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index e999f3e..12f7fbf 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 {% load staticfiles %}
diff --git a/src/postorius/templates/postorius/site_settings.html b/src/postorius/templates/postorius/site_settings.html
new file mode 100644
index 0000000..1908783
--- /dev/null
+++ b/src/postorius/templates/postorius/site_settings.html
@@ -0,0 +1,7 @@
+{% extends postorius_base_template %}
+{% load i18n %}
+
+{% block main %}
+    {% include 'postorius/menu/settings_nav.html' %}
+    <h1>General Settings</h1>
+{% endblock main %}
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 7918484..6580f79 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html
index a8c7778..b0f5971 100644
--- a/src/postorius/templates/postorius/user_profile.html
+++ b/src/postorius/templates/postorius/user_profile.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_settings.html b/src/postorius/templates/postorius/user_settings.html
index c1fcc90..d5c6a19 100644
--- a/src/postorius/templates/postorius/user_settings.html
+++ b/src/postorius/templates/postorius/user_settings.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_subscriptions.html b/src/postorius/templates/postorius/user_subscriptions.html
index eab40d6..5a52e74 100644
--- a/src/postorius/templates/postorius/user_subscriptions.html
+++ b/src/postorius/templates/postorius/user_subscriptions.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}
 
diff --git a/src/postorius/templates/postorius/user_tasks.html b/src/postorius/templates/postorius/user_tasks.html
index 06d0bfe..80cebb1 100644
--- a/src/postorius/templates/postorius/user_tasks.html
+++ b/src/postorius/templates/postorius/user_tasks.html
@@ -1,4 +1,4 @@
-{% extends extend_template %}
+{% extends postorius_base_template %}
 {% load url from future %}
 {% load i18n %}