CSS cleanup closes #916
Merge pull request #918 from affektive/css_clean_up

CSS cleanup closes #916