diff --git a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
index 306efbe..3f6a70b 100644
--- a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
@@ -15,6 +15,9 @@
 	import { Label } from '$lib/components/ui/label';
 	import { base } from '$app/paths';
 	import { Switch } from '$lib/components/ui/switch/index.js';
+	import * as Card from '$lib/components/ui/card/index.js';
+	import RequestSeasonDialog from "$lib/components/request-season-dialog.svelte";
+	import DownloadSeasonDialog from "$lib/components/download-season-dialog.svelte";
 
 	let movie: PublicMovie = page.data.movie;
 	let user: () => User = getContext('user');
@@ -80,10 +83,26 @@
 			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}
-				<LibraryCombobox media={movie} mediaType="movie" />
-				<DownloadMovieDialog {movie} />
+				<Card.Root class="w-full">
+					<Card.Header>
+						<Card.Title>Administrator Controls</Card.Title>
+					</Card.Header>
+					<Card.Content class="flex flex-col gap-4 items-center">
+						<LibraryCombobox media={movie} mediaType="movie" />
+					</Card.Content>
+				</Card.Root>
 			{/if}
-			<RequestMovieDialog {movie} />
+			<Card.Root class="w-full">
+				<Card.Header>
+					<Card.Title>Download Options</Card.Title>
+				</Card.Header>
+				<Card.Content class="flex flex-col gap-4 items-center">
+					{#if user().is_superuser}
+						<DownloadMovieDialog {movie} />
+					{/if}
+					<RequestMovieDialog {movie} />
+				</Card.Content>
+			</Card.Root>
 		</div>
 	</div>
 	<div class="flex-1 rounded-xl bg-muted/50 p-4">
diff --git a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
index 10101e5..8ecb209 100644
--- a/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/tv/[showId=uuid]/+page.svelte
@@ -1,176 +1,194 @@
 <script lang="ts">
-	import { env } from '$env/dynamic/public';
-	import { Separator } from '$lib/components/ui/separator/index.js';
-	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
-	import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
-	import { goto } from '$app/navigation';
-	import { ImageOff } from 'lucide-svelte';
-	import * as Table from '$lib/components/ui/table/index.js';
-	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';
-	import CheckmarkX from '$lib/components/checkmark-x.svelte';
-	import { page } from '$app/state';
-	import TorrentTable from '$lib/components/torrent-table.svelte';
-	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';
-	const apiUrl = env.PUBLIC_API_URL;
-	let show: () => PublicShow = getContext('show');
-	let user: () => User = getContext('user');
-	let torrents: RichShowTorrent = page.data.torrentsData;
-	import { base } from '$app/paths';
+    import {env} from '$env/dynamic/public';
+    import {Separator} from '$lib/components/ui/separator/index.js';
+    import * as Sidebar from '$lib/components/ui/sidebar/index.js';
+    import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
+    import {goto} from '$app/navigation';
+    import {ImageOff} from 'lucide-svelte';
+    import * as Table from '$lib/components/ui/table/index.js';
+    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';
+    import CheckmarkX from '$lib/components/checkmark-x.svelte';
+    import {page} from '$app/state';
+    import TorrentTable from '$lib/components/torrent-table.svelte';
+    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';
+    import * as Card from '$lib/components/ui/card/index.js';
 
-	let continuousDownloadEnabled = $state(show().continuous_download);
+    const apiUrl = env.PUBLIC_API_URL;
+    let show: () => PublicShow = getContext('show');
+    let user: () => User = getContext('user');
+    let torrents: RichShowTorrent = page.data.torrentsData;
+    import {base} from '$app/paths';
 
-	async function toggle_continuous_download() {
-		const urlString = `${apiUrl}/tv/shows/${show().id}/continuousDownload?continuous_download=${!continuousDownloadEnabled}`;
-		console.log(
-			'Toggling continuous download for show',
-			show().name,
-			'to',
-			!continuousDownloadEnabled
-		);
-		const response = await fetch(urlString, {
-			method: 'POST',
-			credentials: 'include'
-		});
-		if (!response.ok) {
-			const errorText = await response.text();
-			toast.error('Failed to toggle continuous download: ' + errorText);
-		} else {
-			continuousDownloadEnabled = !continuousDownloadEnabled;
-			toast.success('Continuous download toggled successfully.');
-		}
-	}
+    let continuousDownloadEnabled = $state(show().continuous_download);
 
-	/*	$effect(()=>{
-		continuousDownloadEnabled;
-		toggle_continuous_download();
-	});*/
+    async function toggle_continuous_download() {
+        const urlString = `${apiUrl}/tv/shows/${show().id}/continuousDownload?continuous_download=${!continuousDownloadEnabled}`;
+        console.log(
+            'Toggling continuous download for show',
+            show().name,
+            'to',
+            !continuousDownloadEnabled
+        );
+        const response = await fetch(urlString, {
+            method: 'POST',
+            credentials: 'include'
+        });
+        if (!response.ok) {
+            const errorText = await response.text();
+            toast.error('Failed to toggle continuous download: ' + errorText);
+        } else {
+            continuousDownloadEnabled = !continuousDownloadEnabled;
+            toast.success('Continuous download toggled successfully.');
+        }
+    }
+
+    /*	$effect(()=>{
+        continuousDownloadEnabled;
+        toggle_continuous_download();
+    });*/
 </script>
 
 <svelte:head>
-	<title>{getFullyQualifiedMediaName(show())} - MediaManager</title>
-	<meta
-		content="View details and manage downloads for {getFullyQualifiedMediaName(
+    <title>{getFullyQualifiedMediaName(show())} - MediaManager</title>
+    <meta
+            content="View details and manage downloads for {getFullyQualifiedMediaName(
 			show()
 		)} in MediaManager"
