Presentation of the All Dividends schedule (NZ ONLY)

Anyone else disappointed in the new layout for the Dividends Received schedule for an overseas holding?
I find it a miss-mash and hard to easily read.
If the different columns were split into 2, with the $ signs and currency showing in the column heading, the schedule would be much easier to read.

Below is a schedule of how I think it should appear.
Note that I have added a column to show the Exchange Rate used.