diff --git a/app/domain/routes.py b/app/domain/routes.py
index ea038919..54a74a38 100644
--- a/app/domain/routes.py
+++ b/app/domain/routes.py
@@ -74,9 +74,13 @@ def domains():
     return render_template('domain/domains.html', title='All known domains', domains=domains,
                            next_url=next_url, prev_url=prev_url, search=search, ban_visibility_permission=ban_visibility_permission)
 
+
 @bp.route('/domains/banned', methods=['GET'])
 @login_required
 def blocked_domains():
+    if not current_user.trustworthy():
+        abort(404)
+
     page = request.args.get('page', 1, type=int)
     search = request.args.get('search', '')
 
@@ -86,15 +90,11 @@ def blocked_domains():
     domains = domains.order_by(Domain.name)
     domains = domains.paginate(page=page, per_page=100, error_out=False)
 
-    ban_visibility_permission = False
-    if not current_user.created_recently() and current_user.reputation > 100 or current_user.is_admin():
-        ban_visibility_permission = True
-
     next_url = url_for('domain.domains', page=domains.next_num) if domains.has_next else None
     prev_url = url_for('domain.domains', page=domains.prev_num) if domains.has_prev and page != 1 else None
 
-    return render_template('domain/domains_banned.html', title='Domains banned on this instance', domains=domains,
-                           next_url=next_url, prev_url=prev_url, search=search, ban_visibility_permission=ban_visibility_permission)
+    return render_template('domain/domains_blocked.html', title='Domains blocked on this instance', domains=domains,
+                           next_url=next_url, prev_url=prev_url, search=search)
 
 
 @bp.route('/d/<int:domain_id>/block')
diff --git a/app/models.py b/app/models.py
index 8d4cc870..c42f8a59 100644
--- a/app/models.py
+++ b/app/models.py
@@ -591,6 +591,13 @@ class User(UserMixin, db.Model):
                 return True
         return False
 
+    def trustworthy(self):
+        if self.is_admin():
+            return True
+        if self.created_recently() or self.reputation < 100:
+            return False
+        return True
+
     def link(self) -> str:
         if self.is_local():
             return self.user_name
@@ -1075,7 +1082,8 @@ class Filter(db.Model):
     def keywords_string(self):
         if self.keywords is None or self.keywords == '':
             return ''
-        return ', '.join(self.keywords.split('\n'))
+        split_keywords = [kw.strip() for kw in self.keywords.split('\n')]
+        return ', '.join(split_keywords)
 
 
 class Role(db.Model):
diff --git a/app/templates/base.html b/app/templates/base.html
index c2b5c857..f54a21bf 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -167,10 +167,8 @@
                                 <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/u/{{ current_user.user_name }}" aria-haspopup="true" aria-expanded="false">{{ _('Account') }}</a>
                                 <ul class="dropdown-menu">
                                   <li><a class="dropdown-item{% if active_child == 'view_profile' %} active{% endif %}" href="/u/{{ current_user.user_name }}">{{ _('View profile') }}</a></li>
-                                  <li><a class="dropdown-item{% if active_child == 'edit_profile' %} active{% endif %}" href="/u/{{ current_user.user_name }}/profile">{{ _('Edit profile') }}</a></li>
+                                  <li><a class="dropdown-item{% if active_child == 'edit_profile' %} active{% endif %}" href="/u/{{ current_user.user_name }}/settings">{{ _('Edit profile & settings') }}</a></li>
                                   <li><a class="dropdown-item{% if active_child == 'chats' %} active{% endif %}" href="/chat">{{ _('Chats') }}</a></li>
-                                  <li><a class="dropdown-item{% if active_child == 'settings' %} active{% endif %}" href="/user/settings">{{ _('Settings') }}</a></li>
-                                  <li><a class="dropdown-item{% if active_child == 'filters' %} active{% endif %}" href="/user/settings/filters">{{ _('Filters') }}</a></li>
                                 </ul>
                             </li>
                             <li class="nav-item"><a class="nav-link" href="/donate">{{ _('Donate') }}</a></li>
diff --git a/app/templates/domain/domains.html b/app/templates/domain/domains.html
index 0f814a57..e6fcd163 100644
--- a/app/templates/domain/domains.html
+++ b/app/templates/domain/domains.html
@@ -6,35 +6,32 @@
 {% from 'bootstrap/form.html' import render_form %}
 
 {% block app_content %}
-<div class="card col-md-8" style="max-width:unset;">
-    <div class="card-header">
-        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-            <li class="breadcrumb-item active">Domains</li>
-          </ol>
-        </nav>
-        <ul class="nav nav-tabs flex-column flex-sm-row card-header-tabs">
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link active" href="/domains">All Domains</a>
-          </li>
-          {% if not current_user.is_anonymous %}
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link" href="/domains/banned">Banned Domains</a>
-          </li>
-        {% endif %}
-        </ul>
-    </div>
-    <div class="card-body">
-        <h1 class="">{{ _('Domains') }}</h1>
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
         {% if search == '' %}
