[fix major] Fixing missing event handlers and small refactor
[fix major] Fixing missing event handlers and small refactor

sdaitzman/PopConfirm,Ifnot/PopConfirm,sdaitzman/PopConfirm,Ifnot/PopConfirm,renat2985/PopConfirm,renat2985/PopConfirm