diff --git a/admin/templatetags/admin_extras.py b/admin/templatetags/admin_extras.py
index 43040fde4..8b707452c 100644
--- a/admin/templatetags/admin_extras.py
+++ b/admin/templatetags/admin_extras.py
@@ -149,15 +149,15 @@ def loadadminextmenu(user):
 
 @register.simple_tag
 def param(app, definition):
-    result = """<div class='control-group'>
-  <label class="param-label">%s</label>
-  <div class="param-controls">""" \
-        % (definition.has_key("label") and _(definition["label"]) 
-           or definition["name"])
     name = "%s.%s" % (app, definition["name"])
     value = definition.has_key("value") \
         and definition["value"] or definition["deflt"]
 
+    result = """<div class='control-group'>
+  <label class="param-label" for="%s">%s</label>
+  <div class="param-controls">""" \
+        % (name, definition.has_key("label") and _(definition["label"]) 
+           or definition["name"])
     if definition["type"] in ["string", "int"]:
         result += """
   <input type='text' name='%s' id='%s' value='%s' />""" % (name, name, value)
@@ -188,10 +188,6 @@ def param(app, definition):
         result += """
 <p class="help-block">%s</p>
 """ % definition["help"]
-  #       result += """
-  # <a href='%s' onclick='return false;' class='Tips' title='%s'>
-  #   <img src='%s' border='0' />
-  # </a>""" % (_(definition["help"]), _("Help"), static_url("pics/info.png"))
     result += """
   </div>
 </div>
diff --git a/extensions/amavis_quarantine/sql_listing.py b/extensions/amavis_quarantine/sql_listing.py
index 5d11f2543..b13ceb6fe 100644
--- a/extensions/amavis_quarantine/sql_listing.py
+++ b/extensions/amavis_quarantine/sql_listing.py
@@ -14,9 +14,11 @@ class Qtable(tables.Table):
     styles = "table-condensed"
     idkey = "mailid"
 
-    type = tables.Column("type", align="center", width="30px",
-                         label="<input type='checkbox' name='toggleselect' id='toggleselect' />",
-                         sortable=False)
+    type = tables.Column(
+        "type", align="center", width="30px",
+        label="<input type='checkbox' name='toggleselect' id='toggleselect' />",
+        sortable=False
+        )
     rstatus = tables.ImgColumn("rstatus", width='25px')
     from_ = tables.Column("from", label=ugettext_noop("From"), limit=30)
     subject = tables.Column("subject", label=ugettext_noop("Subject"), limit=40)
diff --git a/extensions/amavis_quarantine/templatetags/amextras.py b/extensions/amavis_quarantine/templatetags/amextras.py
index 176697576..3257a9df3 100644
--- a/extensions/amavis_quarantine/templatetags/amextras.py
+++ b/extensions/amavis_quarantine/templatetags/amextras.py
@@ -85,6 +85,9 @@ def quar_menu(user):
                 {"name" : "selectmsgs",
                  "url" : "S",
                  "label" : _("Spam")},
+                {"name" : "selectmsgs",
+                 "url" : "V",
+                 "label" : _("Virus")},
                 {"name" : "selectmsgs",
                  "url" : "H",
                  "label" : _("Bad header")},
diff --git a/templates/admin/extensions.html b/templates/admin/extensions.html
index bb79fc1cc..0089b2618 100644
--- a/templates/admin/extensions.html
+++ b/templates/admin/extensions.html
@@ -4,4 +4,5 @@
 <form method="POST" action="{% url admin.views.saveextensions %}">
   {{ extensions|safe }}
 </form>
+<a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
 {% endblock %}
diff --git a/templates/admin/parameters.html b/templates/admin/parameters.html
index 5379e0177..19dd5486f 100644
--- a/templates/admin/parameters.html
+++ b/templates/admin/parameters.html
@@ -5,4 +5,6 @@
 <form method="POST" action="{{ action }}" id="params_form" class="form-horizontal">
   {% include "common/parameters.html" %}
 </form>
+<hr>
+<a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
 {% endblock %}
diff --git a/templates/admin/settings_header.html b/templates/admin/settings_header.html
index 053a7a51c..90fbbb47b 100644
--- a/templates/admin/settings_header.html
+++ b/templates/admin/settings_header.html
@@ -20,8 +20,3 @@ $(document).ready(function() {
 </script>
 {% endblock %}
 {% block leftcol %}<div class="well sidebar-nav">{% settings_menu selection user %}</div>{% endblock %}
-{% block footerright %}
-<div class="pull-right padded5">
-  <a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
-</div>
-{% endblock %}
diff --git a/templates/common/parameters.html b/templates/common/parameters.html
index 68bc7f1b0..300213510 100644
--- a/templates/common/parameters.html
+++ b/templates/common/parameters.html
@@ -2,18 +2,13 @@
 {% if gparams %}
   <div class="tabbable">
     <ul class="nav nav-tabs">
-      {% for app in gparams %}
-      <li{% if forloop.first %} class="active"{% endif %}><a href="#{{ forloop.counter }}" data-toggle="tab">{{ app.name }}</a></li>
+      {% for app in gparams %}<li{% if forloop.first %} class="active"{% endif %}><a href="#{{ forloop.counter }}" data-toggle="tab">{{ app.name }}</a></li>
       {% endfor %}
     </ul>
-    <div class="tab-content">
-      {% for app in gparams %}
+    <div class="tab-content">{% for app in gparams %}
       <div class="tab-pane{% if forloop.first %} active{% endif %}" id="{{ forloop.counter }}">
-        {% for p in app.params %}
-        {% param app.name p %}
-        {% endfor %}
-      </div>
-      {% endfor %}
+        {% for p in app.params %}{% param app.name p %}{% endfor %}
+      </div>{% endfor %}
     </div>
   </div>
 {% else %}
diff --git a/templates/userprefs/preferences.html b/templates/userprefs/preferences.html
index 1cc3c7ee0..623e25059 100644
--- a/templates/userprefs/preferences.html
+++ b/templates/userprefs/preferences.html
@@ -23,9 +23,6 @@ $(document).ready(function() {
         id="uparams_form">
     {% include "common/parameters.html" %}
   </form>
-{% endblock %}
-{% block footerright %}
-<div class="pull-right padded5">
+  <hr>
   <a href="#" class="btn btn-primary" id="update" name="update">{% trans 'Save' %}</a>
-</div>
 {% endblock %}