Lots of CSS stuff
Merged after lots of CSS