Gaia changes: Add autofill to setup form, reorder fields per UX feedback