Added more ARIA markup