Revamp annotations system so easier to add/edit annotations

[jessp]

I suggest revamping the existing annotations system so that "New Annotation" and "Edit Annotation" are triggered modes, so as to prevent accidental editing of existing annotations when the user wants to create a new annotation.