Batter annotator_view until it shows the sidebar

Needs a /lot/ of refinement before being used