diff --git a/CHANGELOG.md b/CHANGELOG.md
index 594e3954..f4de5c6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ IMPORTANT NOTE: This version only works on CACTI 1.x++!
 
 --- develop ---
 
+* Fix editor placement reset, destructive action controls and theme contrast
 * Reduce gallery preview cards by 20% while preserving generated thumbnail resolution
 * Add a searchable node icon picker and bundled enterprise site icons
 
diff --git a/css/editor.css b/css/editor.css
index c850da35..163688f0 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -26,9 +26,12 @@ input {
 	margin-right: auto;
 	border: 0px;
 	padding: 0px;
-	cursor: crosshair;
+	cursor: auto;
 }
 
+#xycapture, #existingdata.wm-placement-mode, .mapData.wm-placement-mode map area { cursor: crosshair; }
+.mapData:not(.wm-placement-mode) map area { cursor: pointer; }
+
 #frmMain {
 	position: relative;
 	top: 0;
@@ -86,6 +89,12 @@ input {
 	padding: 2px;
 }
 
+#tb_help {
+	font-size: 13px;
+	font-weight: normal;
+	font-style: italic;
+}
+
 #toolbar ul li {
 	//display:table;
 }
@@ -316,6 +325,26 @@ body#mainView #wm-node-delete-bar { min-height: 32px; }
 .ui-dialog.wm-editor-dialog {
 	overflow: visible;
 }