-		name="description"
-	/>
+            name="description"
+    />
 </svelte:head>
 
 <header class="flex h-16 shrink-0 items-center gap-2">
-	<div class="flex items-center gap-2 px-4">
-		<Sidebar.Trigger class="-ml-1" />
-		<Separator class="mr-2 h-4" orientation="vertical" />
-		<Breadcrumb.Root>
-			<Breadcrumb.List>
-				<Breadcrumb.Item class="hidden md:block">
-					<Breadcrumb.Link href="{base}/dashboard">MediaManager</Breadcrumb.Link>
-				</Breadcrumb.Item>
-				<Breadcrumb.Separator class="hidden md:block" />
-				<Breadcrumb.Item>
-					<Breadcrumb.Link href="{base}/dashboard">Home</Breadcrumb.Link>
-				</Breadcrumb.Item>
-				<Breadcrumb.Separator class="hidden md:block" />
-				<Breadcrumb.Item>
-					<Breadcrumb.Link href="{base}/dashboard/tv">Shows</Breadcrumb.Link>
-				</Breadcrumb.Item>
-				<Breadcrumb.Separator class="hidden md:block" />
-				<Breadcrumb.Item>
-					<Breadcrumb.Page>{getFullyQualifiedMediaName(show())}</Breadcrumb.Page>
-				</Breadcrumb.Item>
-			</Breadcrumb.List>
-		</Breadcrumb.Root>
-	</div>
+    <div class="flex items-center gap-2 px-4">
+        <Sidebar.Trigger class="-ml-1"/>
+        <Separator class="mr-2 h-4" orientation="vertical"/>
+        <Breadcrumb.Root>
+            <Breadcrumb.List>
+                <Breadcrumb.Item class="hidden md:block">
+                    <Breadcrumb.Link href="{base}/dashboard">MediaManager</Breadcrumb.Link>
+                </Breadcrumb.Item>
+                <Breadcrumb.Separator class="hidden md:block"/>
+                <Breadcrumb.Item>
+                    <Breadcrumb.Link href="{base}/dashboard">Home</Breadcrumb.Link>
+                </Breadcrumb.Item>
+                <Breadcrumb.Separator class="hidden md:block"/>
+                <Breadcrumb.Item>
+                    <Breadcrumb.Link href="{base}/dashboard/tv">Shows</Breadcrumb.Link>
+                </Breadcrumb.Item>
+                <Breadcrumb.Separator class="hidden md:block"/>
+                <Breadcrumb.Item>
+                    <Breadcrumb.Page>{getFullyQualifiedMediaName(show())}</Breadcrumb.Page>
+                </Breadcrumb.Item>
+            </Breadcrumb.List>
+        </Breadcrumb.Root>
+    </div>
 </header>
 <h1 class="scroll-m-20 text-center text-4xl font-extrabold tracking-tight lg:text-5xl">
-	{getFullyQualifiedMediaName(show())}
+    {getFullyQualifiedMediaName(show())}
 </h1>
 <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}
