Adds Images and fixes map editing