diff --git a/src/stylesheets/components/_form.scss b/src/stylesheets/base/_form.scss
similarity index 83%
rename from src/stylesheets/components/_form.scss
rename to src/stylesheets/base/_form.scss
index 809b433..3efab47 100644
--- a/src/stylesheets/components/_form.scss
+++ b/src/stylesheets/base/_form.scss
@@ -1,7 +1,12 @@
-form.form {
+form {
 	display: grid;
 	gap: 1rem;
 
+	.input-group {
+		display: grid;
+		gap: 1rem;
+	}
+
 	input:not([type='submit']), textarea {
 		background: #E1E1E1;
 		border: none;
@@ -21,10 +26,8 @@ form.form {
 	}
 
 	@include respond-to('medium') {
-		.form__input-group {
-			display: grid;
+		.input-group {
 			grid-template-columns: 1fr 1fr;
-			gap: 1rem;
 		}
 	}
 }
diff --git a/src/stylesheets/components/_mainForm.scss b/src/stylesheets/components/_mainForm.scss
index e388319..1baf220 100644
--- a/src/stylesheets/components/_mainForm.scss
+++ b/src/stylesheets/components/_mainForm.scss
@@ -1,14 +1,4 @@
-form.mainForm {
-	@extend .form;
-
-	input[type='submit'] {
-		@extend .btn, .btn--primary, .btn--full;
-		width: 100%;
-		padding: 1rem 0;
-	}
-}
-
-.mainFormContainer {
+.mainForm {
 	margin: 2rem auto 0 auto;
 	width: 85vw;
 
@@ -19,6 +9,12 @@ form.mainForm {
 		font-size: 1.2em;
 	}
 
+	input[type='submit'] {
+		@extend .btn, .btn--primary, .btn--full;
+		width: 100%;
+		padding: 1rem 0;
+	}
+
 	@include respond-to('large') {
 		width: 40vw;
 	}
diff --git a/src/stylesheets/main.scss b/src/stylesheets/main.scss
index f8cb1d3..e3a333f 100644
--- a/src/stylesheets/main.scss
+++ b/src/stylesheets/main.scss
@@ -5,13 +5,13 @@
 @import 'vendors/normalise';
 
 @import 'base/typography';
+@import 'base/form';
 
 @import 'components/mainNav';
 @import 'components/button';
 @import 'components/feature';
 @import 'components/testimonial';
 @import 'components/title';
-@import 'components/form';
 @import 'components/mainPageHeader';
 @import 'components/mainForm';
 
diff --git a/views/index.hbs b/views/index.hbs
index 1f11787..981ce4f 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -77,8 +77,8 @@
 				<span>Stratos HQ, HX9 9HN</span>
 			</div>
 		</div>
-		<form class='form' action='/contact' method='post'>
-			<div class='form__input-group'>
+		<form action='/contact' method='post'>
+			<div class='input-group'>
 				<input type='text' id='fname' name='fname' placeholder='First Name' required/>
 				<input type='text' id='lname' name='lname' placeholder='Last Name' required/>
 			</div>
diff --git a/views/login.hbs b/views/login.hbs
index 09b5149..bba93dd 100644
--- a/views/login.hbs
+++ b/views/login.hbs
@@ -1,7 +1,7 @@
 {{> mainPageHeader name='Log In' }}
 
-<div class='mainFormContainer'>
-	<form class='mainForm' action='/login' method='post'>
+<div class='mainForm'>
+	<form action='/login' method='post'>
 		<input type='email' id='email' name='email' placeholder='Email Address' required/>
 		<input type='password' id='password' name='password' placeholder='Password' required/>