cleaning up css
merged with master