More UX improvements.