Update notification behavior, add Exit button