Add gallery & upload improvements