[Fix]
[Accessibility] Improvements