diff --git a/assets/sass/content.scss b/assets/sass/content.scss
index 8be81ec4..22cdb414 100644
--- a/assets/sass/content.scss
+++ b/assets/sass/content.scss
@@ -71,6 +71,7 @@ td {
 .footnotes {
   p {
     text-align: left;
+    margin-bottom: 0;
   }
 
   hr {
@@ -80,6 +81,7 @@ td {
   ol {
     padding-left: 2rem;
     list-style-position: outside;
+    margin-bottom: 0;
   }
 }
 
@@ -87,7 +89,7 @@ p:has(+ span) {
   margin-bottom: 0;
 }
 
-article p:last-child,
-section p:last-child {
+.o-single__content > *:last-child,
+.o-single__container > *:last-child {
   margin-bottom: 0;
 }
diff --git a/layouts/country/single.html b/layouts/country/single.html
index 407da5a3..b5e0a097 100644
--- a/layouts/country/single.html
+++ b/layouts/country/single.html
@@ -14,7 +14,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
           {{ partial "updateDate.html" . }}
         </div>
 
-        <div data-pagefind-weight="2">
+        <div class="o-single__content" data-pagefind-weight="2">
           {{ partial "content" . }}
         </div>
       </div>
diff --git a/layouts/news/single.html b/layouts/news/single.html
index 8a354398..e2f280da 100644
--- a/layouts/news/single.html
+++ b/layouts/news/single.html
@@ -41,7 +41,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
       <div class="o-single__news-image">
         {{ partial "image" (partial "helper/contentImage" .) }}
       </div>
-      <div data-pagefind-body>
+      <div data-pagefind-body class="o-single__content">
         {{ .Content }}
       </div>
     </div>
diff --git a/layouts/operator/single.html b/layouts/operator/single.html
index a4e55627..f9ca0d06 100644
--- a/layouts/operator/single.html
+++ b/layouts/operator/single.html
@@ -10,7 +10,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
           </div>
           {{ partial "updateDate.html" . }}
         </div>
-        <div data-pagefind-weight="2.5">
+        <div class="o-single__content" data-pagefind-weight="2.5">
           {{ partial "content" . }}
         </div>
       </div>