Update with some accessibility improvements