Changes to better support accessibility via ARIA

These changes should close #304
Can you please follow conventions for elses?