diff --git a/src/_includes/base.njk b/src/_includes/base.njk
index 4194669..4b4990e 100644
--- a/src/_includes/base.njk
+++ b/src/_includes/base.njk
@@ -49,40 +49,44 @@
 		{% endif %}
 	</head>
 	<body>
-		<header class="wrapper-lg row space-between">
-			<a href="/" class="site-title">LD</a>
-			
-			<a href="/feed/" class="rss" aria-label="RSS feed">
-				<i class="fa-solid fa-rss"></i>
-			</a>
-			<fieldset class="color-scheme">
-				<legend>Change your colour scheme</legend>
-				<label>
-					<input type="radio" name="color-scheme" value="dark">
-					Dark
-				</label>
-				<label>
-					<input type="radio" name="color-scheme" value="light">
-					Light
-				</label>
-				<label>
-					<input type="radio" name="color-scheme" value="system">
-					System
-				</label>
-			</fieldset>
-
+		<header>
+			<div class="switcher-lg">
 			<nav class="main-nav">
-				<ul class="row" role='list'>
+				<ul role='list'>
 					<li><a href="/">Home</a></li>
 					<li><a href="/blog">Blog</a></li>
-					<li><a href="/events/2024">Events</a></li>
 					<li><a href="/links">Links</a></li>
 					<li><a href="/blogroll">/Blogroll</a></li>
 					<li><a href="/uses">/Uses</a></li>
+					<li>
+						<a href="/feed/" class="rss" aria-label="RSS feed">
+							<i class="fa-solid fa-rss"></i>
+						</a>
+					</li>
 				</ul>
 			</nav>
+			<fieldset class="color-scheme">
+				<legend>Change your colour scheme</legend>
+				<div class="switcher-sm">
+					<label>
+						<input type="radio" name="color-scheme" value="dark">
+						Dark
+					</label>
+					<label>
+						<input type="radio" name="color-scheme" value="light">
+						Light
+					</label>
+					<label>
+						<input type="radio" name="color-scheme" value="system">
+						System
+					</label>
+				</div>
+			</fieldset>
+			</div>
 		</header>
+		<div class="content">
 		{{ content | safe }}
+		</div>
 		<footer>
 			<div class="wrapper-lg">Copyright &copy; {{ today.year }} {{ metadata.author.name }}</div>
 
diff --git a/src/_includes/post.njk b/src/_includes/post.njk
index 5bc78e2..8a4ffd0 100644
--- a/src/_includes/post.njk
+++ b/src/_includes/post.njk
@@ -2,7 +2,7 @@
 layout: base.njk
 includePrism: true
 ---
-<main class="wrapper-lg stack-lg">
+<main class="stack-lg">
     <article class="stack-md h-entry">
             <h1 class="p-name"><a href="{{ url }}" class="u-url">{{ title | safe }}</a></h1>
             <p class="published">Published: <time class="dt-published" datetime="{{ page.date | dateToRfc3339 }}">{{ page.date | dateDisplay }}</time></p>
diff --git a/src/css/compositions/switcher.css b/src/css/compositions/switcher.css
new file mode 100644
index 0000000..5779bec
--- /dev/null
+++ b/src/css/compositions/switcher.css
@@ -0,0 +1,21 @@
+[class*="switcher"] {
+        display: flex;
+        flex-wrap: wrap;
+        margin: calc(var(--switcher-space, 1rem) / 2 * -1);
+
+        > * {
+            flex-grow: 1;
+            flex-basis: calc((var(--switcher-threshold, 30rem) - (100% - var(--switcher-space, 1rem))) * 999);
+            margin: calc(var(--switcher-space, 1rem) / 2);
+        }
+}
+
+.switcher-sm {
+    --switcher-threshold: 20rem;
+    --switcher-space: var(--space-size-4xs);
+}
+
+.switcher-lg {
+    --switcher-threshold: 50rem;
+    --switcher-space: var(--space-size-3xs);
+}
\ No newline at end of file
diff --git a/src/css/exceptions/color-scheme-picker.css b/src/css/exceptions/color-scheme-picker.css
index ecb67a0..0b5309b 100644
--- a/src/css/exceptions/color-scheme-picker.css
+++ b/src/css/exceptions/color-scheme-picker.css
@@ -3,8 +3,11 @@
 	border: 0;
 	padding: 0;
 	display: flex;
