Issue #163 - Fixing UX comments