-        <p class="card-text">All domains this instance knows about</p>
+            <h1>{{ _('Domains') }}</h1>
         {% else %}
-        <p class="card-text">Domains containing "{{ _('%(search)s', search=search) }}"</p>
+            <h1>{{ _('Domains containing "%(search)s"', search=search) }}</h1>
+        {% endif %}
+        {% if not current_user.is_anonymous and current_user.trustworthy() %}
+        <div class="row">
+            <div class="col-auto">
+                <div class="btn-group">
+                    <a href="/domains" class="btn {{ 'btn-primary' if request.path == '/domains' else 'btn-outline-secondary' }}">
+                        {{ _('Domains') }}
+                    </a>
+                    <a href="/domains/banned" class="btn {{ 'btn-primary' if request.path == '/domains/banned' else 'btn-outline-secondary' }}">
+                        {{ _('Banned domains') }}
+                    </a>
+                </div>
+            </div>
+            <div class="col-auto">
+                <form method="get"><input type="search" name="search" value="{{ search }}" placeholder="{{ _('Search') }}" autofocus></form>
+            </div>
+        </div>
         {% endif %}
-        <form method="get"><input type="search" name="search" value="{{ search }}" placeholder="{{ _('Search') }}" autofocus></form>
 
-        <div class="table-responsive-sm">
+        <div class="table-responsive-sm pt-4">
         <table class="table table-striped">
             <tr>
                <th>Domain</th>
@@ -48,7 +45,7 @@
                     {% if not current_user.is_anonymous %}
                     {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}
                     <td>
-                                <a class="confirm_first btn btn-primary" title="{{ _('Banning this domain will delete all posts linking to this domain and prevent future posts linking to that domain.') }}" href="/d/{{ domain.id }}/ban">{{ _('Ban') }}</a>
+                        <a class="confirm_first btn btn-primary" title="{{ _('Banning this domain will delete all posts linking to this domain and prevent future posts linking to that domain.') }}" href="/d/{{ domain.id }}/ban">{{ _('Ban') }}</a>
                     </td>
                     {% endif %}
                     {% endif %}
@@ -68,8 +65,10 @@
             </a>
         {% endif %}
         </nav>
-      </div>
     </div>
 </div>
+
+
+
 {% endblock %}
 
