diff --git a/openspending/auth/forum.py b/openspending/auth/forum.py
index f1623c3b..0cd8a227 100644
--- a/openspending/auth/forum.py
+++ b/openspending/auth/forum.py
@@ -51,7 +51,7 @@ def check_perm(user, perm, forum, post_user_id=None):
         return True
 
     #need to check the permissions
-    return post_user_id and user.id and not getattr(user, "is_lockdownuser", False)
+    return post_user_id == user.id and not getattr(user, "is_lockdownuser", False)
         # return True
         # #need to figure someting out here
         # return user.permissions[perm] and user.id == post_user_id
diff --git a/openspending/forum/forum/views.py b/openspending/forum/forum/views.py
index 41bdf353..5693d741 100644
--- a/openspending/forum/forum/views.py
+++ b/openspending/forum/forum/views.py
@@ -343,6 +343,7 @@ def manage_forum(forum_id, slug=None):
     return render_template(
         "forum/forum/edit_forum.html", forum=forum_instance, topics=topics,
         available_forums=available_forums, forumsread=forumsread,
+        flaskbb_config=flaskbb_config
     )
 
 
diff --git a/openspending/forum/management/views.py b/openspending/forum/management/views.py
index 4fcb9250..79c7832d 100644
--- a/openspending/forum/management/views.py
+++ b/openspending/forum/management/views.py
@@ -46,45 +46,45 @@ def overview():
                            post_count=post_count)
 
 
-@management.route("/settings", methods=["GET", "POST"])
-@management.route("/settings/<path:slug>", methods=["GET", "POST"])
-@admin_required
-def settings(slug=None):
-    slug = slug if slug else "general"
+# @management.route("/settings", methods=["GET", "POST"])
+# @management.route("/settings/<path:slug>", methods=["GET", "POST"])
+# @admin_required
+# def settings(slug=None):
+#     slug = slug if slug else "general"
 
-    # get the currently active group
-    active_group = SettingsGroup.query.filter_by(key=slug).first_or_404()
-    # get all groups - used to build the navigation
-    all_groups = SettingsGroup.query.all()
+#     # get the currently active group
+#     active_group = SettingsGroup.query.filter_by(key=slug).first_or_404()
+#     # get all groups - used to build the navigation
+#     all_groups = SettingsGroup.query.all()
 
-    SettingsForm = Setting.get_form(active_group)
+#     SettingsForm = Setting.get_form(active_group)
 
-    old_settings = Setting.get_settings(active_group)
-    new_settings = {}
+#     old_settings = Setting.get_settings(active_group)
+#     new_settings = {}
 
-    form = SettingsForm()
+#     form = SettingsForm()
 
-    if form.validate_on_submit():
-        for key, values in iteritems(old_settings):
-            try:
-                # check if the value has changed
-                if values['value'] == form[key].data:
-                    continue
-                else:
-                    new_settings[key] = form[key].data
-            except KeyError:
-                pass
-        Setting.update(settings=new_settings, app=current_app)
-        flash(_("Settings saved."), "success")
-    else:
-        for key, values in iteritems(old_settings):
-            try:
-                form[key].data = values['value']
-            except (KeyError, ValueError):
-                pass
-
-    return render_template("forum/management/settings.html", form=form,
-                           all_groups=all_groups, active_group=active_group)
+#     if form.validate_on_submit():
+#         for key, values in iteritems(old_settings):
+#             try:
+#                 # check if the value has changed
+#                 if values['value'] == form[key].data:
+#                     continue
+#                 else:
+#                     new_settings[key] = form[key].data
+#             except KeyError:
+#                 pass
+#         Setting.update(settings=new_settings, app=current_app)
+#         flash(_("Settings saved."), "success")
+#     else:
+#         for key, values in iteritems(old_settings):
+#             try:
+#                 form[key].data = values['value']
+#             except (KeyError, ValueError):
+#                 pass
+
+#     return render_template("forum/management/settings.html", form=form,
+#                            all_groups=all_groups, active_group=active_group)
 
 
 # # Users
