diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
index abbaf1e14..1079aadec 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/advanced_search.html.twig
@@ -20,25 +20,25 @@
 {% block title title|trans %}
 
 {% block content %}
-<div class="search-list my-5">
+<div class="col-md-10 col-xxl search-list">
 
-            <h1>{{ title|trans }}</h1>
+    <h1>{{ title|trans }}</h1>
 
-            {{ form_start(form) }}
+    {{ form_start(form) }}
 
-            {% for f in form %}
-                {% if f.vars.name != 'submit' %}
-                  {{ form_row(f) }}
-                {% endif %}
-            {% endfor %}
+    {% for f in form %}
+        {% if f.vars.name != 'submit' %}
+          {{ form_row(f) }}
+        {% endif %}
+    {% endfor %}
 
-            <ul class="record_actions">
-                <li>
-                    {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }}
-                </li>
-            </ul>
+    <ul class="record_actions">
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create change-icon' } } ) }}
+        </li>
+    </ul>
 
-            {{ form_end(form) }}
+    {{ form_end(form) }}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
index bb872a3b2..80996db23 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/error.html.twig
@@ -19,9 +19,9 @@
 {% set _search_pattern = pattern %}
 
 {%  block content %}
-<div class="search-list my-5">
+<div class="col-md-10 col-xxl search-list">
 
-            <p class="error">{{ message }}</p>
+    <p class="error">{{ message }}</p>
 
 </div>
 {%  endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
index 2d890bd2b..db2d63c80 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Search/list.html.twig
@@ -21,11 +21,11 @@
 {% block title %}{{ 'Search %pattern%'|trans({ '%pattern%' : pattern }) }}{% endblock title %}
 
 {%  block content %}
-<div class="search-list my-5">
+<div class="col-md-10 col-xxl search-list">
 
-            {% for result in results %}
-                {{ result|raw }}
-            {%  endfor %}
+    {% for result in results %}
+        {{ result|raw }}
+    {%  endfor %}
 
 </div>
 {%  endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 3725684c8..76a6e18b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -17,7 +17,7 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
-    
+
 {% block content %}
 <div class="col-md-10 col-xxl person-new">
 
@@ -47,6 +47,5 @@
 
     {{ form_end(form) }}
 
-
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
index 8c5b6eb35..9e715c640 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig
@@ -17,80 +17,75 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
-    
-{% block content %}
-<div class="person-new col-12 my-5">
-    <div class="row justify-content-center">
-        
-        <div class="col-md-10 col-xxl">
-            
-            <div class="alert alert-warning flash_message">
-                <span>
-                {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
-                %nb% person with similar name. Please verify that this is a new person
-                {% endtranschoice %}
-                </span>
-            </div>
-            
-            {% if alternatePersons is not empty %}
-                <table class="table table-bordered border-dark">
-                    <thead>
-                        <tr>
-                            <th class="chill-red">{{ 'Name'|trans }}</th>
-                            <th class="chill-green">{{ 'Date of birth'|trans }}</th>
-                            <th class="chill-orange">{{ 'Nationality'|trans }}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for person in alternatePersons %}
-                            <tr>
-                                <td>
-                                    <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
-                                        {{ person|chill_entity_render_string }}{% apply spaceless %}
-                                            {% if person.isOpen == false %}
-                                                <i class="icon-lock"></i>
-                                            {% endif %}
-                                        {% endapply %}
-                                    </a>
-                                </td>
-                                <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
-                                <td>
-                                    {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            {% endif %}
-        
-            <div id="person_details" class="my-5">
-                {{ form_start(form) }}
-                    <h2>{{ 'You will create this person'|trans }}</h2>
-                    <dl>
-                        <dt>{{ 'Name'|trans }}</dt>
-                        <dd>{{ person|chill_entity_render_string }}</dd>
-                        
-                        <dt>{{ 'Date of birth'|trans }}</dt>
-                        <dd>{{ birthdate|format_date('long')|default( 'Unknown date of birth'|trans ) }}</dd>
-                        
-                        <dt>{{ 'Gender'|trans }}</dt>
-                        <dd>{{ gender|trans }}</dd>
-                        
-                        <dt>{{ 'Creation date'|trans }}</dt>
-                        <dd>{{ creation_date|format_date('long') }}</dd>
-                        
-                        {% if form.altNames is defined %}
-                            {# mark as rendered #}
-                            {{ form_widget(form.altNames) }}
-                        {% endif %}
-                    </dl>
-                    
-                    {{ form_rest(form) }}
-                    <button class="btn btn-submit" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
-                {{ form_end(form) }}
-            </div>
 
-        </div>
+{% block content %}
+<div class="col-md-10 col-xxl person-new">
+
+    <div class="alert alert-warning flash_message">
+        <span>
+        {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
+        %nb% person with similar name. Please verify that this is a new person
+        {% endtranschoice %}
+        </span>
     </div>
-</div>    
+
+    {% if alternatePersons is not empty %}
+        <table class="table table-bordered border-dark">
+            <thead>
+                <tr>
+                    <th class="chill-red">{{ 'Name'|trans }}</th>
+                    <th class="chill-green">{{ 'Date of birth'|trans }}</th>
+                    <th class="chill-orange">{{ 'Nationality'|trans }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for person in alternatePersons %}
+                    <tr>
+                        <td>
+                            <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
+                                {{ person|chill_entity_render_string }}{% apply spaceless %}
+                                    {% if person.isOpen == false %}
+                                        <i class="icon-lock"></i>
+                                    {% endif %}
+                                {% endapply %}
+                            </a>
+                        </td>
+                        <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
+                        <td>
+                            {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+
+    <div id="person_details" class="my-5">
+        {{ form_start(form) }}
+            <h2>{{ 'You will create this person'|trans }}</h2>
+            <dl>
+                <dt>{{ 'Name'|trans }}</dt>
+                <dd>{{ person|chill_entity_render_string }}</dd>
+
+                <dt>{{ 'Date of birth'|trans }}</dt>
+                <dd>{{ birthdate|format_date('long')|default( 'Unknown date of birth'|trans ) }}</dd>
+
+                <dt>{{ 'Gender'|trans }}</dt>
+                <dd>{{ gender|trans }}</dd>
+
+                <dt>{{ 'Creation date'|trans }}</dt>
+                <dd>{{ creation_date|format_date('long') }}</dd>
+
+                {% if form.altNames is defined %}
+                    {# mark as rendered #}
+                    {{ form_widget(form.altNames) }}
+                {% endif %}
+            </dl>
+
+            {{ form_rest(form) }}
+            <button class="btn btn-submit" type="submit"><i class="fa fa-check"></i> {{ 'Confirm the creation'|trans }}</button>
+        {{ form_end(form) }}
+    </div>
+
+</div>
 {% endblock content %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index e5c60412a..149a5401c 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -31,15 +31,13 @@
 {% if person is not null %}
     {% block personcontent %}
         <div class="tasks">
-                    {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
+            {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
         </div>
     {% endblock %}
 {% else %}
     {% block content %}
-        <div class="col-md-10 col-xxl">
-            <div class="tasks my-5">
-                {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
-            </div>
+        <div class="col-md-10 col-xxl tasks">
+            {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
         </div>
     {% endblock %}
 {% endif %}