updated order of address fields as per wireframe