Changes to better support accessibility via ARIA

These changes should close #304
The convention everywhere else for IDs is to use hyphens.