WIP: Add aria attributes in the right places.