More tweaks to control layout editing