minor refactors for making popover / modals disappear where necessary
removed exit(1); added icons