SONAR-4466 Fixed several display and labels issues