DDF-580 Refactor popup notifications.