Tidy up and favicons