Dragging this site ever closer to XHTML