popup fixes