Reordered charts
Added a chart and refactored to remove some duplicate code