Change Gallery Carousel to inline list
Resolve merge conflicts