Changes to better support accessibility via ARIA

These changes should close #304