Clean up CSS
Merge branch 'client' into develop