A big tidy up in CSS and added some nice bits and pieces in