Fix annotation diagrams, add interactivity