6 files changed, 24 insertions, 21 deletions
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index d8aa572..eeca534 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -6,6 +6,7 @@ interface Props {
 
 const { title = "ShiftOS: The Archive", description } = Astro.props;
 import '../styles/style.css';
+import '../styles/window.css';
 ---
 
 <!DOCTYPE html>
@@ -15,7 +16,7 @@ import '../styles/style.css';
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
-    
+
     <!-- Default Metadata -->
 	<meta name="title" content={title} />
 	<meta name="description" content={description} />
@@ -28,7 +29,7 @@ import '../styles/style.css';
 
     <meta name="theme-color" content="#000000"/>
     <meta name="generator" content={Astro.generator} />
-    
+
     <title>{title}</title>
 </head>
 <body>
diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro
index c9066be..780bc8d 100644
--- a/src/layouts/Page.astro
+++ b/src/layouts/Page.astro
@@ -1,10 +1,18 @@
 ---
-import Layout from '../layouts/Layout.astro';
+import Layout from "../layouts/Layout.astro";
 const { frontmatter } = Astro.props;
 ---
 
 <Layout title={frontmatter.title} description={frontmatter.description}>
-    <div class="container">
-        <slot />
+    <div class="window">
+        <div class="titlebar">
+            <p class="titlebar-text">{frontmatter.title}</p>
+            <div class="titlebar-buttons">
+                <a href="/"><div class="titlebar-box titlebar-box-link"></div></a>
+            </div>
+        </div>
+        <div class="container">
+            <slot />
+        </div>
     </div>
-</Layout>
-\ No newline at end of file
+</Layout>
diff --git a/src/pages/downloads.md b/src/pages/downloads.md
index f068700..08c0645 100644
--- a/src/pages/downloads.md
+++ b/src/pages/downloads.md
@@ -3,12 +3,8 @@ title: "ShiftOS: Downloads"
 description: Download ShiftOS here! This contains the ShiftOS source code and ShiftOS binary files.
 layout: ../layouts/Page.astro
 ---
-
-# ShiftOS Downloads
-
-[Return to homepage](/)
-
-Download ShiftOS here! This contains the ShiftOS source code and ShiftOS binary files.
+# Download ShiftOS here! 
+This contains the ShiftOS source code and ShiftOS binary files.
 
 If you have files for ShiftOS, zip it (if it has dependencies), and email [email protected] with the binary/zip attached.
 
diff --git a/src/pages/history.md b/src/pages/history.md
index 001b4cb..29b1a4b 100644
--- a/src/pages/history.md
+++ b/src/pages/history.md
@@ -4,10 +4,4 @@ description: ShiftOS started back in November 2013 when Philip Adams wanted to m
 layout: ../layouts/Page.astro
 # TODO: Replace this with the doc version
 ---
-
-# ShiftOS History
-If you have anything to add, feel free to make a [pull request](https://github.com/Alee14/shiftos-website).
-
-[Return to homepage](/)
-    
 ## This page is currently being revamped...
diff --git a/src/pages/index.astro b/src/pages/index.astro
index b016f7b..4caa7e6 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -2,7 +2,6 @@
 import { Image } from 'astro:assets';
 import logo from "../assets/logo.png";
 import Layout from '../layouts/Layout.astro';
-import '../styles/window.css';
 ---
 
 <Layout title="ShiftOS: The Archive" description="ShiftOS was a game developed by Philip Adams and other developers. The original goal was to go from a bare terminal to a graphical user interface with full desktop features.">
diff --git a/src/styles/window.css b/src/styles/window.css
index 0a3715a..ad7a855 100644
--- a/src/styles/window.css
+++ b/src/styles/window.css
@@ -2,6 +2,7 @@
     --titlebar-colour: #808080;
     --titlebar-text-colour: #ffffff;
     --titlebar-control-colour: #000000;
+    --titlebar-control-link: #c4c4c4;
 
     --dark-window: #000000;
     --light-window: #ffffff;
@@ -82,6 +83,10 @@
     margin-left: 0.2em;
 }
 
+.titlebar-box-link:hover {
+    background-color: var(--titlebar-control-link);
+}
+
 .window {
     font-family: Arial, Helvetica, sans-serif;
     margin: 1em 2%;
@@ -91,9 +96,9 @@
 }
 
 .button {
-    padding: 15px 40px;
+    padding: 10px 40px;
     border: solid;
-    border-width: 2px;
+    border-width: 1px;
 }
 
 .nav {