Changes for XHTML and accessibility compliance