npm/702-rework-ui-flow