Fixes in CSS
Merge branch 'develop' into staging