Slight clean up
Changed layout change String Address to Address clas