diff --git a/evennia/web/website/templates/website/character_form.html b/evennia/web/website/templates/website/character_form.html
index 964f4e6aa4..20ad71e261 100644
--- a/evennia/web/website/templates/website/character_form.html
+++ b/evennia/web/website/templates/website/character_form.html
@@ -7,10 +7,10 @@
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
+
   <div class="row">
-    <div class="col-lg-12 col-sm-12">
-      <div class="card mt-3">
+    <div class="col">
+      <div class="card">
         <div class="card-body">
           <h1 class="card-title">{{ view.page_title }}</h1>
           <hr />
@@ -47,5 +47,5 @@
       </div>
     </div>
   </div>
-</div>
+
 {% endblock %}
diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html
index ffb401e315..c8845f7165 100644
--- a/evennia/web/website/templates/website/character_manage_list.html
+++ b/evennia/web/website/templates/website/character_manage_list.html
@@ -7,28 +7,26 @@
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
-  <div class="row">
-    <div class="col">
-      <div class="card mt-3">
-        <div class="card-body">
-          <h1 class="card-title">{{ view.page_title }}</h1>
-          <hr />
+<div class="row">
+  <div class="col">
+    <div class="card">
+      <div class="card-body">
+        <h1 class="card-title">{{ view.page_title }}</h1>
+        <hr />
 
-            {% for object in object_list %}
-            <div class="media mb-4">
-              <a href="{{ object.web_get_detail_url }}"><img class="d-flex mr-3" src="http://placehold.jp/50x50.png" alt="" /></a>
-              <div class="media-body">
-                <p class="float-right ml-2">{{ object.db_date_created }}
-                <br /><a href="{{ object.web_get_delete_url }}">Delete</a>
-                <br /><a href="{{ object.web_get_update_url }}">Edit</a></p>
-                <h5 class="mt-0"><a href="{{ object.web_get_detail_url }}">{{ object }}</a> {% if object.subtitle %}<small class="text-muted" style="white-space:nowrap;">{{ object.subtitle }}</small>{% endif %}</h5>
-                <p>{{ object.db.desc }}</p>
-              </div>
+          {% for object in object_list %}
+          <div class="media mb-4">
+            <a href="{{ object.web_get_detail_url }}"><img class="d-flex mr-3" src="http://placehold.jp/50x50.png" alt="" /></a>
+            <div class="media-body">
+              <p class="float-right ml-2">{{ object.db_date_created }}
+              <br /><a href="{{ object.web_get_delete_url }}">Delete</a>
+              <br /><a href="{{ object.web_get_update_url }}">Edit</a></p>
+              <h5 class="mt-0"><a href="{{ object.web_get_detail_url }}">{{ object }}</a> {% if object.subtitle %}<small class="text-muted" style="white-space:nowrap;">{{ object.subtitle }}</small>{% endif %}</h5>
+              <p>{{ object.db.desc }}</p>
             </div>
-            {% endfor %}
-            
-        </div>
+          </div>
+          {% endfor %}
+          
       </div>
     </div>
   </div>
diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html
index 8e88d9cc50..80e22e2f2a 100644
--- a/evennia/web/website/templates/website/evennia_admin.html
+++ b/evennia/web/website/templates/website/evennia_admin.html
@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-block p-4">
         <h1 class="card-title">Admin</h1>
         <p class="card-text">
           Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.
diff --git a/evennia/web/website/templates/website/pagination.html b/evennia/web/website/templates/website/pagination.html
index e2cb6bed73..c89d4ee473 100644
--- a/evennia/web/website/templates/website/pagination.html
+++ b/evennia/web/website/templates/website/pagination.html
@@ -1,32 +1,30 @@
 {% if page_obj %}
