fixed the ligtbox, added label, refactored some