adding pop-up fixes