modal popup fixes