Added a layout option and averages to days instead of hours