Layout and edit tweaks