Improved DOM and ARIA