diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 3d84e595..4cebdc2c 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -1,6 +1,7 @@
 {% set env='mailu.env' %}
 # This file is auto-generated by the Mailu configuration wizard.
 # Please read the documentation before attempting any change.
+# Generated for {{ flavor }} flavor
 
 version: '3.6'
 
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index fba5bee8..dc788bea 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -1,5 +1,7 @@
 # Mailu main configuration file
 #
+# Generated for {{ flavor }} flavor
+#
 # This file is autogenerated by the configuration management wizard.
 # For a detailed list of configuration variables, see the documentation at
 # https://mailu.io
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 3f56d571..f27b661f 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -1,3 +1,8 @@
+{% set env='mailu.env' %}
+# This file is auto-generated by the Mailu configuration wizard.
+# Please read the documentation before attempting any change.
+# Generated for {{ flavor }} flavor
+
 version: '3.6'
 
 services:
diff --git a/setup/server.py b/setup/server.py
index 4e29fe9e..7818e662 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -68,7 +68,8 @@ def build_app(path):
         @bp.route("/submit_flavor", methods=["POST"])
         def submit_flavor():
             data = flask.request.form.copy()
-            return flask.render_template('wizard.html', flavor=data["flavor"])
+            flavor_files = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"]))
+            return flask.render_template('wizard.html', flavor=data["flavor"], flavor_files=flavor_files)
 
         @bp.route("/submit", methods=["POST"])
         def submit():
diff --git a/setup/templates/base.html b/setup/templates/base.html
index d40a4880..5be0b1eb 100644
--- a/setup/templates/base.html
+++ b/setup/templates/base.html
@@ -8,7 +8,7 @@
   <h1>Mailu configuration</h1>
   <p>
     Version
-    <select onchange="window.location.href=this.value;">
+    <select onchange="window.location.href=this.value;" class="btn btn-primary dropdown-toggle">
       {% for available in versions %}
       <option value="{{ url_for('{}.wizard'.format(available)) }}" {% if available == version %}selected{% endif %}>{{ available }}</option>
       {% endfor %}
diff --git a/setup/templates/steps/compose/config.html b/setup/templates/steps/compose/01_config.html
similarity index 95%
rename from setup/templates/steps/compose/config.html
rename to setup/templates/steps/compose/01_config.html
index 8d613d08..cfca8aa7 100644
--- a/setup/templates/steps/compose/config.html
+++ b/setup/templates/steps/compose/01_config.html
@@ -1,5 +1,5 @@
 {% call macros.panel("info", "Step 2 - Initial configuration") %}
-<p>Before starting some variables must be st</p>
+<p>Before starting some variables must be set</p>
 
 <div class="form-group">
   <label>Root path: </label>
@@ -29,7 +29,7 @@
 <div class="form-group">
   <label>Choose how secure connections will behave </label>
   <br/>
-  <select name="tls_flavor">
+  <select class="btn btn-primary dropdown-toggle" name="tls_flavor">
   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %}
   	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option>
   	{% endfor %}
diff --git a/setup/templates/steps/compose/services.html b/setup/templates/steps/compose/02_services.html
similarity index 97%
rename from setup/templates/steps/compose/services.html
rename to setup/templates/steps/compose/02_services.html
index d8ec8106..07bca6ba 100644
--- a/setup/templates/steps/compose/services.html
+++ b/setup/templates/steps/compose/02_services.html
@@ -26,7 +26,7 @@ accessing messages for beginner users.</p>
 <!--     {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }} -->
 <!--   </div> -->
   <br/>
-  <select name="webmail_type">
+  <select class="btn btn-primary dropdown-toggle" name="webmail_type">
   	{% for webmailtype in ["none", "roundcube", "rainloop"] %}
   	<option value="{{ webmailtype }}" >{{ webmailtype }}</option>
   	{% endfor %}
