Added more accessibility compliance per Richard's email