Improved Report layout according to spec, also fixed some calculations.
Merge pull request #4656 from lwyszomi/worldvision_qa_4_fixes

Improved Report layout according to spec, also fixed some calculations.