Second round accessibility fixes

 More accessibility fixes.

I still have some to put in, but they're going to take a little longer.