Updated UI and Performance