Accessibility fixes

Fixes to help accessibility