Fix css and some markup
Merge branch 'clean-css'