Improve UI wording and