semicolon
Annotation UI improvement (WIP)
merge conflict resolved