diff --git a/assets/css/src/page-sectioned.css b/assets/css/src/page-sectioned.css
index 4cb6c95..7223b6c 100644
--- a/assets/css/src/page-sectioned.css
+++ b/assets/css/src/page-sectioned.css
@@ -1,5 +1,14 @@
-[data-template="sectioned"] main p {
+[data-template="sectioned"] section {
+  scroll-margin-top: 7rem;
+}
+
+[data-template="sectioned"] .section__row {
+  margin-bottom: 1rem;
+}
+
+[data-template="sectioned"] main p:not(:last-child) {
   font-size: var(--font-size-s);
+  margin-bottom: 1rem;
 }
 
 [data-template="sectioned"] main .big p {
@@ -8,6 +17,10 @@
 
 [data-template="sectioned"] main h2 {
   font-weight: bold;
+}
+
+[data-template="sectioned"] main h2,
+[data-template="sectioned"] main h3 {
   margin-bottom: calc(var(--padding-vertical) / 1.5);
 }
 
diff --git a/site/blueprints/blocks/heading.yml b/site/blueprints/blocks/heading.yml
index 21340f9..c6ca3e9 100644
--- a/site/blueprints/blocks/heading.yml
+++ b/site/blueprints/blocks/heading.yml
@@ -20,9 +20,6 @@ fields:
     default: "h2"
     labels: false
     options:
-      - value: h2
-        icon: h2
-        text: H2
       - value: h3
         icon: h3
         text: H3
diff --git a/site/snippets/calendar-strip.php b/site/snippets/calendar-strip.php
index 8893600..e4905bf 100644
--- a/site/snippets/calendar-strip.php
+++ b/site/snippets/calendar-strip.php
@@ -60,7 +60,7 @@
       </li>
     </template>
   </ul>
-  <button class="calendar-strip__calendar-btn">calendrier</button>
+  <a href="<?= page('programme')->url() ?>" class="calendar-strip__calendar-btn">calendrier</a>
   <div class="calendar-strip__date" :class="open ? 'open' : ''">
     <ul class="sessions sessions--detailed">
       <template x-for="session in targetSessions">
diff --git a/site/snippets/nav.php b/site/snippets/nav.php
index 81d10bb..8fedc2c 100644
--- a/site/snippets/nav.php
+++ b/site/snippets/nav.php
@@ -54,7 +54,7 @@
           <ul>
             <?php foreach($category->children() as $subcategory): ?>
                 <?php if ($subcategory->isIndexed() == 'true'): ?>
-                  <li><a class="expanded-nav__subcategory" href="<?= $subcategory->url() ?>"><?= $subcategory->title() ?></a></li>
+                  <li><a class="expanded-nav__subcategory" href="<?= $category->url() . '/#' . $subcategory->slug() ?>"><?= $subcategory->title() ?></a></li>
                 <?php endif ?>
             <?php endforeach ?>
           </ul>
diff --git a/site/templates/sectioned.php b/site/templates/sectioned.php
index fd76344..d6be7d8 100644
--- a/site/templates/sectioned.php
+++ b/site/templates/sectioned.php
@@ -5,12 +5,12 @@
 </section>
 
 <?php foreach($page->children() as $sectionPage): ?>
-  <section>
+  <section id="<?= $sectionPage->slug() ?>">
     <?php if ($sectionPage->isIndexed() != 'false'): ?>
       <h2 class="h3"><?= $sectionPage->title() ?></h2>
     <?php endif ?>
     <?php foreach ($sectionPage->section()->toLayouts() as $layout): ?>
-    <div class="grid" id="<?= $layout->id() ?>">
+    <div class="section__row grid" id="<?= $layout->id() ?>">
       <?php foreach ($layout->columns() as $column): ?>
       <div class="grid__item" style="--span:<?= $column->span() ?>">
         <div class="blocks">