Improved the UX again