Add lightbox, dialog fixes