adding the remaining modals and addresses