diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json
index 75ebfca..bfe4015 100644
--- a/contrib/grafana/dashboard.json
+++ b/contrib/grafana/dashboard.json
@@ -100,6 +100,240 @@
             "title": "Doses Administered Yesterday",
             "type": "stat"
         },
+        {
+            "datasource": null,
+            "fieldConfig":
+            {
+                "defaults":
+                {
+                    "mappings":
+                    [],
+                    "thresholds":
+                    {
+                        "mode": "absolute",
+                        "steps":
+                        [
+                            {
+                                "color": "red",
+                                "value": null
+                            },
+                            {
+                                "color": "#EAB839",
+                                "value": 10000
+                            },
+                            {
+                                "color": "green",
+                                "value": 110000
+                            }
+                        ]
+                    }
+                },
+                "overrides":
+                []
+            },
+            "gridPos":
+            {
+                "h": 3,
+                "w": 5,
+                "x": 5,
+                "y": 0
+            },
+            "id": 18,
+            "links":
+            [],
+            "options":
+            {
+                "colorMode": "value",
+                "graphMode": "none",
+                "justifyMode": "auto",
+                "orientation": "auto",
+                "reduceOptions":
+                {
+                    "calcs":
+                    [
+                        "lastNotNull"
+                    ],
+                    "fields": "",
+                    "values": false
+                },
+                "text":
+                {},
+                "textMode": "auto"
+            },
+            "pluginVersion": "7.5.1",
+            "targets":
+            [
+                {
+                    "exemplar": true,
+                    "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "Most Doses Given in a Day",
+                    "refId": "A"
+                }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Most Doses Given in a Day",
+            "type": "stat"
+        },
+        {
+            "datasource": null,
+            "fieldConfig":
+            {
+                "defaults":
+                {
+                    "mappings":
+                    [],
+                    "thresholds":
+                    {
+                        "mode": "absolute",
+                        "steps":
+                        [
+                            {
+                                "color": "red",
+                                "value": null
+                            },
+                            {
+                                "color": "#EAB839",
+                                "value": 10000
+                            },
+                            {
+                                "color": "green",
+                                "value": 110000
+                            }
+                        ]
+                    }
+                },
+                "overrides":
+                []
+            },
+            "gridPos":
+            {
+                "h": 3,
+                "w": 5,
+                "x": 0,
+                "y": 3
+            },
+            "id": 17,
+            "links":
+            [],
+            "options":
+            {
+                "colorMode": "value",
+                "graphMode": "none",
+                "justifyMode": "auto",
+                "orientation": "auto",
+                "reduceOptions":
+                {
+                    "calcs":
+                    [
+                        "lastNotNull"
+                    ],
+                    "fields": "",
+                    "values": false
+                },
+                "text":
+                {},
+                "textMode": "auto"
+            },
+            "pluginVersion": "7.5.1",
+            "targets":
+            [
+                {
+                    "exemplar": true,
+                    "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "Avg Doses Given/Day",
+                    "refId": "A"
+                }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Avg Doses Given/Day",
+            "type": "stat"
+        },
+        {
+            "datasource": null,
+            "fieldConfig":
+            {
+                "defaults":
+                {
+                    "mappings":
+                    [],
+                    "thresholds":
+                    {
+                        "mode": "absolute",
+                        "steps":
+                        [
+                            {
+                                "color": "red",
+                                "value": null
+                            },
+                            {
+                                "color": "#EAB839",
+                                "value": 10000
+                            },
+                            {
+                                "color": "green",
+                                "value": 110000
+                            }
+                        ]
+                    }
+                },
+                "overrides":
+                []
+            },
+            "gridPos":
+            {
+                "h": 3,
+                "w": 5,
+                "x": 5,
+                "y": 3
+            },
+            "id": 19,
+            "links":
+            [],
+            "options":
+            {
+                "colorMode": "value",
+                "graphMode": "none",
+                "justifyMode": "auto",
+                "orientation": "auto",
+                "reduceOptions":
+                {
+                    "calcs":
+                    [
+                        "lastNotNull"
+                    ],
+                    "fields": "",
+                    "values": false
+                },
+                "text":
+                {},
+                "textMode": "auto"
+            },
+            "pluginVersion": "7.5.1",
+            "targets":
+            [
+                {
+                    "exemplar": true,
+                    "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "Least Doses Given in a Day",
+                    "refId": "A"
+                }
+            ],
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Least Doses Given in a Day",
+            "type": "stat"
+        },
         {
             "aliasColors":
             {},
@@ -120,9 +354,9 @@
             "gridPos":
             {
                 "h": 6,
-                "w": 9,
-                "x": 5,
-                "y": 0
+                "w": 10,
+                "x": 0,
+                "y": 6
             },
             "hiddenSeries": false,
             "id": 14,
@@ -228,162 +462,6 @@
                 "alignLevel": null
             }
         },
-        {
-            "datasource": null,
-            "fieldConfig":
-            {
-                "defaults":
-                {
-                    "mappings":
-                    [],
-                    "thresholds":
-                    {
-                        "mode": "absolute",
-                        "steps":
-                        [
-                            {
-                                "color": "red",
-                                "value": null
-                            },
-                            {
-                                "color": "#EAB839",
-                                "value": 10000
-                            },
-                            {
-                                "color": "green",
-                                "value": 110000
-                            }
-                        ]
-                    }
-                },
-                "overrides":
-                []
-            },
-            "gridPos":
-            {
-                "h": 3,
-                "w": 5,
-                "x": 0,
-                "y": 3
-            },
-            "id": 18,
-            "links":
-            [],
-            "options":
-            {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions":
-                {
-                    "calcs":
-                    [
-                        "lastNotNull"
-                    ],
-                    "fields": "",
-                    "values": false
-                },
-                "text":
-                {},
-                "textMode": "auto"
-            },
-            "pluginVersion": "7.5.1",
-            "targets":
-            [
-                {
-                    "exemplar": true,
-                    "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                    "format": "time_series",
-                    "interval": "",
-                    "intervalFactor": 1,
-                    "legendFormat": "Most Doses Given in a Day",
-                    "refId": "A"
-                }
-            ],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Most Doses Given in a Day",
-            "type": "stat"
-        },
-        {
-            "datasource": null,
-            "fieldConfig":
-            {
-                "defaults":
-                {
-                    "mappings":
-                    [],
-                    "thresholds":
-                    {
-                        "mode": "absolute",
-                        "steps":
-                        [
-                            {
-                                "color": "red",
-                                "value": null
-                            },
-                            {
-                                "color": "#EAB839",
-                                "value": 10000
-                            },
-                            {
-                                "color": "green",
-                                "value": 110000
-                            }
-                        ]
-                    }
-                },
-                "overrides":
-                []
-            },
-            "gridPos":
-            {
-                "h": 3,
-                "w": 5,
-                "x": 0,
-                "y": 6
-            },
-            "id": 19,
-            "links":
-            [],
-            "options":
-            {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions":
-                {
-                    "calcs":
-                    [
-                        "lastNotNull"
-                    ],
-                    "fields": "",
-                    "values": false
-                },
-                "text":
-                {},
-                "textMode": "auto"
-            },
-            "pluginVersion": "7.5.1",
-            "targets":
-            [
-                {
-                    "exemplar": true,
-                    "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                    "format": "time_series",
-                    "interval": "",
-                    "intervalFactor": 1,
-                    "legendFormat": "Least Doses Given in a Day",
-                    "refId": "A"
-                }
-            ],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Least Doses Given in a Day",
-            "type": "stat"
-        },
         {
             "aliasColors":
             {},
@@ -406,9 +484,9 @@
             "gridPos":
             {
                 "h": 6,
-                "w": 9,
-                "x": 5,
-                "y": 6
+                "w": 10,
+                "x": 0,
+                "y": 12
             },
             "hiddenSeries": false,
             "id": 10,
@@ -472,7 +550,7 @@
             "timeRegions":
             [],
             "timeShift": null,
-            "title": "Vacination Rate (3 day avg )",
+            "title": "Vacination Rate (3 day avg)",
             "tooltip":
             {
                 "shared": false,
@@ -514,84 +592,6 @@
                 "alignLevel": null
             }
         },
-        {
-            "datasource": null,
-            "fieldConfig":
-            {
-                "defaults":
-                {
-                    "mappings":
-                    [],
-                    "thresholds":
-                    {
-                        "mode": "absolute",
-                        "steps":
-                        [
-                            {
-                                "color": "red",
-                                "value": null
-                            },
-                            {
-                                "color": "#EAB839",
-                                "value": 10000
-                            },
-                            {
-                                "color": "green",
-                                "value": 110000
-                            }
-                        ]
-                    }
-                },
-                "overrides":
-                []
-            },
-            "gridPos":
-            {
-                "h": 3,
-                "w": 5,
-                "x": 0,
-                "y": 9
-            },
-            "id": 17,
-            "links":
-            [],
-            "options":
-            {
-                "colorMode": "value",
-                "graphMode": "none",
-                "justifyMode": "auto",
-                "orientation": "auto",
-                "reduceOptions":
-                {
-                    "calcs":
-                    [
-                        "lastNotNull"
-                    ],
-                    "fields": "",
-                    "values": false
-                },
-                "text":
-                {},
-                "textMode": "auto"
-            },
-            "pluginVersion": "7.5.1",
-            "targets":
-            [
-                {
-                    "exemplar": true,
-                    "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                    "format": "time_series",
-                    "interval": "",
-                    "intervalFactor": 1,
-                    "legendFormat": "Avg Doses Given/Day",
-                    "refId": "A"
-                }
-            ],
-            "timeFrom": null,
-            "timeShift": null,
-            "title": "Avg Doses Given/Day",
-            "type": "stat"
-        },
         {
             "datasource": null,
             "description": "% of Ontario Population partially or Fully Vaccinated.",
@@ -645,9 +645,9 @@
             "gridPos":
             {
                 "h": 8,
-                "w": 14,
+                "w": 10,
                 "x": 0,
-                "y": 12
+                "y": 18
             },
             "id": 2,
             "links":
@@ -746,5 +746,5 @@
     "timezone": "",
     "title": "Ontario Vaccination Stats",
     "uid": "vhnVv3lMk",
-    "version": 51
+    "version": 54
 }
\ No newline at end of file
diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json
index ef2766b..3f477e7 100644
--- a/contrib/update_dashboard/ontvacstats-snapshot.json
+++ b/contrib/update_dashboard/ontvacstats-snapshot.json
@@ -102,6 +102,240 @@
                 "title": "Doses Administered Yesterday",
                 "type": "stat"
             },
