Changed images and fixed bugs