Tidy up old CSS and more leaf fiddling