SONAR-4303 improve popups