Use custom HTML for the annotation adder pop-over, fix a couple of JS errors