Updated Form Validation