fix bugs + valid CSS/XHTML