diff --git a/src/lib/components/ThreeColumnPhotoGrid.svelte b/src/lib/components/ThreeColumnPhotoGrid.svelte
new file mode 100644
index 0000000..2c9d347
--- /dev/null
+++ b/src/lib/components/ThreeColumnPhotoGrid.svelte
@@ -0,0 +1,290 @@
+<script lang="ts">
+	import type { PhotoItem as PhotoItemType } from '$lib/types/photos'
+	import { isAlbum } from '$lib/types/photos'
+	import { goto } from '$app/navigation'
+
+	const {
+		photoItems,
+		albumSlug
+	}: {
+		photoItems: PhotoItemType[]
+		albumSlug?: string
+	} = $props()
+
+	// Function to determine if an image is ultrawide (aspect ratio > 2:1)
+	function isUltrawide(item: PhotoItemType): boolean {
+		if (isAlbum(item)) {
+			const { width, height } = item.coverPhoto
+			return width / height > 2
+		} else {
+			return item.width / item.height > 2
+		}
+	}
+
+	// Process items to determine grid placement
+	let gridItems = $state<Array<{ item: PhotoItemType; spanFull: boolean }>>([])
+
+	$effect(() => {
+		// First, separate ultrawide and regular items
+		const ultrawideItems: PhotoItemType[] = []
+		const regularItems: PhotoItemType[] = []
+
+		photoItems.forEach((item) => {
+			if (isUltrawide(item)) {
+				ultrawideItems.push(item)
+			} else {
+				regularItems.push(item)
+			}
+		})
+
+		// Build the grid ensuring we fill rows of 3
+		const processedItems: Array<{ item: PhotoItemType; spanFull: boolean }> = []
+		let regularIndex = 0
+		let ultrawideIndex = 0
+		let rowsSinceLastUltrawide = 1 // Start with 1 to allow ultrawide at beginning
+
+		while (regularIndex < regularItems.length || ultrawideIndex < ultrawideItems.length) {
+			const remainingRegular = regularItems.length - regularIndex
+			const remainingUltrawide = ultrawideItems.length - ultrawideIndex
+
+			// Check if we can/should place an ultrawide
+			if (
+				ultrawideIndex < ultrawideItems.length &&
+				rowsSinceLastUltrawide >= 1 &&
+				(remainingRegular === 0 || remainingRegular >= 3)
+			) {
+				// Place ultrawide
+				processedItems.push({
+					item: ultrawideItems[ultrawideIndex],
+					spanFull: true
+				})
+				ultrawideIndex++
+				rowsSinceLastUltrawide = 0
+			} else if (regularIndex < regularItems.length && remainingRegular >= 3) {
+				// Place a full row of 3 regular photos
+				for (let i = 0; i < 3 && regularIndex < regularItems.length; i++) {
+					processedItems.push({
+						item: regularItems[regularIndex],
+						spanFull: false
+					})
+					regularIndex++
+				}
+				rowsSinceLastUltrawide++
+			} else if (regularIndex < regularItems.length) {
+				// Place remaining regular photos (less than 3)
+				while (regularIndex < regularItems.length) {
+					processedItems.push({
+						item: regularItems[regularIndex],
+						spanFull: false
+					})
+					regularIndex++
+				}
+				rowsSinceLastUltrawide++
+			} else {
+				// Only ultrawides left, place them with spacing
+				if (ultrawideIndex < ultrawideItems.length) {
+					processedItems.push({
+						item: ultrawideItems[ultrawideIndex],
+						spanFull: true
+					})
+					ultrawideIndex++
+				}
+			}
+		}
+
+		gridItems = processedItems
+	})
+
+	function handleClick(item: PhotoItemType) {
+		if (isAlbum(item)) {
+			// Navigate to album page using the slug
+			goto(`/photos/${item.slug}`)
+		} else {
+			// For individual photos, check if we have album context
+			if (albumSlug) {
+				// Navigate to photo within album
+				const mediaId = item.id.replace(/^(media|photo)-/, '') // Support both prefixes
+				goto(`/photos/${albumSlug}/${mediaId}`)
+			} else {
+				// Navigate to individual photo page using the media ID
+				const mediaId = item.id.replace(/^(media|photo)-/, '') // Support both prefixes
+				goto(`/photos/p/${mediaId}`)
+			}
+		}
+	}
+
+	function getImageSrc(item: PhotoItemType): string {
+		return isAlbum(item) ? item.coverPhoto.src : item.src
+	}
+
+	function getImageAlt(item: PhotoItemType): string {
+		return isAlbum(item) ? item.coverPhoto.alt : item.alt
+	}
+</script>
+
+<div class="three-column-grid">
+	{#each gridItems as { item, spanFull }}
+		<button
+			class="grid-item"
+			class:span-full={spanFull}
+			class:is-album={isAlbum(item)}
+			onclick={() => handleClick(item)}
+			type="button"
+		>
+			<div class="image-container">
+				<img src={getImageSrc(item)} alt={getImageAlt(item)} loading="lazy" draggable="false" />
+			</div>
+			{#if isAlbum(item)}
+				<div class="album-overlay">
+					<div class="album-info">
+						<span class="album-title">{item.title}</span>
+						<span class="album-count">{item.photos.length} photos</span>
+					</div>
+				</div>
+			{/if}
+		</button>
+	{/each}
+</div>
+
+<style lang="scss">
+	.three-column-grid {
+		display: grid;
+		grid-template-columns: repeat(3, minmax(0, 1fr));
+		gap: $unit-2x;
+		width: 100%;
+		max-width: 100%;
+		box-sizing: border-box;
+	}
+
+	.grid-item {
+		grid-column: span 1;
+		position: relative;
+		aspect-ratio: 1; // Square by default
+		overflow: hidden;
+		border-radius: $corner-radius;
+		cursor: pointer;
+		background: none;
+		border: none;
+		padding: 0;
+		transition:
+			transform 0.2s ease,
+			box-shadow 0.2s ease;
+
+		&:hover {
+			box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15);
+		}
+
+		&.span-full {
+			grid-column: span 3;
+			aspect-ratio: 3; // Wider aspect ratio for ultrawide images
+		}
+	}
+
+	.image-container {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+
+		img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+			display: block;
+		}
+	}
+
+	.album-overlay {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: linear-gradient(to top, rgba(0, 0, 0, 0.8), transparent);
+		color: white;
+		padding: $unit-2x;
+		z-index: 1;
+	}
+
+	.album-info {
+		display: flex;
+		flex-direction: column;
+		gap: $unit-half;
+	}
+
+	.album-title {
+		font-weight: 600;
+		font-size: 0.9rem;
+		line-height: 1.2;
+	}
+
+	.album-count {
+		font-size: 0.75rem;
+		opacity: 0.9;
+	}
+
+	// Stack effect for albums
+	.is-album {
+		&::before,
+		&::after {
+			content: '';
+			position: absolute;
+			border-radius: $corner-radius;
+			background: rgba(0, 0, 0, 0.1);
+			z-index: -1;
+		}
+
+		&::before {
+			top: -3px;
+			left: 3px;
+			right: -3px;
+			bottom: 3px;
+			transform: rotate(-1deg);
+		}
+
+		&::after {
+			top: -6px;
+			left: 6px;
+			right: -6px;
+			bottom: 6px;
+			transform: rotate(2deg);
+		}
+
+		&:hover {
+			&::before {
+				transform: rotate(-1.5deg) translateY(-0.5px);
+			}
+
+			&::after {
+				transform: rotate(3deg) translateY(-1px);
+			}
+		}
+	}
+
+	@include breakpoint('tablet') {
+		.three-column-grid {
+			grid-template-columns: repeat(2, 1fr);
+			gap: $unit;
+		}
+
+		.grid-item.span-full {
+			grid-column: span 2;
+			aspect-ratio: 2; // Adjust aspect ratio for 2-column layout
+		}
+	}
+
+	@include breakpoint('phone') {
+		.three-column-grid {
+			grid-template-columns: 1fr;
+		}
+
+		.grid-item {
+			aspect-ratio: 4/3; // Slightly wider on mobile
+		}
+
+		.grid-item.span-full {
+			grid-column: span 1;
+			aspect-ratio: 16/9; // Standard widescreen on mobile
+		}
+	}
+</style>
diff --git a/src/lib/components/ViewModeSelector.svelte b/src/lib/components/ViewModeSelector.svelte
index cf2a21f..fdbbe2f 100644
--- a/src/lib/components/ViewModeSelector.svelte
+++ b/src/lib/components/ViewModeSelector.svelte
@@ -16,25 +16,12 @@
 		onWidthChange?: (width: 'normal' | 'wide') => void
 	}
 