-				<MediaPicture media={show()} />
-			{:else}
-				<div
-					class="aspect-9/16 flex h-auto w-full items-center justify-center rounded-lg bg-gray-200 text-gray-500"
-				>
-					<ImageOff size={48} />
-				</div>
-			{/if}
-		</div>
-		<div class="w-full flex-auto rounded-xl bg-muted/50 p-4 md:w-1/4">
-			<p class="leading-7 [&:not(:first-child)]:mt-6">
-				{show().overview}
-			</p>
-		</div>
-		<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="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>
-					</div>
-				{/if}
-				<LibraryCombobox media={show()} mediaType="tv" />
-				<DownloadSeasonDialog show={show()} />
-			{/if}
-			<RequestSeasonDialog show={show()} />
-		</div>
-	</div>
-	<div class="flex-1 rounded-xl bg-muted/50 p-4">
-		<div class="w-full overflow-x-auto">
-			<Table.Root>
-				<Table.Caption>A list of all seasons.</Table.Caption>
-				<Table.Header>
-					<Table.Row>
-						<Table.Head>Number</Table.Head>
-						<Table.Head>Exists on file</Table.Head>
-						<Table.Head>Title</Table.Head>
-						<Table.Head>Overview</Table.Head>
-					</Table.Row>
-				</Table.Header>
-				<Table.Body>
-					{#if show().seasons.length > 0}
-						{#each show().seasons as season (season.id)}
-							<Table.Row
-								link={true}
-								onclick={() => goto(base + '/dashboard/tv/' + show().id + '/' + season.id)}
-							>
-								<Table.Cell class="min-w-[10px] font-medium">{season.number}</Table.Cell>
-								<Table.Cell class="min-w-[10px] font-medium">
-									<CheckmarkX state={season.downloaded} />
-								</Table.Cell>
-								<Table.Cell class="min-w-[50px]">{season.name}</Table.Cell>
-								<Table.Cell class="max-w-[300px] truncate">{season.overview}</Table.Cell>
-							</Table.Row>
-						{/each}
-					{:else}
-						<Table.Row>
-							<Table.Cell colspan={3} class="text-center">No season data available.</Table.Cell>
-						</Table.Row>
-					{/if}
-				</Table.Body>
-			</Table.Root>
-		</div>
-	</div>
-	<div class="flex-1 rounded-xl bg-muted/50 p-4">
-		<div class="w-full overflow-x-auto">
-			<TorrentTable torrents={torrents.torrents} />
-		</div>
-	</div>
+    <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}
+                <MediaPicture media={show()}/>
+            {:else}
+                <div
+                        class="aspect-9/16 flex h-auto w-full items-center justify-center rounded-lg bg-gray-200 text-gray-500"
+                >
+                    <ImageOff size={48}/>
+                </div>
+            {/if}
+        </div>
+        <div class="w-full flex-auto rounded-xl bg-muted/50 p-4 md:w-1/4">
+            <p class="leading-7 [&:not(:first-child)]:mt-6">
+                {show().overview}
+            </p>
+        </div>
+        <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}
+                <Card.Root class="w-full">
+                    <Card.Header>
+                        <Card.Title>Administrator Controls</Card.Title>
+                    </Card.Header>
+                    <Card.Content class="flex flex-col gap-4 items-center">
+                        {#if !show().ended}
+                            <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>
+                            </div>
+                        {/if}
+                        <LibraryCombobox media={show()} mediaType="tv"/>
+                    </Card.Content>
+                </Card.Root>
+            {/if}
+            <Card.Root class="w-full">
+                <Card.Header>
+                    <Card.Title>Download Options</Card.Title>
+                </Card.Header>
+                <Card.Content class="flex flex-col gap-4 items-center">
+                    {#if user().is_superuser}
+                        <DownloadSeasonDialog show={show()}/>
+                    {/if}
+                    <RequestSeasonDialog show={show()}/>
+                </Card.Content>
+            </Card.Root>
+        </div>
+    </div>
+    <div class="flex-1 rounded-xl bg-muted/50 p-4">
+        <div class="w-full overflow-x-auto">
+            <Table.Root>
+                <Table.Caption>A list of all seasons.</Table.Caption>
+                <Table.Header>
+                    <Table.Row>
+                        <Table.Head>Number</Table.Head>
+                        <Table.Head>Exists on file</Table.Head>
+                        <Table.Head>Title</Table.Head>
+                        <Table.Head>Overview</Table.Head>
+                    </Table.Row>
+                </Table.Header>
+                <Table.Body>
+                    {#if show().seasons.length > 0}
+                        {#each show().seasons as season (season.id)}
+                            <Table.Row
+                                    link={true}
+                                    onclick={() => goto(base + '/dashboard/tv/' + show().id + '/' + season.id)}
+                            >
+                                <Table.Cell class="min-w-[10px] font-medium">{season.number}</Table.Cell>
+                                <Table.Cell class="min-w-[10px] font-medium">
+                                    <CheckmarkX state={season.downloaded}/>
+                                </Table.Cell>
+                                <Table.Cell class="min-w-[50px]">{season.name}</Table.Cell>
+                                <Table.Cell class="max-w-[300px] truncate">{season.overview}</Table.Cell>
+                            </Table.Row>
+                        {/each}
+                    {:else}
+                        <Table.Row>
+                            <Table.Cell colspan={3} class="text-center">No season data available.</Table.Cell>
+                        </Table.Row>
+                    {/if}
+                </Table.Body>
+            </Table.Root>
+        </div>
+    </div>
+    <div class="flex-1 rounded-xl bg-muted/50 p-4">
+        <div class="w-full overflow-x-auto">
+            <TorrentTable torrents={torrents.torrents}/>
+        </div>
+    </div>
 </div>