diff --git a/.gitignore b/.gitignore
index d4f65e23da8f2d98fe800f64887d6b8d8f5936af..3dd1c6704b7f707daf638d1a5c913cfafcc97e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,4 @@ terraform.rc
 test/
 **/node_modules/*
 .vscode/
-vegeta*
\ No newline at end of file
+simulate_constant_use.sh
\ No newline at end of file
diff --git a/deploy/templates/dashboards/dashboard.json.tpl b/deploy/templates/dashboards/dashboard.json.tpl
index 26d2f69647da44ce3dc63ab4b151da0e450097ac..60fc338471856fff8ac3dd1809c0992969ae7e39 100644
--- a/deploy/templates/dashboards/dashboard.json.tpl
+++ b/deploy/templates/dashboards/dashboard.json.tpl
@@ -13,7 +13,7 @@
         {
             "height": 3,
             "width": 24,
-            "y": 15,
+            "y": 9,
             "x": 0,
             "type": "text",
             "properties": {
@@ -23,7 +23,7 @@
         {
             "height": 3,
             "width": 24,
-            "y": 29,
+            "y": 23,
             "x": 0,
             "type": "text",
             "properties": {
@@ -38,15 +38,17 @@
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ { "expression": "100*(m1/m2)", "label": "Expression1", "id": "e1", "region": "eu-west-1" } ],
-                    [ "AWS/ApiGateway", "4XXError", "ApiName", "${apigw_name}", "Stage", "${apigw_stage_name}", { "id": "m1", "visible": false } ],
-                    [ ".", "Count", ".", ".", ".", ".", { "id": "m2", "visible": false } ]
+                    [ { "expression": "100*(m1/m3)", "label": "Proportion of 5XX errors", "id": "e1", "region": "${aws_region}" } ],
+                    [ { "expression": "100*(m2/m3)", "label": "Proportion of 4XX errors", "id": "e2", "region": "${aws_region}" } ],
+                    [ "AWS/ApiGateway", "5XXError", "ApiName", "${apigw_name}", "Stage", "${apigw_stage_name}", { "id": "m1", "visible": false } ],
+                    [ "AWS/ApiGateway", "4XXError", "ApiName", "${apigw_name}", "Stage", "${apigw_stage_name}", { "id": "m2", "visible": false } ],
+                    [ ".", "Count", ".", ".", ".", ".", { "id": "m3", "visible": false } ]
                 ],
                 "view": "timeSeries",
                 "stacked": false,
-                "region": "eu-west-1",
+                "region": "${aws_region}",
                 "period": 60,
-                "title": "Proportion of 4XX errors",
+                "title": "Request Errors",
                 "stat": "Sum"
             }
         },
@@ -56,26 +58,6 @@
             "y": 3,
             "x": 12,
             "type": "metric",
-            "properties": {
-                "metrics": [
-                    [ { "expression": "100*(m1/m2)", "label": "Expression1", "id": "e1", "region": "eu-west-1" } ],
-                    [ "AWS/ApiGateway", "5XXError", "ApiName", "${apigw_name}", "Stage", "${apigw_stage_name}", { "id": "m1", "visible": false } ],
-                    [ ".", "Count", ".", ".", ".", ".", { "id": "m2", "visible": false } ]
-                ],
-                "view": "timeSeries",
-                "stacked": false,
-                "region": "eu-west-1",
-                "period": 60,
-                "title": "Proportion of 5XX errors",
-                "stat": "Sum"
-            }
-        },
-        {
-            "height": 6,
-            "width": 12,
-            "y": 9,
-            "x": 0,
-            "type": "metric",
             "properties": {
                 "view": "timeSeries",
                 "stacked": false,
@@ -91,7 +73,7 @@
         {
             "height": 6,
             "width": 12,
-            "y": 18,
+            "y": 12,
             "x": 0,
             "type": "metric",
             "properties": {
@@ -109,7 +91,7 @@
         {
             "height": 6,
             "width": 12,
-            "y": 18,
+            "y": 12,
             "x": 12,
             "type": "metric",
             "properties": {
@@ -127,7 +109,7 @@
         {
             "height": 6,
             "width": 12,
-            "y": 24,
+            "y": 18,
             "x": 0,
             "type": "metric",
             "properties": {
@@ -145,7 +127,7 @@
         {
             "height": 6,
             "width": 12,
-            "y": 33,
+            "y": 27,
             "x": 0,
             "type": "metric",
             "properties": {
@@ -162,7 +144,7 @@
         {
             "height": 6,
             "width": 12,
-            "y": 33,
+            "y": 27,
             "x": 12,
             "type": "metric",
             "properties": {