Improve Validation
Use form submition
Save code