Fix CSS
Merge branch 'release/8' into develop