SONAR-5078 Fix different issues of new design