diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 6753489e7a08a47465fb5e2bfee5c07c563cc961..f33cd9d0fd857460a6edfaa249bf114f18cbe91e 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -371,6 +371,7 @@ $block-key_figures-number-font-size-xxl: px2rem(80) !default
 
 // Block gallery
 $block-gallery-carousel-background: $color-background-alt !default
+$block-gallery-carousel-max-height: 70vh !default
 
 // Block image
 $block-image-max-height-with-sidebar: calc(100vh - var(--header-height)) !default
diff --git a/assets/sass/_theme/blocks/gallery.sass b/assets/sass/_theme/blocks/gallery.sass
index 300a3bcb6fd5393e4a7dbe327c7dbd6c0855887b..609e87c3552240b2c451940e187cc179d2b39877 100644
--- a/assets/sass/_theme/blocks/gallery.sass
+++ b/assets/sass/_theme/blocks/gallery.sass
@@ -39,6 +39,8 @@
                 @include grid(2)
                 grid-gap: half($grid-gutter-sm) !important
             &--with-text
+                @include in-page-without-sidebar
+                    @include grid(4, desktop, $spacing0)
                 figure
                     display: grid
                     grid-template-columns: subgrid
@@ -46,7 +48,6 @@
                     figcaption
                         &::after
                             content: ' '
-
     &--carousel
         overflow: hidden
         position: relative
@@ -96,12 +97,12 @@
                 picture
                     img
                         // FIXME Arnaud: I would like images at constant height, can't manage to get it right.
-                        max-height: 70vh
+                        max-height: $block-gallery-carousel-max-height
                         width: auto
                         height: auto
                         max-width: calc(100vw - #{$grid-gutter-sm} * 2)
                         @include media-breakpoint-up(desktop)
-                            height: 70vh
+                            height: $block-gallery-carousel-max-height
                             width: auto
                             max-width: none
                 figcaption
diff --git a/assets/sass/_theme/design-system/a11y.sass b/assets/sass/_theme/design-system/a11y.sass
index 100667b58c6dd1d8126dfe59f8f59e59344c50a4..9fbce2042a73076d5f2a81bd005b4de4fb9546e5 100644
--- a/assets/sass/_theme/design-system/a11y.sass
+++ b/assets/sass/_theme/design-system/a11y.sass
@@ -1,7 +1,7 @@
 .nav-accessibility
     padding: $spacing1
     position: absolute
-    transform: translateY(calc(-100% - 24px))
+    transform: translateY(-300%)
     z-index: $zindex-nav-accessibility
     a
         color: black
diff --git a/layouts/partials/blocks/templates/agenda.html b/layouts/partials/blocks/templates/agenda.html
index d82332429b036cdd3efc91e761663a494978ed24..cdcdff462012351320b4d1e43cec7d3ec182c990 100644
--- a/layouts/partials/blocks/templates/agenda.html
+++ b/layouts/partials/blocks/templates/agenda.html
@@ -16,21 +16,26 @@
           "description" .description
         )}}
 
-        <div class="events events--{{- $layout -}}">
-          {{ range .events }}
-            {{ $event := site.GetPage .file }}
-            {{ with $event }}
-                {{ partial "events/event" (dict
-                  "event" .
-                  "layout" $layout
-                  "show_summary" $show_summary
-                  "show_category" $show_category
-                  "show_status" $show_status
-                  "heading" (printf "h%d" $block.ranks.children)
-                ) }}
+        {{ if .events }}
+          <div class="events events--{{- $layout -}}">
+            {{ range .events }}
+              {{ $event := site.GetPage .file }}
+              {{ with $event }}
+                  {{ partial "events/event" (dict
+                    "event" .
+                    "layout" $layout
+                    "show_summary" $show_summary
+                    "show_category" $show_category
+                    "show_status" $show_status
+                    "heading" (printf "h%d" $block.ranks.children)
+                  ) }}
+              {{ end }}
             {{ end }}
-          {{ end }}
-        </div>
+          </div>
+        {{ else if .no_event_message }}
+          <p>{{ partial "PrepareHTML" .no_event_message }}</p>
+        {{ end }}
+
       </div>
     </div>
   </div>