Lightbox addition plus tweaks