Avi | Updations to lightbox after feedback