Added some organisation to the CSS