UX improvements.