css fixes and updates
Merge branch 'dev'