Split CSS up and updated the styling a little