modals now display correct errors and return to correct activities