Move graphs to part of data view. Change variable names within graph to be clearer
Add calendar functionality