popup fixes, need to change locations