ENH: first pass at adding in better support for light box mode