Improved markup for accessibility