Reordered to put totals at the top, followed by new Grand Totals section. Various other refactors