Improved UX and design