Better form validation and UI flow in break conditions