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