Added lightbox functionality
Merge