Some lightbox improvements