Some minor flow changes to improve UX