Design & UX improvements