diff --git a/src/lib/components/admin/ProjectForm.svelte b/src/lib/components/admin/ProjectForm.svelte
index 1e6e6d3..68c8901 100644
--- a/src/lib/components/admin/ProjectForm.svelte
+++ b/src/lib/components/admin/ProjectForm.svelte
@@ -4,7 +4,7 @@
 	import AdminPage from './AdminPage.svelte'
 	import AdminSegmentedControl from './AdminSegmentedControl.svelte'
 	import FormFieldWrapper from './FormFieldWrapper.svelte'
-	import CaseStudyEditor from './CaseStudyEditor.svelte'
+	import EnhancedComposer from './EnhancedComposer.svelte'
 	import ProjectMetadataForm from './ProjectMetadataForm.svelte'
 	import ProjectBrandingForm from './ProjectBrandingForm.svelte'
 	import ProjectImagesForm from './ProjectImagesForm.svelte'
@@ -273,14 +273,14 @@
 
 				<!-- Case Study Panel -->
 				<div class="panel panel-case-study" class:active={activeTab === 'case-study'}>
-					<CaseStudyEditor
+					<EnhancedComposer
 						bind:this={editorRef}
 						bind:data={formData.caseStudyContent}
 						onChange={handleEditorChange}
 						placeholder="Write your case study here..."
 						minHeight={400}
 						autofocus={false}
-						mode="default"
+						variant="full"
 					/>
 				</div>
 			</div>
diff --git a/src/routes/admin/media/+page.svelte b/src/routes/admin/media/+page.svelte
index a9fea07..a8fffb4 100644
--- a/src/routes/admin/media/+page.svelte
+++ b/src/routes/admin/media/+page.svelte
@@ -11,6 +11,7 @@
 	import DropdownItem from '$lib/components/admin/DropdownItem.svelte'
 	import MediaDetailsModal from '$lib/components/admin/MediaDetailsModal.svelte'
 	import MediaUploadModal from '$lib/components/admin/MediaUploadModal.svelte'
+	import AlbumSelectorModal from '$lib/components/admin/AlbumSelectorModal.svelte'
 	import ChevronDown from '$icons/chevron-down.svg'
 	import type { Media } from '@prisma/client'
 
@@ -58,12 +59,13 @@
 	let selectedMedia = $state<Media | null>(null)
 	let isDetailsModalOpen = $state(false)
 	let isUploadModalOpen = $state(false)
+	let showBulkAlbumModal = $state(false)
 
 	// Multiselect states
 	let selectedMediaIds = $state<Set<number>>(new Set())
 	let isMultiSelectMode = $state(false)
 	let isDeleting = $state(false)
-	
+
 	// Dropdown state
 	let isDropdownOpen = $state(false)
 
