Tidy up more CSS