diff --git a/app/frontend/src/stylesheets/app.components.scss b/app/frontend/src/stylesheets/app.components.scss
index 7d47a0c7f..5ea994be0 100644
--- a/app/frontend/src/stylesheets/app.components.scss
+++ b/app/frontend/src/stylesheets/app.components.scss
@@ -77,6 +77,21 @@
   }
 }
 
+.modal-footer.btn-stack {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+
+  &::after,
+  &::before {
+    content: none;
+  }
+
+  & > * {
+    margin: 0 !important;
+  }
+}
+
 .modal-backdrop {
   height: 100%;
 }
diff --git a/app/frontend/templates/admin/calendar/eventModal.html b/app/frontend/templates/admin/calendar/eventModal.html
index 12b0dac7d..aebabf13a 100644
--- a/app/frontend/templates/admin/calendar/eventModal.html
+++ b/app/frontend/templates/admin/calendar/eventModal.html
@@ -82,18 +82,18 @@
     <p class="text-center font-sbold" translate>{{ 'app.admin.calendar.divide_this_availability' }}</p>
     <div class="row">
       <div class="col-md-5">
-        <div class="input-group">
-          <input type="number" class="form-control" ng-model="slots_nb" step="1" min="1" required="true" />
-          <span class="input-group-addon" translate>{{ 'app.admin.calendar.slots' }}</span>
-        </div>
+        <div class="form-group">
+          <input id="slots_nb" type="number" class="form-control" ng-model="slots_nb" step="1" min="1" required="true" />
+          <label for="slots_nb" translate>{{ 'app.admin.calendar.slots' }}</label>
         </div>
+      </div>
       <p class="col-md-2 middle-of-inputs" translate>
         {{ 'app.admin.calendar.slots_of' }}
       </p>
       <div class="col-md-5">
-        <div class="input-group">
-          <input type="number" class="form-control" ng-model="availability.slot_duration" min="1" required="true" />
-          <span class="input-group-addon" translate>{{ 'app.admin.calendar.minutes' }}</span>
+        <div class="form-group">
+          <input id="slot_duration" type="number" class="form-control" ng-model="availability.slot_duration" min="1" required="true" />
+          <label for="slot_duration" translate>{{ 'app.admin.calendar.minutes' }}</label>
         </div>
       </div>
     </div>
@@ -223,7 +223,7 @@
     <p class="text-center font-sbold" translate>{{ 'app.admin.calendar.summary' }}</p>
     <div class="row">
       <span>{{ 'app.admin.calendar.about_to_create' | translate:{NUMBER:occurrences.length,TYPE:availability.available_type} }}</span>
-      <ul>
+      <ul style="max-height: 25vh; overflow: auto;">
         <li ng-repeat="slot in occurrences">{{slot.start_at | amDateFormat:'L LT'}} - {{slot.end_at | amDateFormat:'LT'}}</li>
       </ul>
       <div class="alert alert-info text-xs" ng-show="availability.slot_duration">
diff --git a/app/frontend/templates/admin/events/index.html b/app/frontend/templates/admin/events/index.html
index 9d4d8bd93..26f303ed7 100644
--- a/app/frontend/templates/admin/events/index.html
+++ b/app/frontend/templates/admin/events/index.html
@@ -17,37 +17,37 @@
       </section>
     </div>
   </div>
