diff --git a/src/lib/components/admin/composer/BubbleColorPicker.svelte b/src/lib/components/admin/composer/BubbleColorPicker.svelte
index d62ca63..e5954f6 100644
--- a/src/lib/components/admin/composer/BubbleColorPicker.svelte
+++ b/src/lib/components/admin/composer/BubbleColorPicker.svelte
@@ -36,7 +36,7 @@
 		'#FFC107', // Amber
 		'#FF9800', // Orange
 		'#FF5722', // Deep Orange
-		'#795548'  // Brown
+		'#795548' // Brown
 	]
 
 	// Lighter, pastel colors for highlighting
@@ -60,7 +60,7 @@
 		'#FFE0B2', // Light Orange
 		'#FFCCBC', // Light Deep Orange
 		'#D7CCC8', // Light Brown
-		'#F5F5F5'  // Light Gray
+		'#F5F5F5' // Light Gray
 	]
 
 	const presetColors = $derived(mode === 'text' ? textPresetColors : highlightPresetColors)
@@ -123,9 +123,7 @@
 	<div class="bubble-color-picker">
 		<div class="color-picker-header">
 			<span>{mode === 'text' ? 'Text Color' : 'Highlight Color'}</span>
-			<button class="remove-color-btn" onclick={removeColor}>
-				Remove
-			</button>
+			<button class="remove-color-btn" onclick={removeColor}> Remove </button>
 		</div>
 
 		<div class="preset-colors">
@@ -141,7 +139,7 @@
 
 		<div class="custom-color-section">
 			{#if !showPicker}
-				<button class="custom-color-btn" onclick={() => showPicker = true}>
+				<button class="custom-color-btn" onclick={() => (showPicker = true)}>
 					Custom color...
 				</button>
 			{:else}
@@ -152,9 +150,7 @@
 						sliderDirection="horizontal"
 						isAlpha={false}
 					/>
-					<button class="apply-custom-btn" onclick={handleCustomColor}>
-						Apply
-					</button>
+					<button class="apply-custom-btn" onclick={handleCustomColor}> Apply </button>
 				</div>
 			{/if}
 		</div>
@@ -335,7 +331,7 @@
 
 	:global(.bubble-color-picker .input) {
 		margin-top: 8px;
-		
+
 		input {
 			width: 100%;
 			padding: 6px 10px;
@@ -354,4 +350,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/components/admin/composer/BubbleTextStyleMenu.svelte b/src/lib/components/admin/composer/BubbleTextStyleMenu.svelte
index 4e2c341..1009f35 100644
--- a/src/lib/components/admin/composer/BubbleTextStyleMenu.svelte
+++ b/src/lib/components/admin/composer/BubbleTextStyleMenu.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Editor } from '@tiptap/core'
-	
+
 	interface Props {
 		editor: Editor
 		isOpen: boolean
@@ -12,14 +12,46 @@
 
 	// Text style options
 	const textStyles = [
-		{ name: 'paragraph', label: 'Paragraph', action: () => editor.chain().focus().setParagraph().run() },
-		{ name: 'heading1', label: 'Heading 1', action: () => editor.chain().focus().toggleHeading({ level: 1 }).run() },
-		{ name: 'heading2', label: 'Heading 2', action: () => editor.chain().focus().toggleHeading({ level: 2 }).run() },
-		{ name: 'heading3', label: 'Heading 3', action: () => editor.chain().focus().toggleHeading({ level: 3 }).run() },
-		{ name: 'bulletList', label: 'Bullet List', action: () => editor.chain().focus().toggleBulletList().run() },
-		{ name: 'orderedList', label: 'Ordered List', action: () => editor.chain().focus().toggleOrderedList().run() },
-		{ name: 'taskList', label: 'Task List', action: () => editor.chain().focus().toggleTaskList().run() },
-		{ name: 'blockquote', label: 'Blockquote', action: () => editor.chain().focus().toggleBlockquote().run() }
+		{
+			name: 'paragraph',
+			label: 'Paragraph',
+			action: () => editor.chain().focus().setParagraph().run()
+		},
+		{
+			name: 'heading1',
+			label: 'Heading 1',
+			action: () => editor.chain().focus().toggleHeading({ level: 1 }).run()
+		},
+		{
+			name: 'heading2',
+			label: 'Heading 2',
+			action: () => editor.chain().focus().toggleHeading({ level: 2 }).run()
+		},
+		{
+			name: 'heading3',
+			label: 'Heading 3',
+			action: () => editor.chain().focus().toggleHeading({ level: 3 }).run()
+		},
+		{
+			name: 'bulletList',
+			label: 'Bullet List',
+			action: () => editor.chain().focus().toggleBulletList().run()
+		},
+		{
+			name: 'orderedList',
+			label: 'Ordered List',
+			action: () => editor.chain().focus().toggleOrderedList().run()
+		},
+		{
+			name: 'taskList',
+			label: 'Task List',
+			action: () => editor.chain().focus().toggleTaskList().run()
+		},
+		{
+			name: 'blockquote',
+			label: 'Blockquote',
+			action: () => editor.chain().focus().toggleBlockquote().run()
+		}
 	]
 
 	// Add code block if feature is enabled
@@ -61,8 +93,13 @@
 		{#each textStyles as style}
 			<button
 				class="text-style-option"
-				class:active={
-					(style.name === 'paragraph' && !editor.isActive('heading') && !editor.isActive('bulletList') && !editor.isActive('orderedList') && !editor.isActive('taskList') && !editor.isActive('blockquote') && !editor.isActive('codeBlock')) ||
+				class:active={(style.name === 'paragraph' &&
+					!editor.isActive('heading') &&
+					!editor.isActive('bulletList') &&
+					!editor.isActive('orderedList') &&
+					!editor.isActive('taskList') &&
+					!editor.isActive('blockquote') &&
+					!editor.isActive('codeBlock')) ||
 					(style.name === 'heading1' && editor.isActive('heading', { level: 1 })) ||
 					(style.name === 'heading2' && editor.isActive('heading', { level: 2 })) ||
 					(style.name === 'heading3' && editor.isActive('heading', { level: 3 })) ||
@@ -70,8 +107,7 @@
 					(style.name === 'orderedList' && editor.isActive('orderedList')) ||
 					(style.name === 'taskList' && editor.isActive('taskList')) ||
 					(style.name === 'blockquote' && editor.isActive('blockquote')) ||
-					(style.name === 'codeBlock' && editor.isActive('codeBlock'))
-				}
+					(style.name === 'codeBlock' && editor.isActive('codeBlock'))}
 				onclick={() => handleSelect(style.action)}
 			>
 				{style.label}
@@ -135,4 +171,4 @@
 			font-weight: 500;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/components/admin/composer/ComposerBubbleMenu.svelte b/src/lib/components/admin/composer/ComposerBubbleMenu.svelte
index e0198da..ec2b761 100644
--- a/src/lib/components/admin/composer/ComposerBubbleMenu.svelte
+++ b/src/lib/components/admin/composer/ComposerBubbleMenu.svelte
@@ -37,7 +37,7 @@
 
 	// Filter out link command as we'll handle it specially
 	const formattingCommands = bubbleMenuCommands.filter((cmd) => cmd.name !== 'link')
-	
+
 	// Get current text style
 	const currentTextStyle = $derived(editor ? getCurrentTextStyle(editor) : 'Paragraph')
 
@@ -193,12 +193,12 @@
 						<span class="text-style-label">{currentTextStyle}</span>
 						<ChevronDown size={12} />
 					</button>
-					
+
 					<!-- Text Style Dropdown -->
 					<BubbleTextStyleMenu
 						{editor}
 						isOpen={showTextStyleMenu}
-						onClose={() => showTextStyleMenu = false}
+						onClose={() => (showTextStyleMenu = false)}
 						{features}
 					/>
 				</div>
@@ -231,16 +231,18 @@
 							showHighlightPicker = false
 						}}
 						title="Text color"
-						style={editor.getAttributes('textStyle').color ? `color: ${editor.getAttributes('textStyle').color}` : ''}
+						style={editor.getAttributes('textStyle').color
+							? `color: ${editor.getAttributes('textStyle').color}`
+							: ''}
 					>
 						<Palette size={16} />
 					</button>
-					
+
 					<!-- Text Color Picker -->
 					<BubbleColorPicker
 						{editor}
 						isOpen={showColorPicker}
-						onClose={() => showColorPicker = false}
+						onClose={() => (showColorPicker = false)}
 						mode="text"
 						currentColor={editor.getAttributes('textStyle').color}
 					/>
@@ -256,16 +258,18 @@
 							showColorPicker = false
 						}}
 						title="Highlight color"
-						style={editor.getAttributes('highlight').color ? `background-color: ${editor.getAttributes('highlight').color}` : ''}
+						style={editor.getAttributes('highlight').color
+							? `background-color: ${editor.getAttributes('highlight').color}`
+							: ''}
 					>
 						<Highlighter size={16} />
 					</button>
-					
+
 					<!-- Highlight Color Picker -->
 					<BubbleColorPicker
 						{editor}
 						isOpen={showHighlightPicker}
-						onClose={() => showHighlightPicker = false}
+						onClose={() => (showHighlightPicker = false)}
 						mode="highlight"
 						currentColor={editor.getAttributes('highlight').color}
 					/>
