diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
index 86b7c6fd2..c3a13b55a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/confirm_delete.html.twig
@@ -5,6 +5,7 @@
 {% block title 'Delete event'|trans %}
 
 {% block event_content %}
+<div class="col-10">
 
     {{ include('@ChillMain/Util/confirmation_template.html.twig',
         {
@@ -15,6 +16,6 @@
             'form'              : delete_form
         }
     ) }}
-
+</div>
 {% endblock %}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
index 288c81edd..a528f1f5c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
@@ -3,6 +3,7 @@
 {% block title 'Event edit'|trans %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Event edit'|trans }}</h1>
 
     {{ form_start(edit_form) }}
@@ -28,6 +29,8 @@
             {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' } }) }}
         </li>
     </ul>
-            
+
     {{ form_end(edit_form) }}
+
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
index 6e77b6df8..8d5f49da8 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
@@ -6,42 +6,42 @@
 
     <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + events|length, '%total%' : total } ) }}</p>
 
-    <table class="events">
+    <table class="table events">
         <thead>
-            <tr>
-                <th class="chill-red">{{ 'Name'|trans }}</th>
-                <th class="chill-green">{{ 'Date'|trans }}</th>
-                <th class="chill-orange">{{ 'Event type'|trans }}</th>
-                <th>&nbsp;</th>
-            </tr>
+        <tr>
+            <th class="chill-red">{{ 'Name'|trans }}</th>
+            <th class="chill-green">{{ 'Date'|trans }}</th>
+            <th class="chill-orange">{{ 'Event type'|trans }}</th>
+            <th>&nbsp;</th>
+        </tr>
         </thead>
         <tbody>
