Misc fixes / cleanup
Lightbox amends