UX modification added

v2.2.1