diff --git a/public/contact.html b/public/contact.html
index e0a2cee..16d041d 100644
--- a/public/contact.html
+++ b/public/contact.html
@@ -2,7 +2,7 @@
 <html lang="nl" data-bs-theme="dark">
 
 <head>
-  <!--# include file="/includes/head.html" -->
+  <!--# include file="/includes/partials/head-content.html" -->
 
   <title>Vandevliet Aerial Shots</title>
   <meta name="description" content="FPV dronevideo's voor bedrijven, vastgoed, recreatie, sport en evenementen.">
@@ -17,21 +17,27 @@
 
 <body>
   <header>
-    <!--# include file="/includes/nav.html" -->
+    <!--# include file="/includes/components/nav.html" -->
   </header>
 
   <main>
     <section class="container-xxl pb-0 text-center">
+      <h1 id="contact" class="text-center">Contact</h1>
       <p class="lead">
         Stuur mij gerust een mailtje voor een vrijblijvend gesprek! 🙂
         <br>🡇
       </p>
+      <section class="container-xxl">
+        <!--# include file="/includes/components/contact-row.html" -->
+      </section>
     </section>
 
     <!-- Nothing more here yet, contact form will be added later, contact info is in the footer -->
   </main>
 
-  <!--# include file="/includes/footer.html" -->
+  <footer class="bg-secondary-subtle pt-3">
+    <!--# include file="/includes/partials/footer-bottom.html" -->
+  </footer>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/includes/components/contact-row.html b/public/includes/components/contact-row.html
new file mode 100644
index 0000000..4648160
--- /dev/null
+++ b/public/includes/components/contact-row.html
@@ -0,0 +1,34 @@
+<div class="row justify-content-center">
+  <div class="col-6 col-lg-3">
+    <div class="card h-100">
+      <div class="card-body d-flex flex-column">
+        <h2 class="section fs-3 card-title">Bob Vandevliet</h2>
+        <p style="margin-top: 0 !important;">Gecertificeerd FPV-dronepiloot</p>
+        <p>
+          <a href="mailto:bob@vandevliet-aerialshots.com">bob@vandevliet-aerialshots.com</a>
+          <br>Arnhem, Gelderland
+        </p>
+        <!-- <p><a class="btn btn-primary" href="/contact">Offerte aanvragen</a></p> -->
+        <p class="fs-5 ff-header">Vandevliet Aerial Shots</p>
+        <p style="margin-top: 0 !important;">
+          KvK: 94567255<br>
+          Btw: NL005095319B19
+        </p>
+        <p>
+          <a href="/assets/static/Vandevliet AS - Algemene Voorwaarden - 250530.pdf" target="_blank">Algemene Voorwaarden</a>
+        </p>
+        <!-- <h4 class="fs-5">Socials</h4> -->
+        <p class="socials fs-2" style="margin-top: auto !important; padding-top: 1rem !important;">
+          <a href="https://www.instagram.com/vandevliet.fpv" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on Instagram" aria-label="Vandevliet Aerial Shots on Instagram"><i class="fab fa-instagram"></i></a>
+          <a href="https://www.youtube.com/@vandevliet-fpv" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on YouTube" aria-label="Vandevliet Aerial Shots on YouTube"><i class="fab fa-youtube"></i></a>
+          <a href="https://www.linkedin.com/company/vdv-as" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on LinkedIn" aria-label="Vandevliet Aerial Shots on LinkedIn"><i class="fab fa-linkedin"></i></a>
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-6 col-lg-3">
+    <div class="card h-100 bg-transparent">
+      <img class="card-img" src="/assets/static/20230909_150343.jpg" alt="Portrait foto van mijzelf.">
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/public/includes/nav.html b/public/includes/components/nav.html
similarity index 100%
rename from public/includes/nav.html
rename to public/includes/components/nav.html
diff --git a/public/includes/footer.html b/public/includes/footer.html
deleted file mode 100644
index b309074..0000000
--- a/public/includes/footer.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<footer class="bg-secondary-subtle pt-3">
-
-  <section class="container-xxl">
-    <div class="row justify-content-center">
-      <div class="col-6 col-lg-3">
-        <div class="card h-100">
-          <div class="card-body d-flex flex-column">
-            <h2 class="section fs-3 card-title">Bob Vandevliet</h2>
-            <p style="margin-top: 0 !important;">Gecertificeerd FPV-dronepiloot</p>
-            <p>
-              <a href="mailto:bob@vandevliet-aerialshots.com">bob@vandevliet-aerialshots.com</a>
-              <br>Arnhem, Gelderland
-            </p>
-            <!-- <p><a class="btn btn-primary" href="/contact">Offerte aanvragen</a></p> -->
-            <p class="fs-5 ff-header">Vandevliet Aerial Shots</p>
-            <p style="margin-top: 0 !important;">
-              KvK: 94567255<br>
-              Btw: NL005095319B19
-            </p>
-            <p>
-              <a href="/assets/static/Vandevliet AS - Algemene Voorwaarden - 250530.pdf" target="_blank">Algemene Voorwaarden</a>
-            </p>
-            <!-- <h4 class="fs-5">Socials</h4> -->
-            <p class="socials fs-2" style="margin-top: auto !important; padding-top: 1rem !important;">
-              <a href="https://www.instagram.com/vandevliet.fpv" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on Instagram" aria-label="Vandevliet Aerial Shots on Instagram"><i class="fab fa-instagram"></i></a>
-              <a href="https://www.youtube.com/@vandevliet-fpv" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on YouTube" aria-label="Vandevliet Aerial Shots on YouTube"><i class="fab fa-youtube"></i></a>
-              <a href="https://www.linkedin.com/company/vdv-as" target="_blank" rel="noopener noreferrer" title="Vandevliet Aerial Shots on LinkedIn" aria-label="Vandevliet Aerial Shots on LinkedIn"><i class="fab fa-linkedin"></i></a>
-            </p>
-          </div>
-        </div>
-      </div>
-      <div class="col-6 col-lg-3">
-        <div class="card h-100 bg-transparent">
-          <img class="card-img" src="/assets/static/20230909_150343.jpg" alt="Portrait foto van mijzelf.">
-        </div>
-      </div>
-    </div>
-  </section>
-
-  <div class="text-center py-4">
-    <p>
-      Vandevliet Aerial Shots &copy; <!--# config timefmt="%Y" --><!--# echo var="date_local" -->
-      &bull; <a href="/privacy#">Privacyverklaring</a>
-    </p>
-  </div>
-</footer>
\ No newline at end of file
diff --git a/public/includes/partials/footer-bottom.html b/public/includes/partials/footer-bottom.html
new file mode 100644
index 0000000..805e114
--- /dev/null
+++ b/public/includes/partials/footer-bottom.html
@@ -0,0 +1,6 @@
+<div class="text-center py-4">
+  <p>
+    Vandevliet Aerial Shots &copy; <!--# config timefmt="%Y" --><!--# echo var="date_local" -->
+    &bull; <a href="/privacy#">Privacyverklaring</a>
+  </p>
+</div>
\ No newline at end of file
diff --git a/public/includes/head.html b/public/includes/partials/head-content.html
similarity index 100%
rename from public/includes/head.html
rename to public/includes/partials/head-content.html
diff --git a/public/index.html b/public/index.html
index 7a69d1f..f77e290 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="nl" data-bs-theme="dark">
 
 <head>
