SONAR-4366 Some UI improvements