diff --git a/assets/sass/_theme/blocks/pages.sass b/assets/sass/_theme/blocks/pages.sass
index 3e8d25159b005a49cb7ca7a0f316d0f1e61ed32a..7095e50e98c4cc6914beb0896e556cc3f766a13a 100644
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -154,6 +154,9 @@
                         li
                             margin-top: 0
             @include in-page-without-sidebar
+                h2
+                    a
+                        @include stretched-link(before)
                 .block-content
                     @include grid
                     grid-row-gap: $spacing1
diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/partials/blocks/templates/chapter.html
index 417e27199f6bd13a63b6da9386ca077278d9bd8d..991d7028c372ac2d2f852c36fec846f9483e9db9 100644
--- a/layouts/partials/blocks/templates/chapter.html
+++ b/layouts/partials/blocks/templates/chapter.html
@@ -20,7 +20,7 @@
             </div>
           {{ end -}}
           {{ if (partial "GetTextFromHTML" .text) -}}
-          <div>
+          <div class="rich-text">
             {{ partial "PrepareHTML" .text }}
           </div>
           {{ end -}}