Popup and Notify: Fixed bugs