Moved situation to lightbox plus UI enhancements