Merge pull request #142 from monetas/fix-headings

Adjust heading levels for single-doc output, add menu metadata, misc. fixes.
Rewrap too long lines and fix layout.