diff --git a/openspending/forum/utils/helpers.py b/openspending/forum/utils/helpers.py
index 61d7582a..97d379e9 100644
--- a/openspending/forum/utils/helpers.py
+++ b/openspending/forum/utils/helpers.py
@@ -60,7 +60,7 @@ def do_topic_action(topics, user, action, reverse):
                     For example, to unlock a topic, ``reverse`` should be
                     set to ``True``.
     """
-    from openspending.forum.utils.permissions import can_moderate, can_delete_topic
+    from openspending.auth.forum import can_moderate, can_delete_topic
     from openspending.model.account import Account as User
     from openspending.forum.forum.models import Post
 
diff --git a/openspending/templates/forum/forum/edit_forum.html b/openspending/templates/forum/forum/edit_forum.html
index cd38e745..e82b8f3c 100644
--- a/openspending/templates/forum/forum/edit_forum.html
+++ b/openspending/templates/forum/forum/edit_forum.html
@@ -1,12 +1,12 @@
     {% set page_title = forum.title %}
     {% set active_forum_nav=True %}
 
-    {% extends theme("forum/layout.html") %}
+    {% extends "forum/layout.html" %}
     {% block forumcontent %}
-    {% from 'macros.html' import render_pagination, topic_pages %}
+    {% from 'forum/macros.html' import render_pagination, topic_pages %}
 
     <ol class="breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li><a href="{{ url_for('forum.index') }}">Forum</a></li>
         <li><a href="{{ forum.category.url }}">{{ forum.category.title }}</a></li>
         <li class="active">{{ forum.title }}</li>
     </ol>
@@ -29,13 +29,13 @@
 
         <tbody>
             <tr>
-                <td colspan="2">{% trans %}Topic{% endtrans %}</td>
+                <td colspan="2">Topic</td>
 
-                <td>{% trans %}Posts{% endtrans %}</td>
+                <td>Posts</td>
 
-                <td>{% trans %}Views{% endtrans %}</td>
+                <td>Views</td>
 
-                <td>{% trans %}Last Post{% endtrans %}</td>
+                <td>Last Post</td>
 
                 <td><input type="checkbox" name="rowtoggle" class="action-checkall" title="Select All"/></td>
             </tr>
@@ -67,7 +67,7 @@
                         {{ topic_pages(topic, flaskbb_config["POSTS_PER_PAGE"]) }}
                         <br />
                         <small>
-                            {% trans %}by{% endtrans %}
+                            by
                             {% if topic.user_id %}
                              <a href="{{ topic.user.url }}">{{ topic.user.username }}</a>
                             {% else %}
@@ -86,7 +86,7 @@
                     <a href="{{ topic.last_post.url }}">{{ topic.last_post.date_created|time_since }}</a><br />
 
                     <small>
-                        {% trans %}by{% endtrans %}
+                        by
                         {% if topic.last_post.user_id %}
                         <a href="{{ topic.last_post.user.url }}">{{ topic.last_post.user.username }}</a>
                         {% else %}
@@ -99,7 +99,7 @@
             {% else %}
             <tr>
                 <td colspan="6">
-                    {% trans %}No Topics.{% endtrans %}
+                    No Topics.
                 </td>
             </tr>
             {% endfor %}
@@ -111,7 +111,7 @@
         <div class="col-md-2">
             <div class="pull-left">
                 <a class="btn btn-default" href="{{ forum.url }}">
-                    <span class="fa fa-arrow-left"></span> {% trans %}Back{% endtrans %}
+                    <span class="fa fa-arrow-left"></span> Back
                 </a>
             </div>
         </div>
@@ -121,37 +121,37 @@
                 <div class="form-group">
                 <div class="btn-group" role="group">
                     <button name="lock" class="btn btn-warning">
-                        <span class="fa fa-lock"></span> {% trans %}Lock{% endtrans %}
+                        <span class="fa fa-lock"></span> Lock
                     </button>
                     <button name="unlock" class="btn btn-warning">
-                        <span class="fa fa-unlock"></span> {% trans %}Unlock{% endtrans %}
+                        <span class="fa fa-unlock"></span> Unlock
                     </button>
                 </div>
                 <div class="btn-group" role="group">
                     <button name="highlight" class="btn btn-success">
-                        <span class="fa fa-star"></span> {% trans %}Highlight{% endtrans %}
+                        <span class="fa fa-star"></span> Highlight
                     </button>
                     <button name="trivialize" class="btn btn-success">
-                        <span class="fa fa-star-o"></span> {% trans %}Trivialize{% endtrans %}
+                        <span class="fa fa-star-o"></span> Trivialize
                     </button>
                 </div>
 
                 <button name="delete" class="btn btn-danger">
-                    <span class="fa fa-trash-o"></span> {% trans %}Delete{% endtrans %}
+                    <span class="fa fa-trash-o"></span> Delete
                 </button>
                 </div>
 
                 <div class="form-group row">
                     <div class="col-sm-5">
                         <select class="form-control" id="forum" name="forum">
-                            <option selected value="">{% trans %}Move to...{% endtrans %}</option>
+                            <option selected value="">Move to...</option>
                             {% for forum in available_forums %}
                                 <option value={{forum.id}}>{{ forum.title }}</option>
                             {% endfor %}
                         </select>
                     </div> <!-- end div_class -->
                     <button name="move" class="btn btn-info">
-                        <span class="fa fa-plane"></span> {% trans %}Move{% endtrans %}
+                        <span class="fa fa-plane"></span> Move
                     </button>
                 </div> <!-- end form-group -->
             </div>
diff --git a/openspending/templates/forum/forum/index.html b/openspending/templates/forum/forum/index.html
index 0dfc4ebb..92d7b3b1 100644
--- a/openspending/templates/forum/forum/index.html
+++ b/openspending/templates/forum/forum/index.html
@@ -15,7 +15,6 @@
         <tr>
             <td colspan="2">
                 <strong>Board Statistics</strong>
-                [<a href="{{ url_for('forum.who_is_online') }}" onclick="window.open(this.href, 'wio_window','width=500,height=500'); return false;">Who is online?</a>]
             </td>
         </tr>
     </thead>
diff --git a/openspending/templates/forum/forum/online_users.html b/openspending/templates/forum/forum/online_users.html
deleted file mode 100644
index c261c879..00000000
--- a/openspending/templates/forum/forum/online_users.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% set page_title = _("Online Users") %}
-
-{% extends theme("layout.html") %}
-
-{% block navigation %}
-{% endblock %}
-
-{% block forumcontent %}
-
-<legend>{% trans %}Online Users{% endtrans %}</legend>
-{% for user in online_users %}
-    {% if config["REDIS_ENABLED"] %}
-    <a href="{{ url_for('user.profile', username=user) }}">{{ user }}<a>{% if not loop.last %}, {% endif %}
-    {% else %}
-    <a href="{{ url_for('user.profile', username=user.username) }}">{{ user.username }}<a>{% if not loop.last %}, {% endif %}
-    {% endif %}
-{% endfor %}
-
-{% endblock %}
diff --git a/openspending/templates/forum/forum/report_post.html b/openspending/templates/forum/forum/report_post.html
index 1d27601c..3ae9b560 100644
--- a/openspending/templates/forum/forum/report_post.html
+++ b/openspending/templates/forum/forum/report_post.html
@@ -1,14 +1,15 @@
-{% set page_title = _("Report Post") %}
+{% set page_title = "Report Post" %}
 
-{% extends theme("layout.html") %}
+{% extends "forum/layout.html" %}
 
 {% block navigation %}
 {% endblock %}
 
 {% block forumcontent %}
-{% from theme("macros.html") import render_field %}
+{% from "forum/macros.html" import render_field %}
 
 <form class="form" role="form" method="post">
+	<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     {{ form.hidden_tag() }}
     <h3>{% trans %}Report Post{% endtrans %}</h3>
 
diff --git a/openspending/templates/forum/forum/search_form.html b/openspending/templates/forum/forum/search_form.html
index 4d93daea..336fb4ab 100644
--- a/openspending/templates/forum/forum/search_form.html
+++ b/openspending/templates/forum/forum/search_form.html
@@ -1,16 +1,16 @@
-{% set page_title = _("Search") %}
+{% set page_title = "Search" %}
 
-{% extends theme("layout.html") %}
-{% from theme("macros.html") import horizontal_field %}
+{% extends "forum/layout.html" %}
+{% from "forum/macros.html" import horizontal_field %}
 {% block forumcontent %}
 
     <ul class="breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-        <li class="active">{% trans %}Search{% endtrans %}</li>
+        <li><a href="{{ url_for('forum.index') }}">Forum</a></li>
+        <li class="active">Search</li>
     </ul>
 
     <form class="form-horizontal" role="form" method="post">
-        <h2>{% trans %}Search{% endtrans %}</h2>
+        <h2>Search</h2>
         <hr>
         {{ form.hidden_tag() }}
         {{ horizontal_field(form.search_types)}}
diff --git a/openspending/templates/forum/forum/search_result.html b/openspending/templates/forum/forum/search_result.html
index 39eeb32d..47f05141 100644
--- a/openspending/templates/forum/forum/search_result.html
+++ b/openspending/templates/forum/forum/search_result.html
@@ -1,16 +1,16 @@
-{% set page_title = _("Search") %}
+{% set page_title = "Search" %}
 
-{% extends theme("layout.html") %}
+{% extends "forum/layout.html" %}
 {% block forumcontent %}
-    {% from theme('macros.html') import render_pagination, group_field, topic_pages %}
+    {% from 'forum/macros.html' import render_pagination, group_field, topic_pages %}
 
     <ul class="breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-        <li class="active">{% trans %}Search{% endtrans %}</li>
+        <li><a href="{{ url_for('forum.index') }}">Forum</a></li>
+        <li class="active">Search</li>
     </ul>
 
     {% if result['post'] %}
-        <h3>{% trans %}Posts{% endtrans %}</h3>
+        <h3>Posts</h3>
 
         <table class="table table-bordered">
             <tbody>
@@ -29,25 +29,20 @@ <h3>{% trans %}Posts{% endtrans %}</h3>
                                     <a href="{{ post.user.url }}">
                                         <span style="font-weight:bold">{{ post.user.username }}</span> <!-- TODO: Implement userstyles -->
                                     </a>
-                                    {%- if post.user|is_online %}
-                                        <span class="label label-success">Online</span>
-                                    {%- else %}
-                                        <span class="label label-default">Offline</span>
-                                    {%- endif %}
                                     <div class="profile primary-group">
                                         {{ post.user.primary_group.name }}
                                     </div>
                                 </td>
 
                                 <td class="pull-right">
-                                    {% trans %}Posts{% endtrans %}: {{ post.user.post_count }}<br />
-                                    {% trans %}Registered since{% endtrans %}: {{ post.user.date_joined|format_date('%b %d %Y') }}<br />
+                                    Posts: {{ post.user.post_count }}<br />
+                                    Registered since: {{ post.user.date_joined|format_date('%b %d %Y') }}<br />
                                 </td>
                             {% else %}
                                 <td>
                                     <strong>{{ post.username }}</strong>
                                     <br />
-                                    {% trans %}Guest{% endtrans %}
+                                    Guest
                                 </td>
                             {% endif %}
                         </tr>
@@ -66,7 +61,7 @@ <h3>{% trans %}Posts{% endtrans %}</h3>
             </tr>
             {% else %}
             <tr>
-                <td>{% trans %}No posts found matching your search criteria.{% endtrans %}</td>
+                <td>No posts found matching your search criteria.</td>
             </tr>
             {% endfor %}
             </tbody>
@@ -74,16 +69,16 @@ <h3>{% trans %}Posts{% endtrans %}</h3>
     {% endif %}
 
     {% if result['user'] %}
-        <h3>{% trans %}Users{% endtrans %}</h3>
+        <h3>Users</h3>
 
         <table class="table table-bordered">
             <thead>
             <tr>
                 <th>#</th>
-                <th>{% trans %}Username{% endtrans %}</th>
-                <th>{% trans %}Posts{% endtrans %}</th>
-                <th>{% trans %}Date registered{% endtrans %}</th>
-                <th>{% trans %}Group{% endtrans %}</th>
+                <th>Username</th>
+                <th>Posts</th>
+                <th>Date registered</th>
+                <th>Group</th>
             </tr>
             </thead>
             <tbody>
@@ -93,11 +88,10 @@ <h3>{% trans %}Users{% endtrans %}</h3>
                     <td><a href="{{ user.url }}">{{ user.username }}</a></td>
                     <td>{{ user.post_count }}</td>
                     <td>{{ user.date_joined|format_date('%b %d %Y') }}</td>
-                    <td>{{ user.primary_group.name }}</td>
                 </tr>
             {% else %}
                 <tr>
-                    <td colspan="5">{% trans %}No users found matching your search criteria.{% endtrans %}</td>
+                    <td colspan="5">No users found matching your search criteria.</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -105,18 +99,18 @@ <h3>{% trans %}Users{% endtrans %}</h3>
     {% endif %}
 
     {% if result['topic'] %}
-        <h3>{% trans %}Topics{% endtrans %}</h3>
+        <h3>Topics</h3>
 
         <table class="table table-bordered">
             <thead>
             <tr>
-                <th colspan="2">{% trans %}Topic{% endtrans %}</th>
+                <th colspan="2">Topic</th>
 
-                <th>{% trans %}Posts{% endtrans %}</th>
+                <th>Posts</th>
 
-                <th>{% trans %}Views{% endtrans %}</th>
+                <th>Views</th>
 
-                <th>{% trans %}Last Post{% endtrans %}</th>
+                <th>Last Post</th>
             </tr>
             </thead>
 
@@ -139,7 +133,7 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
                             <br />
 
                             <small>
-                            {% trans %}by{% endtrans %}
+                            by
                             {% if topic.user_id %}
                                 <a href="{{ topic.user.url }}">{{ topic.user.username }}</a>
                             {% else %}
@@ -158,7 +152,7 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
                         <a href="{{ topic.last_post.url }}">{{ topic.last_post.date_created|time_since }}</a><br />
 
                         <small>
-                        {% trans %}by{% endtrans %}
+                        by
                         {% if topic.last_post.user_id %}
                             <a href="{{ topic.last_post.user.url }}">{{ topic.last_post.user.username }}</a>
                         {% else %}
@@ -169,7 +163,7 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
                 </tr>
             {% else %}
                 <tr>
-                    <td colspan="5">{% trans %}No topics found matching your search criteria.{% endtrans %}</td>
+                    <td colspan="5">No topics found matching your search criteria.</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -177,15 +171,15 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
     {% endif %}
 
     {% if result['forum'] %}
-        <h3>{% trans %}Forums{% endtrans %}</h3>
+        <h3>Forums</h3>
 
         <table class="table table-bordered">
             <thead class="categoryhead">
             <tr>
-                <th colspan="2"><strong>{% trans %}Forum{% endtrans %}</strong></th>
-                <th width="85" align="center" style="white-space: nowrap"><strong>{% trans %}Topics{% endtrans %}</strong></th>
-                <th width="85" align="center" style="white-space: nowrap"><strong>{% trans %}Posts{% endtrans %}</strong></th>
-                <th width="200" align="center" style="white-space: nowrap"><strong>{% trans %}Last Post{% endtrans %}</strong></th>
+                <th colspan="2"><strong>Forum</strong></th>
+                <th width="85" align="center" style="white-space: nowrap"><strong>Topics</strong></th>
+                <th width="85" align="center" style="white-space: nowrap"><strong>Posts</strong></th>
+                <th width="200" align="center" style="white-space: nowrap"><strong>Last Post</strong></th>
             </tr>
             </thead>
             <tbody class="forumbody">
@@ -228,14 +222,6 @@ <h3>{% trans %}Forums{% endtrans %}</h3>
                         {% autoescape false %}
                         {{ forum.description|markup }}
                         {% endautoescape %}
-                        {% if forum.show_moderators %}
-                            <div class="forum-moderators">
-                                {% trans %}Moderators{% endtrans %}:
-                                {% for moderator in forum.moderators %}
-                                    <a href="{{ url_for('user.profile', username=moderator.username) }}">{{ moderator.username }}</a>{% if not loop.last %}, {% endif %}
-                                {% endfor %}
-                            </div>
-                        {% endif %}
                     </div>
                 </td>
 
@@ -250,7 +236,7 @@ <h3>{% trans %}Forums{% endtrans %}</h3>
                         <br />
                         {{ forum.last_post.date_created|time_since }}<br />
 
-                        {% trans %}by{% endtrans %}
+                        by
                         {% if forum.last_post.user_id %}
                             <a href="{{ url_for('user.profile', username=forum.last_post.user.username) }}">{{ forum.last_post.user.username }}</a>
                         {% else %}
@@ -258,7 +244,7 @@ <h3>{% trans %}Forums{% endtrans %}</h3>
                         {% endif %}
 
                     {% else %}
-                        {% trans %}No posts.{% endtrans %}
+                        No posts.
                     {% endif %}
                     {% endif %}
                 </td>
@@ -266,7 +252,7 @@ <h3>{% trans %}Forums{% endtrans %}</h3>
             {% else %}
             <tr>
                 <td colspan="5">
-                    {% trans %}No forums found matching your search criteria.{% endtrans %}
+                    No forums found matching your search criteria.
                 </td>
             </tr>
             {% endfor %}
diff --git a/openspending/templates/forum/forum/topic.html b/openspending/templates/forum/forum/topic.html
index b501648b..cfcd2d28 100644
--- a/openspending/templates/forum/forum/topic.html
+++ b/openspending/templates/forum/forum/topic.html
@@ -89,9 +89,6 @@
         <tr>
             <td>
                 <span class="pull-left">
-                    {% if current_user|is_authenticated and post.user_id and post.user_id != current_user.id %}
-                    <a href="{{ url_for('message.new_conversation', to_user=post.user.username) }}">PM</a>
-                    {% endif %}
                     {% if user.website %}
                     {% if current_user|is_authenticated %}| {% endif %}<a href="{{ user.website }}">Website</a>
                     {% endif %}
diff --git a/openspending/templates/forum/management/banned_users.html b/openspending/templates/forum/management/banned_users.html
index b30a76b7..6ac87853 100644
--- a/openspending/templates/forum/management/banned_users.html
+++ b/openspending/templates/forum/management/banned_users.html
@@ -1,17 +1,17 @@
-{% set page_title = _("Banned Users") %}
+{% set page_title = "Banned Users" %}
 {% set active_management_user_nav=True %}
 
-{% extends theme("forum/management/management_layout.html") %}
+{% extends "forum/management/management_layout.html" %}
 {% block management_content %}
-{% from theme('macros.html') import render_pagination, render_field, group_field, navlink with context %}
+{% from 'forum/macros.html' import render_pagination, render_field, group_field, navlink with context %}
 
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.users', _("Manage Users")) }}
-        {{ navlink('management.banned_users', _('Banned Users')) }}
+        {{ navlink('management.users', "Manage Users") }}
+        {{ navlink('management.banned_users', 'Banned Users') }}
 
         {% if current_user|is_admin %}
-            {{ navlink('management.add_user', _("Add User")) }}
+            {{ navlink('management.add_user', "Add User") }}
         {% endif %}
     </ul>
 </div><!--/.col-md-3 -->
@@ -22,12 +22,12 @@
             <div class="panel panel-primary">
                 <div class="panel-heading">
 
-                    <span class="fa fa-user-times"></span> {% trans %}Banned Users{% endtrans %}
+                    <span class="fa fa-user-times"></span> Banned Users
 
                     <div class="pull-right action-buttons">
                         <div class="btn-group pull-right">
                             <button type="button" class="btn btn-default btn-xs" onclick="return show_management_search()">
-                                <span class="fa fa-search" style="margin-right: 0px;"></span> {% trans %}Search{% endtrans %}
+                                <span class="fa fa-search" style="margin-right: 0px;"></span> Search
                             </button>
                         </div>
                     </div>
@@ -52,19 +52,19 @@
                             <tr>
                                 <th><input type="checkbox" name="rowtoggle" class="action-checkall" title="Select All"/></th>
                                 <th>#</th>
-                                <th>{% trans %}Username{% endtrans %}</th>
-                                <th>{% trans %}Posts{% endtrans %}</th>
-                                <th>{% trans %}Date registered{% endtrans %}</th>
-                                <th>{% trans %}Group{% endtrans %}</th>
+                                <th>Username</th>
+                                <th>Posts</th>
+                                <th>Date registered</th>
+                                <th>Group</th>
                                 <th>
                                     <div class="btn-group">
                                         <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                            <span class="fa fa-cog" style="margin-right: 0px;"></span> {% trans %}Actions{% endtrans %}
+                                            <span class="fa fa-cog" style="margin-right: 0px;"></span> Actions
                                         </button>
                                         <ul class="dropdown-menu slidedown">
                                             <li>
-                                                <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.unban_user') }}', '{% trans %}Are you sure you want to unban these Users?{% endtrans %}')">
-                                                    <span class="fa fa-flag text-success"></span> {% trans %}Unban selected Users{% endtrans %}
+                                                <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.unban_user') }}', 'Are you sure you want to unban these Users?')">
+                                                    <span class="fa fa-flag text-success"></span> Unban selected Users
                                                 </a>
                                             </li>
                                         </ul>
@@ -80,14 +80,13 @@
                                 <td><a href="{{ url_for('user.profile', username=user.username) }}">{{ user.username }}</a></td>
                                 <td>{{ user.post_count }}</td>
                                 <td>{{ user.date_joined|format_date('%b %d %Y') }}</td>
-                                <td>{{ user.primary_group.name }}</td>
                                 <td>
                                     {% if current_user|can_ban_user and user.permissions['banned'] %}
                                         <form class="inline-form" id="unban-{{user.id}}" method="post" action="{{ url_for('management.unban_user', user_id = user.id) }}">
                                             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
 
                                             <button class="btn btn-link">
-                                                <span class="fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="{% trans %}Unban{% endtrans %}"></span>
+                                                <span class="fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="Unban"></span>
                                             </button>
                                         </form>
                                     {% endif %}
@@ -96,7 +95,7 @@
                         {% else %}
                             <tr>
                                 <td colspan="6">
-                                    {% trans %}No users found matching your search criteria.{% endtrans %}
+                                    No users found matching your search criteria.
                                 </td>
                             </tr>
                         {% endfor %}
diff --git a/openspending/templates/forum/management/group_form.html b/openspending/templates/forum/management/group_form.html
deleted file mode 100644
index 51594623..00000000
--- a/openspending/templates/forum/management/group_form.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% set page_title = title %}
-{% set active_management_group_nav=True %}
-
-{% extends theme("management/management_layout.html") %}
-{% block management_content %}
-{% from theme("macros.html") import render_field, render_boolean_field, render_submit_field, navlink with context %}
-
-<div class="col-md-3">
-    <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.groups', _("Manage Groups")) }}
-        {{ navlink('management.add_group', _("Add Group")) }}
-    </ul>
-</div>
-
-<div class="col-md-9">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    <span class="fa fa-user-plus"></span> {{ title }}
-                </div>
-                <div class="panel-body">
-                    <form class="form-horizontal" role="form" method="post">
-                        {{ form.hidden_tag() }}
-                        {{ render_field(form.name) }}
-                        {{ render_field(form.description, rows="4", div_class="col-md-12") }}
-
-                        {{ render_boolean_field(form.admin) }}
-                        {{ render_boolean_field(form.super_mod) }}
-
-                        {{ render_boolean_field(form.mod) }}
-                        {{ render_boolean_field(form.banned) }}
-                        {{ render_boolean_field(form.guest) }}
-
-                        {{ render_boolean_field(form.mod_edituser) }}
-                        {{ render_boolean_field(form.mod_banuser) }}
-
-                        {{ render_boolean_field(form.editpost) }}
-                        {{ render_boolean_field(form.deletepost) }}
-                        {{ render_boolean_field(form.deletetopic) }}
-                        {{ render_boolean_field(form.posttopic) }}
-                        {{ render_boolean_field(form.postreply) }}
-                        <div class="row">
-                            {{ render_submit_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/openspending/templates/forum/management/management_layout.html b/openspending/templates/forum/management/management_layout.html
index e4df8f39..f5d3a2cb 100644
--- a/openspending/templates/forum/management/management_layout.html
+++ b/openspending/templates/forum/management/management_layout.html
@@ -10,7 +10,6 @@
     {{ navlink('management.unread_reports', 'Reports', active=active_management_report_nav) }}
 
     {% if current_user.admin %}
-        {{ navlink('management.settings', 'Settings') }}
         {{ navlink('management.forums', 'Forums', active=active_management_forum_nav) }}
     {% endif %}
     </ul>
diff --git a/openspending/templates/forum/management/plugins.html b/openspending/templates/forum/management/plugins.html
deleted file mode 100644
index 5398e617..00000000
--- a/openspending/templates/forum/management/plugins.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{% set page_title = _("Plugins") %}
-
-{% extends theme("management/management_layout.html") %}
-{% block management_content %}
-{% from theme('macros.html') import render_pagination %}
-
-<div class="col-md-12">
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <span class="fa fa-puzzle-piece"></span> {% trans %}Manage Plugins{% endtrans %}
-        </div>
-        <div class="panel-body">
-            <table class="table">
-                <thead>
-                    <tr>
-                        <th>{% trans %}Plugin{% endtrans %}</th>
-                        <th>{% trans %}Information{% endtrans %}</th>
-                        <th>{% trans %}Manage{% endtrans %}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for plugin in plugins %}
-                    <tr>
-                      <td>
-                        {% if plugin.website %}
-                          <a href="{{ plugin.website }}">{{ plugin.name }}</a>
-                        {% else %}
-                          {{ plugin.name }}
-                        {% endif %}
-                        </td>
-                        <td>
-                            {% trans %}Version{% endtrans %}: <i>{{ plugin.version }}</i> <br />
-                            {{ plugin.description }} <br />
-                            {% trans %}by{% endtrans %}  <i>{{ plugin.author }}</i>
-                        </td>
-                        <td>
-                            {% if not plugin.enabled %}
-                            <form class="inline-form" method="post" action="{{ url_for('management.enable_plugin', plugin=plugin.identifier) }}">
-                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                                <button class="btn btn-link">{% trans %}Enable{% endtrans %}</button>
-                            </form>
-                            {% else %}
-                            <form class="inline-form" method="post" action="{{ url_for('management.disable_plugin', plugin=plugin.identifier) }}">
-                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                                <button class="btn btn-link">{% trans %}Disable{% endtrans %}</button>
-                            </form>
-                            {% endif %}
-
-                            {% set uninstallable = plugin.uninstallable %}
-                            {% if plugin.installable and not uninstallable %}
-                            <br />
-                            <form class="inline-form" method="post" action="{{ url_for('management.install_plugin', plugin=plugin.identifier) }}">
-                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                                <button class="btn btn-link">{% trans %}Install{% endtrans %}</button>
-                            </form>
-                            {% endif %}
-                            {% if uninstallable %}
-                            <form class="inline-form" method="post" action="{{ url_for('management.uninstall_plugin', plugin=plugin.identifier) }}">
-                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                                <button class="btn btn-link">{% trans %}Uninstall{% endtrans %}</button>
-                            </form>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/openspending/templates/forum/management/reports.html b/openspending/templates/forum/management/reports.html
index a2f887fd..2d211939 100644
--- a/openspending/templates/forum/management/reports.html
+++ b/openspending/templates/forum/management/reports.html
@@ -1,14 +1,14 @@
-{% set page_title = _("Reports") %}
+{% set page_title = "Reports" %}
 {% set active_management_report_nav=True %}
 
-{% extends theme("management/management_layout.html") %}
+{% extends "forum/management/management_layout.html" %}
 {% block management_content %}
-{% from theme('macros.html') import render_pagination, navlink with context %}
+{% from 'forum/macros.html' import render_pagination, navlink with context %}
 
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.unread_reports', _("Show unread reports")) }}
-        {{ navlink('management.reports', _("Show all reports")) }}
+        {{ navlink('management.unread_reports', "Show unread reports") }}
+        {{ navlink('management.reports', "Show all reports") }}
     </ul>
 </div>
 
@@ -17,7 +17,7 @@
         <div class="col-md-12">
             <div class="panel panel-primary">
                 <div class="panel-heading">
-                    <span class="fa fa-flag"></span> {% trans %}All Reports{% endtrans %}
+                    <span class="fa fa-flag"></span> All Reports
                 </div>
                 <div class="panel-body management-body"></div>
 
@@ -25,11 +25,11 @@
                     <thead>
                         <tr>
                             <th>#</th>
-                            <th>{% trans %}Poster{% endtrans %}</th>
-                            <th>{% trans %}Topic{% endtrans %}</th>
-                            <th>{% trans %}Reporter{% endtrans %}</th>
-                            <th>{% trans %}Reason{% endtrans %}</th>
-                            <th>{% trans %}Reported{% endtrans %}</th>
+                            <th>Poster</th>
+                            <th>Topic</th>
+                            <th>Reporter</th>
+                            <th>Reason</th>
+                            <th>Reported</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -44,7 +44,7 @@
                         </tr>
                         {% else %}
                         <tr>
-                            <td colspan="6">{% trans %}No reports.{% endtrans %}</td>
+                            <td colspan="6">No reports.</td>
                         </tr>
                         {% endfor %}
                     </tbody>
diff --git a/openspending/templates/forum/management/settings.html b/openspending/templates/forum/management/settings.html
deleted file mode 100644
index 2200dc30..00000000
--- a/openspending/templates/forum/management/settings.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% set page_title = active_group.name %}
-
-{% extends theme("management/management_layout.html") %}
-{% block management_content %}
-{% from theme('macros.html') import render_boolean_field, render_select_field, render_field, navlink with context %}
-
-<div class="col-md-3">
-    <ul class="nav nav-pills nav-stacked">
-        {% for group in all_groups %}
-            {% if group.key == active_group.key %}
-                <li class="active"><a href="{{ url_for('management.settings', slug=group.key) }}">{{ group.name }}</a></li>
-            {% else %}
-                <li><a href="{{ url_for('management.settings', slug=group.key) }}">{{ group.name }}</a></li>
-            {% endif %}
-        {% endfor %}
-    </ul>
-</div><!--/.col-md-3 -->
-
-<div class="col-md-9">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    <span class="fa fa-cogs"></span> {{ active_group.name }}
-                </div>
-                <div class="panel-body">
-                    <form class="form-horizontal" role="form" method="post">
-                        {{ form.hidden_tag() }}
-                        {% for field in form %}
-                            {% if field.type not in ["TextField", "IntegerField"] %}
-                                {% if field.type == "BooleanField" %}
-                                    {{ render_boolean_field(field) }}
-                                {% endif %}
-
-                                {% if field.type in ["SelectField", "SelectMultipleField"] %}
-                                    {{ render_select_field(field) }}
-                                {% endif %}
-                            {% else %}
-                                {{ render_field(field) }}
-                            {% endif %}
-                        {%  endfor %}
-
-                        <button type="submit" class="btn btn-success">{% trans %}Save{% endtrans %}</button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/openspending/templates/forum/management/unread_reports.html b/openspending/templates/forum/management/unread_reports.html
index b6cd3bac..3cb1587e 100644
--- a/openspending/templates/forum/management/unread_reports.html
+++ b/openspending/templates/forum/management/unread_reports.html
@@ -1,14 +1,14 @@
-{% set page_title = _("Unread Reports") %}
+{% set page_title = "Unread Reports" %}
 {% set active_management_report_nav=True %}
 
-{% extends theme("management/management_layout.html") %}
+{% extends "forum/management/management_layout.html" %}
 {% block management_content %}
-{% from theme('macros.html') import render_pagination, navlink with context %}
+{% from 'forum/macros.html' import render_pagination, navlink with context %}
 
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.unread_reports', _("Show unread reports")) }}
-        {{ navlink('management.reports', _("Show all reports")) }}
+        {{ navlink('management.unread_reports', "Show unread reports") }}
+        {{ navlink('management.reports', "Show all reports") }}
     </ul>
 </div>
 
@@ -17,7 +17,7 @@
         <div class="col-md-12">
             <div class="panel panel-primary">
                 <div class="panel-heading">
-                    <span class="fa fa-flag"></span> {% trans %}Unread Reports{% endtrans %}
+                    <span class="fa fa-flag"></span> Unread Reports
                 </div>
                 <div class="panel-body management-body"></div>
 
@@ -26,20 +26,20 @@
                         <tr>
                             <th><input type="checkbox" name="rowtoggle" class="action-checkall" title="Select All"/></th>
                             <th>#</th>
-                            <th>{% trans %}Poster{% endtrans %}</th>
-                            <th>{% trans %}Topic{% endtrans %}</th>
-                            <th>{% trans %}Reporter{% endtrans %}</th>
-                            <th>{% trans %}Reason{% endtrans %}</th>
-                            <th>{% trans %}Reported{% endtrans %}</th>
+                            <th>Poster</th>
+                            <th>Topic</th>
+                            <th>Reporter</th>
+                            <th>Reason</th>
+                            <th>Reported</th>
                             <th>
                                 <div class="btn-group">
                                     <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                        <span class="fa fa-cog" style="margin-right: 0px;"></span> {% trans %}Actions{% endtrans %}
+                                        <span class="fa fa-cog" style="margin-right: 0px;"></span> Actions
                                     </button>
                                     <ul class="dropdown-menu slidedown">
                                         <li>
-                                            <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.report_markread') }}', '{% trans %}Are you sure you want to mark these Reports as read?{% endtrans %}')">
-                                                <span class="fa fa-flag-o text-primary"></span> {% trans %}Mark as Read{% endtrans %}
+                                            <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.report_markread') }}', 'Are you sure you want to mark these Reports as read?')">
+                                                <span class="fa fa-flag-o text-primary"></span> Mark as Read
                                             </a>
                                         </li>
                                     </ul>
@@ -61,14 +61,14 @@
                                 <form class="inline-form" id="read-{{report.id}}" method="post" action="{{ url_for('management.report_markread', report_id=report.id) }}">
                                     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
                                     <button class="btn btn-link">
-                                        <span class="fa fa-flag-o text-primary" data-toggle="tooltip" data-placement="top" title="{% trans %}Mark as Read{% endtrans %}"></span>
+                                        <span class="fa fa-flag-o text-primary" data-toggle="tooltip" data-placement="top" title="Mark as Read"></span>
                                     </button>
                                 </form>
                             </td>
                         </tr>
                         {% else %}
                         <tr>
-                            <td colspan="7">{% trans %}No unread reports.{% endtrans %}</td>
+                            <td colspan="7">No unread reports.</td>
                         </tr>
                         {% endfor %}
                     </tbody>
diff --git a/openspending/templates/forum/management/user_form.html b/openspending/templates/forum/management/user_form.html
deleted file mode 100644
index 2ee46be1..00000000
--- a/openspending/templates/forum/management/user_form.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% set page_title = title %}
-{% set active_management_user_nav=True %}
-
-{% extends theme("management/management_layout.html") %}
-{% block management_content %}
-{% from theme("macros.html") import horizontal_field, horizontal_select_field, navlink with context %}
-
-<div class="col-md-3">
-    <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.users', _("Manage Users")) }}
-        {{ navlink('management.banned_users', _('Banned Users')) }}
-
-        {% if current_user|is_admin %}
-            {{ navlink('management.add_user', _("Add User")) }}
-        {% endif %}
-    </ul>
-</div><!--/.col-md-3 -->
-
-<div class="col-md-9">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    <span class="fa fa-user-plus"></span> {{ title }}
-                </div>
-                <div class="panel-body">
-                    <form class="form-horizontal" role="form" method="post">
-                        {{ form.hidden_tag() }}
-                        {{ horizontal_field(form.username) }}
-                        {{ horizontal_field(form.email) }}
-                        {{ horizontal_field(form.password) }}
-                        {{ horizontal_select_field(form.birthday, surrounded_div="col-sm-4") }}
-                        {{ horizontal_field(form.gender) }}
-                        {{ horizontal_field(form.location) }}
-                        {{ horizontal_field(form.website) }}
-                        {{ horizontal_field(form.avatar) }}
-                        {{ horizontal_field(form.primary_group) }}
-                        {{ horizontal_field(form.secondary_groups) }}
-                        {{ horizontal_field(form.signature, rows=5, div_class="col-sm-9") }}
-                        {{ horizontal_field(form.notes, rows=12, div_class="col-sm-9") }}
-                        {{ horizontal_field(form.submit) }}
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/openspending/templates/forum/management/users.html b/openspending/templates/forum/management/users.html
deleted file mode 100644
index f76eee8d..00000000
--- a/openspending/templates/forum/management/users.html
+++ /dev/null
@@ -1,163 +0,0 @@
-{% set page_title = _("Users") %}
-{% set active_management_user_nav=True %}
-
-{% extends theme("management/management_layout.html") %}
-{% block management_content %}
-{% from theme('macros.html') import render_pagination, render_field, group_field, navlink with context %}
-
-<div class="col-md-3">
-    <ul class="nav nav-pills nav-stacked">
-        {{ navlink('management.users', _("Manage Users")) }}
-        {{ navlink('management.banned_users', _('Banned Users')) }}
-
-        {% if current_user|is_admin %}
-            {{ navlink('management.add_user', _("Add User")) }}
-        {% endif %}
-    </ul>
-</div><!--/.col-md-3 -->
-
-<div class="col-md-9">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-
-                    <span class="fa fa-user"></span> {% trans %}Users{% endtrans %}
-
-                    <div class="pull-right action-buttons">
-                        <div class="btn-group pull-right">
-                            <button type="button" class="btn btn-default btn-xs" onclick="return show_management_search()">
-                                <span class="fa fa-search" style="margin-right: 0px;"></span> {% trans %}Search{% endtrans %}
-                            </button>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="panel-body management-body">
-                    <form class="search-form" role="form" method="post">
-                        {{ search_form.hidden_tag() }}
-                        <div class="input-group">
-                            {{ group_field(search_form.search_query, css_class="form-control") }}
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type="button"><span class="fa fa-search"></span></button>
-                            </span>
-                        </div>
-                    </form>
-                </div>
-
-                    <table class="table table-hover">
-                        <thead>
-                            <tr>
-                                <th><input type="checkbox" name="rowtoggle" class="action-checkall" title="Select All"/></th>
-                                <th>#</th>
-                                <th>{% trans %}Username{% endtrans %}</th>
-                                <th>{% trans %}Posts{% endtrans %}</th>
-                                <th>{% trans %}Date registered{% endtrans %}</th>
-                                <th>{% trans %}Group{% endtrans %}</th>
-                                <th>
-                                    <div class="btn-group">
-                                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
-                                            <span class="fa fa-cog" style="margin-right: 0px;"></span> {% trans %}Actions{% endtrans %}
-                                        </button>
-                                        <ul class="dropdown-menu slidedown">
-                                            <li>
-                                                <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.ban_user') }}', '{% trans %}Are you sure you want to ban these Users?{% endtrans %}')">
-                                                    <span class="fa fa-flag text-warning"></span> {% trans %}Ban selected Users{% endtrans %}
-                                                </a>
-                                            </li>
-
-                                            <li>
-                                                <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.unban_user') }}', '{% trans %}Are you sure you want to unban these Users?{% endtrans %}')">
-                                                    <span class="fa fa-flag text-success"></span> {% trans %}Unban selected Users{% endtrans %}
-                                                </a>
-                                            </li>
-
-                                            <li>
-                                                <a href="javascript:void(0)" onclick="return bulk_actions.execute('{{ url_for('management.delete_user') }}', '{% trans %}Are you sure you want to delete these Users?{% endtrans %}')">
-                                                    <span class="fa fa-trash text-danger"></span> {% trans %}Delete selected Users{% endtrans %}
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        {% for user in users.items %}
-                            <tr class="action-row">
-                                <td><input type="checkbox" name="rowid" class="action-checkbox" value="{{ user.id }}" title="Select User"/></td>
-                                <td>{{ user.id }}</td>
-                                <td><a href="{{ url_for('user.profile', username=user.username) }}">{{ user.username }}</a></td>
-                                <td>{{ user.post_count }}</td>
-                                <td>{{ user.date_joined|format_date('%b %d %Y') }}</td>
-                                <td>{{ user.primary_group.name }}</td>
-                                <td>
-                                    {% if current_user|can_edit_user and not user|is_admin or current_user|is_admin %}
-                                        <a href="{{ url_for('management.edit_user', user_id = user.id) }}">
-                                            <span class="fa fa-pencil text-primary" data-toggle="tooltip" data-placement="top" title="{% trans %}Edit{% endtrans %}"></span>
-                                        </a>
-                                    {% endif %}
-
-                                    {% if current_user|can_ban_user and not user.permissions['banned'] %}
-                                        <form class="inline-form" id="ban-{{user.id}}" method="post" action="{{ url_for('management.ban_user', user_id = user.id) }}">
-                                            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-
-                                            <button class="btn btn-link">
-                                                <span class="fa fa-flag text-warning" data-toggle="tooltip" data-placement="top" title="{% trans %}Ban{% endtrans %}"></span>
-                                            </button>
-                                        </form>
-                                    {% endif %}
-
-                                    {% if current_user|can_ban_user and user.permissions['banned'] %}
-                                        <form class="inline-form" id="unban-{{user.id}}" method="post" action="{{ url_for('management.unban_user', user_id = user.id) }}">
-                                            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-
-                                            <button class="btn btn-link">
-                                                <span class="fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="{% trans %}Unban{% endtrans %}"></span>
-                                            </button>
-                                        </form>
-                                    {% endif %}
-
-                                    {% if current_user|is_admin %}
-                                    <form class="inline-form" id="delete-{{user.id}}" method="post" action="{{ url_for('management.delete_user', user_id = user.id) }}">
-                                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-
-                                        <button class="btn btn-link">
-                                            <span class="fa fa-trash text-danger" data-toggle="tooltip" data-placement="top" title="{% trans %}Delete{% endtrans %}"></span>
-                                        </button>
-                                    </form>
-                                    {% endif %}
-                                </td>
-                            </tr>
-                        {% else %}
-                            <tr>
-                                <td colspan="6">
-                                    {% trans %}No users found matching your search criteria.{% endtrans %}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-
-                <div class="panel-footer">
-                    <div class="row">
-                        <div class="col-md-12">
-                            {{ render_pagination(users, url_for('management.users')) }}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-    <script>
-    var bulk_actions = new BulkActions();
-
-    $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
-    })
-    </script>
-{% endblock %}
diff --git a/openspending/templates/includes/navigation.jade b/openspending/templates/includes/navigation.jade
index fa2ab26b..5684ef40 100644
--- a/openspending/templates/includes/navigation.jade
+++ b/openspending/templates/includes/navigation.jade
@@ -51,6 +51,7 @@ nav.navbar.navbar-default.navbar-fixed-top
               p
                 strong Admin Only
               a(href="/admin") Admin Section
+              a(href="{{ url_for('management.overview') }}") Forum Management
               a(href="{{ url_for('findadmin.dataloader') }}") Data Loader
             {% endif %}
             li.divider