Improved the UX