Updates to resolve accessibility issues in markup & style