[PD-dev] popup changes