AG|BMM: lightbox centering - merge in stuff from toolkit restructure work branch