Improvements

Add: Validation on change or click event of a field with errors
Improvement: Code refactor