refactored image names and template includes to tidy it all up a bit