-
-  <section class="m-lg events-management"
-           ui-tour="events"
-           ui-tour-backdrop="true"
-           ui-tour-template-url="'/shared/tour-step-template.html'"
-           ui-tour-use-hotkeys="true"
-           ui-tour-scroll-parent-id="content-main"
-           post-render="setupEventsTour">
-    <div class="row">
-      <div class="col-md-12" ng-if="isAuthorized('admin')">
-        <uib-tabset justified="true" active="tabs.active">
-          <uib-tab heading="{{ 'app.admin.events.settings' | translate }}" index="0">
-            <events-settings on-error="onError" on-success="onSuccess" ui-router="uiRouter"></events-settings>
-          </uib-tab>
-
-          <uib-tab heading="{{ 'app.admin.events.events_monitoring' | translate }}" index="1">
-            <ng-include src="'/admin/events/monitoring.html'"></ng-include>
-          </uib-tab>
-
-          <uib-tab heading="{{ 'app.admin.events.manage_filters' | translate }}" index="2">
-            <ng-include src="'/admin/events/filters.html'"></ng-include>
-          </uib-tab>
-
-          <uib-tab heading="{{ 'app.admin.events.manage_prices_categories' | translate }}" index="3" class="prices-tab">
-            <ng-include src="'/admin/events/prices.html'"></ng-include>
-          </uib-tab>
-        </uib-tabset>
-      </div>
-      <div class="col-md-12" ng-if="isAuthorized('manager')">
-        <ng-include src="'/admin/events/monitoring.html'"></ng-include>
-      </div>
-    </div>
-  </section>
+</section>
+
+<section class="m-lg events-management"
+         ui-tour="events"
+         ui-tour-backdrop="true"
+         ui-tour-template-url="'/shared/tour-step-template.html'"
+         ui-tour-use-hotkeys="true"
+         ui-tour-scroll-parent-id="content-main"
+         post-render="setupEventsTour">
+  <div class="row">
+    <div class="col-md-12" ng-if="isAuthorized('admin')">
+      <uib-tabset justified="true" active="tabs.active">
+        <uib-tab heading="{{ 'app.admin.events.settings' | translate }}" index="0">
+          <events-settings on-error="onError" on-success="onSuccess" ui-router="uiRouter"></events-settings>
+        </uib-tab>
+
+        <uib-tab heading="{{ 'app.admin.events.events_monitoring' | translate }}" index="1">
+          <ng-include src="'/admin/events/monitoring.html'"></ng-include>
+        </uib-tab>
+
+        <uib-tab heading="{{ 'app.admin.events.manage_filters' | translate }}" index="2">
+          <ng-include src="'/admin/events/filters.html'"></ng-include>
+        </uib-tab>
+
+        <uib-tab heading="{{ 'app.admin.events.manage_prices_categories' | translate }}" index="3" class="prices-tab">
+          <ng-include src="'/admin/events/prices.html'"></ng-include>
+        </uib-tab>
+      </uib-tabset>
+    </div>
+    <div class="col-md-12" ng-if="isAuthorized('manager')">
+      <ng-include src="'/admin/events/monitoring.html'"></ng-include>
+    </div>
+  </div>
 </section>
diff --git a/app/frontend/templates/events/index.html b/app/frontend/templates/events/index.html
index 90de341dc..24108fab1 100644
--- a/app/frontend/templates/events/index.html
+++ b/app/frontend/templates/events/index.html
@@ -17,61 +17,60 @@
       </section>
     </div>
   </div>
+</section>
 
+<section class="events-list-page">
+  <events-editorial-block on-error="onError"></events-editorial-block>
 
-  <section class="events-list-page">
-    <events-editorial-block on-error="onError"></events-editorial-block>
-
-    <div class="row">
-      <div class="col-md-3" ng-show="categories.length > 0">
-        <select ng-model="filters.category_id" ng-change="filterEvents()" class="form-control" ng-options="c.id as c.name for c in categories">
-          <option value="" translate>{{ 'app.public.events_list.all_categories' }}</option>
-        </select>
-      </div>
-
-      <div class="col-md-3" ng-show="themes.length > 0">
-        <select ng-model="filters.theme_id" ng-change="filterEvents()" class="form-control" ng-options="t.id as t.name for t in themes">
-          <option value="" translate>{{ 'app.public.events_list.all_themes' }}</option>
-        </select>
-      </div>
-
-      <div class="col-md-3" ng-show="ageRanges.length > 0">
-        <select ng-model="filters.age_range_id" ng-change="filterEvents()" class="form-control" ng-options="a.id as a.name for a in ageRanges">
-          <option value="" translate>{{ 'app.public.events_list.for_all' }}</option>
-        </select>
-      </div>
+  <div class="row">
+    <div class="col-md-3" ng-show="categories.length > 0">
+      <select ng-model="filters.category_id" ng-change="filterEvents()" class="form-control" ng-options="c.id as c.name for c in categories">
+        <option value="" translate>{{ 'app.public.events_list.all_categories' }}</option>
+      </select>
     </div>
 
-    <div class="event-focus" ng-if="featuredEevent && (!currentUser || currentUser.role === 'member')">
+    <div class="col-md-3" ng-show="themes.length > 0">
+      <select ng-model="filters.theme_id" ng-change="filterEvents()" class="form-control" ng-options="t.id as t.name for t in themes">
+        <option value="" translate>{{ 'app.public.events_list.all_themes' }}</option>
+      </select>
+    </div>
+
+    <div class="col-md-3" ng-show="ageRanges.length > 0">
+      <select ng-model="filters.age_range_id" ng-change="filterEvents()" class="form-control" ng-options="a.id as a.name for a in ageRanges">
+        <option value="" translate>{{ 'app.public.events_list.for_all' }}</option>
+      </select>
+    </div>
+  </div>
+
+  <div class="event-focus" ng-if="featuredEevent && (!currentUser || currentUser.role === 'member')">
+    <event-card style="display: contents"
+                event="featuredEevent"
+                card-type="'lg'"
+                ui-sref="app.public.events_show({id: featuredEevent.id})">
+    </event-card>
+  </div>
+
+  <div ng-repeat="month in monthOrder">
+    <h1>{{monthNames[month.split(',')[0] - 1]}}, {{month.split(',')[1]}}</h1>
+
+    <div class="event-monthList">
       <event-card style="display: contents"
