Update UI and flow based on design review