Added more structure to the dashboard but the API needs refining for the actual data source.