-                  event="featuredEevent"
-                  card-type="'lg'"
-                  ui-sref="app.public.events_show({id: featuredEevent.id})">
+                  event="event"
+                  ng-repeat="event in eventsGroupByMonth[month]"
+                  card-type="'sm'"
+                  ng-if="isAuthorized(['admin', 'manager']) || event.id !== featuredEevent.id"
+                  ng-class="{'featured-event': event.id === featuredEevent.id}"
+                  ui-sref="app.public.events_show({id: event.id})">
       </event-card>
     </div>
 
-    <div ng-repeat="month in monthOrder">
-      <h1>{{monthNames[month.split(',')[0] - 1]}}, {{month.split(',')[1]}}</h1>
+  </div>
 
-      <div class="event-monthList">
-        <event-card style="display: contents"
-                    event="event"
-                    ng-repeat="event in eventsGroupByMonth[month]"
-                    card-type="'sm'"
-                    ng-if="isAuthorized(['admin', 'manager']) || event.id !== featuredEevent.id"
-                    ng-class="{'featured-event': event.id === featuredEevent.id}"
-                    ui-sref="app.public.events_show({id: event.id})">
-        </event-card>
-      </div>
+  <div class="row">
 
+    <div class="col-lg-12 text-center m-t-md">
+      <a class="btn btn-warning" ng-click="loadMoreEvents()" ng-hide="noMoreResults" translate>{{ 'app.public.events_list.load_the_next_events' }}</a>
     </div>
+  </div>
 
-    <div class="row">
-
-      <div class="col-lg-12 text-center m-t-md">
-        <a class="btn btn-warning" ng-click="loadMoreEvents()" ng-hide="noMoreResults" translate>{{ 'app.public.events_list.load_the_next_events' }}</a>
-      </div>
-    </div>
-
-  </section>
 </section>
diff --git a/app/frontend/templates/shared/confirm_modify_slot_modal.html b/app/frontend/templates/shared/confirm_modify_slot_modal.html
index bc78c162a..c5ffd6555 100644
--- a/app/frontend/templates/shared/confirm_modify_slot_modal.html
+++ b/app/frontend/templates/shared/confirm_modify_slot_modal.html
@@ -7,7 +7,7 @@
   <p ng-show="object.user && currentUser.id !== object.user.id" translate translate-values="{NAME: object.user.name}">{{ 'app.shared.confirm_modify_slot_modal.do_you_want_to_change_NAME_s_booking_slot_initially_planned_at' }}</p>
   <p><strong>{{object.start | amDateFormat: 'LL'}} : {{object.start | amDateFormat:'LT'}} - {{object.end | amDateFormat:'LT'}}</strong></p>
 </div>
-<div class="modal-footer">
+<div class="modal-footer btn-stack">
   <button class="btn btn-warning" ng-class="{'m-b':object.cancelable&&object.movable}" ng-click="ok('cancel')" ng-show="object.cancelable" translate>{{ 'app.shared.confirm_modify_slot_modal.cancel_this_reservation' }}</button>
   <button class="btn btn-info" ng-click="ok('move')" ng-show="object.movable" translate>{{ 'app.shared.confirm_modify_slot_modal.i_want_to_change_date' }}</button>
   <button class="btn btn-default" ng-click="cancel()" translate>{{ 'app.shared.buttons.cancel' }}</button>
diff --git a/app/frontend/templates/shared/deviseModal.html b/app/frontend/templates/shared/deviseModal.html
index 57a3403b9..b439b683f 100644
--- a/app/frontend/templates/shared/deviseModal.html
+++ b/app/frontend/templates/shared/deviseModal.html
@@ -1,6 +1,6 @@
   <div class="" id="loginModal">
     <div class="modal-header">
-      <img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="{{logo.custom_asset_file_attributes.attachment}}" class="modal-logo"/>
+      <img ng-src="{{logoBlack.custom_asset_file_attributes.attachment_url}}" alt="" class="modal-logo"/>
       <i class="fa fa-times close-modal-button" ng-click="dismiss()"></i>
       <h1 translate translate-default="Login">
         {{ 'app.public.common.connection' }}