-  <!--# include file="/includes/head.html" -->
+  <!--# include file="/includes/partials/head-content.html" -->
 
   <title>Vandevliet Aerial Shots</title>
   <meta name="description" content="FPV dronevideo's voor bedrijven, vastgoed, recreatie, sport en evenementen.">
@@ -17,7 +17,7 @@
 
 <body>
   <header>
-    <!--# include file="/includes/nav.html" -->
+    <!--# include file="/includes/components/nav.html" -->
 
     <div class="hero position-relative overflow-hidden" style="height: 100vh;">
       <div class="hero-body position-absolute bottom-0" style="z-index: 1;">
@@ -190,7 +190,13 @@
     </section>
   </main>
 
-  <!--# include file="/includes/footer.html" -->
+  <footer class="bg-secondary-subtle pt-3">
+    <section class="container-xxl">
+      <!--# include file="/includes/components/contact-row.html" -->
+    </section>
+
+    <!--# include file="/includes/partials/footer-bottom.html" -->
+  </footer>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/privacy.html b/public/privacy.html
index d6e643a..e2b8a94 100644
--- a/public/privacy.html
+++ b/public/privacy.html
@@ -2,7 +2,7 @@
 <html lang="nl" data-bs-theme="dark">
 
 <head>
-  <!--# include file="/includes/head.html" -->
+  <!--# include file="/includes/partials/head-content.html" -->
 
   <title>Privacyverklaring • Vandevliet Aerial Shots</title>
   <meta name="description" content="Privacyverklaring • Vandevliet Aerial Shots">
@@ -17,7 +17,7 @@
 
 <body>
   <header>
-    <!--# include file="/includes/nav.html" -->
+    <!--# include file="/includes/components/nav.html" -->
   </header>
 
   <main>
