XHTML issues fixed and integrated