Annotation focusing fixes
Undoable annotation editing

Issue #72