Further editor tweaks