diff --git a/app/templates/domain/domains_banned.html b/app/templates/domain/domains_banned.html
deleted file mode 100644
index 661fa9b4..00000000
--- a/app/templates/domain/domains_banned.html
+++ /dev/null
@@ -1,77 +0,0 @@
-{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
-    {% extends 'themes/' + theme() + '/base.html' %}
-{% else %}
-    {% extends "base.html" %}
-{% endif %} %}
-{% from 'bootstrap/form.html' import render_form %}
-
-{% block app_content %}
-<div class="card col-md-8" style="max-width:unset;">
-    <div class="card-header">
-        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-            <li class="breadcrumb-item active">Domains</li>
-          </ol>
-        </nav>
-        <ul class="nav nav-tabs flex-column flex-sm-row card-header-tabs">
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link" href="/domains">All Domains</a>
-          </li>
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link active" href="/domains/banned">Banned Domains</a>
-          </li>
-        </ul>
-    </div>
-    <div class="card-body">
-        <h1 class="">{{ _('Domains') }}</h1>
-        {% if not ban_visibility_permission %}
-        <p class="card-text">Your account is either too new or too low reputation to be able to see banned domains on this instance.</p>
-        {% else %}
-        {% if search == '' %}
-        <p class="card-text">All domains this instance banned</p>
-        {% else %}
-        <p class="card-text">Banned domains containing "{{ _('%(search)s', search=search) }}"</p>
-        {% endif %}
-        <form method="get"><input type="search" name="search" value="{{ search }}" placeholder="{{ _('Search') }}" autofocus></form>
-
-        <div class="table-responsive-sm">
-        <table class="table table-striped">
-            <tr>
-               <th>Domain</th>
-               {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}<th>Actions</th>{%endif%}
-            </tr>
-            {% for domain in domains %}
-                <tr>
-                    <td><a href="{{ url_for('domain.show_domain', domain_id=domain.id) }}">{{ domain.name }}</a></td>
-                    <td>
-                        {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}
-                            {% if domain.banned %}
-                                    <a class="btn btn-primary confirm_first" title="{{ _('Unbanning this domain allows future posts linking to that domain.') }}" href="/d/{{ domain.id }}/unban">{{ _('Unban') }}</a>
-                            {% else %}
-                                    <a class="btn btn-primary confirm_first" title="{{ _('Banning this domain will delete all posts linking to this domain and prevent future posts linking to that domain.') }}" href="/d/{{ domain.id }}/ban">{{ _('Ban') }}</a>
-                            {% endif %}
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </table>
-    </div>
-        <nav aria-label="Pagination" class="mt-4" role="navigation">
-        {% if prev_url %}
-            <a href="{{ prev_url }}" class="btn btn-primary" rel="nofollow">
-                <span aria-hidden="true">&larr;</span> {{ _('Previous page') }}
-            </a>
-        {% endif %}
-        {% if next_url %}
-            <a href="{{ next_url }}" class="btn btn-primary" rel="nofollow">
-                {{ _('Next page') }} <span aria-hidden="true">&rarr;</span>
-            </a>
-        {% endif %}
-        </nav>
-      </div>
-      {% endif %}
-    </div>
-</div>
-{% endblock %}
-
diff --git a/app/templates/domain/domains_blocked.html b/app/templates/domain/domains_blocked.html
new file mode 100644
index 00000000..9bb9f1ca
--- /dev/null
+++ b/app/templates/domain/domains_blocked.html
@@ -0,0 +1,71 @@
+{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
+    {% extends 'themes/' + theme() + '/base.html' %}
+{% else %}
+    {% extends "base.html" %}
+{% endif %} %}
+{% from 'bootstrap/form.html' import render_form %}
+
+{% block app_content %}
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
+        {% if search == '' %}
+            <h1>{{ _('Blocked domains') }}</h1>
+        {% else %}
+            <h1>{{ _('Blocked domains containing "%(search)s"', search=search) }}</h1>
+        {% endif %}
+        {% if not current_user.is_anonymous and current_user.trustworthy() %}
+        <div class="row">
+            <div class="col-auto">
+                <div class="btn-group">
+                    <a href="/domains" class="btn {{ 'btn-primary' if request.path == '/domains' else 'btn-outline-secondary' }}">
+                        {{ _('Domains') }}
+                    </a>
+                    <a href="/domains/banned" class="btn {{ 'btn-primary' if request.path == '/domains/banned' else 'btn-outline-secondary' }}">
+                        {{ _('Banned domains') }}
+                    </a>
+                </div>
+            </div>
+            <div class="col-auto">
+                <form method="get"><input type="search" name="search" value="{{ search }}" placeholder="{{ _('Search') }}" autofocus></form>
+            </div>
+        </div>
+        {% endif %}
+
+        <div class="table-responsive-sm pt-4">
+            <table class="table table-striped">
+                <tr>
+                   <th>Domain</th>
+                   {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}<th>Actions</th>{%endif%}
+                </tr>
+                {% for domain in domains %}
+                    <tr>
+                        <td><a href="{{ url_for('domain.show_domain', domain_id=domain.id) }}">{{ domain.name }}</a></td>
+                        <td>
+                            {% if user_access('ban users', current_user.id) or user_access('manage users', current_user.id) %}
+                                {% if domain.banned %}
+                                        <a class="btn btn-primary confirm_first" title="{{ _('Unbanning this domain allows future posts linking to that domain.') }}" href="/d/{{ domain.id }}/unban">{{ _('Unban') }}</a>
+                                {% else %}
+                                        <a class="btn btn-primary confirm_first" title="{{ _('Banning this domain will delete all posts linking to this domain and prevent future posts linking to that domain.') }}" href="/d/{{ domain.id }}/ban">{{ _('Ban') }}</a>
+                                {% endif %}
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        </div>
+        <nav aria-label="Pagination" class="mt-4" role="navigation">
+        {% if prev_url %}
+            <a href="{{ prev_url }}" class="btn btn-primary" rel="nofollow">
+                <span aria-hidden="true">&larr;</span> {{ _('Previous page') }}
+            </a>
+        {% endif %}
+        {% if next_url %}
+            <a href="{{ next_url }}" class="btn btn-primary" rel="nofollow">
+                {{ _('Next page') }} <span aria-hidden="true">&rarr;</span>
+            </a>
+        {% endif %}
+        </nav>
+    </div>
+</div>
+{% endblock %}
+
diff --git a/app/templates/user/_user_nav.html b/app/templates/user/_user_nav.html
new file mode 100644
index 00000000..f8bb8122
--- /dev/null
+++ b/app/templates/user/_user_nav.html
@@ -0,0 +1,15 @@
+<div class="row mb-4">
+    <div class="col-auto">
+        <div class="btn-group">
+            <a href="/user/settings" class="btn {{ 'btn-primary' if request.path == '/user/settings' else 'btn-outline-secondary' }}">
+                {{ _('Settings') }}
+            </a>
+            <a href="/u/{{ current_user.user_name }}/profile" class="btn {{ 'btn-primary' if request.path.endswith('/profile') else 'btn-outline-secondary' }}">
+                {{ _('Profile') }}
+            </a>
+            <a href="/user/settings/filters" class="btn {{ 'btn-primary' if request.path == '/user/settings/filters' else 'btn-outline-secondary' }}">
+                {{ _('Blocks & Filters') }}
+            </a>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/user/edit_filters.html b/app/templates/user/edit_filters.html
index 1618ec65..af3449c3 100644
--- a/app/templates/user/edit_filters.html
+++ b/app/templates/user/edit_filters.html
@@ -7,41 +7,40 @@
 {% set active_child = 'filters' %}
 
 {% block app_content %}
