diff --git a/web/src/lib/components/library-combobox.svelte b/web/src/lib/components/library-combobox.svelte
index 22a65ca..29f5fb9 100644
--- a/web/src/lib/components/library-combobox.svelte
+++ b/web/src/lib/components/library-combobox.svelte
@@ -97,7 +97,7 @@
 				role="combobox"
 				aria-expanded={open}
 			>
-				{selectedLabel || 'Select Library'}
+				{'Select Library'}
 				<ChevronsUpDownIcon class="opacity-50" />
 			</Button>
 		{/snippet}
diff --git a/web/src/lib/components/ui/switch/index.ts b/web/src/lib/components/ui/switch/index.ts
new file mode 100644
index 0000000..129f8f5
--- /dev/null
+++ b/web/src/lib/components/ui/switch/index.ts
@@ -0,0 +1,7 @@
+import Root from './switch.svelte';
+
+export {
+	Root,
+	//
+	Root as Switch
+};
diff --git a/web/src/lib/components/ui/switch/switch.svelte b/web/src/lib/components/ui/switch/switch.svelte
new file mode 100644
index 0000000..01f9f75
--- /dev/null
+++ b/web/src/lib/components/ui/switch/switch.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+	import { Switch as SwitchPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
+	import { cn } from '$lib/utils.js';
+
+	let {
+		ref = $bindable(null),
+		checked = $bindable(false),
+		class: className,
+		...restProps
+	}: WithoutChildrenOrChild<SwitchPrimitive.RootProps> = $props();
+</script>
+
+<SwitchPrimitive.Root
+	bind:ref
+	bind:checked
+	class={cn(
+		'peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input',
+		className
+	)}
+	{...restProps}
+>
+	<SwitchPrimitive.Thumb
+		class={cn(
+			'pointer-events-none block size-4 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0'
+		)}
+	/>
+</SwitchPrimitive.Root>
diff --git a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
index b035a91..306efbe 100644
--- a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
@@ -14,6 +14,7 @@
 	import LibraryCombobox from '$lib/components/library-combobox.svelte';
 	import { Label } from '$lib/components/ui/label';
 	import { base } from '$app/paths';
+	import { Switch } from '$lib/components/ui/switch/index.js';
 
 	let movie: PublicMovie = page.data.movie;
 	let user: () => User = getContext('user');
@@ -57,7 +58,7 @@
 <h1 class="scroll-m-20 text-center text-4xl font-extrabold tracking-tight lg:text-5xl">
 	{getFullyQualifiedMediaName(movie)}
 </h1>
-<div class="flex w-full flex-1 flex-col gap-4 p-4">
+<div class="mx-auto flex w-full flex-1 flex-col gap-4 p-4 md:max-w-[80em]">
 	<div class="flex flex-col gap-4 md:flex-row md:items-stretch">
 		<div class="w-full overflow-hidden rounded-xl bg-muted/50 md:w-1/3 md:max-w-sm">
 			{#if movie.id}
@@ -75,24 +76,16 @@
 				{movie.overview}
 			</p>
 		</div>
-		<div class="w-full flex-auto rounded-xl bg-muted/50 p-4 md:w-1/3">
+		<div
+			class="flex w-full flex-auto flex-col items-center justify-start gap-2 rounded-xl bg-muted/50 p-4 md:w-1/3 md:max-w-[40em]"
+		>
 			{#if user().is_superuser}
-				<div class="mx-1 my-2 block">
-					<LibraryCombobox media={movie} mediaType="movie" />
-					<Label for="library-combobox">Select Library for this movie</Label>
-					<hr />
-				</div>
+				<LibraryCombobox media={movie} mediaType="movie" />
 				<DownloadMovieDialog {movie} />
-				<div class="my-4"></div>
 			{/if}
 			<RequestMovieDialog {movie} />
 		</div>
 	</div>
-	<!-- 	<div class="flex-1 rounded-xl bg-muted/50 p-4">
-            <div class="w-full overflow-x-auto">
-
-            </div>
-        </div> -->
 	<div class="flex-1 rounded-xl bg-muted/50 p-4">
 		<div class="w-full overflow-x-auto">
 			<TorrentTable isShow={false} torrents={movie.torrents} />
diff --git a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
index feb4709..10101e5 100644
--- a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
@@ -6,7 +6,7 @@
 	import { goto } from '$app/navigation';
 	import { ImageOff } from 'lucide-svelte';
 	import * as Table from '$lib/components/ui/table/index.js';
-	import { getContext } from 'svelte';
+	import { getContext, onMount } from 'svelte';
 	import type { PublicShow, RichShowTorrent, User } from '$lib/types.js';
 	import { getFullyQualifiedMediaName } from '$lib/utils';
 	import DownloadSeasonDialog from '$lib/components/download-season-dialog.svelte';
@@ -16,6 +16,7 @@
 	import RequestSeasonDialog from '$lib/components/request-season-dialog.svelte';
 	import MediaPicture from '$lib/components/media-picture.svelte';
 	import { Checkbox } from '$lib/components/ui/checkbox/index.js';
+	import { Switch } from '$lib/components/ui/switch/index.js';
 	import { toast } from 'svelte-sonner';
 	import { Label } from '$lib/components/ui/label';
 	import LibraryCombobox from '$lib/components/library-combobox.svelte';
@@ -25,13 +26,15 @@
 	let torrents: RichShowTorrent = page.data.torrentsData;
 	import { base } from '$app/paths';
 
+	let continuousDownloadEnabled = $state(show().continuous_download);
+
 	async function toggle_continuous_download() {
-		const urlString = `${apiUrl}/tv/shows/${show().id}/continuousDownload?continuous_download=${!show().continuous_download}`;
+		const urlString = `${apiUrl}/tv/shows/${show().id}/continuousDownload?continuous_download=${!continuousDownloadEnabled}`;
 		console.log(
 			'Toggling continuous download for show',
 			show().name,
 			'to',
-			!show().continuous_download
+			!continuousDownloadEnabled
 		);
 		const response = await fetch(urlString, {
 			method: 'POST',
@@ -41,10 +44,15 @@
 			const errorText = await response.text();
 			toast.error('Failed to toggle continuous download: ' + errorText);
 		} else {
-			show().continuous_download = !show().continuous_download;
+			continuousDownloadEnabled = !continuousDownloadEnabled;
 			toast.success('Continuous download toggled successfully.');
 		}
 	}
+
+	/*	$effect(()=>{
+		continuousDownloadEnabled;
+		toggle_continuous_download();
+	});*/
 </script>
 
 <svelte:head>
@@ -85,7 +93,7 @@
 <h1 class="scroll-m-20 text-center text-4xl font-extrabold tracking-tight lg:text-5xl">
 	{getFullyQualifiedMediaName(show())}
 </h1>
-<div class="flex w-full flex-1 flex-col gap-4 p-4">
+<div class="mx-auto flex w-full flex-1 flex-col gap-4 p-4 md:max-w-[80em]">
 	<div class="flex flex-col gap-4 md:flex-row md:items-stretch">
 		<div class="w-full overflow-hidden rounded-xl bg-muted/50 md:w-1/3 md:max-w-sm">
 			{#if show().id}
@@ -103,30 +111,23 @@
 				{show().overview}
 			</p>
 		</div>
-		<div class="w-full flex-auto rounded-xl bg-muted/50 p-4 md:w-1/3">
+		<div
+			class="flex w-full flex-auto flex-col items-center justify-start gap-2 rounded-xl bg-muted/50 p-4 md:w-1/3 md:max-w-[40em]"
+		>
 			{#if user().is_superuser}
 				{#if !show().ended}
-					<div class="mx-1 my-2 block">
-						<Checkbox
-							checked={show().continuous_download}
-							onCheckedChange={() => {
-								toggle_continuous_download();
-							}}
+					<div class="flex items-center gap-3">
+						<Switch
+							bind:checked={() => continuousDownloadEnabled, toggle_continuous_download}
 							id="continuous-download-checkbox"
 						/>
 						<Label for="continuous-download-checkbox">
 							Enable automatic download of future seasons
 						</Label>
-						<hr />
 					</div>
 				{/if}
-				<div class="mx-1 my-2 block">
-					<LibraryCombobox media={show()} mediaType="tv" />
-					<Label for="library-combobox">Select Library for this show</Label>
-					<hr />
-				</div>
+				<LibraryCombobox media={show()} mediaType="tv" />
 				<DownloadSeasonDialog show={show()} />
-				<div class="my-2"></div>
 			{/if}
 			<RequestSeasonDialog show={show()} />
 		</div>