diff --git a/modoboa/extensions/admin/templates/admin/domain_general_form.html b/modoboa/extensions/admin/templates/admin/domain_general_form.html
index 785eb3212..7a79f0b51 100644
--- a/modoboa/extensions/admin/templates/admin/domain_general_form.html
+++ b/modoboa/extensions/admin/templates/admin/domain_general_form.html
@@ -1,5 +1,5 @@
 {% load i18n form_tags %}
 {% render_field form.name %}
-{% render_field_appended form.quota _("MB") %}
+{% render_field form.quota appended_text=_("MB") %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
diff --git a/modoboa/extensions/admin/templates/admin/domain_options_form.html b/modoboa/extensions/admin/templates/admin/domain_options_form.html
index 5aad7717f..0993c11fa 100644
--- a/modoboa/extensions/admin/templates/admin/domain_options_form.html
+++ b/modoboa/extensions/admin/templates/admin/domain_options_form.html
@@ -1,7 +1,7 @@
 {% load i18n form_tags %}
 {% if form.fields %}
 {% render_field form.create_dom_admin %}
-{% render_field_appended form.dom_admin_username "@" %}
+{% render_field form.dom_admin_username appended_text="@" %}
 {% render_field form.create_aliases %}
 {% else %}
 <div class="alert alert-warning">{% trans "You can't create a new domain administrator" %}</div>
diff --git a/modoboa/extensions/admin/templates/admin/newdomainform.html b/modoboa/extensions/admin/templates/admin/newdomainform.html
index b8743c9ed..8b4d2ba29 100644
--- a/modoboa/extensions/admin/templates/admin/newdomainform.html
+++ b/modoboa/extensions/admin/templates/admin/newdomainform.html
@@ -1,6 +1,6 @@
 {% extends "common/generic_modal_form.html" %}{% load form_tags %}{% block formbody %}
 {% render_field form.name %}
-{% render_field_appended form.quota _("MB") %}
+{% render_field form.quota appended_text=_("MB") %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
 {% endblock %}
diff --git a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
index 45ba0ee18..b15a6390b 100644
--- a/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
+++ b/modoboa/extensions/amavis/templates/amavis/domain_content_filter.html
@@ -14,5 +14,5 @@
   </div>
   <span class="help-block">{% trans "or more throw spam message away" %}</span>
 </div>
-{% render_field_with_activator form.spam_subject_tag2 _("default") %}
+{% render_field form.spam_subject_tag2 activator=True activator_label=_("default") %}
 {% render_field form.bypass_banned_checks %}
diff --git a/modoboa/extensions/amavis/templates/amavis/index.html b/modoboa/extensions/amavis/templates/amavis/index.html
index cad7f7ca7..674d7de91 100644
--- a/modoboa/extensions/amavis/templates/amavis/index.html
+++ b/modoboa/extensions/amavis/templates/amavis/index.html
@@ -23,6 +23,6 @@ $(document).ready(function() {
   <div id="menubar">{% quar_menu %}</div>
 </div>
 <div class="row">
-  <div id="listing" class="col-lg-12 col-md-12 col-dm-12 col-xs-12"></div>
+  <div id="listing" class="col-xs-12 fluid-content-quarantine"></div>
 </div>
 {% endblock %}
diff --git a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
index e1ab3e40d..e2e91c5a5 100644
--- a/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
+++ b/modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js
@@ -75,13 +75,13 @@ RelayDomains.prototype = {
     },
 
     srv_tag_handler: function(tag, $link) {
-        if (this.navobj.getparam(tag + "filter") == undefined && $link.hasClass(tag)) {
+        if (this.navobj.getparam(tag + "filter") === undefined && $link.hasClass(tag)) {
             var text = $link.attr("name");
             this.navobj
                 .setparam("domfilter", "relaydomain")
                 .setparam(tag + "filter", text)
                 .update();
-            if ($("a[name=dom]").length == 0) {
+            if ($("a[name=dom]").length === 0) {
                 $("#searchform").parent().after(this.make_tag("relaydomain", "dom"));
             }
             $("#searchform").parent().after(this.make_tag(text, tag));
diff --git a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
index 0e8c43637..13c6869a5 100644
--- a/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
+++ b/modoboa/extensions/postfix_relay_domains/templates/postfix_relay_domains/relaydomain_form.html
@@ -1,7 +1,7 @@
 {% load form_tags %}
 {% render_field form.name %}
 {% render_field form.target_host %}
-{% include "postfix_relay_domains/service_field.html" with field=form.service %}
+{% include "postfix_relay_domains/service_field.html" with field=form.service label_width="col-sm-4" %}
 {% render_fields_group form "aliases" %}
 {% render_field form.enabled %}
 {% render_field form.verify_recipients %}
diff --git a/modoboa/extensions/radicale/templates/radicale/rightsform.html b/modoboa/extensions/radicale/templates/radicale/rightsform.html
index 1017a4aae..8f9e4e750 100644
--- a/modoboa/extensions/radicale/templates/radicale/rightsform.html
+++ b/modoboa/extensions/radicale/templates/radicale/rightsform.html
@@ -1,5 +1,5 @@
 {% load lib_tags radicale_tags %}
-{% if error %}<div class="alert alert-error">{{ error }}</div>{% endif %}
+{% if error %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
 <form action="{{ action }}" method="POST" id="{{ formid }}">
   {% csrf_token %}
   <div class="form-inline" id="original_row">
diff --git a/modoboa/lib/templatetags/form_tags.py b/modoboa/lib/templatetags/form_tags.py
index a1c98561b..5d4e01a42 100644
--- a/modoboa/lib/templatetags/form_tags.py
+++ b/modoboa/lib/templatetags/form_tags.py
@@ -38,42 +38,19 @@ def configure_field_classes(field):
 @register.simple_tag
 def render_field(
         field, help_display_mode="tooltip", label_width="col-sm-4",
-        hidden=False):
+        **options):
     """Render a field."""
     from modoboa.core.templatetags.core_tags import visirule
 
     if type(field.field) is SeparatorField:
         return "<h5%s>%s</h5>" % (visirule(field), unicode(field.label))
     configure_field_classes(field)
-    return render_to_string("common/generic_field.html", dict(
-        field=field, help_display_mode=help_display_mode,
-        label_width=label_width, hidden=hidden
-    ))
-
-
-@register.simple_tag
-def render_field_appended(field, text):
-    configure_field_classes(field)
-    return render_to_string("common/generic_field.html", dict(
-        field=field, help_display_mode="tooltip", appended_text=text
-    ))
-
-
-@register.simple_tag
-def render_field_with_activator(field, activator_label=ugettext_lazy("activate")):
-    configure_field_classes(field)
-    return render_to_string("common/generic_field.html", {
-        "field": field, "help_display_mode": "tooltip", "activator": True,
-        "activator_label": activator_label, "deactivate_if_empty": True
-    })
-
-
-@register.simple_tag
-def render_and_hide_field(field):
-    configure_field_classes(field)
-    return render_to_string("common/generic_field.html", dict(
-        field=field, hidden=True
-    ))
+    context = {
+        "field": field, "help_display_mode": help_display_mode,
+        "label_width": label_width, "deactivate_if_empty": True
+    }
+    context.update(options)
+    return render_to_string("common/generic_field.html", context)
 
 
 @register.simple_tag
diff --git a/modoboa/static/js/dynamic_input.js b/modoboa/static/js/dynamic_input.js
index 08fe2c9bb..509c29c24 100644
--- a/modoboa/static/js/dynamic_input.js
+++ b/modoboa/static/js/dynamic_input.js
@@ -25,7 +25,7 @@
         addrmlink: function(input) {
             var $rmlink = $('<a href="#"'
                 + 'id="' + input.attr("id") + '_rmbtn' + '"'
-                + '"><i class="glyphicon glyphicon-remove"></i></a>');
+                + '"><i class="fa fa-remove"></i></a>');
 
             $rmlink.click($.proxy(this.removeinput, $rmlink));
             return $rmlink;
@@ -102,4 +102,4 @@
         emptylabel: ""
     };
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index d40dafb55..599498644 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -86,7 +86,7 @@ function build_alert_box(msg, level) {
 }
 
 function build_error_alert(msg) {
-    return build_alert_box(msg, 'error');
+    return build_alert_box(msg, 'danger');
 }
 
 function build_success_alert(msg) {
@@ -152,12 +152,12 @@ function display_form_errors(formid, data) {
  */
 function simple_ajax_form_post(e, options) {
     e.preventDefault();
-    var $form = (options.formid != undefined) ? $("#" + options.formid) : $("form");
+    var $form = (options.formid !== undefined) ? $("#" + options.formid) : $("form");
     var defaults = {reload_on_success: true, reload_mode: 'full', modal: true};
     var opts = $.extend({}, defaults, options);
     var args = $form.serialize();
 
-    if (options.extradata != undefined) {
+    if (options.extradata !== undefined) {
         args += "&" + options.extradata;
     }
     $.ajax({
@@ -210,12 +210,12 @@ function gethref(obj) {
     var re = new RegExp("^(https?):");
     var scheme = re.exec(url);
 
-    if (scheme != null) {
+    if (scheme !== null) {
         var baseurl = scheme[0] + "://" + location.host + location.pathname;
         return url.replace(baseurl, "");
     }
     return url;
-};
+}
 
 /*
  * Extract the current URL parameters into a dictionnary.
diff --git a/modoboa/templates/common/generic_modal_form.html b/modoboa/templates/common/generic_modal_form.html
index 8f3294cf6..fec8c8fcf 100644
--- a/modoboa/templates/common/generic_modal_form.html
+++ b/modoboa/templates/common/generic_modal_form.html
@@ -3,7 +3,7 @@
 {% load form_tags %}
 
 {% block modalbody %}
-  {% if error %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
+  {% if error %}<div class="alert alert-danger" role="alert">{{ error }}</div>{% endif %}
 <form class="form-horizontal" action="{{ action }}" enctype="{{ enctype }}" 
       method="POST" id="{{ formid }}" name="{{ formid }}" role="form"
       target="{{ target }}">
diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index 0af657465..cd861f50c 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -18,11 +18,11 @@ class DeployTest(unittest.TestCase):
     def setUp(self):
         self.workdir = tempfile.mkdtemp()
 
-    def tearDown(self):
+    def tearDown(self): 
         path = os.path.join(self.workdir, self.projname)
         code, output = exec_cmd(
             "python manage.py test core lib admin limits postfix_relay_domains"
-            "radicale postfix_autoreply",
+            " radicale postfix_autoreply",
             capture_output=False,
             cwd=path
         )