Merge pull request #297 from Martii/documentPageFixes

Reorder things a bit for the document mcv
Merge branch 'master' into documentPageFixes