Refactoring to be WAI-ARIA compliant