NIBG-1272 Lightbox related changes