diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
index ef62dfd90..505c22ab4 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block title "Download export"|trans ~ export.title|trans %}
     
@@ -33,11 +33,19 @@ window.addEventListener("DOMContentLoaded", function(e) {
 </script>
 {% endblock %}
  
-{% block layout_wvm_content  %}
+{% block content %}
+    <div class="col-md-10">
     
-    <h1>{{ export.title|trans }}</h1>
-    <h2>{{ "Download export"|trans }}</h2>
-    
-    <div id="download_container" data-alias="{{ alias|escape('html_attr') }}" {% if mime_type is defined %}data-mime-type="{{ mime_type|escape('html_attr') }}"{% endif %} data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"><span id="waiting_text">{{ "Waiting for your report"|trans }}...</span></div>
-    
-{% endblock %}
\ No newline at end of file
+        <h1>{{ export.title|trans }}</h1>
+        <h2>{{ "Download export"|trans }}</h2>
+        
+        <div id="download_container"
+             data-alias="{{ alias|escape('html_attr') }}"
+             {%- if mime_type is defined %}
+                 data-mime-type="{{- mime_type|escape('html_attr') -}}"
+             {% endif -%}
+             data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"
+        ><span id="waiting_text">{{ "Waiting for your report"|trans ~ '...' }}</span></div>
+
+    </div>
+{% endblock content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
index 6cb41bc7d..4ee857f00 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new.html.twig
@@ -25,7 +25,6 @@
 {% endblock js %}
 
 {% block content  %}
-
     <div class="col-md-10">
     
         <h1>{{ export.title|trans }}</h1>
@@ -71,7 +70,7 @@
         {% if form.children.export.children.aggregators is defined %}
             {% if form.children.export.children.aggregators is not empty %}
             
-            <section class="aggregator">
+            <section class="aggregator mb-4">
                 <h2>{{ 'Aggregators'| trans }}</h2>
     
                 <div class="flex-table">
@@ -106,7 +105,7 @@
             <style>
                 div#export_export_fields { column-count: 2; }
             </style>
-            <section class="parameter">
+            <section class="parameter mb-4">
                 <h2>
                     {{ 'Export parameters'|trans }}
                 </h2>
@@ -119,7 +118,7 @@
         {% endif %}
         
         {% if form.children.export.children.pick_formatter is defined %}
-            <section class="formatter">
+            <section class="formatter mb-4">
                 <h2>
                     {{ 'Formatter'| trans }}
                 </h2>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
index 43a5f63ec..4854b1c9d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_formatter_step.html.twig
@@ -16,39 +16,40 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ export.title|trans }}{% endblock %}
 
-{% block layout_wvm_content  %}
-    
-    <h1>{{ export.title|trans }}</h1>
-    
-    <p>{{ export.description|trans }}</p>
-
-    {{ form_start(form) }}
-    <div style="">
-        <h2>{{ 'Formatter'| trans }}</h2>
+{% block content %}
+    <div class="col-md-10">
         
-        <div style="clear: both;">
-        {% if form.children.formatter.children|length == 0 %}
-            <p>
-                <span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
-            </p>
-            {{ form_widget(form.children.formatter) }}
-        {% else %}
-            {# we always have to render children, to mark as rendered #}        
-            {% for input in form.children.formatter.children %}
-            {{ form_row(input) }}
-            {% endfor %}
-        {% endif %}
+        <h1>{{ export.title|trans }}</h1>
+        
+        <p>{{ export.description|trans }}</p>
+    
+        {{ form_start(form) }}
+        <section class="formatter mb-4">
+            <h2>{{ 'Formatter'| trans }}</h2>
+            
+            <div>
+            {% if form.children.formatter.children|length == 0 %}
+                <p>
+                    <span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
+                </p>
+                {{ form_widget(form.children.formatter) }}
+            {% else %}
+                {# we always have to render children, to mark as rendered #}
+                {% for input in form.children.formatter.children %}
+                {{ form_row(input) }}
+                {% endfor %}
+            {% endif %}
+            </div>
+        </section>
+        
+        <div class="mb-4">
+            <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action' }, 'label': 'Generate the report' } ) }}</p>
         </div>
+        {{ form_end(form) }}
+        
     </div>
-    
-    <div style=clear:both;">
-    <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action' }, 'label': 'Generate the report' } ) }}</p>
-    </div>
-    
-    {{ form_end(form) }}
-    
-{% endblock layout_wvm_content  %}
+{% endblock content %}