Fixing images and file names