progress on fixing popups