diff --git a/src/lib/components/admin/composer/ComposerMediaHandler.svelte.ts b/src/lib/components/admin/composer/ComposerMediaHandler.svelte.ts
index b84a376..ac26a40 100644
--- a/src/lib/components/admin/composer/ComposerMediaHandler.svelte.ts
+++ b/src/lib/components/admin/composer/ComposerMediaHandler.svelte.ts
@@ -74,18 +74,23 @@ export class ComposerMediaHandler {
 			// Replace placeholder with actual URL
 			const displayWidth = media.width && media.width > 600 ? 600 : media.width
 
-			this.editor.commands.insertContent({
-				type: 'image',
-				attrs: {
-					src: media.url,
-					alt: media.filename || '',
-					title: media.description || '',
-					width: displayWidth,
-					height: media.height,
-					align: 'center',
-					mediaId: media.id?.toString()
+			this.editor.commands.insertContent([
+				{
+					type: 'image',
+					attrs: {
+						src: media.url,
+						alt: media.filename || '',
+						title: media.description || '',
+						width: displayWidth,
+						height: media.height,
+						align: 'center',
+						mediaId: media.id?.toString()
+					}
+				},
+				{
+					type: 'paragraph'
 				}
-			})
+			])
 
 			// Clean up the object URL
 			URL.revokeObjectURL(placeholderSrc)
@@ -130,18 +135,23 @@ export class ComposerMediaHandler {
 			const displayWidth = media.width && media.width > 600 ? 600 : media.width
 
 			// Insert image
-			this.editor.commands.insertContent({
-				type: 'image',
-				attrs: {
-					src: media.url,
-					alt: media.filename || '',
-					title: media.description || '',
-					width: displayWidth,
-					height: media.height,
-					align: 'center',
-					mediaId: media.id.toString()
+			this.editor.commands.insertContent([
+				{
+					type: 'image',
+					attrs: {
+						src: media.url,
+						alt: media.filename || '',
+						title: media.description || '',
+						width: displayWidth,
+						height: media.height,
+						align: 'center',
+						mediaId: media.id.toString()
+					}
+				},
+				{
+					type: 'paragraph'
 				}
-			})
+			])
 		}
 	}
 
diff --git a/src/lib/components/edra/drag-handle.svelte b/src/lib/components/edra/drag-handle.svelte
index 403771d..51ef757 100644
--- a/src/lib/components/edra/drag-handle.svelte
+++ b/src/lib/components/edra/drag-handle.svelte
@@ -4,6 +4,7 @@
 	import { onMount } from 'svelte'
 	import { DragHandlePlugin } from './extensions/drag-handle/index.js'
 	import DropdownMenu from '../admin/DropdownMenu.svelte'
+	import { toast } from '$lib/stores/toast'
 
 	interface Props {
 		editor: Editor
@@ -349,10 +350,35 @@
 		if (!nodeToUse) return
 
 		const { node, pos } = nodeToUse
-		const resolvedPos = editor.state.doc.resolve(pos)
-		const nodeEnd = resolvedPos.after(resolvedPos.depth)
+		
+		// Create a copy of the node
+		const nodeCopy = node.toJSON()
 
-		editor.chain().focus().insertContentAt(nodeEnd, node.toJSON()).run()
+		// Find the position after this node
+		// We need to find the actual position of the node in the document
+		const resolvedPos = editor.state.doc.resolve(pos)
+		let nodePos = pos
+		
+		// If we're inside a node, get the position before it
+		if (resolvedPos.depth > 0) {
+			nodePos = resolvedPos.before(resolvedPos.depth)
+		}
+		
+		// Get the actual node at this position
+		const actualNode = editor.state.doc.nodeAt(nodePos)
+		if (!actualNode) {
+			console.error('Could not find node at position', nodePos)
+			return
+		}
+		
+		// Calculate the position after the node
+		const afterPos = nodePos + actualNode.nodeSize
+
+		// Insert the duplicated node
+		editor.chain()
+			.focus()
+			.insertContentAt(afterPos, nodeCopy)
+			.run()
 
 		isMenuOpen = false
 	}
@@ -361,17 +387,42 @@
 		const nodeToUse = menuNode || currentNode
 		if (!nodeToUse) return
 
-		const { pos } = nodeToUse
+		const { node, pos } = nodeToUse
+		
+		// Find the actual position of the node
 		const resolvedPos = editor.state.doc.resolve(pos)
-		const nodeStart = resolvedPos.before(resolvedPos.depth)
-		const nodeEnd = nodeStart + resolvedPos.node(resolvedPos.depth).nodeSize
+		let nodePos = pos
+		
+		// If we're inside a node, get the position before it
+		if (resolvedPos.depth > 0) {
+			nodePos = resolvedPos.before(resolvedPos.depth)
+		}
+		
+		// Get the actual node at this position
+		const actualNode = editor.state.doc.nodeAt(nodePos)
+		if (!actualNode) {
+			console.error('Could not find node at position', nodePos)
+			return
+		}
+		
+		const nodeEnd = nodePos + actualNode.nodeSize
 
-		editor.chain().focus().setTextSelection({ from: nodeStart, to: nodeEnd }).run()
+		// Set selection to the entire block
+		editor.chain().focus().setTextSelection({ from: nodePos, to: nodeEnd }).run()
 
-		document.execCommand('copy')
+		// Execute copy command
+		setTimeout(() => {
+			const success = document.execCommand('copy')
+			
+			// Clear selection after copy
+			editor.chain().focus().setTextSelection(nodeEnd).run()
 
-		// Clear selection after copy
-		editor.chain().focus().setTextSelection(nodeEnd).run()
+			if (success) {
+				toast.success('Block copied to clipboard')
+			} else {
+				toast.error('Failed to copy block')
+			}
+		}, 50)
 
 		isMenuOpen = false
 	}
diff --git a/src/lib/components/edra/extensions/slash-command/slashcommand.ts b/src/lib/components/edra/extensions/slash-command/slashcommand.ts
index ff77cf0..5d6b366 100644
--- a/src/lib/components/edra/extensions/slash-command/slashcommand.ts
+++ b/src/lib/components/edra/extensions/slash-command/slashcommand.ts
@@ -32,7 +32,38 @@ export default (menuList: Component<any, any, ''>): Extension =>
 					modifiers: [
 						{
 							name: 'flip',
-							enabled: false
+							enabled: true,
+							options: {
+								fallbackPlacements: ['top-start', 'top', 'bottom', 'bottom-start'],
+								padding: 40,
+								boundary: 'scrollParent',
+								rootBoundary: 'viewport',
+								flipVariations: true
+							}
+						},
+						{
+							name: 'preventOverflow',
+							enabled: true,
+							options: {
+								boundary: 'scrollParent',
+								rootBoundary: 'viewport',
+								padding: 40,
+								altAxis: true,
+								tether: false
+							}
+						},
+						{
+							name: 'offset',
+							enabled: true,
+							options: {
+								offset: ({ placement }) => {
+									// Add more offset when flipped to top
+									if (placement.includes('top')) {
+										return [16, 12]
+									}
+									return [16, 8]
+								}
+							}
 						}
 					]
 				}
@@ -131,14 +162,8 @@ export default (menuList: Component<any, any, ''>): Extension =>
 										return props.editor.storage[extensionName].rect
 									}
 
-									let yPos = rect.y
-
-									if (rect.top + component.element.offsetHeight + 40 > window.innerHeight) {
-										const diff = rect.top + component.element.offsetHeight - window.innerHeight + 40
-										yPos = rect.y - diff
-									}
-
-									return new DOMRect(rect.x, yPos, rect.width, rect.height)
+									// Return the rect as-is and let Popper.js handle positioning
+									return rect
 								}
 
 								scrollHandler = () => {
@@ -174,14 +199,8 @@ export default (menuList: Component<any, any, ''>): Extension =>
 										return props.editor.storage[extensionName].rect
 									}
 
-									let yPos = rect.y
-
-									if (rect.top + component.element.offsetHeight + 40 > window.innerHeight) {
-										const diff = rect.top + component.element.offsetHeight - window.innerHeight + 40
-										yPos = rect.y - diff
-									}
-
-									return new DOMRect(rect.x, yPos, rect.width, rect.height)
+									// Return the rect as-is and let Popper.js handle positioning
+									return rect
 								}
 
 								const scrollHandler = () => {
@@ -219,7 +238,7 @@ export default (menuList: Component<any, any, ''>): Extension =>
 
 								if (props.event.key === 'Enter') return true
 
-								return component.ref?.onKeyDown(props);
+								return component.ref?.onKeyDown(props)
 								// return false
 							},
 
diff --git a/src/lib/components/edra/headless/components/AudioPlaceholder.svelte b/src/lib/components/edra/headless/components/AudioPlaceholder.svelte
index 15f5c31..893a370 100644
--- a/src/lib/components/edra/headless/components/AudioPlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/AudioPlaceholder.svelte
@@ -2,30 +2,78 @@
 	import type { NodeViewProps } from '@tiptap/core'
 	import AudioLines from 'lucide-svelte/icons/audio-lines'
 	import { NodeViewWrapper } from 'svelte-tiptap'