-            {% for event in events %}
-                <tr>
-                    <td>{{ event.name }}</td>
-                    <td>{{ event.date|format_date('long') }}</td>
-                    <td>{{ event.type.name|localize_translatable_string }}</td>
-                    <td>
-                        <ul class="record_actions">
-                            <li>
-                                {# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
-                                <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-dark">
-                                    {{ 'See'|trans }}
-                                </a>
-                                {# {% endif %} #}
-                                {% if is_granted('CHILL_EVENT_UPDATE', event) %}
+        {% for event in events %}
+            <tr>
+                <td>{{ event.name }}</td>
+                <td>{{ event.date|format_date('long') }}</td>
+                <td>{{ event.type.name|localize_translatable_string }}</td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            {# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
+                            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-dark">
+                                {{ 'See'|trans }}
+                            </a>
+                            {# {% endif %} #}
+                            {% if is_granted('CHILL_EVENT_UPDATE', event) %}
                                 <a href="{{ path('chill_event__event_edit', { 'event_id' : event.id } ) }}" class="btn btn-update">
                                     {{ 'Edit'|trans }}
                                 </a>
-                                {% endif %}
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-            {% endfor %}
+                            {% endif %}
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
         </tbody>
     </table>
-    
+
 {% endif %}
 
 <ul class="record_actions">
@@ -49,17 +49,18 @@
         <a href="{{ path('chill_event__event_new_pickcenter') }}" class="btn btn-create" >
             {{ 'New event'|trans }}
         </a>
-    </li>                
-    {% if preview == true and events|length < total %}
-    <li>
-        <a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="btn btn-next">
-            {{ 'See all results'|trans }}
-        </a>
     </li>
+    {% if preview == true and events|length < total %}
+        <li>
+            <a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="btn btn-misc">
+                {{ 'See all results'|trans }}
+            </a>
+        </li>
     {% endif %}
-    
+
 </ul>
 
 {% if preview == false %}
-{{ chill_pagination(paginator) }}
+    {{ chill_pagination(paginator) }}
 {% endif %}
+
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
index 9ffd5093c..ef2dae85c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
@@ -44,59 +44,59 @@
                 <td>{{ participation.role.name|localize_translatable_string }}</td>
                 <td>{{ participation.status.name|localize_translatable_string }}</td>
                 <td>
-                    <ul class="list-inline">
+                    <div class="btn-group" role="group" aria-label="Button group actions">
 
                         {% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
                         {% set returnLabel = 'Back to %person% events'|trans({ '%person%' : currentPerson } ) %}
 
                         {% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
-                        <li class="list-inline-item">
                             <a  href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel } ) }}"
-                                class="btn btn-primary btn-sm" title="{{ 'See details of the event'|trans }}"><i class="fa fa-fw fa-eye"></i></a>
-                        </li>
+                            class="btn btn-primary btn-sm" title="{{ 'See details of the event'|trans }}">
+                            <i class="fa fa-fw fa-eye"></i>
+                        </a>
                         {% endif %}
 
                         {% if  is_granted('CHILL_EVENT_UPDATE', participation.event)
                            and is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
 
-                        <li class="list-inline-item">
-                            <div class="btn dropdown-toggle">
-                                <a href="" class="btn btn-warning btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
-                                <div class="dropdown-menu">
-
+                            <div class="btn-group" role="group">
+                            <button class="btn btn-sm btn-warning dropdown-toggle" type="button" id="dropdownEdit" data-bs-toggle="dropdown" aria-expanded="false">
+                                <i class="fa fa-pencil"></i>
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="dropdownEdit">
+                                <li>
                                     <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                        class="btn btn-warning btn-sm">
+                                        class="dropdown-item">
                                         {{ 'Edit the event'|trans }}
                                     </a>
+                                </li>
+                                <li>
                                     <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                        class="btn btn-warning btn-sm">
+                                        class="dropdown-item">
                                         {{ 'Edit the participation'|trans }}
                                     </a>
-
-                                </div>
-                            </div>
-                        </li>
+                                </li>
+                            </ul>
+                        </div>
                         {% else %}
 
-                        <li class="list-inline-item">
                             {% if is_granted('CHILL_EVENT_UPDATE', participation.event) %}
-                                <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                    class="btn btn-warning btn-sm">
-                                    {{ 'Edit the event'|trans }}
-                                </a>
+                            <a  href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
+                                class="btn btn-warning btn-sm">
+                                {{ 'Edit the event'|trans }}
+                            </a>
                             {% endif %}
                             {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
-                                <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
-                                    class="btn btn-warning btn-sm">
-                                    {{ 'Edit the participation'|trans }}
-                                </a>
+                            <a  href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
+                                class="btn btn-warning btn-sm">
+                                {{ 'Edit the participation'|trans }}
+                            </a>
                             {% endif %}
-                        </li>
 
                         {% endif %}
 
 
-                    </ul>
+                    </div>
                 </td>
             </tr>
         {% endfor %}
@@ -108,11 +108,14 @@
     {{ chill_pagination(paginator) }}
 {% endif %}
 
-<div class="input-group mt-3">
+<div class="input-group mt-5">
 {{ form_start(form_add_event_participation_by_person) }}
-    {{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : { 'class' : 'form-control' } } ) }}
-    <div class="input-group-append input-group-btn">
-        {{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-sm btn-success' } } ) }}
+    {{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : {
+        'class' : 'custom-select',
+        'style': 'min-width: 15em; max-width: 18em; display: inline-block;'
+    }}) }}
+    <div class="input-group-append">
+        {{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-sm btn-save' } } ) }}
     </div>
 {{ form_rest(form_add_event_participation_by_person) }}
 {{ form_end(form_add_event_participation_by_person) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
index 44d24040b..f0d1b0ea2 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
@@ -3,6 +3,7 @@
 {% block title 'Event creation'|trans %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Event creation'|trans }}</h1>
 
     {{ form_start(form) }}
@@ -26,4 +27,5 @@
     </ul>
             
     {{ form_end(form) }}
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
index c4fb4aacd..a10d754e6 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
@@ -3,6 +3,7 @@
 {% block title 'Event creation'|trans %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Event creation'|trans }}</h1>
 
     {{ form_start(form) }}
@@ -22,5 +23,5 @@
     </ul>
             
     {{ form_end(form) }}
-
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
index 6af5dd80a..4ce92a200 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
@@ -5,9 +5,10 @@
 {% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}    
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Details of an event'|trans }}</h1>
 
-    <table class="record_properties">
+    <table class="table record_properties">
         <tbody>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -69,7 +70,7 @@
     <p>{% transchoice count %}%count% participations to this event{% endtranschoice %}</p>
     
     {% if count > 0 %}
-        <table>
+        <table class="table">
             <thead>
                 <tr>
                     <th>{{ 'Person'|trans }}</th>
@@ -117,7 +118,7 @@
         {% endif %}
     </ul>
 
-    <div style="margin-bottom: 10em;">
+    <div class="row" style="margin-bottom: 10em;">
         <div class="col-8">
             {{ form_start(form_add_participation_by_person) }}
             <div class="input-group">
@@ -150,5 +151,5 @@
     <div class="post_show">
         {{ chill_delegated_block('block_footer_show', { 'event': event }) }}
     </div>
-
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/confirm_delete.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/confirm_delete.html.twig
index 9b023a915..0d993b075 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/confirm_delete.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/confirm_delete.html.twig
@@ -5,7 +5,7 @@
 {% block title 'Remove participation'|trans %}
 
 {% block event_content %}
-
+<div class="col-10">
     {{ include('@ChillMain/Util/confirmation_template.html.twig',
         {
             'title'             : 'Remove participation'|trans,
@@ -15,6 +15,6 @@
             'form'              : delete_form
         }
     ) }}
-
+</div>
 {% endblock %}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index a50615414..f0f522a3d 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -3,9 +3,10 @@
 {% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Participation Edit'|trans }}</h1>
 
-    <table>
+    <table class="table">
         <tbody>
             <tr>
                 <th>{{ 'Associated event'|trans }} </th>
@@ -18,11 +19,11 @@
         </tbody>
     </table>
             
-    <h2>{{ 'Participations'|trans }}</h2>
+    <h2 class="mt-5">{{ 'Participations'|trans }}</h2>
     
     {{ form_start(form) }}
     
-     <table>
+     <table class="table">
             <thead>
                 <tr>
                     <th>{{ 'Person'|trans }}</th>
@@ -59,4 +60,5 @@
     </ul>
     
     {{ form_end(form) }}
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index 19592526e..db716b3dc 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -3,6 +3,7 @@
 {% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Participation Edit'|trans }}</h1>
 
     <table>
@@ -42,4 +43,5 @@
     </ul>
     
     {{ form_end(form) }}
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index a0551ff1a..224b7265f 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -18,7 +18,7 @@
 {% block event_content -%}
     <h1>{{ 'Participation creation'|trans }}</h1>
 
-    <table>
+    <table class="table">
         <tbody>
             <tr>
                 <th>{{ 'Associated event'|trans }} </th>
@@ -30,7 +30,7 @@
     {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
 
     {{ form_start(form) }}
-    <table>
+    <table class="table">
         <thead>
             <tr>
                 <th>{{ 'Person'|trans }}</th>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 33f7bc213..3fbea8b68 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -5,6 +5,7 @@
 {% block title 'Participation creation'|trans %}
 
 {% block event_content -%}
+<div class="col-10">
     <h1>{{ 'Participation creation'|trans }}</h1>
 
     <table>
@@ -43,5 +44,5 @@
     </ul>
     
     {{ form_end(form) }}
-    
+</div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/layout.html.twig b/src/Bundle/ChillEventBundle/Resources/views/layout.html.twig
index 45eb6e481..e34a10e18 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/layout.html.twig
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
-{% block layout_wvm_content %}
+{% block content %}
     {% block event_content %}<!-- block event content empty -->
         <h1>{{ 'Event' |trans }}</h1>
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 9e7938675..501af5b9d 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -144,7 +144,7 @@ class PickPersonType extends AbstractType
             }, $this->user->getGroupCenters()->toArray());
         } else {
             $centers = $this->authorizationHelper
-                ->getReachableCenters($this->user, $options['role']);
+                ->getReachableCenters($this->user, $options['role']->getRole());
         }
 
         if (null === $options['centers']) {