Put all modal code into ModalManager
Better comment popup