Slightly improved ARIA, DOM and CSS