SONAR-5007 Small UI changes