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