Added lightbox effect for video player
Fixed merge conflicts, added lightbox effect for video player