-<div class="container main-content mt-2" id="pagination">
-  <div class="row">
-    <div class="col">
-      <div class="card mt-3">
-        <div class="card-body">
-          <!-- Pagination -->
-          <ul class="pagination justify-content-center mb-0">
-            <li class="page-item {% if page_obj.has_previous %}{% else %}disabled{% endif %}">
-              <a class="page-link" href="{% if page_obj.has_previous %}?{% if q %}q={{ q }}&{% endif %}page={{ page_obj.previous_page_number }}{% endif %}" aria-label="Previous">
-                <span aria-hidden="true">&laquo;</span>
-                <span class="sr-only">Previous</span>
-              </a>
-            </li>
+<div class="row">
+  <div class="col">
+    <div class="card mt-3">
+      <div class="card-body">
+        <!-- Pagination -->
+        <ul class="pagination justify-content-center mb-0">
+          <li class="page-item {% if page_obj.has_previous %}{% else %}disabled{% endif %}">
+            <a class="page-link" href="{% if page_obj.has_previous %}?{% if q %}q={{ q }}&{% endif %}page={{ page_obj.previous_page_number }}{% endif %}" aria-label="Previous">
+              <span aria-hidden="true">&laquo;</span>
+              <span class="sr-only">Previous</span>
+            </a>
+          </li>
+        
+          {% for l in page_obj.paginator.page_range %}
+            {% if l <= page_obj.number|add:5 and l >= page_obj.number|add:-5 %}
+                <li class="page-item {% if forloop.counter == page_obj.number %}active{% endif %}"><a class="page-link" href="?{% if q %}q={{ q }}&{% endif %}page={{ forloop.counter }}">{{ forloop.counter }}</a></li>
+            {% endif %}
+          {% endfor %}
           
-            {% for l in page_obj.paginator.page_range %}
-              {% if l <= page_obj.number|add:5 and l >= page_obj.number|add:-5 %}
-                  <li class="page-item {% if forloop.counter == page_obj.number %}active{% endif %}"><a class="page-link" href="?{% if q %}q={{ q }}&{% endif %}page={{ forloop.counter }}">{{ forloop.counter }}</a></li>
-              {% endif %}
-            {% endfor %}
-            
-            <li class="page-item {% if page_obj.has_next %}{% else %}disabled{% endif %}">
-              <a class="page-link" href="{% if page_obj.has_next %}?{% if q %}q={{ q }}&{% endif %}page={{ page_obj.next_page_number }}{% endif %}" aria-label="Next">
-                <span aria-hidden="true">&raquo;</span>
-                <span class="sr-only">Next</span>
-              </a>
-            </li>
-          </ul>
-        </div>
+          <li class="page-item {% if page_obj.has_next %}{% else %}disabled{% endif %}">
+            <a class="page-link" href="{% if page_obj.has_next %}?{% if q %}q={{ q }}&{% endif %}page={{ page_obj.next_page_number }}{% endif %}" aria-label="Next">
+              <span aria-hidden="true">&raquo;</span>
+              <span class="sr-only">Next</span>
+            </a>
+          </li>
+        </ul>
       </div>
     </div>
   </div>
diff --git a/evennia/web/website/templates/website/registration/password_change_done.html b/evennia/web/website/templates/website/registration/password_change_done.html
new file mode 100644
index 0000000000..8869d8d69c
--- /dev/null
+++ b/evennia/web/website/templates/website/registration/password_change_done.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block titleblock %}
+Password Changed
+{% endblock %}
+
+{% block body %}
+
+{% load addclass %}
+<div class="container main-content mt-4" id="main-copy">
+  <div class="row">
+    <div class="col-lg-5 offset-lg-3 col-sm-12">
+      <div class="card mt-3">
+        <div class="card-body">
+          <h1 class="card-title">Password Changed</h1>
+          <hr />
+          
+          <p>Your password was changed.</p>
+          
+          <p>Click <a href="{% url 'index' %}">here</a> to return to the index.</p>
+          
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/evennia/web/website/templates/website/registration/password_change_form.html b/evennia/web/website/templates/website/registration/password_change_form.html
index bae8c90962..1911b83cf0 100644
--- a/evennia/web/website/templates/website/registration/password_change_form.html
+++ b/evennia/web/website/templates/website/registration/password_change_form.html
@@ -7,10 +7,9 @@ Password Change
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
   <div class="row">
     <div class="col-lg-6 offset-lg-3 col-sm-12">
-      <div class="card mt-3">
+      <div class="card">
         <div class="card-body">
           <h1 class="card-title">Password Change</h1>
           <hr />
diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py
index 43febb5a6b..f4ea939037 100644
--- a/evennia/web/website/views.py
+++ b/evennia/web/website/views.py
@@ -369,7 +369,7 @@ class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, Obje
     def get_redirect_url(self, *args, **kwargs):
         # Get the requested character, if it belongs to the authenticated user
         char = self.get_object()
-        next = self.kwargs.get('next', self.success_url)
+        next = self.request.GET.get('next', self.success_url)
         
         if char:
             self.request.session['puppet'] = int(char.pk)