-    <div class="row">
-        <div class="col main_pane">
-            <nav aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-              <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-                <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-                <li class="breadcrumb-item"><a href="/user/settings">{{ _('Settings') }}</a></li>
-                <li class="breadcrumb-item"><a href="/user/settings/filters">{{ _('Filters') }}</a></li>
-                {% if content_filter %}
-                    <li class="breadcrumb-item active">{{ _('Edit filter') }}</li>
-                {% else %}
-                    <li class="breadcrumb-item active">{{ _('Add filter') }}</li>
-                {% endif %}
-
-              </ol>
-            </nav>
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
+        <nav aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
+            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
+            <li class="breadcrumb-item"><a href="/user/settings/filters">{{ _('Filters') }}</a></li>
             {% if content_filter %}
-                <h1 class="mt-2">{{ _('Filter %(name)s', name=content_filter.title) }}</h1>
+                <li class="breadcrumb-item active">{{ _('Edit filter') }}</li>
             {% else %}
-                <h1 class="mt-2">{{ _('Add filter') }}</h1>
+                <li class="breadcrumb-item active">{{ _('Add filter') }}</li>
             {% endif %}
-            <form method='post' role="form">
-                {{ form.csrf_token() }}
-                {{ render_field(form.title) }}
-                <h4>{{ _('Filter in these places') }}</h4>
-                {{ render_field(form.filter_home) }}
-                {{ render_field(form.filter_posts) }}
-                {{ render_field(form.filter_replies) }}
-                {{ render_field(form.hide_type) }}
-                {{ render_field(form.keywords) }}
-                <small class="field_hint">{{ _('One per line. Case does not matter.') }}</small>
-                {{ render_field(form.expire_after) }}
-                <small class="field_hint">{{ _('Stop applying this filter after this date. Optional.') }}</small>
-                {{ render_field(form.submit) }}
-            </form>
-        </div>
+          </ol>
+        </nav>
+        {% if content_filter %}
+            <h1 class="mt-2">{{ _('Filter %(name)s', name=content_filter.title) }}</h1>
+        {% else %}
+            <h1 class="mt-2">{{ _('Add filter') }}</h1>
+        {% endif %}
+        {% include "user/_user_nav.html" %}
+        <form method='post' role="form">
+            {{ form.csrf_token() }}
+            {{ render_field(form.title) }}
+            <h4>{{ _('Filter in these places') }}</h4>
+            {{ render_field(form.filter_home) }}
+            {{ render_field(form.filter_posts) }}
+            {{ render_field(form.filter_replies) }}
+            {{ render_field(form.hide_type) }}
+            {{ render_field(form.keywords) }}
+            <small class="field_hint">{{ _('One per line. Case does not matter.') }}</small>
+            {{ render_field(form.expire_after) }}
+            <small class="field_hint">{{ _('Stop applying this filter after this date. Optional.') }}</small>
+            {{ render_field(form.submit) }}
+        </form>
     </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/edit_profile.html b/app/templates/user/edit_profile.html
index 40d73f9c..c3731876 100644
--- a/app/templates/user/edit_profile.html
+++ b/app/templates/user/edit_profile.html
@@ -7,53 +7,56 @@
 {% from 'bootstrap/form.html' import render_field %}
 
 {% block app_content %}
