diff --git a/src/app.css b/src/app.css
index 238cd75..3b8985c 100644
--- a/src/app.css
+++ b/src/app.css
@@ -44,6 +44,8 @@
 		--sidebar-accent-foreground: 240 5.9% 10%;
 		--sidebar-border: 220 13% 91%;
 		--sidebar-ring: 217.2 91.2% 59.8%;
+
+		--surface: 210 26% 76%;
 	}
 
 	@media (prefers-color-scheme: dark) {
@@ -85,6 +87,8 @@
 			--sidebar-accent-foreground: 240 4.8% 95.9%;
 			--sidebar-border: 240 3.7% 15.9%;
 			--sidebar-ring: 217.2 91.2% 59.8%;
+
+			--surface: 217.2 40.6% 10.5%;
 		}
 	}
 }
diff --git a/src/lib/components/app/code-snippet/code-snippet.svelte b/src/lib/components/app/code-snippet/code-snippet.svelte
index 9df5770..9cdc6eb 100644
--- a/src/lib/components/app/code-snippet/code-snippet.svelte
+++ b/src/lib/components/app/code-snippet/code-snippet.svelte
@@ -16,51 +16,59 @@
 
 	let wasCopied = $state(false);
 
+	const roundedPre = copy || download ? 'rounded-b-lg' : 'rounded-lg';
+
 	async function copyToClipboard() {
 		await navigator.clipboard.writeText(data);
 		wasCopied = true;
 	}
 </script>
 