-	const { editor }: NodeViewProps = $props()
+	import { getContext } from 'svelte'
+	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
+
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
+
+	// Get album context if available
+	const editorContext = getContext<any>('editorContext') || {}
+	const albumId = $derived(editorContext.albumId)
+
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`audio-${getPos?.() ?? Math.random()}`)
+
+	let showPane = $state(false)
+	let panePosition = $state({ x: 0, y: 0 })
+
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
 
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
-		const audioUrl = prompt('Enter the URL of an audio:')
-		if (!audioUrl) {
-			return
+
+		// Get position for pane
+		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
+		panePosition = {
+			x: rect.left,
+			y: rect.bottom + 8
+		}
+		paneManager.open(paneId)
+	}
+
+	// Handle keyboard navigation
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Enter' || e.key === ' ') {
+			e.preventDefault()
+			handleClick(e as any)
+		} else if (e.key === 'Escape') {
+			if (showPane) {
+				paneManager.close()
+			} else {
+				deleteNode()
+			}
 		}
-		editor.chain().focus().setAudio(audioUrl).run()
 	}
 </script>
 
 <NodeViewWrapper class="edra-audio-placeholder-wrapper" contenteditable="false">
-	<!-- svelte-ignore a11y_click_events_have_key_events -->
 	<button
 		class="edra-audio-placeholder-content"
 		onclick={handleClick}
+		onkeydown={handleKeyDown}
 		tabindex="0"
-		aria-label="Insert An Audio"
+		aria-label="Insert audio"
 	>
 		<AudioLines class="edra-audio-placeholder-icon" />
-		<span class="edra-audio-placeholder-text">Insert An Audio</span>
+		<span class="edra-audio-placeholder-text">Insert audio</span>
 	</button>
