Accessibility Fixes Round 2

Remainder (Hopefully) of Accessibility fixes.

Issue #464 - Accessibility Fixes Round 2.