CSS tidy up and fixes