high gaps fix, lightbox cleanup