diff --git a/site/layouts/partials/contact.html b/site/layouts/partials/contact.html
index ce78172..e9a07e6 100644
--- a/site/layouts/partials/contact.html
+++ b/site/layouts/partials/contact.html
@@ -5,35 +5,10 @@
 	<h2 class="section-header">Contact Us</h2>
 
   <div class="l-section-block no-margin no-pad-top">
-		<div class="l-wrapper contact-section">
-			<p class="h5">Complete this form and we will get back to you within one working day.</p>
-			<form action="https://mailthis.to/remailthis" method="POST" encType="multipart/form-data">
-				<ul class="u-no-list">
-					<li>
-						<label for="name">Name</label>
-						<input id="name" type="text" name="name">
-					</li>
-					<li>
-						<label for="email">E-mail:</label>
-						<input id="email" type="email" name="_replyto">
-					</li>
-					<li>
-						<label for="msg">Message:</label>
-						<textarea id="msg" name="message"></textarea>
-					</li>
-					<li><input type="hidden" name="_subject" value="Contact Form Submission"></li>
-					<li><input type="hidden" name="_honeypot" value=""></li>
-					<li><input type="hidden" name="_confirmation" value="Thank you, your message has been sent."></li> <li> <button id="js-form-send" type="submit">Send</button>
-					</li>
-				</ul>
-			</form>
-		</div>
+	  {{ partial "templates/contact/form-basic.html"  . }}
   </div>
 
   <div class="l-section-block no-margin no-pad-top">
-		<div class="l-wrapper contact-section">
-			<h3 class="h4">Remember to Generate Access Token for URL</h3>
-			<div id="mapbox"></div>
-		</div>
+	  {{ partial "templates/map/mapbox-basic.html" . }}
   </div>
 </article>
diff --git a/site/layouts/partials/templates/contact/form-basic.html b/site/layouts/partials/templates/contact/form-basic.html
new file mode 100644
index 0000000..1ab3807
--- /dev/null
+++ b/site/layouts/partials/templates/contact/form-basic.html
@@ -0,0 +1,24 @@
+		<div class="l-wrapper contact-section">
+			<p class="h5">Complete this form and we will get back to you within one working day.</p>
+			<form action="https://mailthis.to/remailthis" method="POST" encType="multipart/form-data">
+				<ul class="u-no-list">
+					<li>
+						<label for="name">Name</label>
+						<input id="name" type="text" name="name">
+					</li>
+					<li>
+						<label for="email">E-mail:</label>
+						<input id="email" type="email" name="_replyto">
+					</li>
+					<li>
+						<label for="msg">Message:</label>
+						<textarea id="msg" name="message"></textarea>
+					</li>
+					<li><input type="hidden" name="_subject" value="Contact Form Submission"></li>
+					<li><input type="hidden" name="_honeypot" value=""></li>
+					<li><input type="hidden" name="_confirmation" value="Thank you, your message has been sent."></li> <li> <button id="js-form-send" type="submit">Send</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+
diff --git a/site/layouts/partials/templates/map/mapbox-basic.html b/site/layouts/partials/templates/map/mapbox-basic.html
new file mode 100644
index 0000000..20b52d6
--- /dev/null
+++ b/site/layouts/partials/templates/map/mapbox-basic.html
@@ -0,0 +1,5 @@
+		<div class="l-wrapper contact-section">
+			<h3 class="h4">Remember to Generate Access Token for URL</h3>
+			<div id="mapbox"></div>
+		</div>
+
diff --git a/src/css/imports/header.scss b/src/css/imports/header.scss
index 24f38a6..9e774c5 100644
--- a/src/css/imports/header.scss
+++ b/src/css/imports/header.scss
@@ -1 +1 @@
-@import "templates/header/header";
+@import "templates/header/header-checkbox";
diff --git a/src/css/imports/templates/header/header.scss b/src/css/imports/templates/header/header-checkbox.scss
similarity index 100%
rename from src/css/imports/templates/header/header.scss
rename to src/css/imports/templates/header/header-checkbox.scss