Still seems to be small issues with images that can't be found