Merge branch 'hotfix/hotfix'
CSS fix
Merge branch 'hotfix/hotfix' into develop