Cleaned up and reorganised some CSS styles