[html] Add a few annotations, cleanup existing
[html] Hide annotations that are too close together