Reorder fields to better match real UI

On request from the Spanish test site, I reordered the fields so the ones that are in the same window or tab (in Orca, NVDA, etc) are now close together in the form.