Improve city submit form inputs and labels