Fixed accessibility issues
