Accessibility improvements

I also see it is a double post, you already asked this