diff --git a/frontend/src/lib/components/grid/cell-header.svelte b/frontend/src/lib/components/grid/cell-header.svelte
index ec1cfd6..e654e08 100644
--- a/frontend/src/lib/components/grid/cell-header.svelte
+++ b/frontend/src/lib/components/grid/cell-header.svelte
@@ -8,7 +8,8 @@
 		setRowHeight = () => {},
 		val,
 		active,
-		direction = 'col' // New prop: 'col' for right-side drag, 'row' for bottom-side
+		direction = 'col', // New prop: 'col' for right-side drag, 'row' for bottom-side
+		resizeable = true
 	}: {
 		width?: string;
 		height?: string;
@@ -16,6 +17,7 @@
 		setRowHeight?: (height: string) => void;
 		val: string;
 		active: boolean;
+		resizeable?: boolean;
 		direction?: 'col' | 'row';
 	} = $props();
 
@@ -66,27 +68,29 @@
 		{val}
 	</span>
 
-	<div
-		role="separator"
-		aria-label="Resize handle"
-		onmousedown={handleMouseDown}
-		class={clsx('resizer', {
-			'resizer-col': direction === 'col',
-			'resizer-row': direction === 'row'
-		})}
-	></div>
+	{#if resizeable}
+		<div
+			role="separator"
+			aria-label="Resize handle"
+			onmousedown={handleMouseDown}
+			class={clsx('resizer', {
+				'resizer-col': direction === 'col',
+				'resizer-row': direction === 'row'
+			})}
+		></div>
+	{/if}
 </div>
 
 <style>
 	.placeholder {
 		font-size: 14px;
 		border: 1px solid var(--input);
-		overflow: visible;
+		background-color: var(--color-background);
 	}
 
 	.active {
 		border: 1px solid var(--color-primary);
-		background-color: color-mix(in oklab, var(--color-primary) 40%, transparent);
+		background-color: color-mix(in oklab, var(--color-primary) 80%, var(--color-background) 80%);
 	}
 
 	/* --- Resizer Styles --- */
diff --git a/frontend/src/lib/components/grid/cell.svelte b/frontend/src/lib/components/grid/cell.svelte
index cf47ad4..e835991 100644
--- a/frontend/src/lib/components/grid/cell.svelte
+++ b/frontend/src/lib/components/grid/cell.svelte
@@ -36,10 +36,13 @@
 	}
 
 	function handleKeydown(e: KeyboardEvent) {
-		if (e.key === 'Enter' || e.key === 'NumpadEnter' || e.key == 'Escape') {
+		if (e.key === 'Enter' || e.key === 'NumpadEnter') {
 			e.preventDefault(); // avoid form submit/line break
 			const el = (e.currentTarget as HTMLElement).querySelector('input') as HTMLInputElement | null;
 			el?.blur(); // triggers on:blur below
+		} else if (e.key == 'Escape') {
+			e.preventDefault();
+			stopediting();
 		}
 	}
 </script>
@@ -50,7 +53,7 @@
 			style="width: {width}; height: {height}"
 			class="relative rounded-none p-1
              !transition-none delay-0 duration-0
-             focus:z-50"
+             focus:z-20"
 			onblur={(e) => {
 				raw_val = (e.target as HTMLInputElement).value;
 				stopediting();
@@ -63,7 +66,7 @@
 		{onmousedown}
 		style:width
 		style:height
-		class={clsx('placeholder bg-background p-1 dark:bg-input/30', { active, 'z-50': active })}
+		class={clsx('placeholder bg-background p-1 dark:bg-input/30', { active, 'z-20': active })}
 	>
 		{#if raw_val !== '' || val !== ''}
 			<span class="pointer-events-none select-none">
diff --git a/frontend/src/lib/components/grid/grid.svelte b/frontend/src/lib/components/grid/grid.svelte
index ac07dd3..5b5c98d 100644
--- a/frontend/src/lib/components/grid/grid.svelte
+++ b/frontend/src/lib/components/grid/grid.svelte
@@ -202,9 +202,18 @@
 	});
 </script>
 
-<div class="grid-wrapper">
-	<div class="flex w-fit">
-		<CellHeader height={default_row_height} width={default_col_width} val="" active={false} />
+<div class="grid-wrapper relative max-h-[100vh] max-w-full overflow-auto">
+	<div class="sticky top-0 z-40 flex w-fit">
+		<div class="sticky top-0 left-0 z-50">
+			<CellHeader
+				resizeable={false}
+				height={default_row_height}
+				width={default_col_width}
+				val=""
+				active={false}
+			/>
+		</div>
+
 		{#each Array(cols) as _, j}
 			<CellHeader
 				height={default_row_height}
@@ -218,14 +227,16 @@
 	</div>
 	{#each Array(rows) as _, i}
 		<div class="flex w-fit">
-			<CellHeader
-				direction="row"
-				width={default_col_width}
-				height={getRowHeight(i)}
-				setRowHeight={(height) => setRowHeight(i, height)}
-				val={(i + 1).toString()}
-				active={active_cell !== null && active_cell[0] === i}
-			/>
+			<div class="sticky left-0 z-30 flex w-fit">
+				<CellHeader
+					direction="row"
+					width={default_col_width}
+					height={getRowHeight(i)}
+					setRowHeight={(height) => setRowHeight(i, height)}
+					val={(i + 1).toString()}
+					active={active_cell !== null && active_cell[0] === i}
+				/>
+			</div>
 			{#each Array(cols) as _, j}
 				<Cell
 					height={getRowHeight(i)}