Redid organization of content menu, especially captions and annotations. Fixes #70