diff --git a/PanTS-Demo/src/components/segmentation/FillBetweenSlicesFlyout.tsx b/PanTS-Demo/src/components/segmentation/FillBetweenSlicesFlyout.tsx
index 95172ce7..372eceaf 100644
--- a/PanTS-Demo/src/components/segmentation/FillBetweenSlicesFlyout.tsx
+++ b/PanTS-Demo/src/components/segmentation/FillBetweenSlicesFlyout.tsx
@@ -27,7 +27,13 @@ export default function FillBetweenSlicesFlyout({ segmentIndex, maskFilter, onLo
 
 	const picker = useSliceAnchorPicker({
 		segmentIndex,
-		lastRequiresSegment: false,
+		// Unlike Copy-across-slices (whose destination legitimately doesn't
+		// need existing content), Fill needs a real segment on BOTH ends to
+		// interpolate between — a blank second slice has nothing to fill
+		// toward. Was `false` (copied from CopyAcrossSlicesFlyout without
+		// updating for this), which let step 2 accept any slice with no
+		// segment check at all.
+		lastRequiresSegment: true,
 		onError: (d) => { setPickError(d); onLog?.(d); },
 	});
 	const { phase, step, first, last } = picker;
diff --git a/PanTS-Demo/src/components/segmentation/SegmentEffectPanel.css b/PanTS-Demo/src/components/segmentation/SegmentEffectPanel.css
index 2db02c56..548404f5 100644
--- a/PanTS-Demo/src/components/segmentation/SegmentEffectPanel.css
+++ b/PanTS-Demo/src/components/segmentation/SegmentEffectPanel.css
@@ -311,7 +311,7 @@
 
 .seg-effect__number:focus {
     outline: none;
-    border-color: #E76F51;
+    border-color: #0b17ff;
     background: rgba(104, 172, 229, 0.08);
 }
 
@@ -387,7 +387,7 @@
 
 .seg-effect__icon-btn--primary {
     border-color: rgba(15, 23, 42, 0.4);
-    color: #E76F51;
+    color: #0b17ff;
 }
 
 .seg-effect__icon-btn--primary:hover:not(:disabled) {
diff --git a/PanTS-Demo/src/components/segmentation/SegmentsPopup.css b/PanTS-Demo/src/components/segmentation/SegmentsPopup.css
index 9b504606..fc6a999b 100644
--- a/PanTS-Demo/src/components/segmentation/SegmentsPopup.css
+++ b/PanTS-Demo/src/components/segmentation/SegmentsPopup.css
@@ -278,7 +278,7 @@
 }
 
 .segpop__color-popover-swatch.is-active {
-    outline: 2px solid #E76F51;
+    outline: 2px solid #7cb7da;
     outline-offset: 1px;
 }
 
@@ -303,6 +303,53 @@
     appearance: none;
 }
 
+/* Explicit commit footer for the color popover — live preview + hex value
+   + a clear "Done" close button, so picking a color visibly registers
+   before the popover disappears instead of a swatch click silently
+   closing it with no confirmation of what was chosen. Doesn't itself save
+   the class (that's still the row's own Save/ApplyButton); this is purely
+   about the popover's own selection state being unambiguous. */
+.segpop__color-popover-footer {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 2px;
+    padding-top: 8px;
+    border-top: 1px solid rgba(255, 255, 255, 0.09);
+}
+
+.segpop__color-popover-preview {
+    width: 22px;
+    height: 22px;
+    border-radius: 6px;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    flex-shrink: 0;
+}
+
+.segpop__color-popover-hex {
+    font-size: 11px;
+    font-variant-numeric: tabular-nums;
+    letter-spacing: 0.02em;
+    color: rgba(255, 255, 255, 0.7);
+    flex: 1;
+}
+
+.segpop__color-popover-done {
+    appearance: none;
+    border: none;
+    border-radius: 6px;
+    padding: 5px 12px;
+    font-size: 11px;
+    font-weight: 600;
+    background: #7cb7da;
+    color: #16181d;
+    cursor: pointer;
+}
+
+.segpop__color-popover-done:hover {
+    background: #7cb7da;
+}
+
 /* Static color chip shown in the normal (non-editing) row — color is only
    changed together with the name via the pen-icon editor, so this isn't an
    <input type="color"> and doesn't open a picker on click. */
@@ -327,7 +374,7 @@
     width: 18px;
     height: 18px;
     border-radius: 50%;
-    color: #E76F51;
+    color: #7cb7da;
     background: rgba(104, 172, 229, 0.16);
 }
 
@@ -339,8 +386,8 @@
 }
 
 .segpop__target-badge--btn:hover {
-    background: rgba(232, 93, 93, 0.22);
-    color: #E85D5D;
+    background: rgb(17, 0, 75);
+    color: #7cb7da;
     transform: scale(1.08);
 }
 
@@ -380,7 +427,7 @@
 
 .segpop__edit-btn:hover,
 .segpop__edit-btn.is-active {
-    color: #E76F51;
+    color: #7cb7da;
 }
 
 /* Floating add/edit form (see FormFlyout in SegmentsPopup.tsx). Portaled to
@@ -515,7 +562,7 @@
 }
 
 .segpop__delete:hover:not(:disabled) {
-    color: #E76F51;
+    color: #7cb7da;
 }
 
 .segpop__err {
@@ -653,7 +700,7 @@
     width: 6px;
     height: 6px;
     border-radius: 50%;
-    background: #E76F51;
+    background: #7cb7da;
 }
 
 .segpop__tab.is-active .segpop__tab-dot {
diff --git a/PanTS-Demo/src/components/segmentation/SegmentsPopup.tsx b/PanTS-Demo/src/components/segmentation/SegmentsPopup.tsx
index f7828cf4..732dd888 100644
--- a/PanTS-Demo/src/components/segmentation/SegmentsPopup.tsx
+++ b/PanTS-Demo/src/components/segmentation/SegmentsPopup.tsx
@@ -105,6 +105,7 @@ interface ColorPickerPopoverProps {
 function ColorPickerPopover({ value, onChange, onClose, anchorRef }: ColorPickerPopoverProps) {
 	const [closing, setClosing] = useState(false);
 	const popRef = useRef<HTMLDivElement>(null);
+	const colorInputRef = useRef<HTMLInputElement>(null);
 	const [pos, setPos] = useState<{ top: number; left: number } | null>(null);
 
 	const requestClose = () => {
@@ -146,6 +147,16 @@ function ColorPickerPopover({ value, onChange, onClose, anchorRef }: ColorPicker
 		const onDown = (e: MouseEvent) => {
 			if (popRef.current?.contains(e.target as Node)) return;
 			if (anchorRef.current?.contains(e.target as Node)) return;
+			// The native OS color picker (behind the "Custom…" <input
+			// type="color">) can fire a synthetic mousedown on `document`
+			// itself — outside both the input and this whole component tree —
+			// when the user drags/picks within the OS dialog, in some
+			// browsers. Without this guard that got misread as "clicked
+			// outside the popover" and closed it mid-pick, which is exactly
+			// why changing the color via the custom picker felt broken —
+			// every drag/selection risked closing before it registered. Skip
+			// closing while the color input itself still has focus.
+			if (document.activeElement === colorInputRef.current) return;
 			requestClose();
 		};
 		const onKey = (e: KeyboardEvent) => { if (e.key === "Escape") requestClose(); };
@@ -163,6 +174,7 @@ function ColorPickerPopover({ value, onChange, onClose, anchorRef }: ColorPicker
 	return createPortal(
 		<div
 			ref={popRef}
+			data-color-popover-portal
 			className={`segpop__color-popover segpop__color-popover--portaled ${closing ? "is-closing" : "is-open"}`}
 			style={{ position: "fixed", top: pos.top, left: pos.left }}
 			onClick={(e) => e.stopPropagation()}
@@ -175,14 +187,34 @@ function ColorPickerPopover({ value, onChange, onClose, anchorRef }: ColorPicker
 						className={`segpop__color-popover-swatch ${value.toLowerCase() === hex.toLowerCase() ? "is-active" : ""}`}
 						style={{ background: hex }}
 						aria-label={hex}
+						// Stages the color (updates the draft the caller holds) but does
+						// NOT close the popover — picking a swatch used to auto-close
+						// immediately, which looked like "nothing happened" since the
+						// actual save is a separate action on the row below. Leaving it
+						// open lets the person see the live preview/hex below update
+						// and confirm with an explicit "Done" instead.
 						onClick={() => onChange(hex)}
 					/>
 				))}
 			</div>
 			<label className="segpop__color-popover-custom">
-				<input type="color" value={value} onChange={(e) => onChange(e.target.value)} />
+				<input ref={colorInputRef} type="color" value={value} onChange={(e) => onChange(e.target.value)} />
 				<span>Custom…</span>
 			</label>
+			{/* Explicit commit step for the popover itself — a live preview swatch
+			    plus the hex value, so it's visually obvious a selection has been
+			    made and staged, then "Done" closes the popover. This does NOT save
+			    the class — that's still the row's own Save/ApplyButton — it just
+			    makes clear the color choice registered before the popover goes
+			    away, instead of a swatch click silently vanishing the popover with
+			    no confirmation of what got picked. */}
+			<div className="segpop__color-popover-footer">
+				<span className="segpop__color-popover-preview" style={{ background: value }} aria-hidden="true" />
+				<span className="segpop__color-popover-hex">{value.toUpperCase()}</span>
+				<button type="button" className="segpop__color-popover-done" onClick={requestClose}>
+					Done
+				</button>
+			</div>
 		</div>,
 		document.body
 	);
