Store current confirm dialog as currentDialog, so it can be closed globally. Fixes #465
Proper name spacing for module includes. Refs #462