various HTML fixes