Doing minor UX improvements