Hopefully fix the Report view (and clean it up a bit.)