Refine user flow