Lightbox improvements