CSS quick fix
Merge branch 'develop'