-	let { 
-		mode = 'masonry',
-		width = 'normal',
-		onModeChange,
-		onWidthChange
-	}: Props = $props()
+	let { mode = 'two-column', width = 'wide', onModeChange, onWidthChange }: Props = $props()
 </script>
 
 <div class="view-mode-selector">
 	<div class="mode-section">
-		<button 
-			class="mode-button" 
-			class:selected={mode === 'masonry'}
-			aria-label="Masonry view"
-			onclick={() => onModeChange?.('masonry')}
-		>
-			<PhotosIcon />
-		</button>
-		<button 
+		<button
 			class="mode-button"
 			class:selected={mode === 'single'}
 			aria-label="Single column view"
@@ -42,7 +29,7 @@
 		>
 			<ViewSingleIcon />
 		</button>
-		<button 
+		<button
 			class="mode-button"
 			class:selected={mode === 'two-column'}
 			aria-label="Two column view"
@@ -50,7 +37,15 @@
 		>
 			<ViewTwoColumnIcon />
 		</button>
-		<button 
+		<button
+			class="mode-button"
+			class:selected={mode === 'masonry'}
+			aria-label="Masonry view"
+			onclick={() => onModeChange?.('masonry')}
+		>
+			<PhotosIcon />
+		</button>
+		<button
 			class="mode-button"
 			class:selected={mode === 'horizontal'}
 			aria-label="Horizontal scroll view"
