Code reduction in graph, fix some graph logic, take totals for week/month/year, prevent white lines