Changes to better support accessibility via ARIA

These changes should close #304
Of course - I will fix those now.