Fixed accessibility issues