Merge "Fixed A11y issues" into main