More add/edit form field layout updates.