Annotation code refactoring
gui listener cleanup
Added annotation support across views and reports