More graph editing, and other layout tweaks