DAR-2604 modals refactored