fix a z-indexing but with annotations
Merge branch 'document_sidebar' into testing