bug 807: Some HTML cleanup