DAR-741 UI consistency fixes

Replaced alerts with modals