css updates
Merge branch 'hotfix/css_updates'