Tweak edit form layout, and improve tests.