UX Improvement

UX improvement