CSS cleanup

Please check the individual patches for more info @markgoodyear :)