xhtml fixups, use correct classes everywhere