Merging lightbox

Cleaned up the lightbox options, should be clean to merge.