Tidy up css, part 2