Improvements on UX