diff --git a/src/routes/template/[id]/+page.svelte b/src/routes/template/[id]/+page.svelte
index 2eff558..4f76c01 100644
--- a/src/routes/template/[id]/+page.svelte
+++ b/src/routes/template/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Button, Input, Toggle, Textarea, Alert, Modal } from 'flowbite-svelte';
+	import { Button, Input, Toggle, Textarea, Modal } from 'flowbite-svelte';
 	import { Plus, Trash2, Save, X, Play } from 'lucide-svelte';
 	import { page } from '$app/stores';
 	import type { Template } from '$lib/schema/template';
@@ -9,14 +9,14 @@
 	import { db } from '$lib/firebase';
 	import { subscribe } from '$lib/firebase/store';
 	import { goto } from '$app/navigation';
+	import { notifications } from '$lib/stores/notifications';
 
 	let title = '';
 	let task = '';
 	let isPublic = false;
 	let subtasks: string[] = [];
-	let error = '';
-	let success = '';
 	let showDeleteModal = false;
+	let isUploading = false;
 
 	const templateRef = doc(db, 'templates', $page.params.id);
 	const [template, { unsubscribe }] = subscribe<Template>(templateRef);
@@ -38,9 +38,6 @@
 	async function saveTemplate() {
 		if (!template) return;
 
-		error = '';
-		success = '';
-
 		try {
 			const res = await fetch(`/api/template/${$page.params.id}`, {
 				method: 'PATCH',
@@ -55,14 +52,14 @@
 
 			if (!res.ok) {
 				const data = await res.json();
-				error = data.error || 'Failed to save template';
+				notifications.error(data.error || 'Failed to save template');
 				return;
 			}
 
-			success = 'Template saved successfully';
+			notifications.success('Template saved successfully');
 		} catch (e) {
 			console.error('Error saving template:', e);
-			error = 'Failed to save template';
+			notifications.error('Failed to save template');
 		}
 	}
 
@@ -74,6 +71,7 @@
 
 	function removeSubtask(index: number) {
 		subtasks = subtasks.filter((_, i) => i !== index);
+		notifications.info('Subtask removed');
 	}
 
 	async function startSession() {
@@ -88,7 +86,7 @@
 
 			if (!res.ok) {
 				const data = await res.json();
-				error = data.error || 'Failed to create session';
+				notifications.error(data.error || 'Failed to create session');
 				return;
 			}
 
@@ -96,14 +94,11 @@
 			await goto(`/session/${data.sessionId}`);
 		} catch (e) {
 			console.error('Error creating session:', e);
-			error = 'Failed to create session';
+			notifications.error('Failed to create session');
 		}
 	}
 
 	async function deleteTemplate() {
-		error = '';
-		success = '';
-
 		try {
 			const res = await fetch(`/api/template/${$page.params.id}`, {
 				method: 'DELETE'
@@ -111,14 +106,14 @@
 
 			if (!res.ok) {
 				const data = await res.json();
-				error = data.error || 'Failed to delete template';
+				notifications.error(data.error || 'Failed to delete template');
 				return;
 			}
 
 			await goto('/dashboard');
 		} catch (e) {
 			console.error('Error deleting template:', e);
-			error = 'Failed to delete template';
+			notifications.error('Failed to delete template');
 		}
 	}
 </script>
@@ -131,24 +126,12 @@
 	<div class="container mx-auto max-w-4xl px-4 py-8">
 		<div class="mb-8 flex items-center justify-between">
 			<h1 class="text-3xl font-bold">Edit Template</h1>
-			<Button color="primary" on:click={startSession}>
+			<Button color="primary" on:click={startSession} disabled={isUploading}>
 				<Play class="mr-2 h-4 w-4" />
 				Start Session
 			</Button>
 		</div>
 
-		{#if error}
-			<Alert color="red" class="mb-4">
-				{error}
-			</Alert>
-		{/if}
-
-		{#if success}
-			<Alert color="green" class="mb-4">
-				{success}
-			</Alert>
-		{/if}
-
 		<form on:submit|preventDefault={saveTemplate} class="space-y-6">
 			<div>
 				<label for="title" class="mb-2 block">Title</label>
@@ -209,21 +192,21 @@
 			<div class="border-t pt-6">
 				{#key $template}
 					{#if $template}
-						<ResourceList template={$template} />
+						<ResourceList template={$template} bind:isUploading />
 					{/if}
 				{/key}
 			</div>
 
 			<div class="flex justify-end gap-4 border-t pt-6">
-				<Button color="alternative" href="/dashboard">
+				<Button color="alternative" href="/dashboard" disabled={isUploading}>
 					<X class="mr-2 h-4 w-4" />
 					Back to Dashboard
 				</Button>
-				<Button color="red" on:click={() => (showDeleteModal = true)}>
+				<Button color="red" on:click={() => (showDeleteModal = true)} disabled={isUploading}>
 					<Trash2 class="mr-2 h-4 w-4" />
 					Delete this Template
 				</Button>
-				<Button type="submit" color="primary">
+				<Button type="submit" color="primary" disabled={isUploading}>
 					<Save class="mr-2 h-4 w-4" />
 					Save Changes
 				</Button>
@@ -232,7 +215,7 @@
 	</div>
 {:else}
 	<div class="container mx-auto px-4 py-8">
-		<Alert color="blue">Loading template...</Alert>
+		<div class="text-center text-gray-500">Loading template...</div>
 	</div>
 {/if}
 
diff --git a/src/routes/template/[id]/ResourceList.svelte b/src/routes/template/[id]/ResourceList.svelte
index 5bb03f3..53167e6 100644
--- a/src/routes/template/[id]/ResourceList.svelte
+++ b/src/routes/template/[id]/ResourceList.svelte
@@ -15,6 +15,7 @@
 
 	// Props
 	export let template: Template;
+	export let isUploading: boolean = false;
 
 	// State
 	let resources = template.resources;
@@ -23,7 +24,6 @@
 	let isDragging = false;
 	let tempFile: File | null = null;
 	let success = '';
-	let isUploading = false;
 	let expandedResources = new Set<string>();
 	let dragError = false;
 
@@ -238,7 +238,12 @@
 							{/if}
 						</div>
 					</div>
-					<Button color="red" size="sm" on:click={() => deleteResource(resource.id)}>
+					<Button
+						color="red"
+						size="sm"
+						on:click={() => deleteResource(resource.id)}
+						disabled={isUploading}
+					>
 						<Trash2 class="h-4 w-4" />
 					</Button>
 				</div>