Adding more accessibility fixes