SONAR-5209 Small UI improvement