diff --git a/src/lib/components/SegmentedController.svelte b/src/lib/components/SegmentedController.svelte
index b3ab2dd..6473eec 100644
--- a/src/lib/components/SegmentedController.svelte
+++ b/src/lib/components/SegmentedController.svelte
@@ -1,17 +1,103 @@
 <script lang="ts">
-	import Pill from './Pill.svelte'
 	import WorkIcon from '$icons/work.svg'
 	import LabsIcon from '$icons/labs.svg'
 	import UniverseIcon from '$icons/universe.svg'
 	import { page } from '$app/stores'
-
-	$: currentPath = $page.url.pathname
+	
+	const currentPath = $derived($page.url.pathname)
+	
+	interface NavItem {
+		icon: typeof WorkIcon
+		text: string
+		href: string
+		variant: 'work' | 'universe' | 'labs'
+	}
+	
+	const navItems: NavItem[] = [
+		{ icon: WorkIcon, text: 'Work', href: '/', variant: 'work' },
+		{ icon: LabsIcon, text: 'Labs', href: '#', variant: 'labs' },
+		{ icon: UniverseIcon, text: 'Universe', href: '/universe', variant: 'universe' }
+	]
+	
+	// Calculate active index based on current path
+	const activeIndex = $derived(
+		currentPath === '/' ? 0 : 
+		currentPath.startsWith('/universe') ? 2 : 
+		-1
+	)
+	
+	// Calculate pill position and width
+	let containerElement: HTMLElement
+	let itemElements: HTMLAnchorElement[] = []
+	let pillStyle = $state('')
+	
+	function updatePillPosition() {
+		if (activeIndex >= 0 && itemElements[activeIndex] && containerElement) {
+			const activeElement = itemElements[activeIndex]
+			const containerRect = containerElement.getBoundingClientRect()
+			const activeRect = activeElement.getBoundingClientRect()
+			
+			// Subtract the container padding (8px) from the left position
+			const left = activeRect.left - containerRect.left - 8
+			const width = activeRect.width
+			
+			pillStyle = `transform: translateX(${left}px); width: ${width}px;`
+		}
+	}
+	
+	$effect(() => {
+		updatePillPosition()
+		
+		// Handle window resize
+		const handleResize = () => updatePillPosition()
+		window.addEventListener('resize', handleResize)
+		
+		return () => {
+			window.removeEventListener('resize', handleResize)
+		}
+	})
+	
+	// Get background color based on variant
+	function getBgColor(variant: string): string {
+		switch (variant) {
+			case 'work': return '#ffcdc5' // $work-bg
+			case 'universe': return '#ffebc5' // $universe-bg
+			case 'labs': return '#c5eaff' // $labs-bg
+			default: return '#c5eaff'
+		}
+	}
+	
+	// Get text color based on variant
+	function getTextColor(variant: string): string {
+		switch (variant) {
+			case 'work': return '#d0290d' // $work-color
+			case 'universe': return '#b97d14' // $universe-color
+			case 'labs': return '#1482c1' // $labs-color
+			default: return '#1482c1'
+		}
+	}
 </script>
 
-<nav class="segmented-controller">
-	<Pill icon={WorkIcon} text="Work" href="/" active={currentPath === '/'} variant="work" />
-	<Pill icon={LabsIcon} text="Labs" href="#" active={false} variant="default" />
-	<Pill icon={UniverseIcon} text="Universe" href="/universe" active={currentPath.startsWith('/universe')} variant="universe" />
+<nav class="segmented-controller" bind:this={containerElement}>
+	{#if activeIndex >= 0}
+		<div 
+			class="active-pill"
+			style="{pillStyle} background-color: {getBgColor(navItems[activeIndex].variant)};"
+		></div>
+	{/if}
+	
+	{#each navItems as item, index}
+		<a 
+			href={item.href}
+			class="nav-item"
+			class:active={index === activeIndex}
+			bind:this={itemElements[index]}
+			style="color: {index === activeIndex ? getTextColor(item.variant) : '#666'};"
+		>
+			<svelte:component this={item.icon} />
+			<span>{item.text}</span>
+		</a>
+	{/each}
 </nav>
 
 <style lang="scss">
@@ -23,5 +109,41 @@
 		padding: $unit;
 		border-radius: 100px;
 		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+		position: relative;
+		overflow: hidden;
 	}
-</style>
+	
+	.active-pill {
+		position: absolute;
+		top: $unit;
+		left: $unit;
+		height: calc(100% - #{$unit * 2});
+		border-radius: 100px;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		z-index: 1;
+	}
+	
+	.nav-item {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		padding: 10px 12px;
+		border-radius: 100px;
+		text-decoration: none;
+		font-size: 1rem;
+		font-weight: 400;
+		font-family: 'cstd', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+		position: relative;
+		z-index: 2;
+		transition: color 0.2s ease;
+		
+		:global(svg) {
+			width: 20px;
+			height: 20px;
+			flex-shrink: 0;
+			fill: currentColor;
+			transition: fill 0.2s ease;
+		}
+		
+	}
+</style>
\ No newline at end of file