Added AnnotationView & tests