Added totals and more formatting