**Many UX improvements for the flow - Windmill