Mckramer dropdown aria

fix merge conflicts, and cleanup style a bit for #13664