Improving Measurement of Sexual Orientation and Gender Identity Among Middle and High School Students