Merge pull request #320 from Martii/documentPageFixes

Resubmitting #318