+            {
+                "datasource": null,
+                "fieldConfig":
+                {
+                    "defaults":
+                    {
+                        "mappings":
+                        [],
+                        "thresholds":
+                        {
+                            "mode": "absolute",
+                            "steps":
+                            [
+                                {
+                                    "color": "red",
+                                    "value": null
+                                },
+                                {
+                                    "color": "#EAB839",
+                                    "value": 10000
+                                },
+                                {
+                                    "color": "green",
+                                    "value": 110000
+                                }
+                            ]
+                        }
+                    },
+                    "overrides":
+                    []
+                },
+                "gridPos":
+                {
+                    "h": 3,
+                    "w": 5,
+                    "x": 5,
+                    "y": 0
+                },
+                "id": 18,
+                "links":
+                [],
+                "options":
+                {
+                    "colorMode": "value",
+                    "graphMode": "none",
+                    "justifyMode": "auto",
+                    "orientation": "auto",
+                    "reduceOptions":
+                    {
+                        "calcs":
+                        [
+                            "lastNotNull"
+                        ],
+                        "fields": "",
+                        "values": false
+                    },
+                    "text":
+                    {},
+                    "textMode": "auto"
+                },
+                "pluginVersion": "7.5.1",
+                "targets":
+                [
+                    {
+                        "exemplar": true,
+                        "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                        "format": "time_series",
+                        "interval": "",
+                        "intervalFactor": 1,
+                        "legendFormat": "Most Doses Given in a Day",
+                        "refId": "A"
+                    }
+                ],
+                "timeFrom": null,
+                "timeShift": null,
+                "title": "Most Doses Given in a Day",
+                "type": "stat"
+            },
+            {
+                "datasource": null,
+                "fieldConfig":
+                {
+                    "defaults":
+                    {
+                        "mappings":
+                        [],
+                        "thresholds":
+                        {
+                            "mode": "absolute",
+                            "steps":
+                            [
+                                {
+                                    "color": "red",
+                                    "value": null
+                                },
+                                {
+                                    "color": "#EAB839",
+                                    "value": 10000
+                                },
+                                {
+                                    "color": "green",
+                                    "value": 110000
+                                }
+                            ]
+                        }
+                    },
+                    "overrides":
+                    []
+                },
+                "gridPos":
+                {
+                    "h": 3,
+                    "w": 5,
+                    "x": 0,
+                    "y": 3
+                },
+                "id": 17,
+                "links":
+                [],
+                "options":
+                {
+                    "colorMode": "value",
+                    "graphMode": "none",
+                    "justifyMode": "auto",
+                    "orientation": "auto",
+                    "reduceOptions":
+                    {
+                        "calcs":
+                        [
+                            "lastNotNull"
+                        ],
+                        "fields": "",
+                        "values": false
+                    },
+                    "text":
+                    {},
+                    "textMode": "auto"
+                },
+                "pluginVersion": "7.5.1",
+                "targets":
+                [
+                    {
+                        "exemplar": true,
+                        "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                        "format": "time_series",
+                        "interval": "",
+                        "intervalFactor": 1,
+                        "legendFormat": "Avg Doses Given/Day",
+                        "refId": "A"
+                    }
+                ],
+                "timeFrom": null,
+                "timeShift": null,
+                "title": "Avg Doses Given/Day",
+                "type": "stat"
+            },
+            {
+                "datasource": null,
+                "fieldConfig":
+                {
+                    "defaults":
+                    {
+                        "mappings":
+                        [],
+                        "thresholds":
+                        {
+                            "mode": "absolute",
+                            "steps":
+                            [
+                                {
+                                    "color": "red",
+                                    "value": null
+                                },
+                                {
+                                    "color": "#EAB839",
+                                    "value": 10000
+                                },
+                                {
+                                    "color": "green",
+                                    "value": 110000
+                                }
+                            ]
+                        }
+                    },
+                    "overrides":
+                    []
+                },
+                "gridPos":
+                {
+                    "h": 3,
+                    "w": 5,
+                    "x": 5,
+                    "y": 3
+                },
+                "id": 19,
+                "links":
+                [],
+                "options":
+                {
+                    "colorMode": "value",
+                    "graphMode": "none",
+                    "justifyMode": "auto",
+                    "orientation": "auto",
+                    "reduceOptions":
+                    {
+                        "calcs":
+                        [
+                            "lastNotNull"
+                        ],
+                        "fields": "",
+                        "values": false
+                    },
+                    "text":
+                    {},
+                    "textMode": "auto"
+                },
+                "pluginVersion": "7.5.1",
+                "targets":
+                [
+                    {
+                        "exemplar": true,
+                        "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
+                        "format": "time_series",
+                        "interval": "",
+                        "intervalFactor": 1,
+                        "legendFormat": "Least Doses Given in a Day",
+                        "refId": "A"
+                    }
+                ],
+                "timeFrom": null,
+                "timeShift": null,
+                "title": "Least Doses Given in a Day",
+                "type": "stat"
+            },
             {
                 "aliasColors":
                 {},
@@ -122,9 +356,9 @@
                 "gridPos":
                 {
                     "h": 6,
-                    "w": 9,
-                    "x": 5,
-                    "y": 0
+                    "w": 10,
+                    "x": 0,
+                    "y": 6
                 },
                 "hiddenSeries": false,
                 "id": 14,
@@ -230,162 +464,6 @@
                     "alignLevel": null
                 }
             },
