Changes for xhtml files and linking