Changes in some classes and XHTML files