Fixed the average calculations and the expeneses display