removed "Town" field; renamed "Street" label to "Street address"