Updated Screens and Added Lightbox