SONAR-5130 Improve UI