diff --git a/_includes/footer.html b/_includes/footer.html
index 80564e2..1d65093 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer>
-	<div class="footer-container">
+	<div class="menu footer-container">
 		<div style="font-size: 1rem">
 			{{ site.footer }}
 		</div>
diff --git a/_layouts/blog.html b/_layouts/blog.html
index eeb64d8..95a50e2 100644
--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -32,8 +32,8 @@
 					{% endfor %}
 				</p>
 			</main>
-			{%- include footer.html -%}
 		</div>
+		{%- include footer.html -%}
 	</body>
 </html>
 
diff --git a/_layouts/company.html b/_layouts/company.html
index 489edc8..1894788 100644
--- a/_layouts/company.html
+++ b/_layouts/company.html
@@ -85,7 +85,7 @@
 
 				{% include primary-cta.html %}
 			</main>
-			{%- include footer.html -%}
 		</div>
+		{%- include footer.html -%}
 	</body>
 </html>
diff --git a/_layouts/contact.html b/_layouts/contact.html
index e763538..068b07d 100644
--- a/_layouts/contact.html
+++ b/_layouts/contact.html
@@ -58,8 +58,8 @@
 				{% include companies-carousel.html hide_title='true' %}
 			</main>
 			<br />
-			{%- include footer.html -%}
 		</div>
+		{%- include footer.html -%}
 	</body>
 
 	<script>
diff --git a/_layouts/default.html b/_layouts/default.html
index 9fc60c2..757dada 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,17 +4,15 @@
 {%- include head.html -%}
 
 <body>
+	{%- include header.html -%}
   <div class="container">
 
-    {%- include header.html -%}
-
     <main>
       {{ content }}
     </main>
 
-    {%- include footer.html -%}
-
   </div>
+	{%- include footer.html -%}
 </body>
 
 </html>
diff --git a/_layouts/landing.html b/_layouts/landing.html
index b853674..033738d 100644
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
@@ -69,7 +69,7 @@
 
 				{% include primary-cta.html %}
 			</main>
-			{%- include footer.html -%}
 		</div>
+		{%- include footer.html -%}
 	</body>
 </html>
diff --git a/_layouts/post.html b/_layouts/post.html
index ea3bc88..2fedfbe 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -24,8 +24,8 @@
 					</p>
 				</article>
 			</main>
-			{%- include footer.html -%}
 		</div>
+		{%- include footer.html -%}
 	</body>
 </html>
 
diff --git a/_layouts/services.html b/_layouts/services.html
index 3263bfb..3f1efae 100644
--- a/_layouts/services.html
+++ b/_layouts/services.html
@@ -138,6 +138,7 @@
 				</section>
 
 			</main>
-			{%- include footer.html -%}
+		</div>
+		{%- include footer.html -%}
 	</body>
 </html>
diff --git a/_layouts/software.html b/_layouts/software.html
index 32cc1f9..e3d39f6 100644
--- a/_layouts/software.html
+++ b/_layouts/software.html
@@ -160,10 +160,8 @@
 				</section>
 
 			</main>
-
-			{%- include footer.html -%}
-
 		</div>
+		{%- include footer.html -%}
 	</body>
 
 </html>
diff --git a/_sass/base.scss b/_sass/base.scss
index f344661..beb0869 100644
--- a/_sass/base.scss
+++ b/_sass/base.scss
@@ -22,10 +22,6 @@ html {
 	scroll-behavior: smooth;
 }
 
-main {
-	min-height: 100vh;
-}
-
 body {
 	width: 100%;
 	background-color: var(--background-color);
@@ -36,6 +32,13 @@ body {
 	color: var(--text-color);
 	text-align: left;
 	line-height: $base-line-height !important;
+	display: flex;
+	flex-direction: column;
+	min-height: 100vh;
+}
+
+body > div.container {
+	flex: 1;
 }
 
 h1 {
@@ -591,7 +594,8 @@ margin-bottom: 16px;
 
 footer {
 	color: var(--light-grey);
-	border-top: 1px solid var(--light-grey);
+	background-color: color-mix(in srgb, var(--background-color), white 1.5%);
+	border-top: 1px solid rgba(255, 255, 255, 0.13);
 	padding: 40px 0px;
 	text-align: right;
 	margin-top: 80px;
@@ -627,6 +631,7 @@ header {
 	padding: 24px;
 	margin-bottom: 24px;
 	border-bottom: 1px solid rgba(255, 255, 255, 0.13);
+	background-color: color-mix(in srgb, var(--background-color), white 1.5%);
 }
 
 header p {
