DC21-243: Fix accessibility issues