Cleanups in UI messages

TBR @gaurave