diff --git a/src/app/create-username/page.tsx b/src/app/create-username/page.tsx
index bd6fbac..114f5bd 100644
--- a/src/app/create-username/page.tsx
+++ b/src/app/create-username/page.tsx
@@ -1,7 +1,6 @@
-import { auth } from "@/lib/auth";
-
-import UsernameForm from "../components/username-form";
 import { redirect } from "next/navigation";
+import { auth } from "@/lib/auth";
+import UsernameForm from "@/components/username-form";
 
 export default async function CreateUsernamePage() {
 	const session = await auth();
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index bb585cd..b3bb28f 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,8 +3,8 @@ import Script from "next/script";
 import { Lexend } from "next/font/google";
 
 import "./globals.css";
-import Header from "./components/header";
-import Footer from "./components/footer";
+import Header from "@/components/header";
+import Footer from "@/components/footer";
 import Providers from "./provider";
 
 const lexend = Lexend({
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 4efbe31..f569cf2 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
-import LoginButtons from "../components/login-buttons";
+import LoginButtons from "@/components/login-buttons";
 
 export default async function LoginPage() {
 	const session = await auth();
diff --git a/src/app/mii/[slug]/page.tsx b/src/app/mii/[slug]/page.tsx
index 8945377..81ace57 100644
--- a/src/app/mii/[slug]/page.tsx
+++ b/src/app/mii/[slug]/page.tsx
@@ -6,10 +6,10 @@ import { Icon } from "@iconify/react";
 import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 
-import Carousel from "@/app/components/carousel";
-import LikeButton from "@/app/components/like-button";
-import ImageViewer from "@/app/components/image-viewer";
-import DeleteMiiButton from "@/app/components/delete-mii";
+import Carousel from "@/components/carousel";
+import LikeButton from "@/components/like-button";
+import ImageViewer from "@/components/image-viewer";
+import DeleteMiiButton from "@/components/delete-mii";
 
 interface Props {
 	params: Promise<{ slug: string }>;
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index b8b8190..e078649 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -7,8 +7,8 @@ export default function NotFound() {
 			<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-8 max-w-xs w-full text-center flex flex-col">
 				<h2 className="text-7xl font-black">404</h2>
 				<p>Page not found</p>
-				<Link href="/" className="pill button gap-1 mt-8 w-fit self-center">
-					<Icon icon="ic:round-home" fontSize={22} />
+				<Link href="/" className="pill button gap-2 mt-8 w-fit self-center">
+					<Icon icon="ic:round-home" fontSize={24} />
 					Return Home
 				</Link>
 			</div>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 17960ce..45a32a7 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
-import MiiList from "./components/mii-list";
+import MiiList from "@/components/mii-list";
 
 export default async function Page() {
 	const session = await auth();
diff --git a/src/app/profile/[slug]/page.tsx b/src/app/profile/[slug]/page.tsx
index 78a3e5c..b1bff5c 100644
--- a/src/app/profile/[slug]/page.tsx
+++ b/src/app/profile/[slug]/page.tsx
@@ -7,7 +7,7 @@ import { Icon } from "@iconify/react";
 import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 
-import MiiList from "@/app/components/mii-list";
+import MiiList from "@/components/mii-list";
 
 interface Props {
 	params: Promise<{ slug: string }>;
diff --git a/src/app/profile/settings/page.tsx b/src/app/profile/settings/page.tsx
index e883368..3e75379 100644
--- a/src/app/profile/settings/page.tsx
+++ b/src/app/profile/settings/page.tsx
@@ -7,7 +7,7 @@ import { Icon } from "@iconify/react";
 import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 
-import ProfileSettings from "@/app/components/profile-settings";
+import ProfileSettings from "@/components/profile-settings";
 
 export default async function ProfileSettingsPage() {
 	const session = await auth();
diff --git a/src/app/submit/page.tsx b/src/app/submit/page.tsx
index ecf7dd0..7d6eec7 100644
--- a/src/app/submit/page.tsx
+++ b/src/app/submit/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth";
-import SubmitForm from "../components/submit-form";
+import SubmitForm from "@/components/submit-form";
 
 export default async function SubmitPage() {
 	const session = await auth();
diff --git a/src/app/components/carousel.tsx b/src/components/carousel.tsx
similarity index 100%
rename from src/app/components/carousel.tsx
rename to src/components/carousel.tsx
diff --git a/src/app/components/delete-mii.tsx b/src/components/delete-mii.tsx
similarity index 100%
rename from src/app/components/delete-mii.tsx
rename to src/components/delete-mii.tsx
diff --git a/src/app/components/footer.tsx b/src/components/footer.tsx
similarity index 100%
rename from src/app/components/footer.tsx
rename to src/components/footer.tsx
diff --git a/src/app/components/header.tsx b/src/components/header.tsx
similarity index 100%
rename from src/app/components/header.tsx
rename to src/components/header.tsx
diff --git a/src/app/components/image-viewer.tsx b/src/components/image-viewer.tsx
similarity index 100%
rename from src/app/components/image-viewer.tsx
rename to src/components/image-viewer.tsx
diff --git a/src/app/components/like-button.tsx b/src/components/like-button.tsx
similarity index 100%
rename from src/app/components/like-button.tsx
rename to src/components/like-button.tsx
diff --git a/src/app/components/login-buttons.tsx b/src/components/login-buttons.tsx
similarity index 100%
rename from src/app/components/login-buttons.tsx
rename to src/components/login-buttons.tsx
diff --git a/src/app/components/logout-button.tsx b/src/components/logout-button.tsx
similarity index 100%
rename from src/app/components/logout-button.tsx
rename to src/components/logout-button.tsx
diff --git a/src/app/components/mii-list/filter-select.tsx b/src/components/mii-list/filter-select.tsx
similarity index 100%
rename from src/app/components/mii-list/filter-select.tsx
rename to src/components/mii-list/filter-select.tsx
diff --git a/src/app/components/mii-list/index.tsx b/src/components/mii-list/index.tsx
similarity index 100%
rename from src/app/components/mii-list/index.tsx
rename to src/components/mii-list/index.tsx
diff --git a/src/app/components/mii-list/pagination.tsx b/src/components/mii-list/pagination.tsx
similarity index 100%
rename from src/app/components/mii-list/pagination.tsx
rename to src/components/mii-list/pagination.tsx
diff --git a/src/app/components/mii-list/skeleton.tsx b/src/components/mii-list/skeleton.tsx
similarity index 100%
rename from src/app/components/mii-list/skeleton.tsx
rename to src/components/mii-list/skeleton.tsx
diff --git a/src/app/components/mii-list/sort-select.tsx b/src/components/mii-list/sort-select.tsx
similarity index 100%
rename from src/app/components/mii-list/sort-select.tsx
rename to src/components/mii-list/sort-select.tsx
diff --git a/src/app/components/profile-overview.tsx b/src/components/profile-overview.tsx
similarity index 100%
rename from src/app/components/profile-overview.tsx
rename to src/components/profile-overview.tsx
diff --git a/src/app/components/profile-settings/delete-account.tsx b/src/components/profile-settings/delete-account.tsx
similarity index 100%
rename from src/app/components/profile-settings/delete-account.tsx
rename to src/components/profile-settings/delete-account.tsx
diff --git a/src/app/components/profile-settings/index.tsx b/src/components/profile-settings/index.tsx
similarity index 100%
rename from src/app/components/profile-settings/index.tsx
rename to src/components/profile-settings/index.tsx
diff --git a/src/app/components/profile-settings/submit-dialog-button.tsx b/src/components/profile-settings/submit-dialog-button.tsx
similarity index 96%
rename from src/app/components/profile-settings/submit-dialog-button.tsx
rename to src/components/profile-settings/submit-dialog-button.tsx
index 31c6b72..585e4a4 100644
--- a/src/app/components/profile-settings/submit-dialog-button.tsx
+++ b/src/components/profile-settings/submit-dialog-button.tsx
@@ -42,7 +42,7 @@ export default function SubmitDialogButton({ title, description, onSubmit, error
 
 			{isOpen &&
 				createPortal(
-					<div className="fixed inset-0 flex items-center justify-center z-40">
+					<div className="fixed inset-0 flex-grow flex items-center justify-center z-40">
 						<div
 							onClick={close}
 							className={`z-40 absolute inset-0 backdrop-brightness-75 backdrop-blur-xs transition-opacity duration-300 ${
diff --git a/src/app/components/search-bar.tsx b/src/components/search-bar.tsx
similarity index 100%
rename from src/app/components/search-bar.tsx
rename to src/components/search-bar.tsx
diff --git a/src/app/components/submit-form/image-list.tsx b/src/components/submit-form/image-list.tsx
similarity index 100%
rename from src/app/components/submit-form/image-list.tsx
rename to src/components/submit-form/image-list.tsx
diff --git a/src/app/components/submit-form/index.tsx b/src/components/submit-form/index.tsx
similarity index 100%
rename from src/app/components/submit-form/index.tsx
rename to src/components/submit-form/index.tsx
diff --git a/src/app/components/submit-form/qr-finder.tsx b/src/components/submit-form/qr-finder.tsx
similarity index 100%
rename from src/app/components/submit-form/qr-finder.tsx
rename to src/components/submit-form/qr-finder.tsx
diff --git a/src/app/components/submit-form/qr-scanner.tsx b/src/components/submit-form/qr-scanner.tsx
similarity index 100%
rename from src/app/components/submit-form/qr-scanner.tsx
rename to src/components/submit-form/qr-scanner.tsx
diff --git a/src/app/components/submit-form/qr-upload.tsx b/src/components/submit-form/qr-upload.tsx
similarity index 100%
rename from src/app/components/submit-form/qr-upload.tsx
rename to src/components/submit-form/qr-upload.tsx
diff --git a/src/app/components/tag-selector.tsx b/src/components/tag-selector.tsx
similarity index 100%
rename from src/app/components/tag-selector.tsx
rename to src/components/tag-selector.tsx
diff --git a/src/app/components/username-form.tsx b/src/components/username-form.tsx
similarity index 100%
rename from src/app/components/username-form.tsx
rename to src/components/username-form.tsx