Put the address info into logical order

Address
City, state
zip
adjusted text boxes to auto config.