Updated UI elements and names.