Rearranging stuff
Changed all images to global constants