diff --git a/frontend/src/lib/components/ContextHeader.svelte b/frontend/src/lib/components/ContextHeader.svelte
index dfaf69f..8e1470b 100644
--- a/frontend/src/lib/components/ContextHeader.svelte
+++ b/frontend/src/lib/components/ContextHeader.svelte
@@ -300,7 +300,7 @@
 					title="Bytt kontekst"
 				>
 					<span class="context-selector-title">
-						{isPersonalWorkspace ? 'Min arbeidsflate' : (collectionNode?.title || 'Arbeidsflate')}
+						{isPersonalWorkspace ? 'Hjem' : (collectionNode?.title || 'Arbeidsflate')}
 					</span>
 					<span class="context-selector-chevron" class:open={selectorOpen}>&#9662;</span>
 				</button>
@@ -318,14 +318,14 @@
 							/>
 						</div>
 						<div class="context-selector-list">
-							<!-- Min arbeidsflate (alltid øverst når ikke søker) -->
+							<!-- Hjem (alltid øverst når ikke søker) -->
 							{#if !searchQuery.trim()}
 								<button
 									class="context-selector-item"
 									class:current={isPersonalWorkspace}
 									onclick={() => { selectorOpen = false; goto('/'); }}
 								>
-									<span class="context-selector-item-title">Min arbeidsflate</span>
+									<span class="context-selector-item-title">Hjem</span>
 									{#if isPersonalWorkspace}
 										<span class="context-selector-item-check">&#10003;</span>
 									{/if}
@@ -345,8 +345,8 @@
 												{/if}
 											</p>
 											<div class="delete-confirm-actions">
-												<button class="delete-confirm-btn delete-confirm-cancel" onclick={() => { deletingId = undefined; }}>Avbryt</button>
-												<button class="delete-confirm-btn delete-confirm-yes" onclick={confirmDelete}>Slett</button>
+												<button class="delete-confirm-btn delete-confirm-cancel" onclick={(e) => { e.stopPropagation(); deletingId = undefined; }}>Avbryt</button>
+												<button class="delete-confirm-btn delete-confirm-yes" onclick={(e) => { e.stopPropagation(); confirmDelete(); }}>Slett</button>
 											</div>
 										</div>
 									{:else}
@@ -422,8 +422,18 @@
 			</div>
 		</div>
 
-		<!-- Right: Tool menu + traits + status + settings -->
+		<!-- Right: Tool menu + status + settings -->
 		<div class="context-header-right">
+			{#if traitNames.length > 0 && onToggleTraitAdmin}
+				<button
+					onclick={onToggleTraitAdmin}
+					class="context-btn {showTraitAdmin ? 'context-btn-active' : ''}"
+					title="Administrer egenskaper"
+				>
+					Egenskaper
+				</button>
+			{/if}
+
 			<div class="tool-menu">
 				<button
 					class="context-btn tool-menu-trigger"
@@ -455,16 +465,6 @@
 				{/if}
 			</div>
 
-			{#if traitNames.length > 0 && onToggleTraitAdmin}
-				<button
-					onclick={onToggleTraitAdmin}
-					class="context-btn {showTraitAdmin ? 'context-btn-active' : ''}"
-					title="Administrer traits"
-				>
-					Traits
-				</button>
-			{/if}
-
 			{#if connected}
 				<span class="context-status context-status-ok" title="Tilkoblet sanntid">&#9679;</span>
 			{:else}