Making some UX improvements.