Images and stuff
fixed merge conflict