SONAR-4466 Labels and layout adjustments