Updated UI and word usage