diff --git a/modoboa/core/templates/core/parameters.html b/modoboa/core/templates/core/parameters.html
index 1c2d4448d..7c8272790 100644
--- a/modoboa/core/templates/core/parameters.html
+++ b/modoboa/core/templates/core/parameters.html
@@ -2,6 +2,7 @@
 <h2>{% trans "Parameters" %} <small>{% trans "Configure Modoboa" %}</small></h2><hr />
 <form id="settings_form" method="POST" action="{% url 'core:parameter_save' %}" class="form-horizontal">{% csrf_token %}
   {% include "common/parameters.html" %}
+  <hr>
+  <button type="submit" class="btn btn-primary col-xs-offset-4 col-xs-4" id="update" name="update">{% trans 'Save' %}</button>
 </form>
-<hr>
-<a href="#" class="btn btn-primary col-lg-offset-7 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</a>
+
diff --git a/modoboa/core/templates/core/user_preferences.html b/modoboa/core/templates/core/user_preferences.html
index 6c093fb49..ef073e653 100644
--- a/modoboa/core/templates/core/user_preferences.html
+++ b/modoboa/core/templates/core/user_preferences.html
@@ -5,5 +5,5 @@
       id="uprefs_form">{% csrf_token %}
   {% include "common/parameters.html" %}
   <hr>
-  <button type="submit" class="btn btn-primary col-lg-offset-8 col-md-offset-7 col-sm-offset-7 col-lg-1 col-md-2 col-sm-2" id="update" name="update">{% trans 'Save' %}</button>
+  <button type="submit" class="btn btn-primary col-xs-offset-4 col-xs-4" id="update" name="update">{% trans 'Save' %}</button>
 </form>
diff --git a/modoboa/extensions/admin/templates/admin/domains.html b/modoboa/extensions/admin/templates/admin/domains.html
index 44485ac2e..ec4025f0c 100644
--- a/modoboa/extensions/admin/templates/admin/domains.html
+++ b/modoboa/extensions/admin/templates/admin/domains.html
@@ -3,6 +3,7 @@
 {% block pagetitle %}{% trans "Domains" %}{% endblock %}
 
 {% block extra_css %}
+{{ block.super }}
 {% extra_static_content "domains" "css" user %}
 {% endblock %}
 
diff --git a/modoboa/extensions/admin/templates/admin/identities.html b/modoboa/extensions/admin/templates/admin/identities.html
index 250c8dfd1..dde5b0e5f 100644
--- a/modoboa/extensions/admin/templates/admin/identities.html
+++ b/modoboa/extensions/admin/templates/admin/identities.html
@@ -1,9 +1,11 @@
-{% extends "admin/listing.html" %}{% load admin_tags lib_tags i18n %}{% load url from future %}
+{% extends "admin/listing.html" %}
+{% load admin_tags lib_tags i18n %}{% load url from future %}
 {% load static %}
 
 {% block pagetitle %}{% trans "Identities" %}{% endblock %}
 
 {% block extra_css %}
+{{ block.super }}
 {% extra_static_content "identities" "css" user %}
 {% endblock %}
 
diff --git a/modoboa/extensions/postfix_relay_domains/app_settings.py b/modoboa/extensions/postfix_relay_domains/app_settings.py
index 2ce3ab88f..107a16979 100644
--- a/modoboa/extensions/postfix_relay_domains/app_settings.py
+++ b/modoboa/extensions/postfix_relay_domains/app_settings.py
@@ -1,11 +1,22 @@
+"""
+Relay domains settings definition.
+"""
+
 from django import forms
 from django.utils.translation import ugettext_lazy
+
 from modoboa.lib import parameters
+from modoboa.lib.formutils import SeparatorField
 
 
 class AdminParametersForm(parameters.AdminParametersForm):
+
+    """Admin parameters definition."""
+
     app = "postfix_relay_domains"
 
+    general_sep = SeparatorField(label=ugettext_lazy("General"))
+
     master_cf_path = forms.CharField(
         label=ugettext_lazy("Postfix's master.cf path"),
         initial="/etc/postfix/master.cf",
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 911cae2d7..c51c3d5cb 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -55,7 +55,7 @@ def progress_color(value):
         return "progress-bar progress-bar-info"
     if value < 80:
         return "progress-bar progress-bar-warning"
-    return "progress-bar-danger"
+    return "progress-bar progress-bar-danger"
 
 
 @register.filter
diff --git a/modoboa/static/js/jquery.infinitescroll.js b/modoboa/static/js/jquery.infinitescroll.js
index 23de4b23e..814e766f4 100644
--- a/modoboa/static/js/jquery.infinitescroll.js
+++ b/modoboa/static/js/jquery.infinitescroll.js
@@ -135,8 +135,13 @@
          * @param {Array} new_pages - the new loaded pages
          */
         reset_loaded_pages: function(new_pages) {
-            this.current_page = new_pages[0];
-            this.loaded_pages = new_pages;
+            if (new_pages !== undefined) {
+                this.current_page = new_pages[0];
+                this.loaded_pages = new_pages;
+            } else {
+                this.current_page = this.$options.initial_page;
+                this.loaded_pages = [this.$options.initial_pages];
+            }
             this.end_of_results = false;
         },