XHTML cleanup and use templating second part free pages