Accessibility Fixes Round 2

Remainder (Hopefully) of Accessibility fixes.

Closes: #464