diff --git a/evennia/web/website/templates/website/flatpages/default.html b/evennia/web/website/templates/website/flatpages/default.html
index a059acb265..5184c22deb 100644
--- a/evennia/web/website/templates/website/flatpages/default.html
+++ b/evennia/web/website/templates/website/flatpages/default.html
@@ -3,14 +3,15 @@
{% block header_ext %}
{% endblock %}
-{% block sidebar %}
-{% endblock %}
-
{% block content %}
-
-
{{flatpage.title}}
+
+
+
+
{{flatpage.title}}
+ {{flatpage.content}}
+
+
-{{flatpage.content}}
{% endblock %}
diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html
index a30f96bce3..4dfc4959b3 100644
--- a/evennia/web/website/templates/website/index.html
+++ b/evennia/web/website/templates/website/index.html
@@ -1,5 +1,7 @@
{% extends "base.html" %}
+{% block titleblock %}Home{% endblock %}
+
{% block header_ext %}
{% endblock %}
diff --git a/evennia/web/website/templates/website/registration/logged_out.html b/evennia/web/website/templates/website/registration/logged_out.html
index c8ede170b3..ec931cd420 100644
--- a/evennia/web/website/templates/website/registration/logged_out.html
+++ b/evennia/web/website/templates/website/registration/logged_out.html
@@ -1,14 +1,25 @@
{% extends "base.html" %}
-{% block titleblock %}
-Logged Out
+{% block header_ext %}
+
{% endblock %}
+{% block titleblock %}Logged Out{% endblock %}
+
{% block content %}
-
-
Logged Out
+
+
+
+
Logged Out
You have been logged out.
+
Redirecting in 2 seconds...
+
+
+
+
{% endblock %}
diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html
index 294567e83b..aad1c30fe2 100644
--- a/evennia/web/website/templates/website/registration/login.html
+++ b/evennia/web/website/templates/website/registration/login.html
@@ -5,11 +5,15 @@ Login
{% endblock %}
{% block content %}
+
{% load addclass %}
-
-
Login
+
+
+
+
Login
+
{% if user.is_authenticated %}
You are already logged in!
{% else %}
@@ -18,21 +22,26 @@ Login
{% endif %}
+
+
{% endif %}
{% endblock %}
diff --git a/evennia/web/website/templates/website/tbi.html b/evennia/web/website/templates/website/tbi.html
index 802c18b952..b303a270c8 100644
--- a/evennia/web/website/templates/website/tbi.html
+++ b/evennia/web/website/templates/website/tbi.html
@@ -1,9 +1,9 @@
{% extends "base.html" %}
-{% block header_ext %}
-{% endblock %}
+{% block titleblock %}To Be Implemented{% endblock %}
-{% block sidebar %}
+{% block header_ext %}
+
{% endblock %}
{% block content %}