Fix codestyle
XHTML compliancy
Fix codestyle