Fix gallery stuff
More fixes