diff --git a/src/App.css b/src/App.css
deleted file mode 100644
index 8a49fa1..0000000
--- a/src/App.css
+++ /dev/null
@@ -1,10 +0,0 @@
-#root {
-	max-width: 1280px;
-	margin: 0 auto;
-	padding: 2rem;
-	text-align: center;
-}
-
-@theme {
-	
-}
diff --git a/src/App.tsx b/src/App.tsx
index 798648b..8dc0a71 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,4 +1,3 @@
-import "@/App.css";
 import { BrowserRouter, Route, Routes } from "react-router";
 import NavBar from "./components/nav/NavBar";
 import AdminPage from "./pages/protected/AdminPage";
@@ -77,18 +76,26 @@ const protectedRoutes: { path: string; element: React.ReactElement; }[] = [
 
 export default function App(){
 	return (
-		<div
-			className="mt-20"
-		>
-			<BrowserRouter>
-				{/* Nav Bar */}
-				<NavBar/>
+		<BrowserRouter>
+			{/* Nav Bar */}
+			<NavBar/>
 
-				{/* Routing */}
-				<Routes>
-					{/* Public Routes */}
+			{/* Routing */}
+			<Routes>
+				{/* Public Routes */}
+				{
+					publicRoutes.map((route) => (
+						<Route
+							key={route.path}
+							path={route.path}
+							element={route.element}
+						/>
+					))
+				}
+				{/* Protected Routes */}
+				<Route element={<ProtectedRoute/>}>
 					{
-						publicRoutes.map((route) => (
+						protectedRoutes.map((route) => (
 							<Route
 								key={route.path}
 								path={route.path}
@@ -96,20 +103,8 @@ export default function App(){
 							/>
 						))
 					}
-					{/* Protected Routes */}
-					<Route element={<ProtectedRoute/>}>
-						{
-							protectedRoutes.map((route) => (
-								<Route
-									key={route.path}
-									path={route.path}
-									element={route.element}
-								/>
-							))
-						}
-					</Route>
-				</Routes>
-			</BrowserRouter>
-		</div>
+				</Route>
+			</Routes>
+		</BrowserRouter>
 	);
 }
diff --git a/src/components/nav/NavBar.tsx b/src/components/nav/NavBar.tsx
index 7c67572..20f5da2 100644
--- a/src/components/nav/NavBar.tsx
+++ b/src/components/nav/NavBar.tsx
@@ -11,12 +11,12 @@ export default function NavBar(){
 	return (
 		<nav
 			className={clsx(
-				"fixed w-full top-0 left-0 border-b-2 z-40",
+				"border-b-2 z-40",
 				"bg-gray-700 border-gray-600 dark:bg-zinc-900 dark:border-neutral-850 text-white"
 			)}
 		>
 			<div
-				className="max-w-(--breakpoint-xl) flex flex-nowrap flex-row items-center justify-between mx-auto p-4"
+				className="navContents"
 			>
 				<Link
 					to="/"
diff --git a/src/index.css b/src/index.css
index 14fe279..fd8d007 100644
--- a/src/index.css
+++ b/src/index.css
@@ -7,28 +7,26 @@
 }
 
 
+:root.dark {
+	--text-color: #FFFFFFDE;
+	--bg-color: var(--color-neutral-825);
+}
+
+:root.light {
+	--text-color: #213547;
+	--bg-color: #FFFFFF;
+}
+
 :root {
 	font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-	line-height: 1.5;
-	font-weight: 400;
-
-	color-scheme: light dark;
-	color: #213547;
-	background-color: #ffffff;
 
 	font-synthesis: none;
 	text-rendering: optimizeLegibility;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
-}
 
-:root.dark {
-	color: rgba(255, 255, 255, 0.87);
-	background-color: var(--color-neutral-825);
-}
-
-a {
-	text-decoration: inherit;
+	background-color: var(--bg-color);
+	color: var(--text-color);
 }
 
 a.active {
@@ -36,19 +34,38 @@ a.active {
 }
 
 body {
-	margin: 0;
 	display: flex;
 	place-items: center;
 	min-width: 320px;
 	min-height: 100vh;
-}
+	max-width: var(--breakpoint-2xl);
 
-h1 {
-	font-size: 3.2em;
-	line-height: 1.1;
+	margin-top: 82px;
+	margin-inline: auto;
+	padding-inline: 1rem;
+
+	text-align: center;
 }
 
 button {
-	font-family: inherit;
 	cursor: pointer;
 }
+
+nav {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+}
+
+.navContents {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	justify-content: space-between;
+	max-width: var(--breakpoint-2xl);
+
+	margin-inline: auto;
+	padding: 1rem;
+}