Started working on outstanding features in lightbox collection
Merge commit '1e3aed3'