Reworked some of the core CSS