diff --git a/resources/skins.citizen.styles/layout.less b/resources/skins.citizen.styles/layout.less
index 822c954f..15b72ca3 100644
--- a/resources/skins.citizen.styles/layout.less
+++ b/resources/skins.citizen.styles/layout.less
@@ -1,3 +1,10 @@
+.citizen-page-container {
+	display: flex; // Should fix weird margin issues
+	flex-direction: column;
+	min-height: 100vh; // Ensure footer goes to the bottom of the page
+	min-height: stretch; // for iOS, excludes safe areas
+}
+
 .mw-body,
 .parsoid-body {
 	min-height: 80vh; // avoid footer being in the middle of the page