Minor code refactor
[Fixed] App is crashing on editing anno item
Merge branch 'develop' of github.com:usersource/anno into feature/plugin-update