-	gap: var(--space-size-xs);
-	justify-content: flex-end;
+	gap: var(--space-size-3xs);
+	flex-direction: column;
+	max-width: 25rem;
+	margin-left: auto;
+	text-align: right;
 
 	legend {
 		position:absolute;
@@ -64,4 +67,13 @@
 			text-shadow: var(--color-decoration) 1px 0 10px;
 		}
 	}
+}
+
+@media only screen and (max-width: 1280px) {
+	.color-scheme {
+		margin-right: 0;
+		margin-left: auto;
+		padding: 0 var(--space-size-l);
+		width: 100%;
+	}
 }
\ No newline at end of file
diff --git a/src/css/exceptions/header.css b/src/css/exceptions/header.css
new file mode 100644
index 0000000..1e4a362
--- /dev/null
+++ b/src/css/exceptions/header.css
@@ -0,0 +1,17 @@
+header {
+    flex-basis: 20rem;
+    flex-grow: 1;
+    padding: var(--space-size-m) var(--space-size-2xs);
+
+    > * {
+        margin-left: auto;
+    }
+}
+
+@media only screen and (max-width: 1280px) {
+    header {
+        .switcher-lg {
+            flex-direction: column-reverse;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/css/exceptions/home.css b/src/css/exceptions/home.css
index e0f55a2..69ee69f 100644
--- a/src/css/exceptions/home.css
+++ b/src/css/exceptions/home.css
@@ -11,6 +11,10 @@
     font-size: var(--text-size-2xl);
   } */
 
+  h1 {
+    text-align: left;
+    width: 100%;
+  }
   h1, h2, h3 {
     &::before {
       content: "\203A";
diff --git a/src/css/exceptions/main-nav.css b/src/css/exceptions/main-nav.css
index bd483a8..0ba15f1 100644
--- a/src/css/exceptions/main-nav.css
+++ b/src/css/exceptions/main-nav.css
@@ -1,10 +1,24 @@
 .main-nav {
-    width: 100%;
-    flex-grow: 1;
+    text-align: right;
+}
 
-    .row {
-        width: fit-content;
-        max-width: 100%;
-        margin: 0 auto;
+@media only screen and (max-width: 1280px) {
+    .main-nav {
+        flex-basis: 100%;
+        flex-grow: 1;
+        align-content: center;
+        max-width: var(--screen-size-lg);
+
+        ul {
+            display: flex;
+            gap: var(--space-size-xs);
+            flex-grow: 1;
+            align-items: center;
+            align-content: center;
+            max-width: var(--screen-size-lg);
+            margin-left: 0;
+            margin-right: auto;
+            padding: 0 var(--space-size-l);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/css/exceptions/rss.css b/src/css/exceptions/rss.css
index 2067052..2a55911 100644
--- a/src/css/exceptions/rss.css
+++ b/src/css/exceptions/rss.css
@@ -1,7 +1,8 @@
 .rss {
-	flex-grow: initial;
 	font-size: var(--text-size-s);
 	padding: 0 var(--space-size-2xs);
+	height: auto;
+	width: fit-content;
 
 	&:hover {
 		background-color: var(--color-primary);
diff --git a/src/css/exceptions/site-title.css b/src/css/exceptions/site-title.css
index 8c2fb68..a419994 100644
--- a/src/css/exceptions/site-title.css
+++ b/src/css/exceptions/site-title.css
@@ -3,8 +3,7 @@
   letter-spacing: clamp(-0.2rem,1vw,-0.5rem);
   line-height: 1;
   text-decoration: none;
-  place-self: start;
-  flex-grow: 1;
+  width: fit-content;
 
   &:hover, &:focus, &:focus-visible {
     outline: 0px transparent;
diff --git a/src/css/globals.css b/src/css/globals.css
index 556d239..ae542a4 100644
--- a/src/css/globals.css
+++ b/src/css/globals.css
@@ -41,6 +41,16 @@ body {
     font-family: var(--font-family-mono);
     font-size: var(--text-size-s);
     text-underline-offset: var(--space-size-4xs);
+    display: flex;
+    flex-wrap: wrap;
+
+    > .content {
+        flex-basis: 0;
+        flex-grow: 999;
+        min-inline-size: 75%;
+        max-inline-size: var(--screen-lg);
+        padding: var(--space-size-s) var(--space-size-m);        
+    }
 }
 
 
@@ -111,12 +121,6 @@ nav {
     font-size: var(--text-size-s);
 }
 
-header {
-   flex-wrap: wrap;
-   padding-top: var(--space-size-s);
-   padding-bottom: var(--space-size-s);
-   align-items: center;
-}
 
 p {
     line-height: 1.6;
@@ -155,4 +159,11 @@ img, picture {
     max-width: 100%;
     height: auto;
     object-fit: cover;
+}
+
+main {
+    max-width: var(--screen-lg);
+    margin-left: 0;
+    margin-right: auto;
+    padding: 0 var(--space-size-m);
 }
\ No newline at end of file
diff --git a/src/events/2023.11tydata.json b/src/events/2023.11tydata.json
deleted file mode 100644
index ca0fdab..0000000
--- a/src/events/2023.11tydata.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "events": [
-        {
-            "date": "2024-07-14",
-            "name": "Manchester - Blackpool Bike Ride",
-            "location": "Manchester, UK",
-            "distance": "215km"
-        },
-        {
-            "date": "2024-09-02",
-            "name": "Manchester 100",
-            "location": "Manchester, UK",
-            "distance": "173km"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/events/2023.md b/src/events/2023.md
deleted file mode 100644
index 2960079..0000000
--- a/src/events/2023.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 2023 cycling events calendar
-layout: eventcalendar.njk
----
-
-For 2023, I cycled two events raising money for [The Christie](https://www.christie.nhs.uk/), and was able to raise an amazing £936!
-
-Thanks so much to everyone who donated, I really appreciate it.
diff --git a/src/events/2024.11tydata.json b/src/events/2024.11tydata.json
deleted file mode 100644
index 59fae72..0000000
--- a/src/events/2024.11tydata.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{ "events": [
-    {
-        "date": "2024-05-11",
-        "name": "Macclesfield Bikeathon",
-        "location": "Macclesfield, UK",
-        "distance": "96km"
-    },
-    {
-        "date": "2024-05-12",
-        "name": "Helping Kids with Cancer Sportive 2024",
-        "location": "Bolton, UK",
-        "distance": "105km"
-    },
-    {
-        "date": "2024-07-14",
-        "name": "Manchester - Blackpool Bike Ride",
-        "location": "Manchester, UK",
-        "distance": "215km"
-    },
-    {
-        "date": "2024-09-01",
-        "name": "Manchester 100",
-        "location": "Manchester, UK",
-        "distance": "160km"
-    }
-]
-}
\ No newline at end of file
diff --git a/src/events/2024.md b/src/events/2024.md
deleted file mode 100644
index 4c2dea4..0000000
--- a/src/events/2024.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 2024 cycling events calendar
-layout: eventcalendar.njk
----
-
-This year I'm raising money for [Cyclists Fighting Cancer](https://www.cyclistsfc.org.uk/), a brilliant charity that donate bikes to children and young people who are dealing with cancer.
-
-If you'd like to donate to the fundraiser, you can do so on the [JustGiving page](https://www.justgiving.com/page/lewis-dale-bikes).
diff --git a/src/index.html b/src/index.html
index 9dcb062..e003377 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@ title: Home
 layout: base.njk
 ---
 
-<main class="home wrapper-lg stack-2xl">
+<main class="home stack-2xl">
 	<section class="stack-md row h-card">
     <h1><a href="https://{{ metadata.site.domain }}" rel="me" class="u-url">Hi, I'm <span class="p-given-name">Lewis</span></a></h1>
 		<p class="inline-block max-w-[45ch] p-note">
