diff --git a/resources/skins.citizen.styles/layout.less b/resources/skins.citizen.styles/layout.less
index 949d750f..e0018793 100644
--- a/resources/skins.citizen.styles/layout.less
+++ b/resources/skins.citizen.styles/layout.less
@@ -1,5 +1,10 @@
 @width-breakpoint-desktop-wider: @width-breakpoint-desktop + @width-toc * 2;
 
+.citizen-page-container {
+	// Reserve space for header
+	margin-bottom: var( --header-size );
+}
+
 .mw-body,
 .parsoid-body {
 	min-height: 80vh; // avoid footer being in the middle of the page
@@ -87,13 +92,10 @@ a.image {
 		padding-left: ~'calc( var( --padding-page ) * 2 )';
 	}
 
-	#siteNotice,
-	.mw-body,
-	.parsoid-body,
-	.citizen-footer,
-	#mw-data-after-content {
+	.citizen-page-container {
 		// Reserve space for header
 		margin-left: var( --header-size );
+		margin-bottom: 0;
 	}
 }
 
diff --git a/templates/skin.mustache b/templates/skin.mustache
index e47e95c9..d92ac01e 100644
--- a/templates/skin.mustache
+++ b/templates/skin.mustache
@@ -11,16 +11,18 @@
 }}
 
 {{#data-header}}{{>Header}}{{/data-header}}
-<div id="siteNotice">{{{html-site-notice}}}</div>
-<main class="mw-body {{#toc-enabled}}citizen-toc-enabled{{/toc-enabled}}" id="content">
-	{{>ContentHeader}}
-	<div id="bodyContent" class="citizen-body" aria-labelledby="firstHeading">
-		<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
-		{{#html-undelete-link}}<div id="contentSub2">{{{.}}}</div>{{/html-undelete-link}}
-		{{{html-user-message}}}
-		{{{html-body-content--formatted}}}
-	</div>
-	{{>ContentFooter}}
-</main>
-{{{html-after-content}}}
-{{#data-footer}}{{>Footer}}{{/data-footer}}
+<div class="citizen-page-container">
+	<div id="siteNotice">{{{html-site-notice}}}</div>
+	<main class="mw-body {{#toc-enabled}}citizen-toc-enabled{{/toc-enabled}}" id="content">
+		{{>ContentHeader}}
+		<div id="bodyContent" class="citizen-body" aria-labelledby="firstHeading">
+			<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
+			{{#html-undelete-link}}<div id="contentSub2">{{{.}}}</div>{{/html-undelete-link}}
+			{{{html-user-message}}}
+			{{{html-body-content--formatted}}}
+		</div>
+		{{>ContentFooter}}
+	</main>
+	{{{html-after-content}}}
+	{{#data-footer}}{{>Footer}}{{/data-footer}}
+</div>