Refactor CSS

Some very minor stuff and some nice stuff.
Merge pull request #1 from nadavspi/patch-1

Refactor CSS