diff --git a/WebSites/ts2/css/ess.css b/WebSites/ts2/css/ess.css
index 5462502e646324760290f901035fc68a844296de..fc8cccfb7fc57fe5943eea8b887d2d0749535af2 100644
--- a/WebSites/ts2/css/ess.css
+++ b/WebSites/ts2/css/ess.css
@@ -210,3 +210,12 @@ font-size: 28px;
 position: relative;
 bottom: 15px;
 }
+
+svg.highcharts-root {
+font-family: "Titillium Bold" !important;
+font-size: 14px !important;
+}
+
+text.highcharts-axis-title {
+fill: #cef4ff !important;
+}
diff --git a/WebSites/ts2/dashboard.json b/WebSites/ts2/dashboard.json
index 5ad3955b47b990062012480fce6118afaed14fac..703a28701433743b68f2b59739a64943ada2977d 100644
--- a/WebSites/ts2/dashboard.json
+++ b/WebSites/ts2/dashboard.json
@@ -29,17 +29,84 @@
 				}
 			]
 		},
+		{
+			"title": "Cavity 4",
+			"width": 1,
+			"row": {
+				"1": 91,
+				"2": 39,
+				"3": 27,
+				"4": 7,
+				"5": 7,
+				"7": 7
+			},
+			"col": {
+				"1": 1,
+				"2": 2,
+				"3": 1,
+				"4": 4,
+				"5": 4,
+				"7": 4
+			},
+			"col_width": 1,
+			"widgets": [
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "Cernox in cold tuning system - ECCTD only",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-048:MeasValue\"][\"value\"]",
+						"units": "K",
+						"min_value": 0,
+						"max_value": "300"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "Cernox in helium tank boTEom",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-049:MeasValue\"][\"value\"]",
+						"units": "K",
+						"min_value": 0,
+						"max_value": "300"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "PT100 in Power Coupler - ECCTD only",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-041:MeasValue\"][\"value\"]",
+						"units": "K",
+						"min_value": 0,
+						"max_value": "300"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "Power Coupler double wall cooling - ECCTD only",
+						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-042:MeasValue\"][\"value\"]",
+						"units": "K",
+						"min_value": 0,
+						"max_value": "300"
+					}
+				}
+			]
+		},
 		{
 			"title": "Cavity 1",
 			"width": 1,
 			"row": {
 				"1": 7,
+				"2": 7,
+				"3": 7,
 				"4": 7,
 				"6": 7,
 				"7": 7
 			},
 			"col": {
 				"1": 1,
+				"2": 1,
+				"3": 1,
 				"4": 1,
 				"6": 1,
 				"7": 1
@@ -83,12 +150,18 @@
 			"width": 1,
 			"row": {
 				"1": 27,
+				"2": 7,
+				"3": 7,
 				"4": 7,
+				"6": 7,
 				"7": 7
 			},
 			"col": {
 				"1": 1,
+				"2": 2,
+				"3": 2,
 				"4": 2,
+				"6": 2,
 				"7": 2
 			},
 			"col_width": 1,
@@ -150,12 +223,18 @@
 			"width": 1,
 			"row": {
 				"1": 59,
+				"2": 27,
+				"3": 7,
 				"4": 7,
+				"6": 7,
 				"7": 7
 			},
 			"col": {
 				"1": 1,
+				"2": 1,
+				"3": 3,
 				"4": 3,
+				"6": 3,
 				"7": 3
 			},
 			"col_width": 1,
@@ -213,77 +292,28 @@
 			]
 		},
 		{
-			"title": "Cavity 4",
+			"title": "Thermal Screens",
 			"width": 1,
 			"row": {
-				"1": 91,
-				"4": 7,
-				"7": 7
+				"1": 117,
+				"2": 65,
+				"3": 53,
+				"4": 39,
+				"6": 39
 			},
 			"col": {
 				"1": 1,
-				"4": 4,
-				"7": 4
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "Cernox in cold tuning system - ECCTD only",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-048:MeasValue\"][\"value\"]",
-						"units": "K",
-						"min_value": 0,
-						"max_value": "300"
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "Cernox in helium tank boTEom",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-049:MeasValue\"][\"value\"]",
-						"units": "K",
-						"min_value": 0,
-						"max_value": "300"
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "PT100 in Power Coupler - ECCTD only",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-041:MeasValue\"][\"value\"]",
-						"units": "K",
-						"min_value": 0,
-						"max_value": "300"
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "Power Coupler double wall cooling - ECCTD only",
-						"value": "datasources[\"TS2\"][\"TS2-010CRM:Cryo-TE-042:MeasValue\"][\"value\"]",
-						"units": "K",
-						"min_value": 0,
-						"max_value": "300"
-					}
-				}
-			]
-		},
-		{
-			"title": "Thermal Screens",
-			"width": 4,
-			"row": {
-				"4": 39
-			},
-			"col": {
-				"4": 1
+				"2": 1,
+				"3": 1,
+				"4": 1,
+				"6": 1
 			},
 			"col_width": 4,
 			"widgets": [
 				{
 					"type": "highcharts-timeseries",
 					"settings": {
-						"timeframe": 60,
+						"timeframe": 300,
 						"blocks": 4,
 						"chartType": "spline",
 						"xaxis": "{\"title\":{\"text\" : \"Time\"}, \"type\": \"datetime\", \"floor\":0}",
@@ -299,7 +329,7 @@
 				{
 					"type": "highcharts-timeseries",
 					"settings": {
-						"timeframe": 60,
+						"timeframe": 300,
 						"blocks": 4,
 						"chartType": "spline",
 						"xaxis": "{\"title\":{\"text\" : \"Time\"}, \"type\": \"datetime\", \"floor\":0}",
@@ -315,7 +345,7 @@
 				{
 					"type": "highcharts-timeseries",
 					"settings": {
-						"timeframe": 60,
+						"timeframe": 300,
 						"blocks": 4,
 						"chartType": "spline",
 						"xaxis": "{\"title\":{\"text\" : \"Time\"}, \"type\": \"datetime\", \"floor\":0}",