SONAR-4750 Minor UI improvement