Updated form to have validation rules