Added controls for popups