Changed layout and added address line 2, city/zip