Refactor CSS

Some very minor stuff and some nice stuff.