removed extra xhtml/made more valid