Cleanups in UI messages
Merge pull request #3294 from ussuri/small-fixes-3

Cleanups in UI messages