minor refactoring
finished annotator menus