Add an option to re-order the fields within the Address Field