Added modal interface; added remove-confirm-dialog