Updated reporting, attempt 2

Sorry about the last one, indeed I didn't check the formatting after the refactoring. 
Only differences I could spot now are small details (improvements, in my opinion) in the formatting of the tables.