Revert "Changed layout and added address line 2, city/zip"

This reverts commit b98e01e86029f93612a758ac0dcc731aa03c413d.