Allow setting of days and averaging for graphs
Clean up chart options