gallery stuff
fixed merge conflicts