Various small message and UI tweaks

Change-Id: I51cb8b9eae209052e1a96bf88dd5d84c6075092d