Modified event handlers + popups option