Completed lightbox feature and fixed some issues