-    <div class="row">
-        <div class="col main_pane">
-            <nav aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-              <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-                <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-                <li class="breadcrumb-item active">{{ _('Edit profile') }}</li>
-              </ol>
-            </nav>
-            <h1 class="mt-2">{{ _('Edit profile of %(name)s', name=user.user_name) }}</h1>
-            <form method='post' enctype="multipart/form-data" role="form" autocomplete="off">
-                {{ form.csrf_token() }}
-                {{ render_field(form.title) }}
-                {{ render_field(form.email) }}
-                {{ render_field(form.password_field) }}
-                <hr />
-                {{ render_field(form.about) }}
-                {% if not low_bandwidth %}
-                    {% if markdown_editor %}
-                        <script nonce="{{ session['nonce'] }}">
-                            window.addEventListener("load", function () {
-                                var downarea = new DownArea({
-                                    elem: document.querySelector('#about'),
-                                    resize: DownArea.RESIZE_VERTICAL,
-                                    hide: ['heading', 'bold-italic'],
-                                    value: {{ form.about.data | tojson | safe }}
-                                });
-                                setupAutoResize('about');
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
+        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
+            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
+            <li class="breadcrumb-item active">{{ _('Edit profile') }}</li>
+          </ol>
+        </nav>
+        <h1>{{ _('Edit profile of %(name)s', name=user.user_name) }}</h1>
+        {% include "user/_user_nav.html" %}
+
+        <form method='post' enctype="multipart/form-data" role="form" autocomplete="off">
+            {{ form.csrf_token() }}
+
+            {{ render_field(form.email) }}
+            {{ render_field(form.password_field) }}
+            <h5> Profile Data </h5>
+            {{ render_field(form.title) }}
+            {{ render_field(form.about) }}
+            {% if not low_bandwidth %}
+                {% if markdown_editor %}
+                    <script nonce="{{ session['nonce'] }}">
+                        window.addEventListener("load", function () {
+                            var downarea = new DownArea({
+                                elem: document.querySelector('#about'),
+                                resize: DownArea.RESIZE_VERTICAL,
+                                hide: ['heading', 'bold-italic'],
+                                value: {{ form.about.data | tojson | safe }}
                             });
-                        </script>
-                    {% else %}
-                        <a href="#" aria-hidden="true" class="markdown_editor_enabler create_post_markdown_editor_enabler" data-id="about">{{ _('Enable markdown editor') }}</a>
-                    {% endif %}
+                            setupAutoResize('about');
+                        });
+                    </script>
+                {% else %}
+                    <a href="#" aria-hidden="true" class="markdown_editor_enabler create_post_markdown_editor_enabler" data-id="about">{{ _('Enable markdown editor') }}</a>
                 {% endif %}
-                {{ render_field(form.matrixuserid) }}
-                <small class="field_hint">e.g. @something:matrix.org. Include leading @ and use : before server</small>
-                {{ render_field(form.profile_file) }}
-                <small class="field_hint">Provide a square image that looks good when small.</small>
-                {{ render_field(form.banner_file) }}
-                <small class="field_hint">Provide a wide image - letterbox orientation.</small>
-                <hr />
-                {{ render_field(form.bot) }}
-                {{ render_field(form.submit) }}
-            </form>
-            <p class="mt-4 pt-4">
-                <a class="btn btn-warning" href="{{ url_for('user.delete_account') }}">{{ _('Delete account') }}</a>
-            </p>
-        </div>
+            {% endif %}
+            {{ render_field(form.bot) }}
+            {{ render_field(form.matrixuserid) }}
+            <small class="field_hint">e.g. @something:matrix.org. Include leading @ and use : before server</small>
+            <h5> Profile Images </h5>
+            {{ render_field(form.profile_file) }}
+            <small class="field_hint">Provide a square image that looks good when small.</small>
+            {{ render_field(form.banner_file) }}
+            <small class="field_hint">Provide a wide image - letterbox orientation.</small>
+            {{ render_field(form.submit) }}
+        </form>
+        <p class="mt-4 pt-4">
+            <a class="btn btn-warning" href="{{ url_for('user.delete_account') }}">{{ _('Delete account') }}</a>
+        </p>
     </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/edit_profile2.html b/app/templates/user/edit_profile2.html
deleted file mode 100644
index d4327813..00000000
--- a/app/templates/user/edit_profile2.html
+++ /dev/null
@@ -1,77 +0,0 @@
-{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
-    {% extends 'themes/' + theme() + '/base.html' %}
-{% else %}
-    {% extends "base.html" %}
-{% endif %} %}
-{% set active_child = 'edit_profile' %}
-{% from 'bootstrap/form.html' import render_field %}
-
-{% block app_content %}
-<div class="card col-md-8" style="max-width:unset;">
-  <div class="card-header">
-        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-            <li class="breadcrumb-item active">{{ _('Edit profile') }}</li>
-          </ol>
-        </nav>
-        <ul class="nav nav-tabs flex-column flex-sm-row card-header-tabs">
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link" href="/user/settings">Basic</a>
-          </li>
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link" href="/user/settings/filters">Blocks & Filters</a>
-          </li>
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link active" href="/u/{{ current_user.user_name }}/profile">Profile</a>
-          </li>
-          <li class="nav-item">
-            <a class="flex-sm-fill text-sm-center nav-link disabled" href="#">Other</a>
-          </li>
-        </ul>
-    </div>
-    <div class="card-body">
-        <h1>{{ _('Edit profile of %(name)s', name=user.user_name) }}</h1>
-         <p class="card-text"></p>
-        <form method='post' enctype="multipart/form-data" role="form" autocomplete="off">
-            {{ form.csrf_token() }}
-            
-            {{ render_field(form.email) }}
-            {{ render_field(form.password_field) }}
-            <h5> Profile Data </h5>
-            {{ render_field(form.title) }}
-            {{ render_field(form.about) }}
-            {% if not low_bandwidth %}
-                {% if markdown_editor %}
-                    <script nonce="{{ session['nonce'] }}">
-                        window.addEventListener("load", function () {
-                            var downarea = new DownArea({
-                                elem: document.querySelector('#about'),
-                                resize: DownArea.RESIZE_VERTICAL,
-                                hide: ['heading', 'bold-italic'],
-                                value: {{ form.about.data | tojson | safe }}
-                            });
-                            setupAutoResize('about');
-                        });
-                    </script>
-                {% else %}
-                    <a href="#" aria-hidden="true" class="markdown_editor_enabler create_post_markdown_editor_enabler" data-id="about">{{ _('Enable markdown editor') }}</a>
-                {% endif %}
-            {% endif %}
-            {{ render_field(form.bot) }}
-            {{ render_field(form.matrixuserid) }}
-            <small class="field_hint">e.g. @something:matrix.org. Include leading @ and use : before server</small>
-            <h5> Profile Images </h5>
-            {{ render_field(form.profile_file) }}
-            <small class="field_hint">Provide a square image that looks good when small.</small>
-            {{ render_field(form.banner_file) }}
-            <small class="field_hint">Provide a wide image - letterbox orientation.</small>                
-            {{ render_field(form.submit) }}
-        </form>
-        <p class="mt-4 pt-4">
-            <a class="btn btn-warning" href="{{ url_for('user.delete_account') }}">{{ _('Delete account') }}</a>
-        </p>
-  </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/edit_settings.html b/app/templates/user/edit_settings.html
index d5301c52..feb8a9d4 100644
--- a/app/templates/user/edit_settings.html
+++ b/app/templates/user/edit_settings.html
@@ -7,32 +7,37 @@
 {% set active_child = 'settings' %}
 
 {% block app_content %}
-    <div class="row">
-        <div class="col main_pane">
-            <nav aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-              <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-                <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-                <li class="breadcrumb-item active">{{ _('Change settings') }}</li>
-              </ol>
-            </nav>
-            <h1 class="mt-2">{{ _('Change settings') }}</h1>
-            <form method='post' enctype="multipart/form-data" role="form">
-                {{ form.csrf_token() }}
-                {{ render_field(form.newsletter) }}
-                {{ render_field(form.email_unread) }}
-                {{ render_field(form.ignore_bots) }}
-                {{ render_field(form.nsfw) }}
-                {{ render_field(form.nsfl) }}
-                {{ render_field(form.markdown_editor) }}
-                {{ render_field(form.searchable) }}
-                {{ render_field(form.indexable) }}
-                {{ render_field(form.default_sort) }}
-                {{ render_field(form.import_file) }}
-                {{ render_field(form.theme) }}
-                {{ render_field(form.submit) }}
-                &nbsp;&nbsp;<a href="{{ url_for('user.user_settings_filters') }}">{{ _('Manage content filters') }}</a>
-            </form>
-        </div>
-    </div>
+
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
+        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
+            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
+            <li class="breadcrumb-item active">{{ _('Change settings') }}</li>
+          </ol>
+        </nav>
+        <h1>{{ _('Change settings') }}</h1>
+        {% include "user/_user_nav.html" %}
+        <form method='post' enctype="multipart/form-data" role="form">
+            {{ form.csrf_token() }}
+            <h5> Mail Settings </h5>
+            {{ render_field(form.newsletter) }}
+            {{ render_field(form.email_unread) }}
+            <h5> Visibility </h5>
+            {{ render_field(form.ignore_bots) }}
+            {{ render_field(form.nsfw) }}
+            {{ render_field(form.nsfl) }}
+            {{ render_field(form.searchable) }}
+            {{ render_field(form.indexable) }}
+            <h5> Preferences </h5>
+            {{ render_field(form.markdown_editor) }}
+            {{ render_field(form.default_sort) }}
+            {{ render_field(form.theme) }}
+            <h5>Import</h5>
+            {{ render_field(form.import_file) }}
+            {{ render_field(form.submit) }}
+        </form>
+  </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/edit_settings2.html b/app/templates/user/edit_settings2.html
deleted file mode 100644
index be4a207c..00000000
--- a/app/templates/user/edit_settings2.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
-    {% extends 'themes/' + theme() + '/base.html' %}
-{% else %}
-    {% extends "base.html" %}
-{% endif %} %}
-{% from 'bootstrap/form.html' import render_field %}
-{% set active_child = 'settings' %}
-
-{% block app_content %}
-
-<div class="card col-md-8" style="max-width:unset;">
-  <div class="card-header">
-          <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-            <li class="breadcrumb-item active">{{ _('Change settings') }}</li>
-          </ol>
-        </nav>
-    <ul class="nav nav-tabs flex-column flex-sm-row card-header-tabs">
-      <li class="nav-item">
-        <a class="flex-sm-fill text-sm-center nav-link active" href="/user/settings">Basic</a>
-      </li>
-      <li class="nav-item">
-        <a class="flex-sm-fill text-sm-center nav-link" href="/user/settings/filters">Blocks & Filters</a>
-      </li>
-      <li class="nav-item">
-        <a class="flex-sm-fill text-sm-center nav-link" href="/u/{{ current_user.user_name }}/profile">Profile</a>
-      </li>
-      <li class="nav-item">
-        <a class="flex-sm-fill text-sm-center nav-link disabled" href="#">Other</a>
-      </li>
-    </ul>
-  </div>
-  <div class="card-body">
-    <h1>{{ _('Change settings') }}</h1>
-    <p class="card-text">Change your basic settings and preferences </p>
-    <form method='post' enctype="multipart/form-data" role="form">
-            {{ form.csrf_token() }}
-            <h5> Mail Settings </h5>
-            {{ render_field(form.newsletter) }}
-            {{ render_field(form.email_unread) }}
-            <h5> Visibility </h5>
-            {{ render_field(form.ignore_bots) }}
-            {{ render_field(form.nsfw) }}
-            {{ render_field(form.nsfl) }}
-            {{ render_field(form.searchable) }}
-            {{ render_field(form.indexable) }}
-            <h5> Preferences </h5>
-            {{ render_field(form.markdown_editor) }}
-            {{ render_field(form.default_sort) }}
-            {{ render_field(form.theme) }}
-            <h5>Import</h5>
-            {{ render_field(form.import_file) }}
-            {{ render_field(form.submit) }}
-        </form>
-  </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/filters.html b/app/templates/user/filters.html
index 26163ee6..b7e34f85 100644
--- a/app/templates/user/filters.html
+++ b/app/templates/user/filters.html
@@ -7,46 +7,53 @@
 {% set active_child = 'filters' %}
 
 {% block app_content %}
-    <div class="row">
-        <div class="col main_pane">
-            <nav aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-              <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-                <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-                <li class="breadcrumb-item active"><a href="/user/settings">{{ _('Settings') }}</a></li>
-                <li class="breadcrumb-item active">{{ _('Filters') }}</li>
-              </ol>
-            </nav>
-            <div class="rh_action_buttons">
-                <a class="btn btn-primary" href="{{ url_for('user.user_settings_filters_add') }}">{{ _('Add filter') }}</a>
-            </div>
-            <h1 class="mt-2">{{ _('Filters') }}</h1>
-            <p>{{ _('Filters can hide posts that contain keywords you specify, either by making them less noticeable or invisible.') }}</p>
-            {% if filters %}
-                <table class="table table-striped" role="table">
-                    <tr>
-                        <th>{{ _('Name') }}</th>
-                        <th>{{ _('Keywords') }}</th>
-                        <th>{{ _('Action') }}</th>
-                        <th>{{ _('Expires') }}</th>
-                        <th> </th>
-                    </tr>
-                    {% for filter in filters %}
-                        <tr>
-                            <td>{{ filter.title }}</td>
-                            <td>{{ filter.keywords_string()|shorten(30) }}</td>
-                            <td>{{ _('Invisible') if filter.hide_type == 1 else _('Semi-transparent') }}</td>
-                            <td>{{ filter.expire_after if filter.expire_after }}</td>
-                            <td>
-                                <a href="{{ url_for('user.user_settings_filters_edit', filter_id=filter.id) }}">Edit</a> |
-                                <a href="{{ url_for('user.user_settings_filters_delete', filter_id=filter.id) }}" class="confirm_first">Delete</a>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
-            {% else %}
-                <p>{{ _('No filters defined yet.') }}</p>
-            {% endif %}
+<div class="row">
+    <div class="col-12 col-md-8 position-relative main_pane">
+        <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
+            <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
+            <li class="breadcrumb-item active">{{ _('Filters') }}</li>
+          </ol>
+        </nav>
+        <h1>{{ _('Filters') }}</h1>
+        {% include "user/_user_nav.html" %}
+        <div class="rh_action_buttons">
+            <a class="btn btn-primary" href="{{ url_for('user.user_settings_filters_add') }}">{{ _('Add filter') }}</a>
         </div>
+
+        <p class="card-text">{{ _('Filters can hide posts that contain keywords you specify, either by making them less noticeable or invisible.') }}</p>
+        {% if filters %}
+            <table class="table table-striped" role="table">
+                <tr>
+                    <th>{{ _('Name') }}</th>
+                    <th>{{ _('Keywords') }}</th>
+                    <th>{{ _('Action') }}</th>
+                    <th>{{ _('Expires') }}</th>
+                    <th> </th>
+                </tr>
+                {% for filter in filters %}
+                    <tr>
+                        <td>{{ filter.title }}</td>
+                        <td>{{ filter.keywords_string()|shorten(30) }}</td>
+                        <td>{{ _('Invisible') if filter.hide_type == 1 else _('Semi-transparent') }}</td>
+                        <td>{{ filter.expire_after if filter.expire_after }}</td>
+                        <td>
+                            <a href="{{ url_for('user.user_settings_filters_edit', filter_id=filter.id) }}">Edit</a> |
+                            <a href="{{ url_for('user.user_settings_filters_delete', filter_id=filter.id) }}" class="confirm_first">Delete</a>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% else %}
+            <p>{{ _('No filters defined yet.') }}</p>
+        {% endif %}
+        <h5>Blocks</h5>
+        <p class="card-text">Manage what users, communities, domains or instances you want to block. Blocking them means you will no longer see any posts associated with them.</p>
+        <a class="btn btn-primary" href="">Manage User Blocks</a>
+        <a class="btn btn-primary" href="">Manage Communities Blocks</a>
+        <a class="btn btn-primary" href="">Manage Domain Blocks</a>
+        <a class="btn btn-primary" href="">Manage Instance Blocks</a>
     </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/user/filters2.html b/app/templates/user/filters2.html
