Updated report format

I hope you like it
Give me the final word on this and I'll resubmit both of these PRs.