Tidy up content and design