Clean up some css
Merge branch 'develop'