Updated UI and clean up