Added popups handling