UI text corrections

Change-Id: I3833941e4ef81cbb99a3042b343ce689bf60305f