improve UX flow