Added lightbox gallery and media sections
Fixed conflicts