@@ -268,6 +300,16 @@ function FormFlyout({ anchorEl, onClose, children }: FormFlyoutProps) {
 		const onDown = (e: MouseEvent) => {
 			if (panelRef.current?.contains(e.target as Node)) return;
 			if (anchorEl?.contains(e.target as Node)) return;
+			// The color swatch popover portals to document.body on its OWN,
+			// separate from this FormFlyout's portal — so a click on a preset
+			// swatch or the native color input isn't a descendant of either
+			// panelRef or anchorEl, and without this check got misread as
+			// "clicked outside the name/color editor," closing the whole
+			// editor instead of just the small color popover. The color
+			// popover already closes itself independently on its own outside
+			// click; this just stops THIS flyout from also reacting to a
+			// click that was actually still inside it, conceptually.
+			if ((e.target as Element | null)?.closest?.("[data-color-popover-portal]")) return;
 			requestClose();
 		};
 		const onKey = (e: KeyboardEvent) => { if (e.key === "Escape") requestClose(); };
diff --git a/PanTS-Demo/src/components/viewer/AnnotationToolbar.css b/PanTS-Demo/src/components/viewer/AnnotationToolbar.css
index 52f88603..de48b81c 100644
--- a/PanTS-Demo/src/components/viewer/AnnotationToolbar.css
+++ b/PanTS-Demo/src/components/viewer/AnnotationToolbar.css
@@ -152,7 +152,7 @@
 
 .atb-flyout__range:active::-webkit-slider-thumb {
     background: #0F172A;
-    border-color: #E76F51;
+    border-color: #68ACE5;
 }
 
 .atb-flyout__range::-moz-range-track {
@@ -348,8 +348,8 @@
     background: rgba(34, 34, 42, 0.62);
     backdrop-filter: blur(20px) saturate(150%);
     -webkit-backdrop-filter: blur(20px) saturate(150%);
-    border-left: 2px solid #E76F51;
-    border-top: 2px solid #E76F51;
+    border-left: 2px solid #68ACE5;
+    border-top: 2px solid #68ACE5;
     border-radius: 4px 0 0 0;
     transform: translateX(-50%) rotate(45deg);
     transition: left 0.2s ease;
@@ -920,7 +920,7 @@
     font-weight: 800;
     letter-spacing: 0.06em;
     text-transform: uppercase;
-    color: var(--accent, #E76F51);
+    color: var(--jhu-blue-accent, #68ACE5);
     margin: 0 0 8px;
 }
 
@@ -979,7 +979,7 @@
     padding: 10px 0;
     border-radius: 999px;
     background: var(--jhu-blue, #0F172A);
-    border: 1px solid var(--accent, #E76F51);
+    border: 1px solid var(--jhu-blue-accent, #68ACE5);
     color: #ffffff;
     font-size: 12.5px;
     font-weight: 800;
diff --git a/PanTS-Demo/src/components/viewer/AnnotationToolbar.tsx b/PanTS-Demo/src/components/viewer/AnnotationToolbar.tsx
index ee68a132..9af523e4 100644
--- a/PanTS-Demo/src/components/viewer/AnnotationToolbar.tsx
+++ b/PanTS-Demo/src/components/viewer/AnnotationToolbar.tsx
@@ -130,6 +130,15 @@ interface AnnotationToolbarProps {
 	// and the guided-overlay tools (close once their full-screen walkthrough
 	// takes over).
 	renderFlyout: (tool: Exclude<PrimaryEditTool, null>, onApplied: () => void, onCloseSettings: () => void, onGuidedControlsChange: (controls: GuidedFlowControls | null) => void) => React.ReactNode;
+	/** Fired whenever a guided slice-anchor pick flow (Copy/Fill across
+	 *  slices) becomes active or finishes — true for the flow's entire
+	 *  lifecycle (both click steps, the ready-to-apply confirm, and while
+	 *  committing), not just the literal picking sub-phase, since the
+	 *  crosshair shouldn't be live for any of it: clicking a pane during a
+	 *  guided pick is meant to choose a slice/anchor, not move the
+	 *  crosshair. The caller (VisualizationPage) uses this to suppress
+	 *  Crosshairs for the duration. */
+	onGuidedPickingChange?: (active: boolean) => void;
 
 	popupRef?: React.RefObject<HTMLDivElement | null>;
 	popupDragRef?: React.RefObject<HTMLDivElement | null>;
@@ -146,20 +155,20 @@ interface AnnotationToolbarProps {
 }
 
 const TOOL_DEFS: Array<{ id: Exclude<PrimaryEditTool, null>; label: string; Icon: typeof IconBrush; description: string }> = [	
-	{ id: "paint", label: "Brush", Icon: IconBrush, description: "Paint with a round brush." },
-	{ id: "erase", label: "Erase", Icon: IconEraser, description: "Erase with a round brush." },
-	{ id: "scissors", label: "Scissors", Icon: IconScissors, description: "Cut through the entire class from the current viewpoint." },
-	{ id: "levelTracing", label: "Level Tracing", Icon: IconRipple, description: "Trace the boundary of similar intensity around the cursor." },
-	{ id: "margin", label: "Margin", Icon: IconArrowsDiagonal, description: "Grow or shrink the selected class by a specified margin size." },
-	{ id: "smoothing", label: "Smoothing", Icon: IconWaveSine, description: "Make class boundaries smoother." },
+	{ id: "paint", label: "Brush", Icon: IconBrush, description: "Paint freehand with a round brush." },
+	{ id: "erase", label: "Erase", Icon: IconEraser, description: "Erase parts of a shape manually." },
+	{ id: "scissors", label: "Scissors", Icon: IconScissors, description: "Lasso tool using anchor points." },
+	{ id: "levelTracing", label: "Level Tracing", Icon: IconRipple, description: "Traces the boundary of similar intensity around cursor." },
+	{ id: "margin", label: "Margin", Icon: IconArrowsDiagonal, description: "Grow or shrink by a specified margin size." },
+	{ id: "smoothing", label: "Smoothing", Icon: IconWaveSine, description: "Smooth class boundaries." },
 	{ id: "islands", label: "Islands", Icon: IconDroplet, description: "Edit islands (connected components) in a class." },
 	{ id: "logicalOperators", label: "Logical operators", Icon: IconMathFunction, description: "Apply logical operators or combine classes." },
-	{ id: "growFromSeeds", label: "Grow from seeds", Icon: IconWand, description: "Grow a class from user-placed seed scribbles." },
+	{ id: "growFromSeeds", label: "Grow from seeds", Icon: IconWand, description: "Grow a class from user-placed scribbles." },
 	{ id: "fillBetweenSlices", label: "Fill between slices", Icon: IconStack2, description: "Interpolate a class's shape between two annotated slices." },
-	{ id: "copyAcrossSlices", label: "Copy across slices", Icon: IconCopy, description: "Copy a class's shape from one slice across a range." },
+	{ id: "copyAcrossSlices", label: "Copy across slices", Icon: IconCopy, description: "Copy a class's shape from first to last slice." },
 	{ id: "hollow", label: "Hollow", Icon: IconCircleDashed, description: "Make the class hollow by replacing it with a uniform-thickness shell." },
-	{ id: "pointSegment", label: "Click to segment", Icon: IconPointer, description: "Click a point to propose a segment there (grows a region from the click; box-restrict or refine after)." },
-	{ id: "boxSegment", label: "Box to segment", Icon: IconFrame, description: "Draw a box to propose a segment restricted to that region." },
+	{ id: "pointSegment", label: "Click to segment", Icon: IconPointer, description: "Click an object to fill its shape" },
+	{ id: "boxSegment", label: "Box to segment", Icon: IconFrame, description: "Draw a box to find a shape inside that area." },
 ];
 
 const SCISSORS_OPERATIONS: { value: ScissorsOperation; label: string }[] = [
@@ -191,7 +200,7 @@ const GUIDED_HINT_COPY: Record<GuidedHintGroup, string> = {
 	growSeeds:
 		"Continue moves on once you've placed your seed scribbles. Start over clears every seed and lets you begin again. Exit leaves Grow from Seeds without changing anything.",
 	sliceOps:
-		"Continue (labeled Remove picked/Keep picked/etc. depending on the tool) applies your picks. Start over clears them and lets you pick again. Exit leaves the tool without changing anything.",
+		"Start over clears any choices made and lets you pick again. Exit leaves the tool without changing anything.",
 };
 
 // Ribbon height, matches --atb-ribbon-h in CSS. Exported so SegmentsPopup
@@ -393,7 +402,7 @@ function RenderingIndicator({ label: _label, visible }: { label?: string; visibl
 					width: 7,
 					height: 7,
 					borderRadius: "50%",
-					background: "var(--accent, #E76F51)",
+					background: "var(--jhu-blue-accent, #68ACE5)",
 					animation: "seg-effect-render-pulse 0.9s ease-in-out infinite",
 				}}
 			/>
@@ -465,7 +474,7 @@ export default function AnnotationToolbar({
 	renderFlyout, scissorsPointCount, onScissorsCancel, maskingArea,
 	onMaskingAreaChange, hasAnySegments, scopeLocked, isRendering, isDeletingSegment,
 	targetKey, showOnlyTargetMask, onShowOnlyTargetMaskChange,
-	popupRef, popupDragRef, popupMinRef, anchorRef,
+	popupRef, popupDragRef, popupMinRef, anchorRef, onGuidedPickingChange,
 }: AnnotationToolbarProps) {
 	const [hoveredTool, setHoveredTool] = useState<string | null>(null);
 	const [hoveredRect, setHoveredRect] = useState<DOMRect | null>(null);
@@ -854,6 +863,9 @@ export default function AnnotationToolbar({
 	useEffect(() => {
 		guidedControlsRef.current = guidedControls;
 	}, [guidedControls]);
+	useEffect(() => {
+		onGuidedPickingChange?.(guidedControls != null);
+	}, [guidedControls, onGuidedPickingChange]);
 
 	// Small non-blocking hint shown right next to the cursor when Continue
 	// is clicked while `continueDisabled` — e.g. "Mark at least one point
@@ -1012,11 +1024,17 @@ export default function AnnotationToolbar({
 			aria-orientation="horizontal"
 		>
 			<div ref={dockContentRef} style={{ display: "flex", alignItems: "center", width: "100%" }}>
-			<div style={{ display: "flex", alignItems: "center", flex: 1, minWidth: 0, gap: 8 }}>
+			<div style={{ display: "flex", alignItems: "center", flex: 1, minWidth: 0, gap: 20}}>
 				{TOOL_DEFS.map(({ id, label, Icon, description }) => {
 					// Only equip-and-use tools (paint/erase/scissors/level tracing)
 					// get a settings arrow; other tools open settings on icon click.
-					const hasSettingsArrow = LIVE_COMMIT_TOOLS.includes(id);
+					// pointSegment/boxSegment are equip-and-use too (no separate
+					// settings step needed to click/drag) but have no configurable
+					// settings at all, so they're excluded from the arrow itself even
+					// though they stay in LIVE_COMMIT_TOOLS for the rest of its
+					// behavior (outside-click keeps them armed, etc).
+					const hasSettingsArrow =
+						LIVE_COMMIT_TOOLS.includes(id) && id !== "pointSegment" && id !== "boxSegment";
 					const settingsOpenHere = toolFlyout.open && activeTool === id;
 					return (
 						<div
@@ -1041,6 +1059,12 @@ export default function AnnotationToolbar({
 								<FlyoutArrow
 									open={settingsOpenHere}
 									onClick={() => {
+										// Mirrors the main icon button's disabled-click handling above:
+										// the arrow previously called openToolSettings unconditionally,
+										// even when `enabled` was false, silently opening a tool's
+										// settings flyout with no class selected. Route it through the
+										// same "pick a class first" walkthrough popout instead.
+										if (!enabled) { setPickClassHintOpen(true); return; }
 										if (settingsOpenHere) toolFlyout.setOpen(false);
 										else openToolSettings(id);
 									}}
@@ -1086,7 +1110,7 @@ export default function AnnotationToolbar({
 						flexShrink: 0,
 						display: "flex",
 						alignItems: "center",
-						gap: 8,
+						gap: 15,
 						marginLeft: 14,
 						paddingLeft: 14,
 						borderLeft: "1px solid rgba(255, 255, 255, 0.09)",
@@ -1123,7 +1147,7 @@ export default function AnnotationToolbar({
 									width: 7,
 									height: 7,
 									borderRadius: "50%",
-									background: "var(--accent, #E76F51)",
+									background: "var(--jhu-blue-accent, #68ACE5)",
 									animation: "seg-effect-render-pulse 0.9s ease-in-out infinite",
 								}}
 							/>
@@ -1347,7 +1371,7 @@ export default function AnnotationToolbar({
 						left: pickClassHintRect.left - 3,
 						width: pickClassHintRect.width + 6,
 						height: pickClassHintRect.height + 3,
-						border: "2px dashed var(--accent, #E76F51)",
+						border: "2px dashed var(--jhu-blue-accent, #68ACE5)",
 						borderRadius: 12,
 						pointerEvents: "none",
 						zIndex: 120,
@@ -1372,7 +1396,7 @@ export default function AnnotationToolbar({
 					}}
 				>
 					<div style={{ fontSize: 13, lineHeight: 1.5, color: "rgba(255,255,255,0.9)" }}>
-						Select an existing class or create a custom one, then start annotating.
+						Select an existing class or create a custom one to start annotating.
 					</div>
 					<button
 						type="button"
@@ -1406,7 +1430,7 @@ export default function AnnotationToolbar({
 						left: firstTargetHintRect.left,
 						width: firstTargetHintRect.width,
 						height: firstTargetHintRect.height,
-						border: "2px dashed var(--accent, #E76F51)",
+						border: "2px dashed var(--jhu-blue-accent, #68ACE5)",
 						borderRadius: 8,
 						pointerEvents: "none",
 						zIndex: 120,
@@ -1471,7 +1495,7 @@ export default function AnnotationToolbar({
 						left: guidedHintRect.left - 8,
 						width: guidedHintRect.width + 16,
 						height: guidedHintRect.height + 16,
-						border: "2px dashed var(--accent, #E76F51)",
+						border: "2px dashed var(--jhu-blue-accent, #68ACE5)",
 						borderRadius: 12,
 						pointerEvents: "none",
 						zIndex: 120,
diff --git a/PanTS-Demo/src/components/viewer/FlyoutPrimitives.css b/PanTS-Demo/src/components/viewer/FlyoutPrimitives.css
index 4457e6db..741813f9 100644
--- a/PanTS-Demo/src/components/viewer/FlyoutPrimitives.css
+++ b/PanTS-Demo/src/components/viewer/FlyoutPrimitives.css
@@ -86,8 +86,8 @@
     width: 12px;
     height: 12px;
     background: #202124;
-    border-left: 2px solid #E76F51;
-    border-top: 2px solid #E76F51;
+    border-left: 2px solid #3499ff;
+    border-top: 2px solid #3499ff;
     border-radius: 3px 0 0 0;
     z-index: 1;
 }
@@ -284,13 +284,17 @@
    instead of a differently-shaped control breaking the column's rhythm. */
 .atb-menu-row--checkbox {
     cursor: pointer;
+    
+}
+.atb-menu-row_.check {
+    stroke: #3b82f6;
 }
 
 .atb-menu-row__checkbox-input {
     flex-shrink: 0;
     width: 14px;
     height: 14px;
-    accent-color: #E76F51;
+    accent-color: #3499ff;
     cursor: pointer;
 }
 
@@ -338,7 +342,7 @@
 .atb-menu-row__expand-chip.is-open {
     background: rgba(15, 23, 42, 0.35);
     border-color: rgba(104, 172, 229, 0.5);
-    color: #E76F51;
+    color: #3499ff;
 }
 
 .atb-menu-row:hover:not(:disabled) .atb-menu-row__expand-chip:not(.is-open) {
@@ -367,7 +371,7 @@
     justify-content: center;
     width: 16px;
     height: 16px;
-    color: var(--accent, #E76F51);
+    color: var(--accent, #3499ff);
     animation: atb-check-pop 0.15s ease-out;
 }
 
@@ -587,7 +591,7 @@
 
 .atb-action-btn__check {
     flex-shrink: 0;
-    color: #E76F51;
+    color: #3499ff;
     animation: atb-action-check-in 0.24s cubic-bezier(0.34, 1.56, 0.64, 1);
 }
 
diff --git a/PanTS-Demo/src/components/viewer/FlyoutPrimitives.tsx b/PanTS-Demo/src/components/viewer/FlyoutPrimitives.tsx
index 9c9d9ee9..000a358d 100644
--- a/PanTS-Demo/src/components/viewer/FlyoutPrimitives.tsx
+++ b/PanTS-Demo/src/components/viewer/FlyoutPrimitives.tsx
@@ -404,7 +404,7 @@ export function MenuRow({
 				<>
 					{/* Leaf rows (no rowRef) show a check when selected; rows that
 					 *  open a further grandchild show a chevron instead. */}
-					{!rowRef && open && <IconCheck size={14} stroke={2.5} className="atb-menu-row__check" />}
+					{!rowRef && open && <IconCheck size={14} stroke={2.5} className="atb-menu-row__check" style={{ color: 'cyan' }} />}
 					{rowRef && <IconChevronRight size={13} stroke={2.25} className="atb-menu-row__chevron" />}
 				</>
 			)}
diff --git a/PanTS-Demo/src/helpers/CornerstoneNifti2.tsx b/PanTS-Demo/src/helpers/CornerstoneNifti2.tsx
index 708a86ea..e5459588 100644
--- a/PanTS-Demo/src/helpers/CornerstoneNifti2.tsx
+++ b/PanTS-Demo/src/helpers/CornerstoneNifti2.tsx
@@ -840,7 +840,10 @@ export function setMaskBrushSize(diameterMm: number) {
 // always on top of ONE of the two, so this behaves as a single button.
 // ---------------------------------------------------------------------------
 export function undoMaskEdit() {
-  if (canUndoSmartFill()) {
+  // Prefer whichever stack was touched more recently, not always the fill
+  // stack — a brush stroke after a box-segment (or vice versa) must undo in
+  // the order it actually happened.
+  if (canUndoSmartFill() && _lastFillEditTime >= _lastBrushEditTime) {
     undoSmartFill();
     return;
   }
@@ -849,7 +852,7 @@ export function undoMaskEdit() {
 }
 
 export function redoMaskEdit() {
-  if (canRedoSmartFill()) {
+  if (canRedoSmartFill() && _lastFillEditTime >= _lastBrushEditTime) {
     redoSmartFill();
     return;
   }
@@ -1567,15 +1570,53 @@ export async function submitInteractiveSegmentPrompt(
   }
 
   let changed = 0;
+  // Sparse before/after capture for undo — only voxels this proposal
+  // actually touches AND actually changes (skips a no-op write where the
+  // voxel already held activeSegmentIndex), so undo/redo stay cheap even
+  // though `proposal.data` spans the whole volume.
+  const touchedIdx: number[] = [];
+  const priorValues: number[] = [];
   for (let idx = 0; idx < proposal.data.length; idx++) {
     if (proposal.data[idx]) {
+      if (segScalars[idx] !== activeSegmentIndex) {
+        touchedIdx.push(idx);
+        priorValues.push(segScalars[idx]);
+      }
       segScalars[idx] = activeSegmentIndex;
       changed++;
     }
   }
   if (changed > 0) {
     (segVolume as any)?.voxelManager?.setCompleteScalarDataArray?.(segScalars);
-    await _rebuildSegmentationRepresentations();
+    // NOT _rebuildSegmentationRepresentations() — this only mutated voxels
+    // in the SAME already-cached segVolume object, it never swapped which
+    // volume is loaded (unlike upgradeSegmentationVolume, which genuinely
+    // does need the full remove+re-add). A full rebuild tears down and
+    // re-adds every segment's representation on every viewport, which is
+    // both the visible "every class mask flashes/reloads" symptom and
+    // real, avoidable cost on every single click/box prompt. This is the
+    // same lightweight refresh the brush/smart-fill/etc. direct-write paths
+    // already use — it doesn't touch representations or actors, so it also
+    // doesn't disturb camera position/zoom the way rebuilding did.
+    _notifySegmentationChanged();
+
+    // Own undo/redo entry, same shared stack as smart fill / scissors /
+    // lasso (pushEditHistory below) — a SEPARATE stack from brush strokes
+    // (Cornerstone's own HistoryMemo), so undoing a point/box segment never
+    // also reverts (or gets shadowed by) an unrelated brush stroke; see
+    // undoMaskEdit's recency check for how the two stacks interleave.
+    if (touchedIdx.length > 0) {
+      const applyAndRefresh = (values: number[]) => {
+        touchedIdx.forEach((idx, i) => { segScalars[idx] = values[i]; });
+        (segVolume as any)?.voxelManager?.setCompleteScalarDataArray?.(segScalars);
+        _notifySegmentationChanged();
+      };
+      const redoValues = touchedIdx.map(() => activeSegmentIndex);
+      pushEditHistory({
+        undo: () => applyAndRefresh(priorValues),
+        redo: () => applyAndRefresh(redoValues),
+      });
+    }
   }
 
   return changed;
@@ -2541,7 +2582,19 @@ export function runDualScribbleFill(
   _notifySegmentationChanged();
   return { filledVoxels: touched.length, threshold };
 }
+// Guards the dispatch below so the module-level listener a few lines down
+// (which stamps _lastBrushEditTime) can tell "this SEGMENTATION_DATA_MODIFIED
+// came from OUR OWN edit path (fill/box/point/scissors/lasso/etc, all of
+// which route through this function)" apart from "this came natively from
+// Cornerstone's own BrushTool after a paint/erase stroke" — both dispatch
+// the identical event, so without this flag the two are indistinguishable
+// from the listener's side, which is exactly what made the old
+// "smart-fill-stack always wins" undo ordering wrong (see _lastFillEditTime
+// / _lastBrushEditTime below).
+let _dispatchingOwnEdit = false;
+
 function _notifySegmentationChanged() {
+  _dispatchingOwnEdit = true;
   try {
     // This is what BrushTool's own strategies call after painting — it invalidates the
     // labelmap's cached GPU texture so the 2D volume viewports actually repaint the new
@@ -2556,10 +2609,22 @@ function _notifySegmentationChanged() {
   eventTarget.dispatchEvent(
     new CustomEvent(csToolsEnums.Events.SEGMENTATION_DATA_MODIFIED, { detail: { segmentationId } })
   );
+  _dispatchingOwnEdit = false;
   currentRenderingEngine?.renderViewports([...MPR_VIEWPORT_IDS]);
   currentRenderingEngine?.render();
 }
 
+// Fires once, unconditionally, for the lifetime of the module — separate
+// from subscribeToSegmentationEdits below (which callers attach/detach per
+// component). Its only job is recency-tracking for undoMaskEdit/redoMaskEdit:
+// stamp _lastBrushEditTime whenever a genuine NATIVE brush/eraser stroke
+// changes the labelmap (i.e. the event fired WITHOUT _dispatchingOwnEdit set,
+// meaning it didn't come from _notifySegmentationChanged / our own edit
+// paths). See _pushFillHistory below for the matching _lastFillEditTime.
+eventTarget.addEventListener(csToolsEnums.Events.SEGMENTATION_DATA_MODIFIED, () => {
+  if (!_dispatchingOwnEdit) _lastBrushEditTime = Date.now();
+});
+
 // ============================================================================
 // SECTION: Undo / Redo History 
 // ============================================================================
@@ -2569,10 +2634,21 @@ type FillHistoryEntry = { undo: () => void; redo: () => void };
 let _fillHistory: FillHistoryEntry[] = [];
 let _fillHistoryIndex = -1;
 
+// Recency trackers so undoMaskEdit/redoMaskEdit can pick whichever of the
+// two history mechanisms (this _fillHistory stack, used by smart fill,
+// scissors, lasso, and point/box segmentation; or Cornerstone's own
+// HistoryMemo, used natively by brush/eraser strokes) the user actually
+// touched most recently — instead of always preferring one stack
+// regardless of order, which let an older fill-type undo silently jump
+// ahead of a newer brush stroke when the two were interleaved.
+let _lastFillEditTime = 0;
+let _lastBrushEditTime = 0;
+
 function _pushFillHistory(entry: FillHistoryEntry) {
   _fillHistory = _fillHistory.slice(0, _fillHistoryIndex + 1);
   _fillHistory.push(entry);
   _fillHistoryIndex = _fillHistory.length - 1;
+  _lastFillEditTime = Date.now();
 }
 
 // Exposed so hooks/components outside this module (e.g. useSmartFill's
@@ -2689,6 +2765,26 @@ const LIVEWIRE_W_GRADIENT = 0.55;
 const LIVEWIRE_W_LAPLACIAN = 0.25;
 const LIVEWIRE_W_DIRECTION = 0.20;
 
+// The refined snap point (see refinePoint below) sits at the objective
+// gradient-magnitude peak of the CT intensity ramp — the mathematically
+// "sharpest" point of the transition. That can read as a few mm inside the
+// true anatomical boundary compared to where a human eye places the edge
+// under typical windowing, since the visually-perceived edge and the raw
+// gradient peak aren't always the same point. This nudges the final refined
+// point a small extra distance further along the SAME outward normal
+// refinePoint already found, landing it a bit past the gradient peak instead
+// of exactly on it.
+//
+// Sign convention: positive values move along +[ux,uy], i.e. from lower-HU
+// toward higher-HU across the edge — for a denser structure (bone, most solid
+// organs) against a less-dense surround (fat/air), that's outward, away from
+// the structure's interior. If a specific case needs the opposite (e.g.
+// tracing something LESS dense than its surround), flip the sign here — this
+// is a single scalar, not per-edge logic, so it can't be made
+// direction-aware automatically without knowing which side is "inside" for
+// an arbitrary class.
+const LIVEWIRE_OUTWARD_BIAS_VOXELS = 0.9;
+
 // Minimal binary min-heap keyed by a numeric priority — enough for Dijkstra
 // over a few thousand nodes without pulling in a dependency.
 class _MinHeap {
@@ -2962,7 +3058,7 @@ export function computeLiveWirePath(
     const delta = Math.abs(denom) > 1e-6 ? (0.5 * (mMinus - mPlus)) / denom : 0;
     const tRefined = bestT + Math.max(-REFINE_STEP, Math.min(REFINE_STEP, delta * REFINE_STEP));
 
-    return [a + ux * tRefined, b + uy * tRefined];
+    return [a + ux * (tRefined + LIVEWIRE_OUTWARD_BIAS_VOXELS), b + uy * (tRefined + LIVEWIRE_OUTWARD_BIAS_VOXELS)];
   };
 
   const points: Array<[number, number]> = [];
diff --git a/PanTS-Demo/src/helpers/viewer/useInteractivePromptTool.ts b/PanTS-Demo/src/helpers/viewer/useInteractivePromptTool.ts
index 0540c4f0..ea9efb29 100644
--- a/PanTS-Demo/src/helpers/viewer/useInteractivePromptTool.ts
+++ b/PanTS-Demo/src/helpers/viewer/useInteractivePromptTool.ts
@@ -37,16 +37,31 @@ interface UseInteractivePromptToolArgs {
 	 *  disable further clicks — a click mid-request would race the previous
 	 *  one's voxel writes. */
 	onBusyChange?: (busy: boolean) => void;
+	/** Fired once a submit SUCCEEDS (voxels actually changed) — point/box
+	 *  segment is single-shot, not equip-and-use like paint/erase, so the
+	 *  caller should deselect the tool here (activeToolbarTool -> null) so
+	 *  its icon loses the active/white-background state after one use.
+	 *  NOT fired on "nothing changed" or on error — the user should be able
+	 *  to immediately retry in place without re-arming the tool. */
+	onComplete?: () => void;
 }
 
 export function useInteractivePromptTool({
-	enabled, mode, apiBase, caseId, activeSegmentIndex, res, tolerance, onLog, onBusyChange,
+	enabled, mode, apiBase, caseId, activeSegmentIndex, res, tolerance, onLog, onBusyChange, onComplete,
 }: UseInteractivePromptToolArgs) {
 	const [dragStartCanvas, setDragStartCanvas] = useState<[number, number] | null>(null);
 	const [dragStartWorld, setDragStartWorld] = useState<Point3 | null>(null);
 	const [liveBoxCanvas, setLiveBoxCanvas] = useState<[[number, number], [number, number]] | null>(null);
 	const paneRef = useRef<CinePane | null>(null);
 	const busyRef = useRef(false);
+	// Drives the applying/success overlay (mirrors CopyAcrossSlicesFlyout's
+	// GuidedStepModal pattern) instead of the tool silently completing with
+	// only a session-log line — a click/box submit is a real server round
+	// trip (hundreds of ms to a few seconds), so it needs its own feedback,
+	// not just whatever "Interactive segment (N vox)" text happens to scroll
+	// past in the log panel.
+	const [status, setStatus] = useState<"idle" | "applying" | "success" | "error">("idle");
+	const [statusMessage, setStatusMessage] = useState<string | null>(null);
 
 	const reset = useCallback(() => {
 		setDragStartCanvas(null);
@@ -66,6 +81,8 @@ export function useInteractivePromptTool({
 		}
 		busyRef.current = true;
 		onBusyChange?.(true);
+		setStatus("applying");
+		setStatusMessage(null);
 		try {
 			const changed = await submitInteractiveSegmentPrompt(
 				apiBase,
@@ -74,18 +91,33 @@ export function useInteractivePromptTool({
 				{ pointLps: pointWorld, boxLps: boxWorld, tolerance },
 				res,
 			);
-			onLog?.(
-				changed
-					? `Interactive segment (${changed.toLocaleString()} vox)`
-					: "Interactive segment: nothing grew from that point — try a different spot."
-			);
+			if (changed) {
+				const msg = `Interactive segment (${changed.toLocaleString()} vox)`;
+				onLog?.(msg);
+				setStatus("success");
+				setStatusMessage("Operation completed successfully");
+				onComplete?.();
+			} else {
+				const msg = "Interactive segment: nothing grew from that point — try a different spot.";
+				onLog?.(msg);
+				setStatus("error");
+				setStatusMessage(msg);
+			}
 		} catch (e) {
-			onLog?.(e instanceof Error ? e.message : "Interactive segmentation failed.");
+			const msg = e instanceof Error ? e.message : "Interactive segmentation failed.";
+			onLog?.(msg);
+			setStatus("error");
+			setStatusMessage(msg);
 		} finally {
 			busyRef.current = false;
 			onBusyChange?.(false);
 		}
-	}, [apiBase, caseId, activeSegmentIndex, res, tolerance, onLog, onBusyChange]);
+	}, [apiBase, caseId, activeSegmentIndex, res, tolerance, onLog, onBusyChange, onComplete]);
+
+	const dismissStatus = useCallback(() => {
+		setStatus("idle");
+		setStatusMessage(null);
+	}, []);
 
 	const handleClick = (pane: CinePane) => (e: MouseEvent) => {
 		if (!enabled || mode !== "point") return;
@@ -147,6 +179,9 @@ export function useInteractivePromptTool({
 	return {
 		pane,
 		liveBox: liveBoxDisplay,
+		status,
+		statusMessage,
+		dismissStatus,
 		handleClick,
 		handleMouseDown,
 		handleMouseMove,
diff --git a/PanTS-Demo/src/helpers/viewer/useKeyboardShortcuts.ts b/PanTS-Demo/src/helpers/viewer/useKeyboardShortcuts.ts
index 19984734..d4df9644 100644
--- a/PanTS-Demo/src/helpers/viewer/useKeyboardShortcuts.ts
+++ b/PanTS-Demo/src/helpers/viewer/useKeyboardShortcuts.ts
@@ -13,7 +13,6 @@ import {
 	ROI_TOOL,
 	setMaskBrushSize,
 	setPaneSliceIndex,
-	undoMaskEdit,
 	zoomToCursor,
 	zoomToFit,
 	type CinePane,
@@ -61,6 +60,13 @@ interface UseKeyboardShortcutsArgs {
 	sliceInfoRef: MutableRefObject<Record<CinePane, SliceInfo | null>>;
 	editMode: MaskEditMode;
 	setZoomLevel: Dispatch<SetStateAction<number>>;
+	/** Called for the plain undo shortcut (⌘Z/Ctrl+Z, no Shift). Owned by
+	 *  VisualizationPage so it can peel off a scissors/lasso in-progress
+	 *  point before falling through to the global mask-edit undo — see
+	 *  handleUndo there for why that ordering matters. Redo has no
+	 *  equivalent per-tool concept, so Shift+⌘Z still calls redoMaskEdit()
+	 *  directly below. */
+	onUndo: () => void;
 }
 
 /**
@@ -97,6 +103,7 @@ export function useKeyboardShortcuts({
 	sliceInfoRef,
 	editMode,
 	setZoomLevel,
+	onUndo,
 }: UseKeyboardShortcutsArgs) {
 	// Last-seen mouse position (viewport-relative clientX/Y), updated on every
 	// mousemove so +/- can zoom toward "wherever the cursor last was" even
@@ -189,9 +196,13 @@ export function useKeyboardShortcuts({
 			const key = e.key.toLowerCase();
 
 			// ---- Undo / redo ---------------------------------------------------
+			// Plain undo goes through onUndo (not undoMaskEdit directly) so a
+			// pending scissors/lasso point gets peeled off first — see
+			// handleUndo in VisualizationPage for why. Redo has no per-tool
+			// equivalent, so it still calls redoMaskEdit() straight through.
 			if ((e.metaKey || e.ctrlKey) && !e.altKey && key === "z") {
 				if (e.shiftKey) redoMaskEdit();
-				else undoMaskEdit();
+				else onUndo();
 				e.preventDefault();
 				return;
 			}
@@ -297,5 +308,6 @@ export function useKeyboardShortcuts({
 		sliceInfoRef,
 		editMode,
 		setZoomLevel,
+		onUndo,
 	]);
-}
+}
\ No newline at end of file
diff --git a/PanTS-Demo/src/helpers/viewer/usePolygonDraw.ts b/PanTS-Demo/src/helpers/viewer/usePolygonDraw.ts
index 4dd55c76..42ba9597 100644
--- a/PanTS-Demo/src/helpers/viewer/usePolygonDraw.ts
+++ b/PanTS-Demo/src/helpers/viewer/usePolygonDraw.ts
@@ -186,9 +186,22 @@ export function usePolygonDraw({ enabled, onClose, computeLivePath }: UsePolygon
 			else if (e.key === "Enter" && cornersWorld.length >= 3) { e.preventDefault(); close(); }
 			// Ctrl/Cmd+Z removes the last placed point, one at a time — replaces
 			// the old "Undo point" button in the flyout with the shortcut users
-			// actually reach for.
+			// actually reach for. stopImmediatePropagation() (not just
+			// preventDefault) is the important part: this listener is on
+			// `window`, same target as whatever global shortcut undoes the
+			// last committed brush/voxel edit — plain stopPropagation() does
+			// NOT stop a sibling listener registered on that same target, only
+			// propagation to OTHER elements, so without stopImmediatePropagation
+			// a single Ctrl+Z while mid-polygon fired BOTH: this popped the
+			// last placed point AND the global handler undid the last brush
+			// stroke, as if two Ctrl+Z presses had happened. Placing a
+			// scissors point isn't a committed edit yet (nothing touches the
+			// labelmap until the shape closes), so it needs to be its own,
+			// separate undo step — not bundled into the same history entry as
+			// an actual brush stroke.
 			else if ((e.ctrlKey || e.metaKey) && !e.shiftKey && e.key.toLowerCase() === "z" && cornersWorld.length) {
 				e.preventDefault();
+				e.stopImmediatePropagation();
 				undo();
 			}
 		};
diff --git a/PanTS-Demo/src/routes/VisualizationPage.css b/PanTS-Demo/src/routes/VisualizationPage.css
index 4c30fc59..c03aa889 100644
--- a/PanTS-Demo/src/routes/VisualizationPage.css
+++ b/PanTS-Demo/src/routes/VisualizationPage.css
@@ -1441,7 +1441,8 @@
 }
 
 .vp-stats__summary strong {
-  color: #ffb454;
+  color: #465bfc
+;
 }
 
 .vp-stats__msg {
@@ -1508,7 +1509,8 @@
 
 /* Muted by default, highlighted when in the extreme tails (<p5 / >p95). */
 .vp-stats__pct--flag {
-  color: #ffb454 !important;
+  color: #465bfc
+ !important;
   font-weight: 600;
 }
 
@@ -1543,7 +1545,7 @@
 }
 
 .vp-spark__marker--flag {
-  background: #ffb454;
+  background: #465bfc;
 }
 
 /* Explicit index-based stripe (not :nth-child) since expanded detail rows are interleaved
@@ -1594,7 +1596,8 @@
 .vp-stats__truncated-flag {
   margin-left: 5px;
   font-size: 10px;
-  color: #ffb454;
+  color: #465bfc
+;
   cursor: help;
 }
 
@@ -1795,4 +1798,8 @@
   pointer-events: none;
   z-index: 35;
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.4);
-}
\ No newline at end of file
+}
+
+/* Point/box-segment SUCCESS/ERROR now reuses the shared GuidedStepModal
+   (SliceAnchorPickerUI.tsx) instead of its own bottom pill — no CSS of
+   its own needed here anymore. */
\ No newline at end of file
diff --git a/PanTS-Demo/src/routes/VisualizationPage.tsx b/PanTS-Demo/src/routes/VisualizationPage.tsx
index c51a63b9..eb7a724e 100644
--- a/PanTS-Demo/src/routes/VisualizationPage.tsx
+++ b/PanTS-Demo/src/routes/VisualizationPage.tsx
@@ -56,11 +56,12 @@ import MarginPanel from "../components/segmentation/MarginPanel";
 import IslandsPanel from "../components/segmentation/IslandsPanel";
 import LogicalOperatorsPanel from "../components/segmentation/LogicalOperatorsPanel";
 import { setBrushMaskingScope } from "../helpers/CornerstoneNifti2";
-import { loadRecentUploads } from "../helpers/recentUploads";
+
 import SmoothingFlyout from "../components/segmentation/SmoothingFlyout";
 import GrowFromSeedsFlyout from "../components/segmentation/GrowFromSeedFlyout";
 import FillBetweenSlicesFlyout from "../components/segmentation/FillBetweenSlicesFlyout";
 import CopyAcrossSlicesFlyout from "../components/segmentation/CopyAcrossSlicesFlyout";
+import { GuidedStepModal } from "../components/segmentation/SliceAnchorPickerUI";
 import HollowFlyout from "../components/segmentation/HollowFlyout";
 import LevelTracingFlyout from "../components/segmentation/LevelTracingFlyout";
 import { useScissorsTool } from "../helpers/viewer/useScissorsTool";
@@ -510,17 +511,6 @@ function VisualizationPage() {
 	const isLocal = isDicom || isLocalNifti;
 	const [dicomError, setDicomError] = useState<string | null>(null);
 
-	// Header display only — caseId itself stays the raw id everywhere it's used
-	// functionally (API calls, logging, etc). A session's raw id is a UUID, which
-	// means nothing to a person; look up the friendly name the Upload page already
-	// gives it ("LesionSegmenter · Aug 14") when this browser has it in
-	// localStorage, falling back to a short id fragment rather than the full UUID.
-	const sessionDisplayLabel = useMemo(() => {
-		if (!sessionId) return null;
-		const match = loadRecentUploads().find((u) => u.sessionId === sessionId);
-		return match?.label ?? `Session ${sessionId.slice(0, 8)}`;
-	}, [sessionId]);
-
 
 	// Where to load the volumes from. Per the maintainer's rule, dataset cases load
 	// from the lab's LOCAL endpoints (served off disk on the JHU server — much faster
@@ -1279,6 +1269,31 @@ function VisualizationPage() {
 	// The active drawing tool for the pane handlers below — whichever one is
 	// actually armed right now (they're mutually exclusive via `enabled`).
 	const activeDrawTool = activeToolbarTool === "scissors" ? scissors : lasso;
+
+	// Single entry point for both the toolbar's Undo button and the ⌘Z/Ctrl+Z
+	// shortcut. Scissors/lasso place polygon points one click at a time
+	// (usePolygonDraw's local `points` state) BEFORE anything is committed
+	// to the shared mask-edit undo stack — that commit only happens once the
+	// shape is closed. Previously Undo always called the global
+	// `undoMaskEdit()` directly, with no awareness of an in-progress draw:
+	// pressing it while a point was down undid the last COMMITTED mask edit
+	// (e.g. a brush stroke) while doing nothing to the pending point, but
+	// since the point then got silently cleared by the mask refresh that
+	// undo triggers, one press looked like it undid two things at once —
+	// the pending point AND the previous brush stroke. Now: if there's a
+	// pending, uncommitted point, undo removes just that one point first
+	// (activeDrawTool.undo(), from usePolygonDraw); only once there are no
+	// pending points left does it fall through to the normal undoMaskEdit()
+	// for the last committed edit. Redo has no equivalent concept for an
+	// in-progress draw, so it's untouched.
+	const handleUndo = useCallback(() => {
+		if (activeDrawTool.anchorsCanvas.length > 0) {
+			activeDrawTool.undo();
+			return;
+		}
+		undoMaskEdit();
+	}, [activeDrawTool]);
+
 	// Progressive resolution: after the fast low-res load, the full-res CT streams in
 	// the background and hot-swaps in place (no reload). idle → streaming → done/failed.
 	const [enhance, setEnhance] = useState<{ state: "idle" | "streaming" | "done" | "failed"; pct: number | null }>({ state: "idle", pct: null });
@@ -1297,6 +1312,11 @@ function VisualizationPage() {
 		res: isHd || enhance.state === "done" ? "full" : "low",
 		onLog: (detail) => sessionRef.current?.log("edit", detail, 2000),
 		onBusyChange: setPromptToolBusy,
+		// Single-shot tool, not equip-and-use like paint/erase — deselect
+		// (icon loses its active/white-background state) once a click
+		// actually produced a mask, instead of staying armed for repeated
+		// clicks the way the brush does.
+		onComplete: () => setActiveToolbarTool(null),
 	});
 	const boxSegment = useInteractivePromptTool({
 		enabled: activeToolbarTool === "boxSegment" && !promptToolBusy,
@@ -1307,6 +1327,7 @@ function VisualizationPage() {
 		res: isHd || enhance.state === "done" ? "full" : "low",
 		onLog: (detail) => sessionRef.current?.log("edit", detail, 2000),
 		onBusyChange: setPromptToolBusy,
+		onComplete: () => setActiveToolbarTool(null),
 	});
 
 	const enhanceStartedRef = useRef(false);
@@ -1351,7 +1372,7 @@ function VisualizationPage() {
 	}, [showOnlyTargetMask, isolationTargetKey]);
 	// 3D pane rendering mode: organ meshes (dataset cases) or shaded GPU volume
 	// rendering of the CT itself (the only 3D option for local DICOM).
-	const [threeDMode, setThreeDMode] = useState<"mesh" | "volume">("volume");
+	const [threeDMode, setThreeDMode] = useState<"mesh" | "volume">(isLocal ? "volume" : "mesh");
 	const [volumePreset, setVolumePreset] = useState<string>(VOLUME_3D_PRESETS[0].name);
 	// CT presets by default; swapped for the MR set when a local DICOM turns out to be MR.
 	const [volume3DPresets, setVolume3DPresets] = useState<readonly { name: string; label: string }[]>(VOLUME_3D_PRESETS);
@@ -1419,25 +1440,36 @@ function VisualizationPage() {
 		if (editMode === "brush" || editMode === "eraser") {
 			setActiveMeasurementTool(null);
 			setActiveMaskEditTool(editMode === "brush" ? EDIT_BRUSH : EDIT_ERASER);
-		} else if (editMode === "smartfill") {
-			// Smart fill owns the mouse itself (scribbling) — no Cornerstone tool needed.
+		} else if (editMode === "smartfill" || activeToolbarTool === "pointSegment" || activeToolbarTool === "boxSegment") {
+			// Smart fill (scribbling) and point/box segment (click / click-drag
+			// prompts) all own the mouse themselves — no Cornerstone tool
+			// needed. This must be a full releasePrimaryMouseTools(), not just
+			// crosshair-off: box-segment specifically is a mousedown→drag→
+			// mouseup gesture, and with the crosshair merely toggled off but
+			// no tool explicitly released, Cornerstone still had SOME tool
+			// bound to primary-button-drag (pan/window-level, whatever the
+			// viewport's underlying default is) — so dragging out a box
+			// simultaneously panned/adjusted the underlying CT view instead of
+			// just drawing the box overlay. Point segment is a plain click
+			// with no drag, so the same bug wasn't visible there, but it's
+			// released here too for consistency (and so a slight click-drift
+			// during the click can't be misread as a pan/W-L nudge either).
 			setActiveMeasurementTool(null);
 			setActiveMaskEditTool(null);
 			releasePrimaryMouseTools();
 		} else if (editMode === "lasso" || activeToolbarTool === "levelTracing") {
-			// Scissors/lasso (editMode "lasso") and level tracing (its own hook,
-			// keyed off activeToolbarTool rather than editMode) all place their
-			// points via plain clicks on the pane, same as smart fill's
-			// scribbling — so the crosshair tool needs to be OFF here too, not
-			// just left to whatever `crosshairToolActive` (the user's saved
-			// navigation preference) happens to be. Previously this fell
-			// through to the plain `else` below, which re-enabled Crosshairs
-			// whenever `crosshairToolActive` was true (the default) — so the
-			// crosshair stayed live and interactive under the polygon/trace
-			// clicks even though the toolbar's own crosshair button visually
-			// showed itself as deselected (its active-state check already
-			// excludes any editMode) — nothing in the UI hinted navigation was
-			// still armed underneath.
+			// Scissors/lasso (editMode "lasso") and level tracing place their
+			// points via plain clicks on the pane — so the crosshair tool
+			// needs to be OFF here too, not just left to whatever
+			// `crosshairToolActive` (the user's saved navigation preference)
+			// happens to be. Previously this fell through to the plain `else`
+			// below, which re-enabled Crosshairs whenever `crosshairToolActive`
+			// was true (the default) — so the crosshair stayed live and
+			// interactive underneath the polygon/trace clicks even though the
+			// toolbar's own crosshair button visually showed itself as
+			// deselected (its active-state check already excludes any
+			// editMode) — nothing in the UI hinted navigation was still armed
+			// underneath.
 			setActiveMeasurementTool(null);
 			setActiveMaskEditTool(null);
 			toggleCrosshairTool(false);
@@ -1676,6 +1708,7 @@ function VisualizationPage() {
 		sliceInfoRef,
 		editMode,
 		setZoomLevel,
+		onUndo: handleUndo,
 	});
 	// Live-adjust the frame rate: if a clip is already running, restart it immediately at
 	// the new speed rather than waiting for the next stop/start.
@@ -1780,13 +1813,6 @@ function VisualizationPage() {
 
 	useEffect(() => {
 		if (loading || threeDMode !== "volume" || !renderingEngine) return;
-		// Don't contend with the HD CT stream swap-in (runEnhance, below) for
-		// GPU/main-thread time — building the shaded 3D volume texture while
-		// upgradeCtVolume is mid-stream is two heavy GPU uploads at once, which
-		// was freezing the page for several seconds. Wait for the stream to
-		// settle; for local files it never starts (state stays "idle"), so this
-		// never blocks them.
-		if (enhance.state === "streaming") return;
 		const element = volume3DRef.current;
 		if (!element) return;
 		let disposed = false;
@@ -1802,7 +1828,7 @@ function VisualizationPage() {
 		// volumePreset intentionally omitted — preset changes are applied in place below,
 		// without tearing the viewport down.
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [threeDMode, loading, renderingEngine, enhance.state]);
+	}, [threeDMode, loading, renderingEngine]);
 
 	useEffect(() => {
 		if (threeDMode === "volume") applyVolume3DPreset(volumePreset);
@@ -2530,6 +2556,25 @@ function VisualizationPage() {
 		}
 	};
 
+	// Every OTHER main-toolbar icon (crosshair, measure, view, cine, layout,
+	// window preset, adjust, download, HD) needs to close the annotation
+	// toolbar/SegmentsPopup the same way pressing Annotate again does —
+	// previously only the Annotate button itself (and a couple of the
+	// right-side panel togglers like Stats/Metadata/Measurements) ran this
+	// teardown, so clicking e.g. Crosshair or Measure while annotating left
+	// the horizontal toolbar and the class popup visibly open even though
+	// navigation/measurement mode had taken over underneath them. Mirrors
+	// the closing branch of handleToggleAnnotationToolbar exactly, just
+	// gated on "was it open" instead of always toggling.
+	const closeAnnotationToolbarIfOpen = () => {
+		if (!showAnnotationToolbar) return;
+		setShowAnnotationToolbar(false);
+		setActiveCatalogOrganId(null);
+		setActiveSegmentState(null);
+		setEditMode(null);
+		setActiveToolbarTool(null);
+	};
+
 	const handleToggleStats = () => {
 		// The right-side slot is shared by stats / metadata / measurements / mask editing.
 		setShowMetadata(false);
@@ -2788,21 +2833,6 @@ const aiAvailableOrgans = useMemo(() => {
 				<div
 					className="vp-topbar"
 					ref={topbarRef}
-					onClick={(e) => {
-						// Clicking any OTHER control in the main toolbar while the
-						// annotation ribbon is open closes it — same as clicking the
-						// pencil again. The pencil button is excluded here since its
-						// own onClick already toggles the state; without the
-						// exclusion this bubbling handler would immediately flip it
-						// back off right after turning it on.
-						if (
-							showAnnotationToolbar &&
-							!annotatePencilRef.current?.contains(e.target as Node) &&
-							!undoRedoGroupRef.current?.contains(e.target as Node)
-						) {
-							setShowAnnotationToolbar(false);
-						}
-					}}
 				>
 					{/* Gear (hides the bar) + home, in-flow so there's no dead corner space */}
 					<button
@@ -2827,9 +2857,7 @@ const aiAvailableOrgans = useMemo(() => {
 					{/* Case / session identity */}
 					<div className="vp-tb-id">
 						<span className="vp-tb-id__eyebrow">{sessionId ? "Session" : "Case"}</span>
-						<span className="vp-tb-id__val" title={sessionId ? `Session ID: ${sessionId}` : undefined}>
-    						{sessionId ? sessionDisplayLabel : caseId}
-						</span>					
+						<span className="vp-tb-id__val">{caseId}</span>
 					</div>
 
 					<span className="vp-tb-divider" />
@@ -3039,7 +3067,7 @@ const aiAvailableOrgans = useMemo(() => {
 										    dropdowns (same portal-flyout pattern as Measure/Cine originally used)
 										    so the bar reads as ~9 clusters instead of ~20 individual icons. */}
 										<button
-												className={`vp-tool ${crosshairToolActive && !activeMeasureTool && !editMode ? "vp-tool--active" : ""}`}
+												className={`vp-tool ${crosshairToolActive && !activeMeasureTool && !editMode && activeToolbarTool !== "pointSegment" && activeToolbarTool !== "boxSegment" ? "vp-tool--active" : ""}`}
 												onClick={() => {
 													setEditMode(null);
 													setActiveMeasureTool(null);
@@ -3047,7 +3075,7 @@ const aiAvailableOrgans = useMemo(() => {
 												}}
 												aria-label="Crosshair mode"
 											>
-												<IconPointer size={20} color={crosshairToolActive && !activeMeasureTool && !editMode ? "#08090b" : "white"} />
+												<IconPointer size={20} color={crosshairToolActive && !activeMeasureTool && !editMode && activeToolbarTool !== "pointSegment" && activeToolbarTool !== "boxSegment" ? "#08090b" : "white"} />
 												<span className="vp-tool__tip">Crosshair</span>
 											</button>
 
@@ -3246,7 +3274,7 @@ const aiAvailableOrgans = useMemo(() => {
 											<div ref={undoRedoGroupRef} style={{ display: "contents" }}>
 												<button
 													className="vp-tool"
-													onClick={() => undoMaskEdit()}
+													onClick={handleUndo}
 													aria-label="Undo"
 												>
 													<IconArrowBackUp size={20} color="white" />
@@ -3458,7 +3486,7 @@ const aiAvailableOrgans = useMemo(() => {
 											{!isLocal && (
 												<button
 													className="vp-tool"
-													onClick={handleDownloadClick}
+													onClick={() => { closeAnnotationToolbarIfOpen(); handleDownloadClick(); }}
 													aria-label="Download segmentations"
 												>
 													<IconDownload size={20} color="white" />
@@ -3482,6 +3510,7 @@ const aiAvailableOrgans = useMemo(() => {
 												<button
 													className={`vp-tool ${isHd || enhance.state === "done" ? "vp-tool--active" : ""} ${enhance.state === "streaming" ? "vp-tool--busy" : ""}`}
 													onClick={() => {
+														closeAnnotationToolbarIfOpen();
 														// Full-res streams in automatically and swaps in place; the button
 														// is the status + manual trigger, with reload as the failure path.
 														if (isHd) toggleHd();
@@ -3613,7 +3642,8 @@ const aiAvailableOrgans = useMemo(() => {
 					<div
 						className="vp-pane-wrap"
 						style={{ ...panelStyle("axial"), ...paneGridStyle("axial") }}
-						onMouseUp={(e) => { smartFill.handleMouseUp(); boxSegment.handleMouseUp("axial")(e); }}>						<div
+						onMouseUp={(e) => { smartFill.handleMouseUp(); boxSegment.handleMouseUp("axial")(e); }}>
+						<div
 							className={`axial ${loading ? "" : "vp-pane vp-pane--axial"}${hoverIdentifyEnabled ? " vp-pane--hover-identify" : ""}${editMode === "smartfill" || morphPicker.picking ? " vp-pane--edit-cursor" : ""}`}
 							data-label="Axial"
 							ref={axial_ref}
@@ -3646,7 +3676,7 @@ const aiAvailableOrgans = useMemo(() => {
 								{smartFill.preview.axial.fg
 									.filter((p) => p.slice === (sliceInfo.axial?.current ?? -1))
 									.map((p, i) => (
-										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#E76F51" stroke="#08090b" strokeWidth={1.5} />
+										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#68ACE5" stroke="#08090b" strokeWidth={1.5} />
 									))}
 								{smartFill.preview.axial.bg
 									.filter((p) => p.slice === (sliceInfo.axial?.current ?? -1))
@@ -3729,7 +3759,7 @@ const aiAvailableOrgans = useMemo(() => {
 								{smartFill.preview.sagittal.fg
 									.filter((p) => p.slice === (sliceInfo.sagittal?.current ?? -1))
 									.map((p, i) => (
-										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#E76F51" stroke="#08090b" strokeWidth={1.5} />
+										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#68ACE5" stroke="#08090b" strokeWidth={1.5} />
 									))}
 								{smartFill.preview.sagittal.bg
 									.filter((p) => p.slice === (sliceInfo.sagittal?.current ?? -1))
@@ -3815,7 +3845,7 @@ const aiAvailableOrgans = useMemo(() => {
 								{smartFill.preview.coronal.fg
 									.filter((p) => p.slice === (sliceInfo.coronal?.current ?? -1))
 									.map((p, i) => (
-										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#E76F51" stroke="#08090b" strokeWidth={1.5} />
+										<circle key={`fg${i}`} cx={p.pos[0]} cy={p.pos[1]} r={5} fill="#68ACE5" stroke="#08090b" strokeWidth={1.5} />
 									))}
 								{smartFill.preview.coronal.bg
 									.filter((p) => p.slice === (sliceInfo.coronal?.current ?? -1))
@@ -4177,7 +4207,7 @@ const aiAvailableOrgans = useMemo(() => {
 				onMaskingAreaChange={setMaskingArea}
 				hasAnySegments={hasAnySegments}
 				scopeLocked={false}
-				isRendering={isEditRendering}
+				isRendering={isEditRendering || promptToolBusy}
 				isDeletingSegment={isDeletingSegment}
 				targetKey={activeCatalogOrganId ?? activeSegment}
 				showOnlyTargetMask={showOnlyTargetMask}
@@ -4188,6 +4218,32 @@ const aiAvailableOrgans = useMemo(() => {
 				sliceJumpRef={sliceJumpWrapRef}
 				anchorRef={annotatePencilRef}
 			/>
+			{/* Point/box-segment SUCCESS/ERROR overlay only — the "applying"
+			    state is now shown via the toolbar's own pulsing dot (isRendering
+			    below), same spot as Copy-Across-Slices/Grow-From-Seeds/etc, so
+			    it doesn't need its own separate indicator here too. This one is
+			    just the result, and reuses the exact same centered
+			    GuidedStepModal (blurred backdrop + "Got it") that Copy across
+			    slices/Fill between slices use for their own success step,
+			    rather than a small bottom-of-screen pill — consistent with
+			    every other guided-flow tool's confirmation. Rendered once
+			    globally (not per-pane, since a point-prompt submit doesn't
+			    stay anchored to one pane the way a box-drag does). */}
+			{(pointSegment.status === "success" || pointSegment.status === "error" ||
+			  boxSegment.status === "success" || boxSegment.status === "error") && (() => {
+				const active =
+					pointSegment.status === "success" || pointSegment.status === "error"
+						? pointSegment
+						: boxSegment;
+				return (
+					<GuidedStepModal
+						title={active.status === "success" ? "Success" : "No change"}
+						instruction={active.statusMessage ?? ""}
+						primaryLabel="Got it"
+						onPrimary={active.dismissStatus}
+					/>
+				);
+			})()}
 			<SegmentsPopup
 				open={showAnnotationToolbar}
 				segments={customOrgans}