Various Fixes

Mainly Lightbox