+
+	{#if showPane}
+		<ContentInsertionPane
+			{editor}
+			position={panePosition}
+			contentType="audio"
+			onClose={() => paneManager.close()}
+			{deleteNode}
+			{albumId}
+		/>
+	{/if}
 </NodeViewWrapper>
 
 <style lang="scss">
diff --git a/src/lib/components/edra/headless/components/ContentInsertionPane.svelte b/src/lib/components/edra/headless/components/ContentInsertionPane.svelte
index 147628f..44c81e5 100644
--- a/src/lib/components/edra/headless/components/ContentInsertionPane.svelte
+++ b/src/lib/components/edra/headless/components/ContentInsertionPane.svelte
@@ -1,79 +1,88 @@
 <script lang="ts">
 	import type { Editor } from '@tiptap/core'
 	import type { Media } from '@prisma/client'
-	import { onMount, onDestroy } from 'svelte'
 	import Image from 'lucide-svelte/icons/image'
 	import Video from 'lucide-svelte/icons/video'
 	import AudioLines from 'lucide-svelte/icons/audio-lines'
 	import Grid3x3 from 'lucide-svelte/icons/grid-3x3'
 	import MapPin from 'lucide-svelte/icons/map-pin'
+	import MediaIcon from '$icons/media.svg?component'
 	import Upload from 'lucide-svelte/icons/upload'
 	import Link from 'lucide-svelte/icons/link'
 	import Images from 'lucide-svelte/icons/images'
 	import Search from 'lucide-svelte/icons/search'
-	import X from 'lucide-svelte/icons/x'
 	import { mediaSelectionStore } from '$lib/stores/media-selection'
+	import Pane from '$components/ui/Pane.svelte'
 
 	interface Props {
 		editor: Editor
 		position: { x: number; y: number }
+		contentType: ContentType
 		onClose: () => void
 		deleteNode?: () => void
 		albumId?: number
 	}
 
-	let { editor, position, onClose, deleteNode, albumId }: Props = $props()
+	let { editor, position, contentType, onClose, deleteNode, albumId }: Props = $props()
 
 	type ContentType = 'image' | 'video' | 'audio' | 'gallery' | 'location'
 	type ActionType = 'upload' | 'embed' | 'gallery' | 'search'
 
-	let selectedType = $state<ContentType>('image')
+	// Set default action based on content type
+	const defaultAction = $derived(() => {
+		if (contentType === 'location') return 'search'
+		if (contentType === 'gallery') return 'gallery'
+		if (contentType === 'image') return 'gallery'
+		return 'upload'
+	})
+
+	let selectedAction = $state<ActionType>(defaultAction())
 	let embedUrl = $state('')
 	let searchQuery = $state('')
 	let isUploading = $state(false)
 	let fileInput: HTMLInputElement
+	let isOpen = $state(true)
 
-	const contentTypes = [
-		{ type: 'image' as ContentType, icon: Image, label: 'Image' },
-		{ type: 'video' as ContentType, icon: Video, label: 'Video' },
-		{ type: 'audio' as ContentType, icon: AudioLines, label: 'Audio' },
-		{ type: 'gallery' as ContentType, icon: Grid3x3, label: 'Gallery' },
-		{ type: 'location' as ContentType, icon: MapPin, label: 'Location' }
-	]
+	// Location form fields
+	let locationTitle = $state('')
+	let locationDescription = $state('')
+	let locationLat = $state('')
+	let locationLng = $state('')
+	let locationMarkerColor = $state('#ef4444')
+	let locationZoom = $state(15)
 
 	const availableActions = $derived(() => {
-		switch (selectedType) {
+		switch (contentType) {
 			case 'image':
+				return [
+					{ type: 'gallery' as ActionType, icon: MediaIcon, label: 'Gallery' },
+					{ type: 'upload' as ActionType, icon: Upload, label: 'Upload' },
+					{ type: 'embed' as ActionType, icon: Link, label: 'Embed' }
+				]
 			case 'video':
 			case 'audio':
 				return [
+					{ type: 'gallery' as ActionType, icon: MediaIcon, label: 'Gallery' },
 					{ type: 'upload' as ActionType, icon: Upload, label: 'Upload' },
-					{ type: 'embed' as ActionType, icon: Link, label: 'Embed link' },
-					{ type: 'gallery' as ActionType, icon: Images, label: 'Choose from gallery' }
+					{ type: 'embed' as ActionType, icon: Link, label: 'Embed' }
 				]
 			case 'gallery':
-				return [{ type: 'gallery' as ActionType, icon: Images, label: 'Choose images from gallery' }]
+				return [{ type: 'gallery' as ActionType, icon: Images, label: 'Gallery' }]
 			case 'location':
 				return [
 					{ type: 'search' as ActionType, icon: Search, label: 'Search' },
-					{ type: 'embed' as ActionType, icon: Link, label: 'Embed link' }
+					{ type: 'embed' as ActionType, icon: Link, label: 'Embed' }
 				]
 			default:
 				return []
 		}
 	})
 
-	function handleTypeSelect(type: ContentType) {
-		selectedType = type
-		embedUrl = ''
-		searchQuery = ''
-	}
-
 	function handleUpload() {
 		if (!fileInput) return
-		
+
 		// Set accept attribute based on type
-		switch (selectedType) {
+		switch (contentType) {
 			case 'image':
 				fileInput.accept = 'image/*'
 				break
@@ -84,7 +93,7 @@
 				fileInput.accept = 'audio/*'
 				break
 		}
-		
+
 		fileInput.click()
 	}
 
@@ -99,7 +108,7 @@
 			const file = files[0]
 			const formData = new FormData()
 			formData.append('file', file)
-			formData.append('type', selectedType)
+			formData.append('type', contentType)
 
 			if (albumId) {
 				formData.append('albumId', albumId.toString())
@@ -136,9 +145,21 @@
 	function handleEmbed() {
 		if (!embedUrl.trim()) return
 
-		switch (selectedType) {
+		switch (contentType) {
 			case 'image':
-				editor.chain().focus().setImage({ src: embedUrl }).run()
+				editor
+					.chain()
+					.focus()
+					.insertContent([
+						{
+							type: 'image',
+							attrs: { src: embedUrl }
+						},
+						{
+							type: 'paragraph'
+						}
+					])
+					.run()
 				break
 			case 'video':
 				editor.chain().focus().setVideo(embedUrl).run()
@@ -150,15 +171,19 @@
 				// For location, try to extract coordinates from Google Maps URL
 				const coords = extractCoordinatesFromUrl(embedUrl)
 				if (coords) {
-					editor.chain().focus().insertContent({
-						type: 'geolocation',
-						attrs: {
-							latitude: coords.lat,
-							longitude: coords.lng,
-							title: 'Location',
-							description: ''
-						}
-					}).run()
+					editor
+						.chain()
+						.focus()
+						.insertContent({
+							type: 'geolocation',
+							attrs: {
+								latitude: coords.lat,
+								longitude: coords.lng,
+								title: 'Location',
+								description: ''
+							}
+						})
+						.run()
 				} else {
 					alert('Please enter a valid Google Maps URL')
 					return
@@ -171,43 +196,57 @@
 	}
 
 	function handleGallerySelect() {
-		const fileType = selectedType === 'gallery' ? 'image' : selectedType
-		const mode = selectedType === 'gallery' ? 'multiple' : 'single'
+		const fileType = contentType === 'gallery' ? 'image' : contentType
+		const mode = contentType === 'gallery' ? 'multiple' : 'single'
 
-		mediaSelectionStore.open({
-			mode,
-			fileType: fileType as 'image' | 'video' | 'audio',
-			albumId,
-			onSelect: (media: Media | Media[]) => {
-				if (selectedType === 'gallery') {
-					insertGallery(media as Media[])
-				} else {
-					insertContent(media as Media)
+		// Close the pane first to prevent z-index issues
+		handlePaneClose()
+
+		// Open the media modal after a short delay to ensure pane is closed
+		setTimeout(() => {
+			mediaSelectionStore.open({
+				mode,
+				fileType: fileType as 'image' | 'video' | 'audio',
+				albumId,
+				onSelect: (media: Media | Media[]) => {
+					if (contentType === 'gallery') {
+						insertGallery(media as Media[])
+					} else {
+						insertContent(media as Media)
+					}
+				},
+				onClose: () => {
+					mediaSelectionStore.close()
 				}
-			},
-			onClose: () => {
-				mediaSelectionStore.close()
-				onClose()
-			}
-		})
+			})
+		}, 150)
 	}
 
 	function insertContent(media: Media) {
-		switch (selectedType) {
+		switch (contentType) {
 			case 'image':
 				const displayWidth = media.width && media.width > 600 ? 600 : media.width
-				editor.chain().focus().insertContent({
-					type: 'image',
-					attrs: {
-						src: media.url,
-						alt: media.altText || '',
-						title: media.description || '',
-						width: displayWidth,
-						height: media.height,
-						align: 'center',
-						mediaId: media.id?.toString()
-					}
-				}).run()
+				editor
+					.chain()
+					.focus()
+					.insertContent([
+						{
+							type: 'image',
+							attrs: {
+								src: media.url,
+								alt: media.altText || '',
+								title: media.description || '',
+								width: displayWidth,
+								height: media.height,
+								align: 'center',
+								mediaId: media.id?.toString()
+							}
+						},
+						{
+							type: 'paragraph'
+						}
+					])
+					.run()
 				break
 			case 'video':
 				editor.chain().focus().setVideo(media.url).run()
@@ -240,9 +279,9 @@
 	function extractCoordinatesFromUrl(url: string): { lat: number; lng: number } | null {
 		// Extract from Google Maps URL patterns
 		const patterns = [
-			/@(-?\d+\.\d+),(-?\d+\.\d+)/,  // @lat,lng format
+			/@(-?\d+\.\d+),(-?\d+\.\d+)/, // @lat,lng format
 			/ll=(-?\d+\.\d+),(-?\d+\.\d+)/, // ll=lat,lng format
-			/q=(-?\d+\.\d+),(-?\d+\.\d+)/   // q=lat,lng format
+			/q=(-?\d+\.\d+),(-?\d+\.\d+)/ // q=lat,lng format
 		]
 
 		for (const pattern of patterns) {
@@ -264,107 +303,187 @@
 		alert('Location search coming soon! For now, paste a Google Maps link.')
 	}
 
+	function handleLocationInsert() {
+		const lat = parseFloat(locationLat)
+		const lng = parseFloat(locationLng)
+
+		if (isNaN(lat) || isNaN(lng)) {
+			alert('Please enter valid coordinates')
+			return
+		}
+
+		editor
+			.chain()
+			.focus()
+			.insertContent({
+				type: 'geolocation',
+				attrs: {
+					latitude: lat,
+					longitude: lng,
+					title: locationTitle || undefined,
+					description: locationDescription || undefined,
+					markerColor: locationMarkerColor,
+					zoom: locationZoom
+				}
+			})
+			.run()
+
+		deleteNode?.()
+		onClose()
+	}
+
 	function handleKeydown(e: KeyboardEvent) {
-		if (e.key === 'Escape') {
-			onClose()
-		} else if (e.key === 'Enter' && embedUrl.trim()) {
+		if (e.key === 'Enter' && embedUrl.trim()) {
 			handleEmbed()
 		}
 	}
 
-	function handleClickOutside(event: MouseEvent) {
-		const target = event.target as HTMLElement
-		if (!target.closest('.content-insertion-pane')) {
-			onClose()
-		}
+	function handlePaneClose() {
+		isOpen = false
+		onClose()
 	}
 
-	onMount(() => {
-		document.addEventListener('click', handleClickOutside)
-		document.addEventListener('keydown', handleKeydown)
-	})
-
-	onDestroy(() => {
-		document.removeEventListener('click', handleClickOutside)
-		document.removeEventListener('keydown', handleKeydown)
-	})
+	function getContentTitle() {
+		switch (contentType) {
+			case 'image':
+				return 'Insert Image'
+			case 'video':
+				return 'Insert Video'
+			case 'audio':
+				return 'Insert Audio'
+			case 'gallery':
+				return 'Create Gallery'
+			case 'location':
+				return 'Add Location'
+			default:
+				return 'Insert Content'
+		}
+	}
 </script>
 
-<div 
-	class="content-insertion-pane" 
-	style="top: {position.y}px; left: {position.x}px;"
+<Pane
+	bind:isOpen
+	{position}
+	showCloseButton={false}
+	closeOnBackdrop={true}
+	closeOnEscape={true}
+	maxWidth="400px"
+	maxHeight="auto"
+	onClose={handlePaneClose}
 >
-	<div class="pane-header">
-		<div class="content-types">
-			{#each contentTypes as contentType}
+	{#if availableActions().length > 1}
+		<div class="action-selector">
+			{#each availableActions() as action}
 				<button
-					class="content-type-btn"
-					class:active={selectedType === contentType.type}
-					onclick={() => handleTypeSelect(contentType.type)}
+					class="action-tab"
+					class:active={selectedAction === action.type}
+					onclick={() => (selectedAction = action.type)}
 				>
-					<svelte:component this={contentType.icon} size={16} />
-					<span>{contentType.label}</span>
-				</button>
-			{/each}
-		</div>
-		<button class="close-btn" onclick={onClose}>
-			<X size={16} />
-		</button>
-	</div>
-
-	<div class="pane-content">
-		{#if selectedType === 'location' && availableActions()[0]?.type === 'search'}
-			<div class="search-section">
-				<input
-					bind:value={searchQuery}
-					placeholder="Search for a location..."
-					class="search-input"
-				/>
-				<button class="search-btn" onclick={handleLocationSearch}>
-					<Search size={16} />
-					Search
-				</button>
-			</div>
-			<div class="divider">or</div>
-		{/if}
-
-		{#if availableActions().some(a => a.type === 'embed')}
-			<div class="embed-section">
-				<input
-					bind:value={embedUrl}
-					placeholder={selectedType === 'location' ? 'Paste Google Maps link...' : `Paste ${selectedType} URL...`}
-					class="embed-input"
-				/>
-				<button 
-					class="embed-btn" 
-					onclick={handleEmbed}
-					disabled={!embedUrl.trim()}
-				>
-					Embed
-				</button>
-			</div>
-		{/if}
-
-		{#if availableActions().length > 1 && availableActions().some(a => a.type !== 'embed')}
-			<div class="divider">or</div>
-		{/if}
-
-		<div class="action-buttons">
-			{#each availableActions().filter(a => a.type !== 'embed') as action}
-				<button
-					class="action-btn"
-					onclick={() => {
-						if (action.type === 'upload') handleUpload()
-						else if (action.type === 'gallery') handleGallerySelect()
-						else if (action.type === 'search') handleLocationSearch()
-					}}
-					disabled={isUploading}
-				>
-					<svelte:component this={action.icon} size={20} />
+					<svelte:component this={action.icon} size={16} />
 					<span>{action.label}</span>
 				</button>
 			{/each}
 		</div>
+	{/if}
+
+	<div class="pane-content">
+		{#if selectedAction === 'upload'}
+			<div class="upload-section">
+				<button class="upload-btn" onclick={handleUpload} disabled={isUploading}>
+					<Upload size={48} />
+					<span>Click to upload {contentType}</span>
+					<span class="upload-hint">or drag and drop</span>
+				</button>
+			</div>
+		{:else if selectedAction === 'embed'}
+			<div class="embed-section">
+				{#if contentType === 'location'}
+					<p class="section-description">Paste a Google Maps link to embed a location</p>
+				{:else}
+					<p class="section-description">
+						Paste a URL to embed {contentType === 'image' ? 'an' : 'a'}
+						{contentType}
+					</p>
+				{/if}
+				<input
+					bind:value={embedUrl}
+					placeholder={contentType === 'location'
+						? 'https://maps.google.com/...'
+						: `https://example.com/${contentType}.${contentType === 'image' ? 'jpg' : contentType === 'video' ? 'mp4' : 'mp3'}`}
+					class="embed-input"
+					onkeydown={handleKeydown}
+				/>
+				<button class="embed-btn" onclick={handleEmbed} disabled={!embedUrl.trim()}> Embed </button>
+			</div>
+		{:else if selectedAction === 'gallery'}
+			<div class="gallery-section">
+				<button class="gallery-btn" onclick={handleGallerySelect}>
+					<Images size={48} />
+					<span>Choose from media library</span>
+				</button>
+			</div>
+		{:else if selectedAction === 'search' && contentType === 'location'}
+			<div class="location-form">
+				<div class="form-group">
+					<label class="form-label">Title (optional)</label>
+					<input bind:value={locationTitle} placeholder="Location name" class="form-input" />
+				</div>
+
+				<div class="form-group">
+					<label class="form-label">Description (optional)</label>
+					<textarea
+						bind:value={locationDescription}
+						placeholder="About this location"
+						class="form-textarea"
+						rows="2"
+					/>
+				</div>
+
+				<div class="coordinates-group">
+					<div class="form-group">
+						<label class="form-label">Latitude <span class="required">*</span></label>
+						<input
+							bind:value={locationLat}
+							placeholder="37.7749"
+							type="number"
+							step="0.000001"
+							class="form-input"
+							required
+						/>
+					</div>
+					<div class="form-group">
+						<label class="form-label">Longitude <span class="required">*</span></label>
+						<input
+							bind:value={locationLng}
+							placeholder="-122.4194"
+							type="number"
+							step="0.000001"
+							class="form-input"
+							required
+						/>
+					</div>
+				</div>
+
+				<div class="location-options">
+					<label class="option-label">
+						Marker Color
+						<input type="color" bind:value={locationMarkerColor} class="color-input" />
+					</label>
+					<label class="option-label">
+						Zoom Level: {locationZoom}
+						<input type="range" bind:value={locationZoom} min="1" max="20" class="zoom-input" />
+					</label>
+				</div>
+
+				<button
+					class="submit-btn"
+					onclick={handleLocationInsert}
+					disabled={!locationLat || !locationLng}
+				>
+					Insert Location
+				</button>
+			</div>
+		{/if}
 
 		{#if isUploading}
 			<div class="uploading-overlay">
@@ -373,66 +492,45 @@
 			</div>
 		{/if}
 	</div>
+</Pane>
 
-	<!-- Hidden file input -->
-	<input
-		bind:this={fileInput}
-		type="file"
-		onchange={handleFileUpload}
-		style="display: none;"
-	/>
-</div>
+<!-- Hidden file input -->
+<input bind:this={fileInput} type="file" onchange={handleFileUpload} style="display: none;" />
 
 <style lang="scss">
 	@import '$styles/variables';
 
-	.content-insertion-pane {
-		position: fixed;
-		background: $white;
-		border: 1px solid $gray-85;
-		border-radius: $corner-radius;
-		box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
-		width: 400px;
-		z-index: $z-index-modal;
-		overflow: hidden;
-	}
-
-	.pane-header {
+	.action-selector {
 		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: $unit-2x;
+		gap: 0;
 		border-bottom: 1px solid $gray-90;
-		background: $gray-98;
 	}
 
-	.content-types {
-		display: flex;
-		gap: $unit-half;
-	}
-
-	.content-type-btn {
+	.action-tab {
 		display: flex;
 		align-items: center;
+		justify-content: center;
 		gap: $unit-half;
-		padding: $unit-half $unit-2x;
+		padding: $unit-2x;
 		border: none;
-		border-radius: $corner-radius-sm;
+		border-bottom: 2px solid transparent;
 		background: transparent;
 		color: $gray-40;
-		font-size: $font-size-extra-small;
+		font-size: $font-size-small;
 		font-weight: 500;
 		cursor: pointer;
 		transition: all 0.15s ease;
+		position: relative;
+		top: 2px;
+		flex: 1;
 
 		&:hover {
-			background: $gray-95;
 			color: $gray-20;
 		}
 
 		&.active {
-			background: $gray-90;
-			color: $gray-10;
+			color: $primary-color;
+			border-bottom-color: $primary-color;
 		}
 
 		span {
@@ -442,36 +540,62 @@
 		}
 	}
 
-	.close-btn {
+	.pane-content {
+		position: relative;
+		padding: $unit-3x;
+	}
+
+	.upload-section,
+	.gallery-section {
 		display: flex;
-		align-items: center;
 		justify-content: center;
-		width: $unit-3x;
-		height: $unit-3x;
 		padding: 0;
-		border: none;
-		border-radius: $corner-radius-xs;
-		background: transparent;
-		color: $gray-50;
+	}
+
+	.upload-btn,
+	.gallery-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: $unit-2x;
+		padding: $unit-4x;
+		border: 2px dashed $gray-85;
+		border-radius: $corner-radius;
+		background: $gray-95;
+		color: $gray-40;
+		font-size: $font-size-small;
+		font-weight: 500;
 		cursor: pointer;
-		transition: all 0.15s ease;
+		transition: all 0.2s ease;
+		width: 100%;
 
 		&:hover {
 			background: $gray-90;
+			border-color: $gray-70;
 			color: $gray-20;
 		}
+
+		&:disabled {
+			opacity: 0.5;
+			cursor: not-allowed;
+		}
+
+		.upload-hint {
+			font-size: $font-size-extra-small;
+			color: $gray-60;
+		}
 	}
 
-	.pane-content {
-		padding: $unit-3x;
-		position: relative;
-	}
-
-	.search-section,
 	.embed-section {
 		display: flex;
-		gap: $unit;
-		margin-bottom: $unit-2x;
+		flex-direction: column;
+		gap: $unit-2x;
+	}
+
+	.section-description {
+		margin: 0;
+		color: $gray-40;
+		font-size: $font-size-small;
 	}
 
 	.search-input,
@@ -605,4 +729,102 @@
 			transform: rotate(360deg);
 		}
 	}
-</style>
\ No newline at end of file
+
+	.location-form {
+		display: flex;
+		flex-direction: column;
+		gap: $unit-2x;
+	}
+
+	.form-group {
+		display: flex;
+		flex-direction: column;
+		gap: $unit-half;
+	}
+
+	.form-label {
+		font-size: $font-size-extra-small;
+		font-weight: 500;
+		color: $gray-30;
+	}
+
+	.form-input,
+	.form-textarea {
+		padding: $unit $unit-2x;
+		border: 1px solid $gray-85;
+		border-radius: $corner-radius-sm;
+		font-size: $font-size-small;
+		background: $white;
+		font-family: inherit;
+
+		&:focus {
+			outline: none;
+			border-color: $primary-color;
+		}
+	}
+
+	.form-textarea {
+		resize: vertical;
+		min-height: 60px;
+	}
+
+	.coordinates-group {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		gap: $unit-2x;
+	}
+
+	.location-options {
+		display: flex;
+		gap: $unit-3x;
+		align-items: center;
+	}
+
+	.option-label {
+		display: flex;
+		align-items: center;
+		gap: $unit;
+		font-size: $font-size-extra-small;
+		font-weight: 500;
+		color: $gray-30;
+	}
+
+	.color-input {
+		width: 36px;
+		height: 24px;
+		padding: 0;
+		border: 1px solid $gray-85;
+		border-radius: $corner-radius-sm;
+		cursor: pointer;
+	}
+
+	.zoom-input {
+		width: 100px;
+	}
+
+	.submit-btn {
+		width: 100%;
+		padding: $unit-2x;
+		background: $primary-color;
+		color: $white;
+		border: none;
+		border-radius: $corner-radius-sm;
+		font-size: $font-size-small;
+		font-weight: 500;
+		cursor: pointer;
+		transition: all 0.15s ease;
+
+		&:hover:not(:disabled) {
+			background: darken($primary-color, 10%);
+		}
+
+		&:disabled {
+			opacity: 0.5;
+			cursor: not-allowed;
+		}
+	}
+
+	.required {
+		color: $red-60;
+	}
+</style>
diff --git a/src/lib/components/edra/headless/components/EnhancedImagePlaceholder.svelte b/src/lib/components/edra/headless/components/EnhancedImagePlaceholder.svelte
index 00799a4..9d4016f 100644
--- a/src/lib/components/edra/headless/components/EnhancedImagePlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/EnhancedImagePlaceholder.svelte
@@ -4,6 +4,7 @@
 	import { NodeViewWrapper } from 'svelte-tiptap'
 	import { getContext } from 'svelte'
 	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
 
 	const { editor, deleteNode, getPos }: NodeViewProps = $props()
 
@@ -11,20 +12,29 @@
 	const editorContext = getContext<any>('editorContext') || {}
 	const albumId = $derived(editorContext.albumId)
 
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`image-placeholder-${getPos?.() ?? Math.random()}`)
+
 	let showPane = $state(false)
 	let panePosition = $state({ x: 0, y: 0 })
 
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
+
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
-		
+
 		// Get position for pane
 		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
 		panePosition = {
 			x: rect.left,
 			y: rect.bottom + 8
 		}
-		showPane = true
+		paneManager.open(paneId)
 	}
 
 	// Handle keyboard navigation
@@ -34,7 +44,7 @@
 			handleClick(e as any)
 		} else if (e.key === 'Escape') {
 			if (showPane) {
-				showPane = false
+				paneManager.close()
 			} else {
 				deleteNode()
 			}
@@ -53,12 +63,13 @@
 		<Image class="edra-media-placeholder-icon" />
 		<span class="edra-media-placeholder-text">Insert an image</span>
 	</button>
-	
+
 	{#if showPane}
 		<ContentInsertionPane
 			{editor}
 			position={panePosition}
-			onClose={() => showPane = false}
+			contentType="image"
+			onClose={() => paneManager.close()}
 			{deleteNode}
 			{albumId}
 		/>
diff --git a/src/lib/components/edra/headless/components/GalleryPlaceholder.svelte b/src/lib/components/edra/headless/components/GalleryPlaceholder.svelte
index bafd55e..4d3d6c5 100644
--- a/src/lib/components/edra/headless/components/GalleryPlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/GalleryPlaceholder.svelte
@@ -4,27 +4,37 @@
 	import { NodeViewWrapper } from 'svelte-tiptap'
 	import { getContext } from 'svelte'
 	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
 
-	const { editor, deleteNode }: NodeViewProps = $props()
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
 
 	// Get album context if available
 	const editorContext = getContext<any>('editorContext') || {}
 	const albumId = $derived(editorContext.albumId)
 
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`gallery-${getPos?.() ?? Math.random()}`)
+
 	let showPane = $state(false)
 	let panePosition = $state({ x: 0, y: 0 })
 
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
+
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
-		
+
 		// Get position for pane
 		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
 		panePosition = {
 			x: rect.left,
 			y: rect.bottom + 8
 		}
-		showPane = true
+		paneManager.open(paneId)
 	}
 
 	// Handle keyboard navigation
@@ -34,7 +44,7 @@
 			handleClick(e as any)
 		} else if (e.key === 'Escape') {
 			if (showPane) {
-				showPane = false
+				paneManager.close()
 			} else {
 				deleteNode()
 			}
@@ -53,12 +63,13 @@
 		<Grid3x3 class="edra-gallery-placeholder-icon" />
 		<span class="edra-gallery-placeholder-text">Insert a gallery</span>
 	</button>
-	
+
 	{#if showPane}
 		<ContentInsertionPane
 			{editor}
 			position={panePosition}
-			onClose={() => showPane = false}
+			contentType="gallery"
+			onClose={() => paneManager.close()}
 			{deleteNode}
 			{albumId}
 		/>
diff --git a/src/lib/components/edra/headless/components/GeolocationPlaceholder.svelte b/src/lib/components/edra/headless/components/GeolocationPlaceholder.svelte
index 1341795..0fa75b3 100644
--- a/src/lib/components/edra/headless/components/GeolocationPlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/GeolocationPlaceholder.svelte
@@ -1,257 +1,118 @@
 <script lang="ts">
-	import { type Editor, type NodeViewProps } from '@tiptap/core'
-	import { NodeViewWrapper } from 'svelte-tiptap'
+	import type { NodeViewProps } from '@tiptap/core'
 	import MapPin from 'lucide-svelte/icons/map-pin'
+	import { NodeViewWrapper } from 'svelte-tiptap'
+	import { getContext } from 'svelte'
+	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
 
-	interface Props extends NodeViewProps {}
-	let { node, editor, getPos, updateAttributes, deleteNode }: Props = $props()
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
 
-	let latitude = $state<number | null>(null)
-	let longitude = $state<number | null>(null)
-	let title = $state('')
-	let description = $state('')
-	let markerColor = $state('#ef4444')
-	let isConfigured = $state(false)
+	// Get album context if available
+	const editorContext = getContext<any>('editorContext') || {}
+	const albumId = $derived(editorContext.albumId)
 
-	function handleSubmit() {
-		if (!latitude || !longitude || !title) {
-			alert('Please fill in all required fields')
-			return
-		}
-
-		// Replace this placeholder with the actual geolocation node
-		const pos = getPos()
-		if (typeof pos === 'number') {
-			editor
-				.chain()
-				.focus()
-				.deleteRange({ from: pos, to: pos + node.nodeSize })
-				.insertContent({
-					type: 'geolocation',
-					attrs: {
-						latitude,
-						longitude,
-						title,
-						description,
-						markerColor
-					}
-				})
-				.run()
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`location-${getPos?.() ?? Math.random()}`)
+
+	let showPane = $state(false)
+	let panePosition = $state({ x: 0, y: 0 })
+
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
+
+	function handleClick(e: MouseEvent) {
+		if (!editor.isEditable) return
+		e.preventDefault()
+
+		// Get position for pane
+		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
+		panePosition = {
+			x: rect.left,
+			y: rect.bottom + 8
 		}
+		paneManager.open(paneId)
 	}
 
-	function handleCancel() {
-		deleteNode()
+	// Handle keyboard navigation
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Enter' || e.key === ' ') {
+			e.preventDefault()
+			handleClick(e as any)
+		} else if (e.key === 'Escape') {
+			if (showPane) {
+				paneManager.close()
+			} else {
+				deleteNode()
+			}
+		}
 	}
 </script>
 
-<NodeViewWrapper>
-	<div class="geolocation-placeholder">
-		<div class="icon">
-			<MapPin size={24} />
-		</div>
+<NodeViewWrapper class="edra-geolocation-placeholder-wrapper" contenteditable="false">
+	<button
+		class="edra-geolocation-placeholder-content"
+		onclick={handleClick}
+		onkeydown={handleKeyDown}
+		tabindex="0"
+		aria-label="Insert location"
+	>
+		<MapPin class="edra-geolocation-placeholder-icon" />
+		<span class="edra-geolocation-placeholder-text">Insert location</span>
+	</button>
 
-		{#if !isConfigured}
-			<div class="content">
-				<h3>Add Location</h3>
-				<p>Add a map with a location marker</p>
-				<button class="configure-btn" onclick={() => (isConfigured = true)}>
-					Configure Location
-				</button>
-			</div>
-		{:else}
-			<div class="form">
-				<h3>Configure Location</h3>
-
-				<div class="form-group">
-					<label for="latitude">Latitude <span class="required">*</span></label>
-					<input
-						id="latitude"
-						type="number"
-						step="0.000001"
-						bind:value={latitude}
-						placeholder="e.g., 37.7749"
-						required
-					/>
-				</div>
-
-				<div class="form-group">
-					<label for="longitude">Longitude <span class="required">*</span></label>
-					<input
-						id="longitude"
-						type="number"
-						step="0.000001"
-						bind:value={longitude}
-						placeholder="e.g., -122.4194"
-						required
-					/>
-				</div>
-
-				<div class="form-group">
-					<label for="title">Title <span class="required">*</span></label>
-					<input id="title" type="text" bind:value={title} placeholder="Location name" required />
-				</div>
-
-				<div class="form-group">
-					<label for="description">Description</label>
-					<textarea
-						id="description"
-						bind:value={description}
-						placeholder="Optional description"
-						rows="3"
-					></textarea>
-				</div>
-
-				<div class="form-group">
-					<label for="markerColor">Marker Color</label>
-					<input id="markerColor" type="color" bind:value={markerColor} />
-				</div>
-
-				<div class="actions">
-					<button class="cancel-btn" onclick={handleCancel}>Cancel</button>
-					<button class="submit-btn" onclick={handleSubmit}>Add Location</button>
-				</div>
-			</div>
-		{/if}
-	</div>
+	{#if showPane}
+		<ContentInsertionPane
+			{editor}
+			position={panePosition}
+			contentType="location"
+			onClose={() => paneManager.close()}
+			{deleteNode}
+			{albumId}
+		/>
+	{/if}
 </NodeViewWrapper>
 
 <style lang="scss">
 	@import '$styles/variables';
 
-
-	.geolocation-placeholder {
-		background: $gray-95;
+	.edra-geolocation-placeholder-content {
+		width: 100%;
+		padding: $unit-3x;
+		background-color: $gray-95;
 		border: 2px dashed $gray-85;
 		border-radius: $corner-radius;
-		padding: $unit-3x;
-		text-align: center;
-	}
-
-	.icon {
 		display: flex;
+		align-items: center;
 		justify-content: center;
-		margin-bottom: $unit-2x;
+		gap: $unit-2x;
+		cursor: pointer;
+		transition: all 0.2s ease;
 		color: $gray-50;
-	}
 
-	.content {
-		h3 {
-			margin: 0 0 $unit;
-			font-size: $font-size-large;
-			font-weight: 600;
-			color: $gray-10;
+		&:hover {
+			background-color: $gray-90;
+			border-color: $gray-70;
+			color: $gray-40;
 		}
 
-		p {
-			margin: 0 0 $unit-2x;
-			color: $gray-50;
+		&:focus {
+			outline: none;
+			border-color: $primary-color;
+			box-shadow: 0 0 0 3px rgba($primary-color, 0.1);
 		}
 	}
 
-	.configure-btn {
-		background: $primary-color;
-		color: $white;
-		border: none;
-		border-radius: $corner-radius-sm;
-		padding: $unit $unit-2x;
+	:global(.edra-geolocation-placeholder-icon) {
+		width: $unit-3x;
+		height: $unit-3x;
+	}
+
+	.edra-geolocation-placeholder-text {
 		font-size: $font-size-small;
 		font-weight: 500;
-		cursor: pointer;
-		transition: background-color 0.2s;
-
-		&:hover {
-			background: darken($primary-color, 10%);
-		}
-	}
-
-	.form {
-		text-align: left;
-		max-width: 400px;
-		margin: 0 auto;
-
-		h3 {
-			margin: 0 0 20px;
-			font-size: 18px;
-			font-weight: 600;
-			color: #1f2937;
-			text-align: center;
-		}
-	}
-
-	.form-group {
-		margin-bottom: 16px;
-
-		label {
-			display: block;
-			margin-bottom: 4px;
-			font-size: 14px;
-			font-weight: 500;
-			color: #374151;
-		}
-
-		.required {
-			color: #ef4444;
-		}
-
-		input,
-		textarea {
-			width: 100%;
-			padding: 8px 12px;
-			border: 1px solid #d1d5db;
-			border-radius: 6px;
-			font-size: 14px;
-			font-family: inherit;
-			box-sizing: border-box;
-
-			&:focus {
-				outline: none;
-				border-color: #3b82f6;
-				box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
-			}
-		}
-
-		input[type='color'] {
-			width: 60px;
-			height: 36px;
-			padding: 4px;
-			cursor: pointer;
-		}
-	}
-
-	.actions {
-		display: flex;
-		gap: 12px;
-		justify-content: flex-end;
-		margin-top: 24px;
-	}
-
-	.cancel-btn,
-	.submit-btn {
-		padding: 8px 16px;
-		border-radius: 6px;
-		font-size: 14px;
-		font-weight: 500;
-		cursor: pointer;
-		transition: all 0.2s;
-		border: none;
-	}
-
-	.cancel-btn {
-		background: #f3f4f6;
-		color: #374151;
-
-		&:hover {
-			background: #e5e7eb;
-		}
-	}
-
-	.submit-btn {
-		background: #3b82f6;
-		color: white;
-
-		&:hover {
-			background: #2563eb;
-		}
 	}
 </style>
diff --git a/src/lib/components/edra/headless/components/IFramePlaceholder.svelte b/src/lib/components/edra/headless/components/IFramePlaceholder.svelte
index a27310e..a2feaae 100644
--- a/src/lib/components/edra/headless/components/IFramePlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/IFramePlaceholder.svelte
@@ -2,30 +2,78 @@
 	import type { NodeViewProps } from '@tiptap/core'
 	import CodeXML from 'lucide-svelte/icons/code-xml'
 	import { NodeViewWrapper } from 'svelte-tiptap'
-	const { editor }: NodeViewProps = $props()
+	import { getContext } from 'svelte'
+	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
+
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
+
+	// Get album context if available
+	const editorContext = getContext<any>('editorContext') || {}
+	const albumId = $derived(editorContext.albumId)
+
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`iframe-${getPos?.() ?? Math.random()}`)
+
+	let showPane = $state(false)
+	let panePosition = $state({ x: 0, y: 0 })
+
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
 
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
-		const iFrameURL = prompt('Enter the URL of an iFrame:')
-		if (!iFrameURL) {
-			return
+
+		// Get position for pane
+		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
+		panePosition = {
+			x: rect.left,
+			y: rect.bottom + 8
+		}
+		paneManager.open(paneId)
+	}
+
+	// Handle keyboard navigation
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Enter' || e.key === ' ') {
+			e.preventDefault()
+			handleClick(e as any)
+		} else if (e.key === 'Escape') {
+			if (showPane) {
+				paneManager.close()
+			} else {
+				deleteNode()
+			}
 		}
-		editor.chain().focus().setIframe({ src: iFrameURL }).run()
 	}
 </script>
 
 <NodeViewWrapper class="edra-iframe-placeholder-wrapper" contenteditable={false} spellcheck={false}>
-	<!-- svelte-ignore a11y_click_events_have_key_events -->
 	<button
 		class="edra-iframe-placeholder-content"
 		onclick={handleClick}
+		onkeydown={handleKeyDown}
 		tabindex="0"
-		aria-label="Insert An IFrame"
+		aria-label="Insert embed"
 	>
 		<CodeXML class="edra-iframe-placeholder-icon" />
-		<span class="edra-iframe-placeholder-text">Insert An IFrame</span>
+		<span class="edra-iframe-placeholder-text">Insert embed</span>
 	</button>
+
+	{#if showPane}
+		<ContentInsertionPane
+			{editor}
+			position={panePosition}
+			contentType="video"
+			onClose={() => paneManager.close()}
+			{deleteNode}
+			{albumId}
+		/>
+	{/if}
 </NodeViewWrapper>
 
 <style lang="scss">
diff --git a/src/lib/components/edra/headless/components/ImagePlaceholder.svelte b/src/lib/components/edra/headless/components/ImagePlaceholder.svelte
index 464d0ea..6c0b451 100644
--- a/src/lib/components/edra/headless/components/ImagePlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/ImagePlaceholder.svelte
@@ -31,15 +31,20 @@
 			editor
 				.chain()
 				.focus()
-				.insertContent({
-					type: 'image',
-					attrs: {
-						src: selectedMedia.url,
-						alt: selectedMedia.altText || '',
-						title: selectedMedia.description || '',
-						mediaId: selectedMedia.id?.toString()
+				.insertContent([
+					{
+						type: 'image',
+						attrs: {
+							src: selectedMedia.url,
+							alt: selectedMedia.altText || '',
+							title: selectedMedia.description || '',
+							mediaId: selectedMedia.id?.toString()
+						}
+					},
+					{
+						type: 'paragraph'
 					}
-				})
+				])
 				.run()
 		}
 		isMediaLibraryOpen = false
@@ -85,15 +90,20 @@
 				editor
 					.chain()
 					.focus()
-					.insertContent({
-						type: 'image',
-						attrs: {
-							src: media.url,
-							alt: media.altText || '',
-							title: media.description || '',
-							mediaId: media.id?.toString()
+					.insertContent([
+						{
+							type: 'image',
+							attrs: {
+								src: media.url,
+								alt: media.altText || '',
+								title: media.description || '',
+								mediaId: media.id?.toString()
+							}
+						},
+						{
+							type: 'paragraph'
 						}
-					})
+					])
 					.run()
 			} else {
 				console.error('Failed to upload image:', response.status)
diff --git a/src/lib/components/edra/headless/components/SlashCommandList.svelte b/src/lib/components/edra/headless/components/SlashCommandList.svelte
index 43e85b7..adb73fb 100644
--- a/src/lib/components/edra/headless/components/SlashCommandList.svelte
+++ b/src/lib/components/edra/headless/components/SlashCommandList.svelte
@@ -217,9 +217,9 @@
 	.slash-command-menu::-webkit-scrollbar-thumb {
 		background: $gray-85;
 		border-radius: 3px;
-		
+
 		&:hover {
 			background: $gray-70;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/components/edra/headless/components/UrlEmbedPlaceholder.svelte b/src/lib/components/edra/headless/components/UrlEmbedPlaceholder.svelte
index 2fe1062..b964bfd 100644
--- a/src/lib/components/edra/headless/components/UrlEmbedPlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/UrlEmbedPlaceholder.svelte
@@ -1,279 +1,118 @@
 <script lang="ts">
 	import type { NodeViewProps } from '@tiptap/core'
 	import Link from 'lucide-svelte/icons/link'
-	import LoaderCircle from 'lucide-svelte/icons/loader-circle'
-	import AlertCircle from 'lucide-svelte/icons/alert-circle'
 	import { NodeViewWrapper } from 'svelte-tiptap'
-	import { onMount } from 'svelte'
+	import { getContext } from 'svelte'
+	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
 
-	const { editor, node, deleteNode, getPos }: NodeViewProps = $props()
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
 
-	let loading = $state(true)
-	let error = $state(false)
-	let errorMessage = $state('')
-	let inputUrl = $state(node.attrs.url || '')
-	let showInput = $state(!node.attrs.url)
+	// Get album context if available
+	const editorContext = getContext<any>('editorContext') || {}
+	const albumId = $derived(editorContext.albumId)
 
-	async function fetchMetadata(url: string) {
-		loading = true
-		error = false
-		errorMessage = ''
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`urlembed-${getPos?.() ?? Math.random()}`)
 
-		try {
-			const response = await fetch(`/api/og-metadata?url=${encodeURIComponent(url)}`)
-			if (!response.ok) {
-				throw new Error('Failed to fetch metadata')
-			}
+	let showPane = $state(false)
+	let panePosition = $state({ x: 0, y: 0 })
 
-			const metadata = await response.json()
-
-			// Replace this placeholder with the actual URL embed
-			const pos = getPos()
-			if (typeof pos === 'number') {
-				editor
-					.chain()
-					.focus()
-					.insertContentAt({ from: pos, to: pos + node.nodeSize }, [
-						{
-							type: 'urlEmbed',
-							attrs: {
-								url: url,
-								title: metadata.title,
-								description: metadata.description,
-								image: metadata.image,
-								favicon: metadata.favicon,
-								siteName: metadata.siteName
-							}
-						},
-						{
-							type: 'paragraph'
-						}
-					])
-					.run()
-			}
-		} catch (err) {
-			console.error('Error fetching URL metadata:', err)
-			error = true
-			errorMessage = 'Failed to load preview. Please check the URL and try again.'
-			loading = false
-		}
-	}
-
-	function handleSubmit() {
-		if (!inputUrl.trim()) return
-
-		// Basic URL validation
-		try {
-			new URL(inputUrl)
-			fetchMetadata(inputUrl)
-		} catch {
-			error = true
-			errorMessage = 'Please enter a valid URL'
-			loading = false
-		}
-	}
-
-	function handleKeydown(e: KeyboardEvent) {
-		if (e.key === 'Enter' && !e.shiftKey) {
-			e.preventDefault()
-			handleSubmit()
-		} else if (e.key === 'Escape') {
-			deleteNode()
-		}
-	}
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
 
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
 
-		if (!showInput) {
-			showInput = true
+		// Get position for pane
+		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
+		panePosition = {
+			x: rect.left,
+			y: rect.bottom + 8
 		}
+		paneManager.open(paneId)
 	}
 
-	onMount(() => {
-		// If we have a URL from paste, fetch metadata immediately
-		if (node.attrs.url) {
-			fetchMetadata(node.attrs.url)
+	// Handle keyboard navigation
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Enter' || e.key === ' ') {
+			e.preventDefault()
+			handleClick(e as any)
+		} else if (e.key === 'Escape') {
+			if (showPane) {
+				paneManager.close()
+			} else {
+				deleteNode()
+			}
 		}
-	})
+	}
 </script>
 
-<NodeViewWrapper class="edra-url-embed-placeholder-wrapper" contenteditable={false}>
-	{#if showInput && !node.attrs.url}
-		<div class="url-input-container">
-			<input
-				bind:value={inputUrl}
-				onkeydown={handleKeydown}
-				placeholder="Paste or type a URL..."
-				class="url-input"
-				autofocus
-			/>
-			<button onclick={handleSubmit} class="submit-button" disabled={!inputUrl.trim()}>
-				Embed
-			</button>
-		</div>
-	{:else if loading}
-		<div class="placeholder-content loading">
-			<LoaderCircle class="animate-spin placeholder-icon" />
-			<span class="placeholder-text">Loading preview...</span>
-		</div>
-	{:else if error}
-		<div class="placeholder-content error">
-			<AlertCircle class="placeholder-icon" />
-			<div class="error-content">
-				<span class="placeholder-text">{errorMessage}</span>
-				<button
-					onclick={() => {
-						showInput = true
-						error = false
-					}}
-					class="retry-button"
-				>
-					Try another URL
-				</button>
-			</div>
-		</div>
-	{:else}
-		<!-- svelte-ignore a11y_click_events_have_key_events -->
-		<span
-			class="placeholder-content"
-			onclick={handleClick}
-			tabindex="0"
-			role="button"
-			aria-label="Insert URL embed"
-		>
-			<Link class="placeholder-icon" />
-			<span class="placeholder-text">Embed a link</span>
-		</span>
+<NodeViewWrapper class="edra-url-embed-placeholder-wrapper" contenteditable="false">
+	<button
+		class="edra-url-embed-placeholder-content"
+		onclick={handleClick}
+		onkeydown={handleKeyDown}
+		tabindex="0"
+		aria-label="Embed a link"
+	>
+		<Link class="edra-url-embed-placeholder-icon" />
+		<span class="edra-url-embed-placeholder-text">Embed a link</span>
+	</button>
+
+	{#if showPane}
+		<ContentInsertionPane
+			{editor}
+			position={panePosition}
+			contentType="image"
+			onClose={() => paneManager.close()}
+			{deleteNode}
+			{albumId}
+		/>
 	{/if}
 </NodeViewWrapper>
 
 <style lang="scss">
 	@import '$styles/variables';
 
-
-	.url-input-container {
-		display: flex;
-		gap: $unit-half;
-		padding: $unit-2x;
-		background: $gray-95;
-		border: 2px solid $gray-85;
+	.edra-url-embed-placeholder-content {
+		width: 100%;
+		padding: $unit-3x;
+		background-color: $gray-95;
+		border: 2px dashed $gray-85;
 		border-radius: $corner-radius;
-	}
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: $unit-2x;
+		cursor: pointer;
+		transition: all 0.2s ease;
+		color: $gray-50;
 
-	.url-input {
-		flex: 1;
-		padding: $unit $unit-2x;
-		border: 1px solid $gray-80;
-		border-radius: $corner-radius-sm;
-		font-size: $font-size-small;
-		background: $white;
+		&:hover {
+			background-color: $gray-90;
+			border-color: $gray-70;
+			color: $gray-40;
+		}
 
 		&:focus {
 			outline: none;
 			border-color: $primary-color;
+			box-shadow: 0 0 0 3px rgba($primary-color, 0.1);
 		}
 	}
 
-	.submit-button {
-		padding: $unit $unit-2x;
-		background: $primary-color;
-		color: $white;
-		border: none;
-		border-radius: $corner-radius-sm;
+	:global(.edra-url-embed-placeholder-icon) {
+		width: $unit-3x;
+		height: $unit-3x;
+	}
+
+	.edra-url-embed-placeholder-text {
 		font-size: $font-size-small;
 		font-weight: 500;
-		cursor: pointer;
-		transition: background-color 0.2s;
-
-		&:hover:not(:disabled) {
-			background: darken($primary-color, 10%);
-		}
-
-		&:disabled {
-			opacity: 0.5;
-			cursor: not-allowed;
-		}
-	}
-
-	.placeholder-content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		gap: $unit-half;
-		padding: $unit-3x;
-		border: 2px dashed $gray-85;
-		border-radius: $corner-radius;
-		background: $gray-95;
-		cursor: pointer;
-		transition: all 0.2s ease;
-
-		&:hover:not(.loading):not(.error) {
-			border-color: $gray-70;
-			background: $gray-90;
-		}
-
-		&.loading {
-			cursor: default;
-		}
-
-		&.error {
-			border-color: $red-60;
-			background: #fee;
-			cursor: default;
-		}
-	}
-
-	.placeholder-icon {
-		width: $unit-4x;
-		height: $unit-4x;
-		color: $gray-50;
-	}
-
-	.error .placeholder-icon {
-		color: $red-60;
-	}
-
-	.placeholder-text {
-		font-size: $font-size-small;
-		color: $gray-30;
-	}
-
-	.error-content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		gap: $unit-half;
-	}
-
-	.retry-button {
-		padding: $unit-half $unit-2x;
-		background: transparent;
-		color: $red-60;
-		border: 1px solid $red-60;
-		border-radius: $corner-radius-xs;
-		font-size: $font-size-extra-small;
-		cursor: pointer;
-		transition: all 0.2s;
-
-		&:hover {
-			background: $red-60;
-			color: $white;
-		}
-	}
-
-	@keyframes spin {
-		from {
-			transform: rotate(0deg);
-		}
-		to {
-			transform: rotate(360deg);
-		}
-	}
-
-	.animate-spin {
-		animation: spin 1s linear infinite;
 	}
 </style>
diff --git a/src/lib/components/edra/headless/components/VideoPlaceholder.svelte b/src/lib/components/edra/headless/components/VideoPlaceholder.svelte
index a12fb84..abebc6e 100644
--- a/src/lib/components/edra/headless/components/VideoPlaceholder.svelte
+++ b/src/lib/components/edra/headless/components/VideoPlaceholder.svelte
@@ -2,30 +2,78 @@
 	import type { NodeViewProps } from '@tiptap/core'
 	import Video from 'lucide-svelte/icons/video'
 	import { NodeViewWrapper } from 'svelte-tiptap'
-	const { editor }: NodeViewProps = $props()
+	import { getContext } from 'svelte'
+	import ContentInsertionPane from './ContentInsertionPane.svelte'
+	import { paneManager } from '$lib/stores/pane-manager'
+
+	const { editor, deleteNode, getPos }: NodeViewProps = $props()
+
+	// Get album context if available
+	const editorContext = getContext<any>('editorContext') || {}
+	const albumId = $derived(editorContext.albumId)
+
+	// Generate unique pane ID based on node position
+	const paneId = $derived(`video-${getPos?.() ?? Math.random()}`)
+
+	let showPane = $state(false)
+	let panePosition = $state({ x: 0, y: 0 })
+
+	// Subscribe to pane manager
+	const paneState = $derived($paneManager)
+	$effect(() => {
+		showPane = paneManager.isActive(paneId, paneState)
+	})
 
 	function handleClick(e: MouseEvent) {
 		if (!editor.isEditable) return
 		e.preventDefault()
-		const videoUrl = prompt('Enter the URL of the video:')
-		if (!videoUrl) {
-			return
+
+		// Get position for pane
+		const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
+		panePosition = {
+			x: rect.left,
+			y: rect.bottom + 8
+		}
+		paneManager.open(paneId)
+	}
+
+	// Handle keyboard navigation
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Enter' || e.key === ' ') {
+			e.preventDefault()
+			handleClick(e as any)
+		} else if (e.key === 'Escape') {
+			if (showPane) {
+				paneManager.close()
+			} else {
+				deleteNode()
+			}
 		}
-		editor.chain().focus().setVideo(videoUrl).run()
 	}
 </script>
 
 <NodeViewWrapper class="edra-video-placeholder-wrapper" contenteditable="false">
-	<!-- svelte-ignore a11y_click_events_have_key_events -->
 	<button
 		class="edra-video-placeholder-content"
 		onclick={handleClick}
+		onkeydown={handleKeyDown}
 		tabindex="0"
-		aria-label="Insert A Video"
+		aria-label="Insert video"
 	>
 		<Video class="edra-video-placeholder-icon" />
-		<span class="edra-video-placeholder-text">Insert A Video</span>
+		<span class="edra-video-placeholder-text">Insert video</span>
 	</button>
+
+	{#if showPane}
+		<ContentInsertionPane
+			{editor}
+			position={panePosition}
+			contentType="video"
+			onClose={() => paneManager.close()}
+			{deleteNode}
+			{albumId}
+		/>
+	{/if}
 </NodeViewWrapper>
 
 <style lang="scss">