@@ -59,27 +54,27 @@
 			<ViewHorizontalIcon />
 		</button>
 	</div>
-	
+
 	{#if mode !== 'horizontal'}
 		<div class="separator"></div>
-		
+
 		<div class="width-section">
-		<button 
-			class="mode-button" 
-			class:selected={width === 'normal'}
-			aria-label="Normal width"
-			onclick={() => onWidthChange?.('normal')}
-		>
-			<WidthNormalIcon />
-		</button>
-		<button 
-			class="mode-button"
-			class:selected={width === 'wide'}
-			aria-label="Wide width"
-			onclick={() => onWidthChange?.('wide')}
-		>
-			<WidthWideIcon />
-		</button>
+			<button
+				class="mode-button"
+				class:selected={width === 'normal'}
+				aria-label="Normal width"
+				onclick={() => onWidthChange?.('normal')}
+			>
+				<WidthNormalIcon />
+			</button>
+			<button
+				class="mode-button"
+				class:selected={width === 'wide'}
+				aria-label="Wide width"
+				onclick={() => onWidthChange?.('wide')}
+			>
+				<WidthWideIcon />
+			</button>
 		</div>
 	{/if}
 </div>
@@ -96,18 +91,18 @@
 		align-items: center;
 		gap: $unit-2x;
 		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-		
+
 		@include breakpoint('phone') {
 			display: none;
 		}
 	}
-	
+
 	.mode-section,
 	.width-section {
 		display: flex;
 		gap: $unit-half;
 	}
-	
+
 	.separator {
 		flex: 1;
 		min-width: $unit-2x;
diff --git a/src/routes/photos/+page.svelte b/src/routes/photos/+page.svelte
index 0461b68..45c01a2 100644
--- a/src/routes/photos/+page.svelte
+++ b/src/routes/photos/+page.svelte
@@ -28,7 +28,7 @@
 	// Initialize view mode from URL or default
 	const urlMode = $page.url.searchParams.get('view') as ViewMode
 	let viewMode = $state<ViewMode>(
-		urlMode && ['masonry', 'single', 'two-column', 'horizontal'].includes(urlMode) ? urlMode : 'masonry'
+		urlMode && ['masonry', 'single', 'two-column', 'horizontal'].includes(urlMode) ? urlMode : 'two-column'
 	)
 
 	// Track loaded photo IDs to prevent duplicates
@@ -46,7 +46,7 @@
 		viewMode = mode
 		if (browser) {
 			const url = new URL($page.url)
-			if (mode === 'masonry') {
+			if (mode === 'two-column') {
 				url.searchParams.delete('view')
 			} else {
 				url.searchParams.set('view', mode)