Fieldgeolocation

Switches fields around to be in the right places