diff --git a/setup/templates/steps/compose/expose.html b/setup/templates/steps/compose/03_expose.html
similarity index 100%
rename from setup/templates/steps/compose/expose.html
rename to setup/templates/steps/compose/03_expose.html
diff --git a/setup/templates/steps/compose/optional.html b/setup/templates/steps/compose/optional.html
deleted file mode 100644
index b7878b23..00000000
--- a/setup/templates/steps/compose/optional.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% call macros.panel("info", "Step 4 - enable optional features") %}
-<p>Mailu also comes with less common optional features that you might wish
-to enable.</p>
-
-<p>The DAV service enables contacts and calendar storage through Mailu,
-it is especially userful when synchronizing your desktop and mobile devices.</p>
-
-<div class="form-group">
-  <label>Enable the DAV service (and path to the DAV service)</label>
-  <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="dav_enabled" checked></div>
-    <input class="form-control" type="text" name="admin_path" value="/webdav">
-  </div>
-</div>
-
-{% endcall %}
diff --git a/setup/templates/steps/stack/01_config.html b/setup/templates/steps/stack/01_config.html
new file mode 100644
index 00000000..8ada68a7
--- /dev/null
+++ b/setup/templates/steps/stack/01_config.html
@@ -0,0 +1,67 @@
+{% call macros.panel("info", "Step 2 - Initial configuration") %}
+<p>Before starting some variables must be set</p>
+
+<div class="form-group">
+  <label>Root path: </label>
+<!--   Validates path -->
+  <input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
+</div>
+
+<div class="form-group">
+  <label>Main mail domain</label>
+<!--   Validates domain name -->
+  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io" 
+  		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
+    Domain registration
+  </label>
+</div>
+
+<div class="form-group">
+  <label>Postmaster local part (will append the main mail domain)</label>
+  <input class="form-control" type="text" name="postmaster" value="admin" required>
+</div>
+
+<!-- <div class="form-group"> -->
+<!--   <label>Choose how secure connections will behave </label> -->
+<!--   <br/> -->
+<!--   <select name="tls_flavor"> -->
+<!--   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %} -->
+<!--   	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option> -->
+<!--   	{% endfor %} -->
+<!--   </select> -->
+<!-- </div> -->
+
+<div class="form-group">
+  <label>Authentication rate limit (per source IP address)</label>
+<!--   Validates number input only -->
+  <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm" 
+  		value="10" required >/minute;
+  <input class="form-control" style="width: 7%; display: inline;;" type="number" name="auth_ratelimit_ph"
+  		value="1000" required >/hour</p>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="disable_statistics" value="True">
+    Opt-out of statistics
+  </label>
+</div>
+
+<div class="form-group">
+  <label>Website name</label>
+  <input class="form-control" type="text" name="site_name" value="Mailu" required>
+</div>
+
+<div class="form-group">
+  <label>Linked Website URL</label>
+<!--   Validates url with or without https:// -->
+  <input class="form-control" type="url" name="website" value="https://mailu.io" required
+  		pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
+</div>
+
+{% endcall %}
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html
new file mode 100644
index 00000000..07bca6ba
--- /dev/null
+++ b/setup/templates/steps/stack/02_services.html
@@ -0,0 +1,73 @@
+{% call macros.panel("info", "Step 3 - pick some features") %}
+<p>Mailu comes with multiple base features, including a specific admin
+interface, Web email clients (webmails), antispam, antivirus, etc. If you
+wish to disable some of these features, you are free to do so.</p>
+
+<p>The admin interface is the main Mailu-specific bit, it provides tools to
+manage your email domains, users, etc.</p>
+
+<div class="form-group">
+  <label>Enable the admin UI (and path to the admin UI)</label>
+  <div class="input-group">
+    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
+    <input class="form-control" type="text" name="admin_path" value="/admin">
+  </div>
+</div>
+
+<p>Emails will be available through IMAP and POP3. You may also enable a Web
+email client. These do add some complexity but provide an easier way of
+accessing messages for beginner users.</p>
+
+<!-- 	Switched from radio buttons to dropdown menu in order to remove the checkbox -->
+<div class="form-group">
+  <label>Enable Web email client (and path to the Web email client)</label>
+<!--   <div class="radio"> -->
+<!--     {{ macros.radio("webmail_type", "roundcube", "RoundCube", "popular Webmail running on top of PHP") }} -->
+<!--     {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }} -->
+<!--   </div> -->
+  <br/>
+  <select class="btn btn-primary dropdown-toggle" name="webmail_type">
+  	{% for webmailtype in ["none", "roundcube", "rainloop"] %}
+  	<option value="{{ webmailtype }}" >{{ webmailtype }}</option>
+  	{% endfor %}
+  </select>
+  <p></p>
+  <div class="input-group">
+<!--     <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" value="true"></div> -->
+    <input class="form-control" type="text" name="webmail_path" value="/webmail">
+  </div>
+</div>
+
+<p>Email filtering is a really important features. You can still disable it, which
+will prevent Mailu from doing spam filtering, virus filtering, and from applying
+white and blacklists that you may configure in the admin interface. You may
+also disable the antivirus if required (it does use aroung 1GB of ram).</p>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd" checked>
+    Enable the spam filtering service
+  </label>
+</div>
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
+    Enable the antivirus service
+  </label>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="webdav_enabled" value="radicale">
+    Enable the webdav service
+  </label>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="fetchmail_enabled" value="true">
+    Enable fetchmail
+  </label>
+</div>
+
+{% endcall %}
diff --git a/setup/templates/steps/stack/03_expose.html b/setup/templates/steps/stack/03_expose.html
new file mode 100644
index 00000000..58c538f0
--- /dev/null
+++ b/setup/templates/steps/stack/03_expose.html
@@ -0,0 +1,21 @@
+{% call macros.panel("info", "Step 4 - expose Mailu to the world") %}
+<p>A mail server must be exposed to the world to receive emails, send emails,
+and let users access their mailboxes. Mailu has some flexibility in the way
+you expose it to the world.</p>
+
+<div class="form-group">
+  <label>Subnet</label>
+  <input class="form-control" type="text" name="subnet" required pattern="^\d+$">
+</div>
+
+<p>You server will be available under a main hostname but may expose multiple public
+hostnames. Every e-mail domain that points to this server must have one of the
+hostnames in its <code>MX</code> record. Hostnames must be coma-separated.</p>
+
+<div class="form-group">
+  <label>Public hostnames</label>
+<!--   Validates hostname or list of hostnames -->
+  <input class="form-control" type="text" name="hostnames" placeholder="my.host.name,other.host.name" multiple required
+    	pattern="^(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)*(?:,(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)\s*)*$">
+</div>
+{% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index d035a96b..b74ac1b8 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -15,11 +15,10 @@
   {% if flavor %}
   <form method="post" action="{{ url_for(".submit") }}">
   <input type="hidden" name="flavor" value="{{ flavor }}">
-  {% include "steps/" + flavor + "/config.html" %}
-  {% include "steps/" + flavor + "/services.html" %}
-  {% include "steps/" + flavor + "/expose.html" %}
+  {%for file in flavor_files %}
+  {% include "steps/" + flavor + "/" + file %}
+  {% endfor %}
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
   {% endif %}
-<!--   {% include "steps/compose/optional.html" %} -->
   </form>
 {% endblock %}