Change form validation method and fix UI overload