fixed tags for valid XHTML
Fixed some white space