Popups Fixed

kinda