Fixed more accessibility issues