Changes to better support accessibility via ARIA

These changes should close #304
I'm not sure why you're replacing the dfn-?