Some minor UX improvements.