508 fixes after review

... tags for accessibility compatibility