Fixed aria-expanded location
Revised accessibility issues with units block