tidied up markup, ARIA roles added