SONAR-4406 Slight ui improvements