event Form improvements