Improve verbage in UI