Improve User Experience

Improve User Experience