Several UX refinements.