-            {
-                "datasource": null,
-                "fieldConfig":
-                {
-                    "defaults":
-                    {
-                        "mappings":
-                        [],
-                        "thresholds":
-                        {
-                            "mode": "absolute",
-                            "steps":
-                            [
-                                {
-                                    "color": "red",
-                                    "value": null
-                                },
-                                {
-                                    "color": "#EAB839",
-                                    "value": 10000
-                                },
-                                {
-                                    "color": "green",
-                                    "value": 110000
-                                }
-                            ]
-                        }
-                    },
-                    "overrides":
-                    []
-                },
-                "gridPos":
-                {
-                    "h": 3,
-                    "w": 5,
-                    "x": 0,
-                    "y": 3
-                },
-                "id": 18,
-                "links":
-                [],
-                "options":
-                {
-                    "colorMode": "value",
-                    "graphMode": "none",
-                    "justifyMode": "auto",
-                    "orientation": "auto",
-                    "reduceOptions":
-                    {
-                        "calcs":
-                        [
-                            "lastNotNull"
-                        ],
-                        "fields": "",
-                        "values": false
-                    },
-                    "text":
-                    {},
-                    "textMode": "auto"
-                },
-                "pluginVersion": "7.5.1",
-                "targets":
-                [
-                    {
-                        "exemplar": true,
-                        "expr": "max_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                        "format": "time_series",
-                        "interval": "",
-                        "intervalFactor": 1,
-                        "legendFormat": "Most Doses Given in a Day",
-                        "refId": "A"
-                    }
-                ],
-                "timeFrom": null,
-                "timeShift": null,
-                "title": "Most Doses Given in a Day",
-                "type": "stat"
-            },
-            {
-                "datasource": null,
-                "fieldConfig":
-                {
-                    "defaults":
-                    {
-                        "mappings":
-                        [],
-                        "thresholds":
-                        {
-                            "mode": "absolute",
-                            "steps":
-                            [
-                                {
-                                    "color": "red",
-                                    "value": null
-                                },
-                                {
-                                    "color": "#EAB839",
-                                    "value": 10000
-                                },
-                                {
-                                    "color": "green",
-                                    "value": 110000
-                                }
-                            ]
-                        }
-                    },
-                    "overrides":
-                    []
-                },
-                "gridPos":
-                {
-                    "h": 3,
-                    "w": 5,
-                    "x": 0,
-                    "y": 6
-                },
-                "id": 19,
-                "links":
-                [],
-                "options":
-                {
-                    "colorMode": "value",
-                    "graphMode": "none",
-                    "justifyMode": "auto",
-                    "orientation": "auto",
-                    "reduceOptions":
-                    {
-                        "calcs":
-                        [
-                            "lastNotNull"
-                        ],
-                        "fields": "",
-                        "values": false
-                    },
-                    "text":
-                    {},
-                    "textMode": "auto"
-                },
-                "pluginVersion": "7.5.1",
-                "targets":
-                [
-                    {
-                        "exemplar": true,
-                        "expr": "min_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                        "format": "time_series",
-                        "interval": "",
-                        "intervalFactor": 1,
-                        "legendFormat": "Least Doses Given in a Day",
-                        "refId": "A"
-                    }
-                ],
-                "timeFrom": null,
-                "timeShift": null,
-                "title": "Least Doses Given in a Day",
-                "type": "stat"
-            },
             {
                 "aliasColors":
                 {},
@@ -408,9 +486,9 @@
                 "gridPos":
                 {
                     "h": 6,
-                    "w": 9,
-                    "x": 5,
-                    "y": 6
+                    "w": 10,
+                    "x": 0,
+                    "y": 12
                 },
                 "hiddenSeries": false,
                 "id": 10,
@@ -474,7 +552,7 @@
                 "timeRegions":
                 [],
                 "timeShift": null,
-                "title": "Vacination Rate (3 day avg )",
+                "title": "Vacination Rate (3 day avg)",
                 "tooltip":
                 {
                     "shared": false,
@@ -516,84 +594,6 @@
                     "alignLevel": null
                 }
             },
