SONAR-3981 Fix issue on Chrome
SONAR-4003 Improve rendering