Fixes #27

Accessibility issues fixed.