DAT-2203 Change to 'new' modals