SONAR-2501 improve CSS