Updated Addresses layout