Some accessibility improvements