-            {
-                "datasource": null,
-                "fieldConfig":
-                {
-                    "defaults":
-                    {
-                        "mappings":
-                        [],
-                        "thresholds":
-                        {
-                            "mode": "absolute",
-                            "steps":
-                            [
-                                {
-                                    "color": "red",
-                                    "value": null
-                                },
-                                {
-                                    "color": "#EAB839",
-                                    "value": 10000
-                                },
-                                {
-                                    "color": "green",
-                                    "value": 110000
-                                }
-                            ]
-                        }
-                    },
-                    "overrides":
-                    []
-                },
-                "gridPos":
-                {
-                    "h": 3,
-                    "w": 5,
-                    "x": 0,
-                    "y": 9
-                },
-                "id": 17,
-                "links":
-                [],
-                "options":
-                {
-                    "colorMode": "value",
-                    "graphMode": "none",
-                    "justifyMode": "auto",
-                    "orientation": "auto",
-                    "reduceOptions":
-                    {
-                        "calcs":
-                        [
-                            "lastNotNull"
-                        ],
-                        "fields": "",
-                        "values": false
-                    },
-                    "text":
-                    {},
-                    "textMode": "auto"
-                },
-                "pluginVersion": "7.5.1",
-                "targets":
-                [
-                    {
-                        "exemplar": true,
-                        "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[1y]) != 0",
-                        "format": "time_series",
-                        "interval": "",
-                        "intervalFactor": 1,
-                        "legendFormat": "Avg Doses Given/Day",
-                        "refId": "A"
-                    }
-                ],
-                "timeFrom": null,
-                "timeShift": null,
-                "title": "Avg Doses Given/Day",
-                "type": "stat"
-            },
             {
                 "datasource": null,
                 "description": "% of Ontario Population partially or Fully Vaccinated.",
@@ -647,9 +647,9 @@
                 "gridPos":
                 {
                     "h": 8,
-                    "w": 14,
+                    "w": 10,
                     "x": 0,
-                    "y": 12
+                    "y": 18
                 },
                 "id": 2,
                 "links":
@@ -748,7 +748,7 @@
         "timezone": "",
         "title": "Ontario Vaccination Stats",
         "uid": "vhnVv3lMk",
-        "version": 51
+        "version": 54
     },
     "expires": 86400,
     "key": "ontvacstats"