XHTML template fixes
upped version