Accessibility issues and other minor fixes