refactoring of controls finished for now. working on re-code of annotator