-<div class="relative flex-grow overflow-x-hidden rounded-lg bg-accent">
-	<div class="flex items-start overflow-x-auto p-2">
-		<pre><code>{data}</code></pre>
-		{#if copy || download}
-			<!--Copy button-->
-			<!--Flex reverse for peer hover to work properly-->
-			<div class="absolute right-2 flex flex-col gap-2">
+<div class="flex max-w-full flex-grow flex-col rounded-lg bg-accent">
+	{#if copy || download}
+		<!--Copy and download buttons-->
+		<div class="b flex flex-wrap items-center justify-between gap-4 rounded-t-lg p-2">
+			Configuration
+			<div class="flex gap-2">
 				{#if copy}
-					<div class="flex flex-row-reverse items-center gap-1">
-						<Button
-							class="peer size-10 p-2"
-							onclick={copyToClipboard}
-							onmouseleave={() => (wasCopied = false)}
-						>
-							<LucideClipboardCopy />
-						</Button>
-						<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
+					<Button
+						class="action-button group"
+						onclick={copyToClipboard}
+						onmouseleave={() => (wasCopied = false)}
+					>
+						<LucideClipboardCopy />
+						<span class="group-hover:block">
 							{wasCopied ? 'Copied' : 'Copy to clipboard'}
 						</span>
-					</div>
+					</Button>
 				{/if}
 
 				{#if download}
-					<div class="flex flex-row-reverse items-center gap-1">
-						<a
-							class="peer contents"
-							href={`data:application/octet-stream;charset=utf-8,${encodeURIComponent(data)}`}
-							download={filename}
-						>
-							<Button class="size-10 p-2">
-								<LucideDownload />
-							</Button>
-						</a>
-						<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
-							Download
-						</span>
-					</div>
+					<a
+						class="contents"
+						href={`data:application/octet-stream;charset=utf-8,${encodeURIComponent(data)}`}
+						download={filename}
+					>
+						<Button class="action-button group">
+							<LucideDownload />
+							<span class="group-hover:block">Download</span>
+						</Button>
+					</a>
 				{/if}
 			</div>
-		{/if}
+		</div>
+	{/if}
+	<div class="bg-surface flex items-start overflow-x-auto {roundedPre} p-2">
+		<pre><code>{data}</code></pre>
 	</div>
 </div>
+
+<style>
+	:global(.action-button) {
+		@apply relative size-auto p-2;
+	}
+
+	:global(.action-button > span) {
+		@apply absolute bottom-full mb-3 hidden rounded-lg bg-muted p-2 text-xs text-foreground;
+	}
+</style>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8c5e767..a1f6331 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -29,7 +29,7 @@
 		</ul>
 	</nav>
 </header>
-<main class="flex min-w-full max-w-full flex-grow flex-col gap-4 xl:min-w-[1280px]">
+<main class="flex min-w-full max-w-full flex-grow flex-col gap-4 xl:min-w-[78rem]">
 	{@render children()}
 </main>
 
diff --git a/src/routes/clients/+page.svelte b/src/routes/clients/+page.svelte
index 63c63cd..83f8b58 100644
--- a/src/routes/clients/+page.svelte
+++ b/src/routes/clients/+page.svelte
@@ -38,7 +38,7 @@
 	</Table.Header>
 	<Table.Body class="divide-y-2 divide-background">
 		{#each data.clients as client}
-			<Table.Row class="group hover:bg-background hover:bg-opacity-40">
+			<Table.Row class="hover:bg-surface group">
 				<Table.Head scope="row">
 					<a
 						href={`/clients/${client.id}`}
diff --git a/src/routes/clients/[id]/+page.svelte b/src/routes/clients/[id]/+page.svelte
index 98522e2..8a8c4f2 100644
--- a/src/routes/clients/[id]/+page.svelte
+++ b/src/routes/clients/[id]/+page.svelte
@@ -2,7 +2,7 @@
 	import type { PageData } from './$types';
 	import QRCode from 'qrcode-svg';
 	import { CodeSnippet } from '$lib/components/app/code-snippet';
-	import { WireguardGuide } from '$lib/components/app/wireguard-guide/index.js';
+	import { WireguardGuide } from '$lib/components/app/wireguard-guide';
 
 	const { data }: { data: PageData } = $props();
 
@@ -16,6 +16,8 @@
 		content: data.config,
 		join: true,
 		background: 'hsl(var(--accent-light))',
+		width: 296,
+		height: 296,
 	});
 </script>
 
@@ -25,10 +27,10 @@
 
 <h1 class="w-fit rounded-lg bg-accent p-2 text-lg">{data.client.name}</h1>
 
-<section id="client-configuration" class="flex flex-wrap justify-center gap-4">
+<section id="client-configuration" class="flex flex-wrap items-center justify-center gap-4">
 	<CodeSnippet data={data.config} filename={clientWgCleanedName} copy download />
 
-	<div class="overflow-hidden rounded-lg">
+	<div class="size-fit overflow-auto rounded-lg">
 		{@html qrCode.svg()}
 	</div>
 </section>
diff --git a/src/routes/connections/+page.svelte b/src/routes/connections/+page.svelte
index 8873f85..139e0bf 100644
--- a/src/routes/connections/+page.svelte
+++ b/src/routes/connections/+page.svelte
@@ -17,13 +17,11 @@
 	});
 
 	function getSize(size: number) {
-		let sizes = ['Bytes', 'KiB', 'MiB', 'GiB',
-			'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+		let sizes = ['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
 
 		for (let i = 1; i < sizes.length; i++) {
 			if (size < Math.pow(1024, i))
-				return (Math.round((size / Math.pow(
-					1024, i - 1)) * 100) / 100) + ' ' + sizes[i - 1];
+				return Math.round((size / Math.pow(1024, i - 1)) * 100) / 100 + ' ' + sizes[i - 1];
 		}
 		return size;
 	}
@@ -33,7 +31,7 @@
 	<title>Connections</title>
 </svelte:head>
 
-<Table.Root class="bg-accent rounded-lg overflow-hidden divide-y-2 divide-background">
+<Table.Root class="divide-y-2 divide-background overflow-hidden rounded-lg bg-accent">
 	<Table.Header>
 		<Table.Row>
 			<Table.Head scope="col">Name</Table.Head>
@@ -49,14 +47,14 @@
 	</Table.Header>
 	<Table.Body class="divide-y-2 divide-background">
 		{#each data.peers.rows as peer}
-			<Table.Row class="hover:bg-background hover:bg-opacity-40">
+			<Table.Row class="hover:bg-surface">
 				<Table.Head scope="row">{peer.name}</Table.Head>
-				<Table.Cell class="truncate max-w-[10ch]">{peer['public-key']}</Table.Cell>
+				<Table.Cell class="max-w-[10ch] truncate">{peer['public-key']}</Table.Cell>
 				<Table.Cell>{peer.endpoint}</Table.Cell>
 				<Table.Cell>
 					<div class="flex flex-wrap gap-1">
 						{#each peer['allowed-ips'].split(',') as addr}
-							<Badge class="bg-background select-auto" variant="secondary">{addr}</Badge>
+							<Badge class="select-auto bg-background" variant="secondary">{addr}</Badge>
 						{/each}
 					</div>
 				</Table.Cell>
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 1699018..7fca059 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -1,93 +1,94 @@
-import { fontFamily } from "tailwindcss/defaultTheme";
-import type { Config } from "tailwindcss";
-import tailwindcssAnimate from "tailwindcss-animate";
+import { fontFamily } from 'tailwindcss/defaultTheme';
+import type { Config } from 'tailwindcss';
+import tailwindcssAnimate from 'tailwindcss-animate';
 
 const config: Config = {
-	darkMode: ["media"],
-	content: ["./src/**/*.{html,js,svelte,ts}"],
-	safelist: ["dark"],
+	darkMode: ['media'],
+	content: ['./src/**/*.{html,js,svelte,ts}'],
+	safelist: ['dark'],
 	theme: {
 		container: {
 			center: true,
-			padding: "2rem",
+			padding: '2rem',
 			screens: {
-				"2xl": "1400px"
-			}
+				'2xl': '1400px',
+			},
 		},
 		extend: {
 			colors: {
-				border: "hsl(var(--border) / <alpha-value>)",
-				input: "hsl(var(--input) / <alpha-value>)",
-				ring: "hsl(var(--ring) / <alpha-value>)",
-				background: "hsl(var(--background) / <alpha-value>)",
-				foreground: "hsl(var(--foreground) / <alpha-value>)",
+				border: 'hsl(var(--border) / <alpha-value>)',
+				input: 'hsl(var(--input) / <alpha-value>)',
+				ring: 'hsl(var(--ring) / <alpha-value>)',
+				background: 'hsl(var(--background) / <alpha-value>)',
+				foreground: 'hsl(var(--foreground) / <alpha-value>)',
 				primary: {
-					DEFAULT: "hsl(var(--primary) / <alpha-value>)",
-					foreground: "hsl(var(--primary-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--primary) / <alpha-value>)',
+					foreground: 'hsl(var(--primary-foreground) / <alpha-value>)',
 				},
 				secondary: {
-					DEFAULT: "hsl(var(--secondary) / <alpha-value>)",
-					foreground: "hsl(var(--secondary-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--secondary) / <alpha-value>)',
+					foreground: 'hsl(var(--secondary-foreground) / <alpha-value>)',
 				},
 				destructive: {
-					DEFAULT: "hsl(var(--destructive) / <alpha-value>)",
-					foreground: "hsl(var(--destructive-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--destructive) / <alpha-value>)',
+					foreground: 'hsl(var(--destructive-foreground) / <alpha-value>)',
 				},
 				muted: {
-					DEFAULT: "hsl(var(--muted) / <alpha-value>)",
-					foreground: "hsl(var(--muted-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--muted) / <alpha-value>)',
+					foreground: 'hsl(var(--muted-foreground) / <alpha-value>)',
 				},
 				accent: {
-					DEFAULT: "hsl(var(--accent) / <alpha-value>)",
-					foreground: "hsl(var(--accent-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--accent) / <alpha-value>)',
+					foreground: 'hsl(var(--accent-foreground) / <alpha-value>)',
 				},
 				popover: {
-					DEFAULT: "hsl(var(--popover) / <alpha-value>)",
-					foreground: "hsl(var(--popover-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--popover) / <alpha-value>)',
+					foreground: 'hsl(var(--popover-foreground) / <alpha-value>)',
 				},
 				card: {
-					DEFAULT: "hsl(var(--card) / <alpha-value>)",
-					foreground: "hsl(var(--card-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--card) / <alpha-value>)',
+					foreground: 'hsl(var(--card-foreground) / <alpha-value>)',
 				},
 				sidebar: {
-					DEFAULT: "hsl(var(--sidebar-background))",
-					foreground: "hsl(var(--sidebar-foreground))",
-					primary: "hsl(var(--sidebar-primary))",
-					"primary-foreground": "hsl(var(--sidebar-primary-foreground))",
-					accent: "hsl(var(--sidebar-accent))",
-					"accent-foreground": "hsl(var(--sidebar-accent-foreground))",
-					border: "hsl(var(--sidebar-border))",
-					ring: "hsl(var(--sidebar-ring))",
-        		},
+					DEFAULT: 'hsl(var(--sidebar-background))',
+					foreground: 'hsl(var(--sidebar-foreground))',
+					primary: 'hsl(var(--sidebar-primary))',
+					'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
+					accent: 'hsl(var(--sidebar-accent))',
+					'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
+					border: 'hsl(var(--sidebar-border))',
+					ring: 'hsl(var(--sidebar-ring))',
+				},
+				surface: 'hsl(var(--surface) / <alpha-value>)',
 			},
 			borderRadius: {
-				xl: "calc(var(--radius) + 4px)",
-				lg: "var(--radius)",
-				md: "calc(var(--radius) - 2px)",
-				sm: "calc(var(--radius) - 4px)"
+				xl: 'calc(var(--radius) + 4px)',
+				lg: 'var(--radius)',
+				md: 'calc(var(--radius) - 2px)',
+				sm: 'calc(var(--radius) - 4px)',
 			},
 			fontFamily: {
-				sans: [...fontFamily.sans]
+				sans: [...fontFamily.sans],
 			},
 			keyframes: {
-				"accordion-down": {
-					from: { height: "0" },
-					to: { height: "var(--bits-accordion-content-height)" },
+				'accordion-down': {
+					from: { height: '0' },
+					to: { height: 'var(--bits-accordion-content-height)' },
 				},
-				"accordion-up": {
-					from: { height: "var(--bits-accordion-content-height)" },
-					to: { height: "0" },
+				'accordion-up': {
+					from: { height: 'var(--bits-accordion-content-height)' },
+					to: { height: '0' },
 				},
-				"caret-blink": {
-					"0%,70%,100%": { opacity: "1" },
-					"20%,50%": { opacity: "0" },
+				'caret-blink': {
+					'0%,70%,100%': { opacity: '1' },
+					'20%,50%': { opacity: '0' },
 				},
 			},
 			animation: {
-        		"accordion-down": "accordion-down 0.2s ease-out",
-        		"accordion-up": "accordion-up 0.2s ease-out",
-       			"caret-blink": "caret-blink 1.25s ease-out infinite",
-      		},
+				'accordion-down': 'accordion-down 0.2s ease-out',
+				'accordion-up': 'accordion-up 0.2s ease-out',
+				'caret-blink': 'caret-blink 1.25s ease-out infinite',
+			},
 		},
 	},
 	plugins: [tailwindcssAnimate],