Updated UI and Scraper Logic