deleted file mode 100644
index 005e166d..00000000
--- a/app/templates/user/filters2.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% if theme() and file_exists('app/templates/themes/' + theme() + '/base.html') %}
-    {% extends 'themes/' + theme() + '/base.html' %}
-{% else %}
-    {% extends "base.html" %}
-{% endif %} %}
-{% from 'bootstrap/form.html' import render_field %}
-{% set active_child = 'filters' %}
-
-{% block app_content %}
-    <div class="card col-md-8" style="max-width:unset;">
-      <div class="card-header">
-            <nav class="mb-2" aria-label="breadcrumb" id="breadcrumb_nav" title="Navigation">
-              <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">{{ _('Home') }}</a></li>
-                <li class="breadcrumb-item"><a href="/u/{{ user.link() }}">{{ user.display_name() }}</a></li>
-                <li class="breadcrumb-item active"><a href="/user/settings">{{ _('Settings') }}</a></li>
-                <li class="breadcrumb-item active">{{ _('Filters') }}</li>
-              </ol>
-            </nav>
-            <ul class="nav nav-tabs flex-column flex-sm-row card-header-tabs">
-              <li class="nav-item">
-                <a class="flex-sm-fill text-sm-center nav-link" href="/user/settings">Basic</a>
-              </li>
-              <li class="nav-item">
-                <a class="flex-sm-fill text-sm-center nav-link active" href="/user/settings/filters">Blocks & Filters</a>
-              </li>
-              <li class="nav-item">
-                <a class="flex-sm-fill text-sm-center nav-link" href="/u/{{ current_user.user_name }}/profile">Profile</a>
-              </li>
-              <li class="nav-item">
-                <a class="flex-sm-fill text-sm-center nav-link disabled" href="#">Other</a>
-              </li>
-            </ul>
-    </div>
-    <div class="card-body">
-        <div class="rh_action_buttons">
-            <a class="btn btn-primary" href="{{ url_for('user.user_settings_filters_add') }}">{{ _('Add filter') }}</a>
-        </div>
-        <h1>{{ _('Filters') }}</h1>
-        <p class="card-text">{{ _('Filters can hide posts that contain keywords you specify, either by making them less noticeable or invisible.') }}</p>
-        {% if filters %}
-            <table class="table table-striped" role="table">
-                <tr>
-                    <th>{{ _('Name') }}</th>
-                    <th>{{ _('Keywords') }}</th>
-                    <th>{{ _('Action') }}</th>
-                    <th>{{ _('Expires') }}</th>
-                    <th> </th>
-                </tr>
-                {% for filter in filters %}
-                    <tr>
-                        <td>{{ filter.title }}</td>
-                        <td>{{ filter.keywords_string()|shorten(30) }}</td>
-                        <td>{{ _('Invisible') if filter.hide_type == 1 else _('Semi-transparent') }}</td>
-                        <td>{{ filter.expire_after if filter.expire_after }}</td>
-                        <td>
-                            <a href="{{ url_for('user.user_settings_filters_edit', filter_id=filter.id) }}">Edit</a> |
-                            <a href="{{ url_for('user.user_settings_filters_delete', filter_id=filter.id) }}" class="confirm_first">Delete</a>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </table>
-        {% else %}
-            <p>{{ _('No filters defined yet.') }}</p>
-        {% endif %}
-        <h1>Blocks</h5>
-        <p class="card-text">Manage what users, communities, domains or instances you want to block. Blocking them means you will no longer see any posts associated with them.</p>
-        <a class="btn btn-primary" href="">Manage User Blocks</a>
-        <a class="btn btn-primary" href="">Manage Communities Blocks</a>
-        <a class="btn btn-primary" href="">Manage Domain Blocks</a>
-        <a class="btn btn-primary" href="">Manage Instance Blocks</a>
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/app/user/routes.py b/app/user/routes.py
index 3f5d4a88..04c9af0b 100644
--- a/app/user/routes.py
+++ b/app/user/routes.py
@@ -142,7 +142,7 @@ def edit_profile(actor):
         form.matrixuserid.data = current_user.matrix_user_id
         form.password_field.data = ''
 