@@ -375,23 +377,16 @@
 		{#snippet actions()}
 			<div class="actions-dropdown">
 				<Button variant="primary" buttonSize="large" onclick={openUploadModal}>Upload</Button>
-				<Button
-					variant="ghost"
-					iconOnly
-					buttonSize="large"
-					onclick={handleDropdownToggle}
-				>
+				<Button variant="ghost" iconOnly buttonSize="large" onclick={handleDropdownToggle}>
 					<ChevronDown slot="icon" />
 				</Button>
-				
+
 				{#if isDropdownOpen}
 					<DropdownMenuContainer>
 						<DropdownItem onclick={toggleMultiSelectMode}>
 							{isMultiSelectMode ? 'Exit Select' : 'Select Files'}
 						</DropdownItem>
-						<DropdownItem onclick={handleAuditStorage}>
-							Audit Storage
-						</DropdownItem>
+						<DropdownItem onclick={handleAuditStorage}>Audit Storage</DropdownItem>
 						<DropdownItem onclick={() => goto('/admin/media/regenerate')}>
 							Regenerate Cloudinary
 						</DropdownItem>
@@ -492,6 +487,13 @@
 						>
 							Remove Photography
 						</button>
+						<button
+							onclick={() => (showBulkAlbumModal = true)}
+							class="btn btn-secondary btn-small"
+							title="Add or remove selected items from albums"
+						>
+							Manage Albums
+						</button>
 						<button
 							onclick={handleBulkDelete}
 							class="btn btn-danger btn-small"
@@ -611,6 +613,17 @@
 	onUploadComplete={handleUploadComplete}
 />
 
+<!-- Bulk Album Modal -->
+<AlbumSelectorModal
+	bind:isOpen={showBulkAlbumModal}
+	selectedMediaIds={Array.from(selectedMediaIds)}
+	onSave={() => {
+		// Optionally refresh the media list or show a success message
+		clearSelection()
+		isMultiSelectMode = false
+	}}
+/>
+
 <style lang="scss">
 	.btn {
 		padding: $unit-2x $unit-3x;
@@ -659,7 +672,7 @@
 
 	// Ensure search input matches filter dropdown sizing
 	:global(.admin-filters) {
-		:global(input[type="search"]) {
+		:global(input[type='search']) {
 			height: 36px; // Match Select component small size
 			font-size: 0.875rem; // Match Select component font size
 			min-width: 200px; // Wider to show full placeholder
@@ -1013,13 +1026,13 @@
 					&::after {
 						content: '';
 						position: absolute;
-						top: 2px;
-						left: 6px;
+						top: 50%;
+						left: 50%;
 						width: 4px;
 						height: 8px;
 						border: solid white;
 						border-width: 0 2px 2px 0;
-						transform: rotate(45deg);
+						transform: translate(-50%, -60%) rotate(45deg);
 						opacity: 0;
 						transition: opacity 0.2s ease;
 					}
diff --git a/src/routes/admin/media/audit/+page.svelte b/src/routes/admin/media/audit/+page.svelte
index 4b6e273..4fbd3f6 100644
--- a/src/routes/admin/media/audit/+page.svelte
+++ b/src/routes/admin/media/audit/+page.svelte
@@ -40,7 +40,12 @@
 	let selectedFiles = new Set<string>()
 	let showDeleteModal = false
 	let deleteResults: { succeeded: number; failed: string[] } | null = null
-	let cleanupResults: { cleanedMedia: number; cleanedProjects: number; cleanedPosts: number; errors: string[] } | null = null
+	let cleanupResults: {
+		cleanedMedia: number
+		cleanedProjects: number
+		cleanedPosts: number
+		errors: string[]
+	} | null = null
 	let showCleanupModal = false
 	let cleaningUp = false
 
@@ -50,7 +55,6 @@
 		auditData?.orphanedFiles
 			.filter((f) => selectedFiles.has(f.publicId))
 			.reduce((sum, f) => sum + f.size, 0) || 0
-	
 
 	onMount(() => {
 		runAudit()
@@ -124,7 +128,7 @@
 
 			const response = await fetch('/api/admin/cloudinary-audit', {
 				method: 'DELETE',
-				headers: { 
+				headers: {
 					'Content-Type': 'application/json',
 					Authorization: `Basic ${auth}`
 				},
@@ -180,7 +184,7 @@
 
 			const response = await fetch('/api/admin/cloudinary-audit', {
 				method: 'PATCH',
-				headers: { 
+				headers: {
 					'Content-Type': 'application/json',
 					Authorization: `Basic ${auth}`
 				},
@@ -326,7 +330,7 @@
 					</thead>
 					<tbody>
 						{#each auditData.orphanedFiles as file}
-							<tr 
+							<tr
 								class:selected={selectedFiles.has(file.publicId)}
 								onclick={() => toggleFile(file.publicId)}
 								role="button"
@@ -394,7 +398,8 @@
 			<div class="broken-references-section">
 				<h2>Broken References</h2>
 				<p class="broken-references-info">
-					Found {auditData.missingReferences.length} files referenced in the database but missing from Cloudinary.
+					Found {auditData.missingReferences.length} files referenced in the database but missing from
+					Cloudinary.
 				</p>
 				<Button
 					variant="secondary"
@@ -408,7 +413,7 @@
 				>
 					Clean Up Broken References
 				</Button>
-				
+
 				{#if cleanupResults}
 					<div class="cleanup-results">
 						<h3>Cleanup Complete</h3>
@@ -437,12 +442,19 @@
 			<p class="warning">⚠️ This action cannot be undone.</p>
 		</div>
 		<div class="modal-actions">
-			<Button variant="secondary" onclick={() => {
-				showDeleteModal = false
-			}}>Cancel</Button>
-			<Button variant="danger" onclick={() => {
-				deleteSelected(false)
-			}} disabled={deleting}>
+			<Button
+				variant="secondary"
+				onclick={() => {
+					showDeleteModal = false
+				}}>Cancel</Button
+			>
+			<Button
+				variant="danger"
+				onclick={() => {
+					deleteSelected(false)
+				}}
+				disabled={deleting}
+			>
 				{deleting ? 'Deleting...' : 'Delete Files'}
 			</Button>
 		</div>
@@ -456,7 +468,9 @@
 			<h2>Clean Up Broken References</h2>
 		</div>
 		<div class="cleanup-confirmation">
-			<p>Are you sure you want to clean up {auditData?.missingReferences.length || 0} broken references?</p>
+			<p>
+				Are you sure you want to clean up {auditData?.missingReferences.length || 0} broken references?
+			</p>
 			<p class="warning">⚠️ This will:</p>
 			<ul class="cleanup-actions">
 				<li>Delete Media records where the main file no longer exists in Cloudinary</li>
@@ -467,12 +481,19 @@
 			<p class="warning">This action cannot be undone.</p>
 		</div>
 		<div class="modal-actions">
-			<Button variant="secondary" onclick={() => {
-				showCleanupModal = false
-			}}>Cancel</Button>
-			<Button variant="danger" onclick={() => {
-				cleanupBrokenReferences()
-			}} disabled={cleaningUp}>
+			<Button
+				variant="secondary"
+				onclick={() => {
+					showCleanupModal = false
+				}}>Cancel</Button
+			>
+			<Button
+				variant="danger"
+				onclick={() => {
+					cleanupBrokenReferences()
+				}}
+				disabled={cleaningUp}
+			>
 				{cleaningUp ? 'Cleaning Up...' : 'Clean Up References'}
 			</Button>
 		</div>
diff --git a/src/routes/admin/media/regenerate/+page.svelte b/src/routes/admin/media/regenerate/+page.svelte
index 523bbe7..f78ac93 100644
--- a/src/routes/admin/media/regenerate/+page.svelte
+++ b/src/routes/admin/media/regenerate/+page.svelte
@@ -95,7 +95,7 @@
 
 			colorExtractionResults = await response.json()
 			showResultsModal = true
-			
+
 			// Refresh stats
 			await fetchMediaStats()
 		} catch (err) {
@@ -130,7 +130,7 @@
 
 			thumbnailResults = await response.json()
 			showResultsModal = true
-			
+
 			// Refresh stats
 			await fetchMediaStats()
 		} catch (err) {
@@ -165,7 +165,7 @@
 
 			reanalysisResults = await response.json()
 			showResultsModal = true
-			
+
 			// Refresh stats
 			await fetchMediaStats()
 		} catch (err) {
@@ -227,7 +227,10 @@
 				<Palette size={24} />
 				<h2>Extract Dominant Colors</h2>
 			</div>
-			<p>Analyze images to extract dominant colors for better loading states. This process uses Cloudinary's color analysis API.</p>
+			<p>
+				Analyze images to extract dominant colors for better loading states. This process uses
+				Cloudinary's color analysis API.
+			</p>
 			<div class="action-details">
 				<ul>
 					<li>Extracts the primary color from each image</li>
@@ -252,7 +255,10 @@
 				<Image size={24} />
 				<h2>Regenerate Thumbnails</h2>
 			</div>
-			<p>Update thumbnails to maintain aspect ratio with 800px on the long edge instead of fixed 800x600 dimensions.</p>
+			<p>
+				Update thumbnails to maintain aspect ratio with 800px on the long edge instead of fixed
+				800x600 dimensions.
+			</p>
 			<div class="action-details">
 				<ul>
 					<li>Preserves original aspect ratios</li>
@@ -277,7 +283,9 @@
 				<Sparkles size={24} />
 				<h2>Smart Color Reanalysis</h2>
 			</div>
-			<p>Use advanced color detection to pick vibrant subject colors instead of background greys.</p>
+			<p>
+				Use advanced color detection to pick vibrant subject colors instead of background greys.
+			</p>
 			<div class="action-details">
 				<ul>
 					<li>Analyzes existing color data intelligently</li>
@@ -304,7 +312,11 @@
 	<div class="modal-content">
 		<div class="modal-header">
 			<h2>
-				{colorExtractionResults ? 'Color Extraction Results' : thumbnailResults ? 'Thumbnail Regeneration Results' : 'Color Reanalysis Results'}
+				{colorExtractionResults
+					? 'Color Extraction Results'
+					: thumbnailResults
+						? 'Thumbnail Regeneration Results'
+						: 'Color Reanalysis Results'}
 			</h2>
 		</div>
 
@@ -314,7 +326,7 @@
 				<p><strong>Succeeded:</strong> {colorExtractionResults.succeeded}</p>
 				<p><strong>Failed:</strong> {colorExtractionResults.failed}</p>
 				<p><strong>Photos Updated:</strong> {colorExtractionResults.photosUpdated}</p>
-				
+
 				{#if colorExtractionResults.errors.length > 0}
 					<div class="errors-section">
 						<h3>Errors:</h3>
@@ -336,7 +348,7 @@
 				<p><strong>Processed:</strong> {thumbnailResults.processed} media items</p>
 				<p><strong>Succeeded:</strong> {thumbnailResults.succeeded}</p>
 				<p><strong>Failed:</strong> {thumbnailResults.failed}</p>
-				
+
 				{#if thumbnailResults.errors.length > 0}
 					<div class="errors-section">
 						<h3>Errors:</h3>
@@ -358,7 +370,7 @@
 				<p><strong>Processed:</strong> {reanalysisResults.processed} media items</p>
 				<p><strong>Updated:</strong> {reanalysisResults.updated} (colors improved)</p>
 				<p><strong>Skipped:</strong> {reanalysisResults.skipped} (already optimal)</p>
-				
+
 				{#if reanalysisResults.errors.length > 0}
 					<div class="errors-section">
 						<h3>Errors:</h3>
@@ -376,12 +388,15 @@
 		{/if}
 
 		<div class="modal-actions">
-			<Button variant="primary" onclick={() => {
-				showResultsModal = false
-				colorExtractionResults = null
-				thumbnailResults = null
-				reanalysisResults = null
-			}}>Close</Button>
+			<Button
+				variant="primary"
+				onclick={() => {
+					showResultsModal = false
+					colorExtractionResults = null
+					thumbnailResults = null
+					reanalysisResults = null
+				}}>Close</Button
+			>
 		</div>
 	</div>
 </Modal>
@@ -602,4 +617,4 @@
 		padding-top: 1.5rem;
 		border-top: 1px solid $grey-90;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/admin/posts/+page.svelte b/src/routes/admin/posts/+page.svelte
index 783a78c..b0dd162 100644
--- a/src/routes/admin/posts/+page.svelte
+++ b/src/routes/admin/posts/+page.svelte
@@ -7,7 +7,7 @@
 	import PostListItem from '$lib/components/admin/PostListItem.svelte'
 	import LoadingSpinner from '$lib/components/admin/LoadingSpinner.svelte'
 	import Select from '$lib/components/admin/Select.svelte'
-	import UniverseComposer from '$lib/components/admin/UniverseComposer.svelte'
+	import InlineComposerModal from '$lib/components/admin/InlineComposerModal.svelte'
 	import DeleteConfirmationModal from '$lib/components/admin/DeleteConfirmationModal.svelte'
 	import Button from '$lib/components/admin/Button.svelte'
 
@@ -285,7 +285,7 @@
 		<!-- Inline Composer -->
 		{#if showInlineComposer}
 			<div class="composer-section">
-				<UniverseComposer
+				<InlineComposerModal
 					isOpen={true}
 					initialMode="page"
 					initialPostType="post"
diff --git a/src/routes/admin/posts/[id]/edit/+page.svelte b/src/routes/admin/posts/[id]/edit/+page.svelte
index 19de623..6213178 100644
--- a/src/routes/admin/posts/[id]/edit/+page.svelte
+++ b/src/routes/admin/posts/[id]/edit/+page.svelte
@@ -3,7 +3,7 @@
 	import { goto } from '$app/navigation'
 	import { onMount } from 'svelte'
 	import AdminPage from '$lib/components/admin/AdminPage.svelte'
-	import CaseStudyEditor from '$lib/components/admin/CaseStudyEditor.svelte'
+	import Composer from '$lib/components/admin/Composer.svelte'
 	import LoadingSpinner from '$lib/components/admin/LoadingSpinner.svelte'
 	import PostMetadataPopover from '$lib/components/admin/PostMetadataPopover.svelte'
 	import DeleteConfirmationModal from '$lib/components/admin/DeleteConfirmationModal.svelte'
@@ -306,7 +306,9 @@
 </script>
 
 <svelte:head>
-	<title>{post && post.title ? `${post.title} - Admin @jedmund` : 'Edit Post - Admin @jedmund'}</title>
+	<title
+		>{post && post.title ? `${post.title} - Admin @jedmund` : 'Edit Post - Admin @jedmund'}</title
+	>
 </svelte:head>
 
 <AdminPage>
@@ -394,7 +396,7 @@
 
 				{#if config?.showContent && contentReady}
 					<div class="editor-wrapper">
-						<CaseStudyEditor bind:data={content} placeholder="Continue writing..." mode="default" />
+						<Composer bind:data={content} placeholder="Continue writing..." />
 					</div>
 				{/if}
 			</div>
diff --git a/src/routes/admin/posts/new/+page.svelte b/src/routes/admin/posts/new/+page.svelte
index a8d34aa..996018b 100644
--- a/src/routes/admin/posts/new/+page.svelte
+++ b/src/routes/admin/posts/new/+page.svelte
@@ -3,7 +3,7 @@
 	import { goto } from '$app/navigation'
 	import { onMount } from 'svelte'
 	import AdminPage from '$lib/components/admin/AdminPage.svelte'
-	import CaseStudyEditor from '$lib/components/admin/CaseStudyEditor.svelte'
+	import Composer from '$lib/components/admin/Composer.svelte'
 	import PostMetadataPopover from '$lib/components/admin/PostMetadataPopover.svelte'
 	import Button from '$lib/components/admin/Button.svelte'
 	import PublishDropdown from '$lib/components/admin/PublishDropdown.svelte'
@@ -199,7 +199,7 @@
 
 			{#if config?.showContent}
 				<div class="editor-wrapper">
-					<CaseStudyEditor bind:data={content} placeholder="Start writing..." mode="default" />
+					<Composer bind:data={content} placeholder="Start writing..." />
 				</div>
 			{/if}
 		</div>
diff --git a/src/routes/admin/universe/compose/+page.svelte b/src/routes/admin/universe/compose/+page.svelte
index d407aa4..aa97e4b 100644
--- a/src/routes/admin/universe/compose/+page.svelte
+++ b/src/routes/admin/universe/compose/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from '$app/stores'
-	import UniverseComposer from '$lib/components/admin/UniverseComposer.svelte'
+	import InlineComposerModal from '$lib/components/admin/InlineComposerModal.svelte'
 	import AdminPage from '$lib/components/admin/AdminPage.svelte'
 
 	// Get initial state from URL params
@@ -15,5 +15,10 @@
 </svelte:head>
 
 <AdminPage>
-	<UniverseComposer isOpen={true} initialMode="page" initialPostType={postType} {initialContent} />
+	<InlineComposerModal
+		isOpen={true}
+		initialMode="page"
+		initialPostType={postType}
+		{initialContent}
+	/>
 </AdminPage>