Fix stuff and tidy up content folder