Issue/#27

Accessibility issues fixed.
fixes #27