added popup management