#164, #162 - UI text updates