Fixed some issues with the xhtml files.