Bug fix
Add required
Update form validation