UX: Fixing User messages to improve User eXperience.
Merge pull request #691 from arthurbenemann/UX_minnor_fix

UX: Fixing User messages to improve User eXperience.