Update small part of UX Issue #3