SONAR-5209 UI improvements