diff --git a/src/components/MainWindow.astro b/src/components/MainWindow.astro
new file mode 100644
index 0000000..62fd00e
--- /dev/null
+++ b/src/components/MainWindow.astro
@@ -0,0 +1,21 @@
+---
+import Contacts from "../components/Contacts.astro";
+import GroupBox from "../components/GroupBox.astro";
+import Me from "../components/Me.astro";
+import Presence from "../components/Presence.astro";
+import Window from "../components/Window.astro";
+---
+<Window title="Home" maxWidth="600px">
+    <Me />
+    <Presence />
+    <GroupBox name="About me">
+        <p>
+            I'm a Canadian self-taught software developer that makes things some people find useful in Python, HTML, JavaScript, and Kotlin.
+            <br/>
+            I occasionally code with Java or C#, and am currently learning Rust.
+        </p>
+    </GroupBox>
+    <GroupBox name="Reach out">
+        <Contacts />
+    </GroupBox>
+</Window>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 76b5392..b5ca2fd 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,28 +1,10 @@
 ---
-import Contacts from "../components/Contacts.astro";
 import FearOfTechnology from "../components/FearOfTechnology.astro";
-import GroupBox from "../components/GroupBox.astro";
-import Me from "../components/Me.astro";
-import Presence from "../components/Presence.astro";
-import Social from "../components/Social.astro";
-import Window from "../components/Window.astro";
+import MainWindow from "../components/MainWindow.astro";
 import BaseLayout from "../layouts/BaseLayout.astro";
 ---
 
 <BaseLayout tabTitle="Home - nin0dev">
 	<FearOfTechnology />
-	<Window title="Home" maxWidth="600px">
-		<Me />
-		<Presence />
-		<GroupBox name="About me">
-			<p>
-				I'm a Canadian self-taught software developer that makes things some people find useful in Python, HTML, JavaScript, and Kotlin.
-				<br/>
-				I occasionally code with Java or C#, and am currently learning Rust.
-			</p>
-		</GroupBox>
-		<GroupBox name="Reach out">
-			<Contacts />
-		</GroupBox>
-	</Window>
+	<MainWindow />
 </BaseLayout>