clean up css
merge with master
merge with master