+/* Use Cacti's own theme heading colours in every grouped editor dialog. */
+.dlgProperties .wm-editor-section { display: table; width: 100%; box-sizing: border-box; margin: 10px 0 6px; }
+.dlgProperties table .wm-editor-section { margin: 0; }
+/* Destructive node/link controls share readable red styling in every theme. */
+#node_delete, #link_delete, #note_delete,
+.wm-delete-action, .wm-delete-action .ui-menu-item-wrapper {
+ color: #c62828 !important;
+ background: #fff !important;
+}
+#node_delete, #link_delete, #note_delete, button.wm-delete-action {
+ border: 1px solid #c62828 !important;
+}
+
+/* Standalone dialogs need a matching text/surface pair in legacy dark themes. */
+body#mainView .ui-dialog .ui-button:not(.wm-asset-delete):not(.wm-image-delete):not(#note_delete):not(.wm-delete-action):not(#node_delete):not(#link_delete):not(.wm-icon-choice):not(.wm-note-colour),
+body#mainView .ui-dialog input.ui-state-default,
+body#mainView .ui-dialog textarea.ui-state-default {
+ background: var(--background-content, #e6e6e6) !important;
+ color: var(--text-color-lighter, #333) !important;
+}
 
 /* Searchable node icon gallery; keep backgrounds on their existing selector. */
 body#mainView .wm-icon-source { display: none; }
diff --git a/js/editor.js b/js/editor.js
index c15fbcef..4ee8f470 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -379,6 +379,7 @@ $(function() {
 function initJS() {
 	// if the xycapture element is there, then we are in the main edit screen
 	if ($('#xycapture').length) {
+		if ($('#tb_help').data('idle-help') === undefined) $('#tb_help').data('idle-help', $('#tb_help').text());
 		attach_click_events();
 		attach_help_events();
 		//show_context_help('node_label', 'node_help');
@@ -391,7 +392,7 @@ function initJS() {
 
 	$('#frmMain').off('submit').on('submit', function(event) {
 		event.preventDefault();
-		form_submit();
+		form_submit(event);
 	});
 
 	/* Cacti core may have already converted this select to select2; don't
@@ -433,7 +434,7 @@ function initContextMenu() {
 		{title: txtMove, cmd: 'move', uiIcon: 'ui-icon-arrow-4'},
 		{title: txtClone, cmd: 'clone', uiIcon: 'ui-icon-copy'},
 		{title: txtEdit, cmd: 'edit', uiIcon: 'ui-icon-pencil'},
-		{title: txtDelete, cmd: 'delete', uiIcon: 'ui-icon-trash'},
+		{title: txtDelNode, cmd: 'delete', uiIcon: 'ui-icon-trash', addClass: 'wm-delete-action'},
 		{title: "----"},
 		{title: txtProperties, cmd: 'properties', uiIcon: 'ui-icon-gear'}
 	];
@@ -443,7 +444,7 @@ function initContextMenu() {
 		{title: txtTidy, cmd: 'tidy', uiIcon: 'ui-icon-arrow-4'},
 		{title: txtVia, cmd: 'via', uiIcon: 'ui-icon-copy'},
 		{title: txtEdit, cmd: 'edit', uiIcon: 'ui-icon-pencil'},
-		{title: txtDelete, cmd: 'delete', uiIcon: 'ui-icon-trash'},
+		{title: txtDelLink, cmd: 'delete', uiIcon: 'ui-icon-trash', addClass: 'wm-delete-action'},
 		{title: "----"},
 		{title: txtProperties, cmd: 'properties', uiIcon: 'ui-icon-gear'}
 	];
@@ -461,6 +462,10 @@ function initContextMenu() {
 		},
 		beforeOpen: function(event, ui) {
 			var target = ui.target[0].id;
+			if (target.startsWith('LINK') || target.startsWith('NODE')) {
+				if (['add_link', 'add_link2', 'add_node', 'place_note', 'move_node', 'via_link', 'place_legend', 'place_stamp'].indexOf($('#action').val()) !== -1) $('#action').val('');
+				mapmode('existing');
+			}
 
 			if (target.startsWith('LINK')) {
 				$(this).contextmenu('replaceMenu', linkMenu);
@@ -658,7 +663,7 @@ function click_execute(event, alt) {
 		if (objecttype == 'NODE' && $('#action').val() == 'add_link') {
 			$('#param').val(NodeIDs[objectid]);
 			$('#action').val('add_link2');
-			$('#tb_help').text('Click on the second node for the end of the link.');
+			$('#tb_help').addClass('wm-action-help').text('Click on the second node for the end of the link.');
 		} else if (objecttype == 'NODE' && $('#action').val() == 'add_link2') {
 			$('#param2').val(NodeIDs[objectid]);
 			form_submit();
@@ -667,7 +672,8 @@ function click_execute(event, alt) {
 			// reset back to standard state, and see if we can oblige them
 			//		alert('A bit confused');
 			$('#action').val('');
-			hide_all_dialogs()
+			hide_all_dialogs();
+			mapmode('existing');
 		}
 	}
 }
@@ -714,7 +720,15 @@ function new_file() {
 	self.location = '?action=newfile';
 }
 
+function wmResetActionHelp() {
+	$('#tb_help').removeClass('wm-action-help').text($('#tb_help').data('idle-help'));
+}
+
 function mapmode(m) {
+	var placing = m == 'xy' || ['add_link', 'add_link2'].indexOf($('#action').val()) !== -1;
+	$('#existingdata, .mapData').toggleClass('wm-placement-mode', placing);
+	$('#tb_help').toggleClass('wm-action-help', placing);
+	if (!placing) wmResetActionHelp();
 	if (m == 'xy') {
 		$('#debug').val('xy');
 		$('#xycapture').show();
@@ -738,7 +752,7 @@ function setCanvasSize(element) {
 }
 
 function add_node() {
-	$('#tb_help').text(addNodeHelp);
+	$('#tb_help').addClass('wm-action-help').text(addNodeHelp);
 	$('#action').val('add_node');
 
 	mapmode('xy');
@@ -757,14 +771,16 @@ function delete_node() {
 	}
 	$('.dlgConfirm').text(message + ' ' + delNodeKeepDevice);
 
-	mapmode('xy');
+	if (['add_link', 'add_link2', 'add_node', 'place_note', 'move_node', 'via_link', 'place_legend', 'place_stamp'].indexOf($('#action').val()) !== -1) $('#action').val('');
+	mapmode('existing');
 
 	$('.dlgConfirm').dialog({
+		close: function() { mapmode('existing'); },
 		resizable: false,
 		title: delNodeTitle,
 		height: 'auto',
 		width: 400,
-		modal: false,
+		modal: true,
 		buttons: [
 			{
 				text: txtCancel,
@@ -775,9 +791,11 @@ function delete_node() {
 			},
 			{
 				text: txtDelNode,
+				'class': 'wm-delete-action',
 				click: function() {
 					$(this).dialog('close');
 					hide_all_dialogs();
+					$('#param').val(name);
 					$('#action').val('delete_node');
 					form_submit();
 				}
@@ -807,7 +825,7 @@ function edit_link() {
 function move_node() {
 	hide_dialog('dlgNodeProperties');
 
-	$('#tb_help').text(moveNodeHelp);
+	$('#tb_help').addClass('wm-action-help').text(moveNodeHelp);
 	$('#action').val('move_node');
 
 	mapmode('xy');
@@ -816,14 +834,14 @@ function move_node() {
 function via_link() {
 	hide_dialog('dlgLinkProperties');
 
-	$('#tb_help').text(viaLinkHelp);
+	$('#tb_help').addClass('wm-action-help').text(viaLinkHelp);
 	$('#action').val('via_link');
 
 	mapmode('xy');
 }
 
 function add_link() {
-	$('#tb_help').text(addLinkHelp);
+	$('#tb_help').addClass('wm-action-help').text(addLinkHelp);
 	$('#action').val('add_link');
 
 	mapmode('existing');
@@ -841,9 +859,12 @@ function delete_link() {
 		});
 	$('.dlgConfirm').text(prompt + ' ' + wmEditorText.keepLinkNodes);
 
-	mapmode('xy');
+	if (['add_link', 'add_link2', 'add_node', 'place_note', 'move_node', 'via_link', 'place_legend', 'place_stamp'].indexOf($('#action').val()) !== -1) $('#action').val('');
+	$('#param').val($('#link_name').val());
+	mapmode('existing');
 
 	$('.dlgConfirm').dialog({
+		close: function() { mapmode('existing'); },
 		resizable: false,
 		title: delLinkTitle,
 		height: 'auto',
@@ -859,6 +880,7 @@ function delete_link() {
 			},
 			{
 				text: txtDelLink,
+				'class': 'wm-delete-action',
 				click: function() {
 					$(this).dialog('close');
 					hide_all_dialogs();
@@ -870,7 +892,30 @@ function delete_link() {
 	});
 }
 
-function form_submit() {
+function form_submit(event) {
+	// Property dialogs can remain open while a toolbar placement action is active.
+	// Their own Save buttons always dispatch the properties they are showing.
+	var button = event && event.currentTarget && event.currentTarget.id;
+	var sources = {
+		tb_node_submit: ['set_node_properties', '#node_name'],
+		tb_link_submit: ['set_link_properties', '#link_name'],
+		tb_map_submit: ['set_map_properties'],
+		tb_mapstyle_submit: ['set_map_style'],
+		tb_editorsettings_submit: ['editor_settings'],
+		tb_note_submit: ['set_note_properties', '#note_name'],
+		tb_textedit_submit: [$('#dlgTextEdit').data('wm-config-action')]
+	};
+	if (button === 'frmMain' || !button) {
+		var focused = $(button === 'frmMain' ? document.activeElement : event && event.currentTarget).closest('.ui-dialog-content').attr('id');
+		var dialogs = {dlgNodeProperties: 'tb_node_submit', dlgLinkProperties: 'tb_link_submit', dlgMapProperties: 'tb_map_submit', dlgMapStyle: 'tb_mapstyle_submit', dlgEditorSettings: 'tb_editorsettings_submit', dlgNoteProperties: 'tb_note_submit', dlgTextEdit: 'tb_textedit_submit'};
+		button = dialogs[focused];
+	}
+	if (sources[button] && sources[button][0]) {
+		$('#action').val(sources[button][0]);
+		if (sources[button][1]) $('#param').val($(sources[button][1]).val());
+		mapmode('existing');
+	}
+
 	var data = $('input, select, textarea').serialize();
 
 	$.ajax({
@@ -924,7 +969,7 @@ function map_style() {
 }
 
 function position_timestamp() {
-	$('#tb_help').text(timeStHelp);
+	$('#tb_help').addClass('wm-action-help').text(timeStHelp);
 	$('#action').val('place_stamp');
 
 	mapmode('xy');
@@ -960,7 +1005,7 @@ function position_legend(event) {
 }
 
 function real_position_legend(scalename) {
-	$('#tb_help').text(posLegendHelp);
+	$('#tb_help').addClass('wm-action-help').text(posLegendHelp);
 	$('#action').val('place_legend');
 	$('#param').val(scalename);
 
@@ -982,6 +1027,7 @@ function show_itemtext(itemtype,name) {
 		$('#action').val('set_link_config');
 	}
 
+	$('#dlgTextEdit').data('wm-config-action', $('#action').val());
 	show_dialog('dlgTextEdit');
 
 	$.ajax({
@@ -1197,6 +1243,8 @@ show_dialog('dlgLinkProperties');
 }
 
 function show_dialog(dlg) {
+	mapmode('existing');
+	wmResetActionHelp();
 	if (dlg == 'dlgMapProperties') {
 		var selectedNode = $('#map_bgfile').val();
 
diff --git a/lib/editor.actions.php b/lib/editor.actions.php
index bf976588..8117a40b 100644
--- a/lib/editor.actions.php
+++ b/lib/editor.actions.php
@@ -952,6 +952,9 @@ function editorSettings($mapfile) {
 	$use_overlay          = (isset_request_var('editorsettings_showvias') ? intval(get_nfilter_request_var('editorsettings_showvias')) : false);
 	$use_relative_overlay = (isset_request_var('editorsettings_showrelative') ? intval(get_nfilter_request_var('editorsettings_showrelative')) : false);
 	$grid_snap_value      = (isset_request_var('editorsettings_gridsnap') ? intval(get_nfilter_request_var('editorsettings_gridsnap')) : 0);
+
+	// This AJAX action exits before the entry page's cookie write.
+	cacti_cookie_set('wmeditor', ($use_overlay ? '1' : '0') . ':' . ($use_relative_overlay ? '1' : '0') . ':' . intval($grid_snap_value));
 }
 
 /**
diff --git a/lib/editor.inc.php b/lib/editor.inc.php
index ece87ac9..50d97c5a 100644
--- a/lib/editor.inc.php
+++ b/lib/editor.inc.php
@@ -1058,9 +1058,9 @@ function getEditorJs() {
 		'deleteLinkPrompt'     => __('Remove the link between %1$s and %2$s?', 'weathermap'),
 		'keepLinkNodes'        => __('The nodes and Cacti graphs will remain.', 'weathermap'),
 	], JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
-	var delNodePrompt = <?php print json_encode(__('Remove %s from this map?', '%s', 'weathermap'), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
+	var delNodePrompt = <?php print json_encode(__('Delete %s from this map?', '%s', 'weathermap'), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
 	var delNodeConnected = <?php print json_encode(__('Connected links to remove: %s.', '%s', 'weathermap'), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
-	var delNodeKeepDevice = <?php print json_encode(__('The Cacti device and graphs will remain.', 'weathermap'), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
+	var delNodeKeepDevice = <?php print json_encode(__('The Cacti device and its graphs will remain.', 'weathermap'), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT); ?>;
 
 	var delNodeWarning  = '<?php print __esc('WARNING: Pressing \'Delete Node\' will delete this Node.', 'weathermap'); ?>';
 	var delNodeTitle    = '<?php print __esc('Delete Node Confirmation', 'weathermap'); ?>';
@@ -1075,7 +1075,7 @@ function getEditorJs() {
 	var txtLinkActions = '<?php print __esc('Link Actions', 'weathermap'); ?>';
 	var txtMove        = '<?php print __esc('Move', 'weathermap'); ?>';
 	var txtClone       = '<?php print __esc('Clone', 'weathermap'); ?>';
-	var txtEdit        = '<?php print __esc('Edit', 'weathermap'); ?>';
+	var txtEdit        = '<?php print __esc('Edit Configuration', 'weathermap'); ?>';
 	var txtDelete      = '<?php print __esc('Delete', 'weathermap'); ?>';
 	var txtVia         = '<?php print __esc('Via', 'weathermap'); ?>';
 	var txtTidy        = '<?php print __esc('Tidy', 'weathermap'); ?>';
@@ -1108,7 +1108,7 @@ function getEditorJs() {
 		'link_default':       '<?php print __esc('This is where help appears for links', 'weathermap'); ?>',
 		'map_default':        '<?php print __esc('This is where help appears for maps', 'weathermap'); ?>',
 		'node_default':       '<?php print __esc('This is where help appears for nodes', 'weathermap'); ?>',
-		'tb_default':         '<?php print __esc('or click a Node or Link to edit it\'s properties', 'weathermap'); ?>'
+		'tb_default':         '<?php print __esc('or click a Node or Link to edit its properties', 'weathermap'); ?>'
 	};
 	</script>
 	<?php
diff --git a/locales/po/cacti.pot b/locales/po/cacti.pot
index daae9b2e..7c4a4756 100644
--- a/locales/po/cacti.pot
+++ b/locales/po/cacti.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cacti 1.7\n"
 "Report-Msgid-Bugs-To: developers@cacti.net\n"
-"POT-Creation-Date: 2026-10-12 01:30+1030\n"
+"POT-Creation-Date: 2026-10-12 12:29+1030\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cacti Developers <developers@cacti.net>\n"
 "Language-Team: Cacti Developers <developers@cacti.net>\n"
@@ -363,7 +363,7 @@ msgstr ""
 
 #: lib/editor.inc.php
 #, php-format
-msgid "Remove %s from this map?"
+msgid "Delete %s from this map?"
 msgstr ""
 
 #: lib/editor.inc.php
@@ -372,7 +372,7 @@ msgid "Connected links to remove: %s."
 msgstr ""
 
 #: lib/editor.inc.php
-msgid "The Cacti device and graphs will remain."
+msgid "The Cacti device and its graphs will remain."
 msgstr ""
 
 #: lib/editor.inc.php
@@ -420,9 +420,8 @@ msgstr ""
 msgid "Clone"
 msgstr ""
 
-#: lib/editor.inc.php weathermap-cacti-plugin-editor.php
-#: weathermap-cacti-plugin-mgmt.php
-msgid "Edit"
+#: lib/editor.inc.php
+msgid "Edit Configuration"
 msgstr ""
 
 #: lib/editor.inc.php weathermap-cacti-plugin-editor.php
@@ -523,7 +522,7 @@ msgid "This is where help appears for nodes"
 msgstr ""
 
 #: lib/editor.inc.php
-msgid "or click a Node or Link to edit it's properties"
+msgid "or click a Node or Link to edit its properties"
 msgstr ""
 
 #: setup.php
@@ -998,7 +997,7 @@ msgid "Position<br>---, ---"
 msgstr ""
 
 #: weathermap-cacti-plugin-editor.php
-msgid "Select a menu item or either right-click or click on a Node or Link to edit it's properties"
+msgid "Select a menu item or either right-click or click on a Node or Link to edit its properties"
 msgstr ""
 
 #: weathermap-cacti-plugin-editor.php
@@ -1081,6 +1080,10 @@ msgstr ""
 msgid "Graph Selector"
 msgstr ""
 
+#: weathermap-cacti-plugin-editor.php weathermap-cacti-plugin-mgmt.php
+msgid "Edit"
+msgstr ""
+
 #: weathermap-cacti-plugin-editor.php
 msgid "Save"
 msgstr ""
@@ -1317,6 +1320,26 @@ msgstr ""
 msgid "Link Hover Height (pixels)"
 msgstr ""
 
+#: weathermap-cacti-plugin-editor.php
+msgid "Edit Object Configuration"
+msgstr ""
+
+#: weathermap-cacti-plugin-editor.php
+msgid "Edit the raw configuration for this map object."
+msgstr ""
+
+#: weathermap-cacti-plugin-editor.php
+msgid "Advanced: changes are saved directly to the map configuration without syntax validation. Use Properties for the normal editing controls."
+msgstr ""
+
+#: weathermap-cacti-plugin-editor.php
+msgid "Overlays"
+msgstr ""
+
+#: weathermap-cacti-plugin-editor.php
+msgid "Placement"
+msgstr ""
+
 #: weathermap-cacti-plugin-mgmt.php
 msgid "Duplicate"
 msgstr ""
diff --git a/tests/Browser/EditorContextMenuTest.cjs b/tests/Browser/EditorContextMenuTest.cjs
new file mode 100644
index 00000000..a770e7d5
--- /dev/null
+++ b/tests/Browser/EditorContextMenuTest.cjs
@@ -0,0 +1,87 @@
+// Exercise real editor mode and confirmation callbacks with jQuery UI.
+const { JSDOM } = require('jsdom');
+const jquery = require('jquery');
+const fs = require('node:fs');
+const path = require('node:path');
+const assert = require('node:assert/strict');
+const dom = new JSDOM('<body><input id="action" name="action"><input id="param" name="param" value="dc"><input id="node_name" value="dc"><input id="link_name" value="uplink"><div id="tb_help"></div><div class="mainArea"><img id="existingdata"><img id="xycapture"></div><div class="mapData"><map><area id="NODE:1:0"></map></div></body>', {runScripts:'outside-only',pretendToBeVisual:true});
+const w = dom.window;
+const $ = jquery(w);
+w.$ = w.jQuery = $;
+w.eval(fs.readFileSync(path.join(process.env.CACTI_JS_DIR, 'jquery-ui.js'),'utf8'));
+$('head').append($('<style>').text(fs.readFileSync(path.join(__dirname,'../../css/editor.css'),'utf8')));
+const src=fs.readFileSync(path.join(__dirname,'../../js/editor.js'),'utf8');
+w.eval(src.slice(src.indexOf('function wmResetActionHelp('),src.indexOf('function add_node(')));
+w.eval(src.slice(src.indexOf('function delete_node('),src.indexOf('function clone_node(')));
+w.eval(src.slice(src.indexOf('function delete_link('),src.indexOf('function form_submit(')));
+Object.assign(w,{Links:{uplink:{a:'dc',b:'office'}},delNodePrompt:'Delete %s from this map?',delNodeConnected:'Connected links to remove: %s.',delNodeKeepDevice:'The Cacti device and its graphs will remain.',delNodeTitle:'Delete Node Confirmation',txtCancel:'Cancel',txtDelNode:'Delete Node',delLinkTitle:'Delete Link Confirmation',txtDelLink:'Delete Link',wmEditorText:{deleteLinkPrompt:'Remove %1$s to %2$s?',keepLinkNodes:'Nodes remain.'},wmNodeDisplayName:n=>n==='dc'?'Datacentre':n});
+$('#action').val('move_node');w.mapmode('xy');
+assert.ok($('#existingdata').hasClass('wm-placement-mode'));
+assert.equal($('area').css('cursor'),'crosshair');
+$('#action').val('');w.mapmode('existing');
+assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));
+assert.equal($('area').css('cursor'),'pointer');
+$('#action').val('add_link');w.mapmode('existing');
+assert.ok($('#existingdata').hasClass('wm-placement-mode'));
+$('#action').val('');
+w.delete_node();
+assert.equal($('#existingdata').css('display')==='none',false);
+assert.equal($('.dlgConfirm').dialog('option','modal'),true);
+assert.equal($('#xycapture').css('display'),'none');
+assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));
+assert.match($('.dlgConfirm').text(),/Connected links to remove: 1\./);
+assert.equal($('.dlgConfirm').dialog('widget').find('button.wm-delete-action').text(),'Delete Node');
+// Title-bar X and Escape both run jQuery UI's close callback.
+$('.dlgConfirm').dialog('close');
+assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));
+w.delete_node();
+assert.match($('.dlgConfirm').text(),/Connected links to remove: 1/);
+let submitted;
+w.hide_all_dialogs=()=>$('#action').val('');
+w.form_submit=()=>{submitted=$('input').serializeArray();};
+$('#param').val('other_node');
+$('.dlgConfirm').dialog('option','buttons')[1].click.call($('.dlgConfirm')[0]);
+assert.equal(submitted.find(x=>x.name==='action').value,'delete_node');
+assert.equal(submitted.find(x=>x.name==='param').value,'dc');
+assert.equal($('#action').val(),'delete_node');
+assert.equal($('#param').val(),'dc');
+w.delete_link();
+assert.equal($('.dlgConfirm').dialog('widget').find('button.wm-delete-action').text(),'Delete Link');
+assert.equal($('#xycapture').css('display'),'none');
+$('.dlgConfirm').dialog('close');
+assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));
+let contextOptions;
+$.fn.contextmenu=function(options){contextOptions=options;return this;};
+for(const key of ['txtNodeActions','txtMove','txtClone','txtEdit','txtDelete','txtProperties','txtLinkActions','txtTidy','txtVia'])w[key]=key;
+w.eval(src.slice(src.indexOf('function initContextMenu('),src.indexOf('function contextAction(')));
+w.initContextMenu();
+const beforeOpen = contextOptions.beforeOpen;
+$('#action').val('add_link');w.mapmode('existing');
+beforeOpen.call($('map')[0],{}, {target:$('#NODE\\:1\\:0')});
+assert.equal($('#action').val(),'');
+assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));
+for (const action of ['set_node_properties','set_link_properties']) {
+ $('#action').val(action);
+ beforeOpen.call($('map')[0],{}, {target:$('#NODE\\:1\\:0')});
+ assert.equal($('#action').val(),action);
+}
+w.eval(src.slice(src.indexOf('function click_execute('),src.indexOf('function show_context_help(')));
+$('#action').val('add_link');w.mapmode('existing');assert.ok($('#existingdata').hasClass('wm-placement-mode'));
+w.click_execute({},'LINK:1:0');assert.equal($('#action').val(),'');assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));assert.equal($('area').css('cursor'),'pointer');
+w.eval(src.slice(src.indexOf('function form_submit('),src.indexOf('function map_properties(')));
+$('body').append('<div id="dlgNodeProperties"></div><div id="dlgLinkProperties"></div>');
+let saveRequest;$.ajax=opts=>saveRequest=opts;w.editor_url='/editor';
+for (const kind of ['node','link']) for (const exit of ['cancel','close']) {
+ const dialog=$('#dlg'+(kind==='node'?'Node':'Link')+'Properties');dialog.dialog({modal:false});
+ $('#action').val('add_link2');$('#param').val('first-endpoint');w.mapmode('existing');
+ if(kind==='node')w.delete_node();else w.delete_link();
+ if(exit==='cancel')$('.dlgConfirm').dialog('option','buttons')[0].click.call($('.dlgConfirm')[0]);else $('.dlgConfirm').dialog('close');
+ assert.ok(dialog.dialog('isOpen'));
+ w.form_submit({currentTarget:{id:kind==='node'?'tb_node_submit':'tb_link_submit'}});
+ const submitted=new URLSearchParams(saveRequest.data);
+ assert.equal(submitted.get('action'),kind==='node'?'set_node_properties':'set_link_properties');
+ assert.equal(submitted.get('param'),$(kind==='node'?'#node_name':'#link_name').val());
+ assert.ok(!$('#existingdata').hasClass('wm-placement-mode'));dialog.dialog('close');
+}
+dom.window.close();
+console.log('PASS: context menu cancels placement; node/link confirmations and closing restore normal map mode');
diff --git a/tests/Browser/EditorPickerLayeringTest.cjs b/tests/Browser/EditorPickerLayeringTest.cjs
index d79ee40d..d8ec38c3 100644
--- a/tests/Browser/EditorPickerLayeringTest.cjs
+++ b/tests/Browser/EditorPickerLayeringTest.cjs
@@ -11,6 +11,7 @@ w.$ = w.jQuery = $;
 const cactiJs = process.env.CACTI_JS_DIR || path.join(__dirname, '../../../../include/js');
 w.eval(fs.readFileSync(path.join(cactiJs, 'jquery-ui.js'), 'utf8'));
 const source = fs.readFileSync(path.join(__dirname, '../../js/editor.js'), 'utf8');
+w.eval(source.slice(source.indexOf('function wmResetActionHelp('), source.indexOf('function add_node(')));
 w.eval(source.slice(source.indexOf('function show_dialog('), source.indexOf('function hide_dialog(')));
 $('#picker').autocomplete({source: ['Interface A'], appendTo: w.document.body});
 const menu = $('#picker').autocomplete('widget');
diff --git a/tests/Browser/EditorPropertySubmitTest.cjs b/tests/Browser/EditorPropertySubmitTest.cjs
new file mode 100644
index 00000000..a82d83ee
--- /dev/null
+++ b/tests/Browser/EditorPropertySubmitTest.cjs
@@ -0,0 +1,17 @@
+const {JSDOM}=require('jsdom'),jquery=require('jquery'),fs=require('node:fs'),path=require('node:path'),assert=require('node:assert/strict');
+const ids=['dlgNodeProperties','dlgLinkProperties','dlgMapProperties','dlgMapStyle'];
+const dom=new JSDOM('<form id="frmMain"><input id="action" name="action"><input id="param" name="param"><input id="node_name" name="node_name" value="A"><input id="link_name" name="link_name" value="AB"><input id="map_background_colour" name="map_background_colour">'+ids.map(id=>`<div id="${id}" class="ui-dialog-content"><input class="focus-field"></div>`).join('')+'</form><div id="wm-map-background-colour"><input class="wm-colour-value" value="#ffffff"></div>',{runScripts:'outside-only'});
+const w=dom.window,$=jquery(w);w.$=w.jQuery=$;Object.assign(w,{editor_url:'/editor',wmEditorText:{},WMNotes:{},mapmode:()=>{}});let request;$.ajax=opts=>request=opts;
+const src=fs.readFileSync(path.join(__dirname,'../../js/editor.js'),'utf8');w.eval(src.slice(src.indexOf('function form_submit('),src.indexOf('function map_properties(')));
+for(const [button,action,param] of [['tb_node_submit','set_node_properties','A'],['tb_link_submit','set_link_properties','AB'],['tb_map_submit','set_map_properties'],['tb_mapstyle_submit','set_map_style']]) {
+ $('#action').val('place_stamp');w.form_submit({currentTarget:{id:button}});const data=new URLSearchParams(request.data);assert.equal(data.get('action'),action);if(param)assert.equal(data.get('param'),param);
+}
+const start=src.indexOf("$('#frmMain').off('submit')"),end=src.indexOf('\n\t});',start)+6;w.eval(src.slice(start,end));
+for(const [id,action] of ids.map((id,index)=>[id,['set_node_properties','set_link_properties','set_map_properties','set_map_style'][index]])) {
+ $('#'+id+' input')[0].focus();$('#action').val('place_legend');$('#frmMain').trigger('submit');assert.equal(new URLSearchParams(request.data).get('action'),action);
+}
+$('#action').val('move_node');w.form_submit();assert.equal(new URLSearchParams(request.data).get('action'),'move_node');
+for (const [id,action] of [['dlgEditorSettings','editor_settings'],['dlgNoteProperties','set_note_properties'],['dlgTextEdit','set_node_config']]) {
+ const dialog=$('<div>').attr('id',id).addClass('ui-dialog-content').appendTo('#frmMain');const button=$('<button>').appendTo(dialog);$('#dlgTextEdit').data('wm-config-action','set_node_config');$('#action').val('place_stamp');w.form_submit({currentTarget:button[0]});assert.equal(new URLSearchParams(request.data).get('action'),action);
+}
+dom.window.close();console.log('PASS: modeless dialog buttons and implicit form submission restore property actions');
diff --git a/tests/Browser/EditorWorkflowTest.cjs b/tests/Browser/EditorWorkflowTest.cjs
index d59a5667..75913807 100644
--- a/tests/Browser/EditorWorkflowTest.cjs
+++ b/tests/Browser/EditorWorkflowTest.cjs
@@ -309,6 +309,24 @@ for (const failOld of [false, true]) {
  assert.equal($('#link_target').val(), '/rrd/shared.rrd');
  assert.equal($('#link_infourl').val().includes('local_graph_id=20'), true);
 }
+// Real mode and delete handlers must cancel placement on every confirmation exit.
+$('body').append('<input id="param"><input id="action"><input id="debug"><input id="xycapture"><img id="existingdata" data-width="600" data-height="300"><div class="mapData"></div><span id="tb_help"></span>');
+$('#tb_help').data('idle-help','Idle help');
+w.setCanvasSize=()=>{};
+w.eval(editor.slice(editor.indexOf('function wmResetActionHelp()'),editor.indexOf('function setCanvasSize(')));
+for (const kind of ['node','link']) {
+ for (const exit of ['cancel','close']) for (const placement of ['add_link','add_link2']) {
+  $('#param').val('first-endpoint');$('#action').val(placement);w.mapmode('existing');$('#tb_help').text('Place link');
+  assert.equal($('#existingdata').hasClass('wm-placement-mode'),true);
+  if(kind==='node') w.delete_node();else w.delete_link();
+  if(kind==='link')assert.equal($('#param').val(),$('#link_name').val());
+  if(exit==='cancel')$('.dlgConfirm').dialog('option','buttons')[0].click.call($('.dlgConfirm')[0]);else $('.dlgConfirm').dialog('close');
+  assert.equal($('#action').val(),'');assert.equal($('#existingdata').hasClass('wm-placement-mode'),false);assert.equal($('#tb_help').text(),'Idle help');
+ }
+ $('#action').val(kind==='node'?'set_node_properties':'set_link_properties');
+ if(kind==='node')w.delete_node();else w.delete_link();
+ assert.equal($('#action').val(),kind==='node'?'set_node_properties':'set_link_properties');$('.dlgConfirm').dialog('close');
+}
 console.log(
 	'PASS: current interface, retained selection, explicit apply, advanced fields, action names, URL decoding and failed-request retry'
 );
diff --git a/tests/Unit/EditorJsStringsTest.php b/tests/Unit/EditorJsStringsTest.php
index c082e0f4..1eab12ed 100644
--- a/tests/Unit/EditorJsStringsTest.php
+++ b/tests/Unit/EditorJsStringsTest.php
@@ -39,7 +39,7 @@
 	expect($strings['nodeTitle'])->toBe('Node: %s');
 	expect($strings['hoverSummary'])->toBe('Hover graphs: %s');
 	expect($strings['graphSelected'])->toContain('%s');
-	expect($output)->toContain('Connected links to remove: %s.', 'Remove %s from this map?');
+	expect($output)->toContain('Connected links to remove: %s.', 'Delete %s from this map?');
 	expect($output)->toContain('currentInterface');
 	expect($output)->toContain('deleteLinkPrompt');
 });
diff --git a/tests/Unit/EditorSettingsCookieTest.php b/tests/Unit/EditorSettingsCookieTest.php
new file mode 100644
index 00000000..77298149
--- /dev/null
+++ b/tests/Unit/EditorSettingsCookieTest.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2004-2026 The Cacti Group, Howard Jones                   |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or           |
+ | modify it under the terms of the GNU General Public License             |
+ | as published by the Free Software Foundation; either version 2          |
+ | of the License, or (at your option) any later version.                  |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti: The Complete RRDtool-based Graphing Solution                     |
+ +-------------------------------------------------------------------------+
+ | This code is designed, written, and maintained by the Cacti Group. See  |
+ | about.php and/or the AUTHORS file for specific developer information.   |
+ +-------------------------------------------------------------------------+
+ | http://www.cacti.net/                                                   |
+ +-------------------------------------------------------------------------+
+*/
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\Attributes\PreserveGlobalState;
+use PHPUnit\Framework\TestCase;
+
+final class EditorSettingsCookieTest extends TestCase {
+	#[RunInSeparateProcess]
+	#[PreserveGlobalState(false)]
+	public function testSettingsActionPersistsCookieBeforeExit(): void {
+		require dirname(__DIR__) . '/bootstrap-unit.php';
+		function cacti_cookie_set($name, $value) { $GLOBALS['wm_test_cookies'][$name] = $value; }
+		$plugin = dirname(__DIR__, 2);
+		chdir($plugin);
+		require $plugin . '/setup.php';
+		require $plugin . '/lib/WeatherMap.class.php';
+		require $plugin . '/lib/editor.inc.php';
+		require $plugin . '/lib/editor.actions.php';
+		$file = tempnam(sys_get_temp_dir(), 'wmsettings');
+		file_put_contents($file, "WIDTH 100\nHEIGHT 100\n");
+		try {
+			foreach ([[1,1,10,'1:1:10'], [0,1,5,'0:1:5'], [0,0,'NO','0:0:0']] as [$via,$relative,$grid,$expected]) {
+				$GLOBALS['__test_nfilter_request'] = ['editorsettings_showvias'=>$via, 'editorsettings_showrelative'=>$relative, 'editorsettings_gridsnap'=>$grid];
+				$GLOBALS['__test_request'] = $GLOBALS['__test_nfilter_request'];
+				editorSettings($file);
+				self::assertSame($expected, $GLOBALS['wm_test_cookies']['wmeditor']);
+			}
+		} finally { unlink($file); }
+	}
+}
diff --git a/weathermap-cacti-plugin-editor.php b/weathermap-cacti-plugin-editor.php
index a3ee49bc..2e86436b 100644
--- a/weathermap-cacti-plugin-editor.php
+++ b/weathermap-cacti-plugin-editor.php
@@ -320,7 +320,7 @@
 			<li class='tb_active' id='tb_prefs'><?php print __('Editor<br>Settings', 'weathermap'); ?></li>
 			<li class='tb_coords' id='tb_coords'><?php print __('Position<br>---, ---', 'weathermap'); ?></li>
 			<li class='tb_help'>
-				<span id='tb_help'><?php print __('Select a menu item or either right-click or click on a Node or Link to edit it\'s properties', 'weathermap'); ?></span>
+				<span id='tb_help' role='status' aria-live='polite'><?php print __('Select a menu item or either right-click or click on a Node or Link to edit its properties', 'weathermap'); ?></span>
 			</li>
 		</ul>
 	</div>
@@ -700,7 +700,7 @@
 				<div class='dlgBody'>
 					<table class='cactiTable'>
 						<tr><td colspan='2'>
-						<div class='cactiTableTitleRow' style='display:table'><?php print __('Map Defaults', 'weathermap'); ?></div>
+						<div class='cactiTableTitleRow wm-editor-section'><?php print __('Map Defaults', 'weathermap'); ?></div>
 						</td></tr>
 						<tr>
 							<td><?php print __('HTML Style', 'weathermap'); ?></td>
@@ -736,7 +736,7 @@
 							<td><?php print get_fontlist($map, 'mapstyle_legendfont', $map->keyfont); ?></td>
 						</tr>
 						<tr><td colspan='2'>
-						<div class='cactiTableTitleRow' style='display:table'><?php print __('Node Defaults', 'weathermap'); ?></div>
+						<div class='cactiTableTitleRow wm-editor-section'><?php print __('Node Defaults', 'weathermap'); ?></div>
 						</td></tr>
 						<tr>
 							<td><?php print __('Node Font', 'weathermap'); ?></td>
@@ -745,7 +745,7 @@
 
 
 						<tr><td colspan='2'>
-						<div class='cactiTableTitleRow' style='display:table'><?php print __('Link Defaults', 'weathermap'); ?></div>
+						<div class='cactiTableTitleRow wm-editor-section'><?php print __('Link Defaults', 'weathermap'); ?></div>
 						</td></tr>
 						<tr>
 							<td><?php print __('Link Labels', 'weathermap'); ?></td>
@@ -778,25 +778,25 @@
 <summary style='cursor: pointer; padding: 8px 0;'><?php print __esc('Advanced settings', 'weathermap'); ?></summary>
 <p><?php print __esc('Hover dimensions use pixels. Set 0 for automatic sizing. Width limits the preview size; height is a legacy hint and may not change the displayed height. Graph URLs can specify their own image dimensions.', 'weathermap'); ?></p>
 <table style='width: 100%;'>
-<tr>
+						<tr>
 							<td><label for='mapstyle_nodewidth'><?php print __esc('Node Hover Width (pixels)', 'weathermap'); ?></label></td>
 							<td>
 								<input id='mapstyle_nodewidth' name='mapstyle_nodewidth' type='text' size='6' class='ui-state-default ui-corner-all' value='<?php print $map->nodes['DEFAULT']->overlibwidth; ?>'>
 							</td>
 						</tr>
-<tr>
+						<tr>
 							<td><label for='mapstyle_nodeheight'><?php print __esc('Node Hover Height (pixels)', 'weathermap'); ?></label></td>
 							<td>
 								<input id='mapstyle_nodeheight' name='mapstyle_nodeheight' type='text' size='6' class='ui-state-default ui-corner-all' value='<?php print $map->nodes['DEFAULT']->overlibheight; ?>'>
 							</td>
 						</tr>
-<tr>
+						<tr>
 							<td><label for='mapstyle_linkwidth'><?php print __esc('Link Hover Width (pixels)', 'weathermap'); ?></label></td>
 							<td>
 								<input id='mapstyle_linkwidth' name='mapstyle_linkwidth' type='text' size='6' class='ui-state-default ui-corner-all' value='<?php print $map->links['DEFAULT']->overlibwidth; ?>'>
 							</td>
 						</tr>
-<tr>
+						<tr>
 							<td><label for='mapstyle_linkheight'><?php print __esc('Link Hover Height (pixels)', 'weathermap'); ?></label></td>
 							<td>
 								<input id='mapstyle_linkheight' name='mapstyle_linkheight' type='text' size='6' class='ui-state-default ui-corner-all' value='<?php print $map->links['DEFAULT']->overlibheight; ?>'>
@@ -878,14 +878,14 @@
 		<!-- Images -->
 
 		<!-- TextEdit -->
-        <div id='dlgTextEdit' class='dlgProperties' title='Edit Map Object'>
+        <div id='dlgTextEdit' class='dlgProperties' title='<?php print __esc('Edit Object Configuration', 'weathermap'); ?>'>
 			<div class='cactiTable'>
 				<div class='dlgBody'>
-					<p>You can edit the map items directly here.</p>
+					<p><?php print __esc('Edit the raw configuration for this map object.', 'weathermap'); ?></p>
 	   	             <textarea id='item_configtext' name='item_configtext' cols='80' rows='15'></textarea>
 				</div>
 				<div class='dlgHelp'>
-					From this form, you can edit the Mapfile component directly.  No syntax checking is done.  So, make changes with care.
+					<?php print __esc('Advanced: changes are saved directly to the map configuration without syntax validation. Use Properties for the normal editing controls.', 'weathermap'); ?>
 				</div>
 				<div class='dlgButtons'>
 					<div class='dlgSubButtons'>
@@ -902,6 +902,7 @@
 			<div class='cactiTable'>
 				<div class='dlgBody'>
 					<table class='cactiTable'>
+						<tr><td colspan='2'><div class='cactiTableTitleRow wm-editor-section'><?php print __esc('Overlays', 'weathermap'); ?></div></td></tr>
 						<tr>
 							<td>Show VIAs overlay</td>
 							<td>
@@ -920,6 +921,7 @@
 								</select>
 							</td>
 						</tr>
+						<tr><td colspan='2'><div class='cactiTableTitleRow wm-editor-section'><?php print __esc('Placement', 'weathermap'); ?></div></td></tr>
 						<tr>
 							<td>Snap To Grid</td>
 							<td>
diff --git a/weathermap-cacti-plugin-mgmt.php b/weathermap-cacti-plugin-mgmt.php
index 1d92750a..57d481ae 100644
--- a/weathermap-cacti-plugin-mgmt.php
+++ b/weathermap-cacti-plugin-mgmt.php
@@ -41,6 +41,7 @@
 */
 
 include_once('../../include/auth.php');
+require_once __DIR__ . '/setup.php';
 
 global $config;
 include_once($config['library_path'] . '/rrd.php');