cleaning up css
Merge branch 'styling'