Made some changes to help with accessibility
Merge pull request #183 from goehle/2.10-bugfixes

2.10 Bugfixes