Added popup manager