Reorder things a bit for the document mcv

Applies to #296
Merge pull request #297 from Martii/documentPageFixes

Reorder things a bit for the document mcv