-    return render_template('user/edit_profile2.html', title=_('Edit profile'), form=form, user=current_user,
+    return render_template('user/edit_profile.html', title=_('Edit profile'), form=form, user=current_user,
                            markdown_editor=current_user.markdown_editor,
                            moderating_communities=moderating_communities(current_user.get_id()),
                            joined_communities=joined_communities(current_user.get_id())
@@ -202,7 +202,7 @@ def change_settings():
         form.theme.data = current_user.theme
         form.markdown_editor.data = current_user.markdown_editor
 
-    return render_template('user/edit_settings2.html', title=_('Edit profile'), form=form, user=current_user,
+    return render_template('user/edit_settings.html', title=_('Edit profile'), form=form, user=current_user,
                            moderating_communities=moderating_communities(current_user.get_id()),
                            joined_communities=joined_communities(current_user.get_id())
                            )
@@ -614,11 +614,12 @@ def import_settings_task(user_id, filename):
 @login_required
 def user_settings_filters():
     filters = Filter.query.filter_by(user_id=current_user.id).order_by(Filter.title).all()
-    return render_template('user/filters2.html', filters=filters, user=current_user,
+    return render_template('user/filters.html', filters=filters, user=current_user,
                            moderating_communities=moderating_communities(current_user.get_id()),
                            joined_communities=joined_communities(current_user.get_id())
                            )
 
+
 @bp.route('/user/settings/filters/add', methods=['GET', 'POST'])
 @login_required
 def user_settings_filters_add():