* Fixed templates to be XHTML 1.1 compliant