diff --git a/WebSites/cws/dashboard.json b/WebSites/cws/dashboard.json
index 8a4b93b07d416f8533bf407dd8de4c89760770fe..581a7ef23bd82477d1431eea3c8d02137f324b60 100644
--- a/WebSites/cws/dashboard.json
+++ b/WebSites/cws/dashboard.json
@@ -67,242 +67,116 @@
 			]
 		},
 		{
-			"title": "CWL",
+			"title": "CWL trends",
 			"width": 1,
 			"row": {
-				"1": 67,
-				"2": 67,
-				"3": 67,
+				"1": 11,
+				"2": 11,
+				"3": 11,
 				"4": 11,
 				"5": 11,
+				"7": 11,
+				"8": 11,
 				"9": 11,
-				"10": 11
+				"10": 11,
+				"11": 11
 			},
 			"col": {
 				"1": 1,
 				"2": 1,
 				"3": 1,
 				"4": 1,
-				"5": 2,
-				"9": 4,
-				"10": 4
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC003",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-022:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "ºC",
-						"min_value": "0",
-						"max_value": "20"
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC002",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-019:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "ºC",
-						"min_value": 0,
-						"max_value": "20"
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC001",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-017:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "ºC",
-						"min_value": "0",
-						"max_value": "20"
-					}
-				}
-			]
-		},
-		{
-			"title": "CWL",
-			"width": 1,
-			"row": {
-				"1": 11,
-				"2": 11,
-				"3": 11,
-				"4": 11,
-				"5": 11,
+				"5": 1,
 				"7": 1,
 				"8": 1,
 				"9": 1,
-				"10": 1
+				"10": 1,
+				"11": 1
 			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 2,
-				"5": 3,
-				"7": 5,
-				"8": 5,
-				"9": 5,
-				"10": 5
-			},
-			"col_width": 2,
+			"col_width": 3,
 			"widgets": [
 				{
 					"type": "flot_extended_plugin",
 					"settings": {
 						"plot_type": "line",
 						"legend": true,
-						"height": 6,
-						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n            {label: 'EC003', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n            {label: 'EC003', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n            {label: 'EC003', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n            {label: 'EC003', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n            {label: 'EC003', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n            {label: 'EC003', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n            {label: 'EC003', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]},\n\t\t\t{label: 'EC001', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-017:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
-						"xticks": "6",
+						"height": 10,
+						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n            {label: 'EC003', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n            {label: 'EC003', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n            {label: 'EC003', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n            {label: 'EC003', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n            {label: 'EC003', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n            {label: 'EC003', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n            {label: 'EC003', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-022:Temp-R\"]},\n \t\t\t{label: 'EC002', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-019:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+						"xticks": "4",
 						"x_timestamp": true,
+						"tooltip": true,
 						"zoom": ""
 					}
 				}
 			]
 		},
 		{
-			"title": "CWH",
+			"title": "CWL live",
 			"width": 1,
 			"row": {
-				"1": 119,
-				"2": 67,
-				"3": 43,
+				"1": 77,
+				"2": 77,
+				"3": 77,
 				"4": 11,
 				"5": 11,
-				"9": 27,
-				"11": 27,
-				"14": 27
+				"9": 11,
+				"10": 11,
+				"12": 11,
+				"15": 11
 			},
 			"col": {
 				"1": 1,
-				"2": 2,
-				"3": 3,
+				"2": 1,
+				"3": 1,
 				"4": 4,
-				"5": 5,
+				"5": 4,
 				"9": 4,
-				"11": 4,
-				"14": 4
+				"10": 4,
+				"12": 4,
+				"15": 4
 			},
 			"col_width": 1,
 			"widgets": [
 				{
 					"type": "gauge",
 					"settings": {
-						"title": "EC003 TT-011",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-011:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 50
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC003 TT-012",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-012:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC002 TT-007",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-007:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC002 TT-008",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-008:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC001 TT-003",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-003:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
+						"title": "EC003",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-022:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "ºC",
+						"min_value": "5",
+						"max_value": "20"
 					}
 				},
 				{
 					"type": "gauge",
 					"settings": {
-						"title": "EC001 TT-004",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-004:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
+						"title": "EC002",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-019:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "ºC",
+						"min_value": "5",
+						"max_value": "20"
 					}
 				}
 			]
 		},
 		{
-			"title": "CWM",
+			"title": "CWM live",
 			"width": 1,
 			"row": {
-				"1": 25,
-				"2": 25,
-				"3": 25,
+				"1": 91,
+				"2": 77,
+				"3": 77,
 				"4": 25,
 				"5": 25,
-				"11": 19,
-				"12": 19
+				"9": 25,
+				"12": 25
 			},
 			"col": {
 				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 2,
-				"5": 3,
-				"11": 1,
-				"12": 1
-			},
-			"col_width": 2,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 6,
-						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n         \t{label: 'EC-003 TT-031', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]},\n            {label: 'EC-001 TT-018', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-018:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
-						"x_timestamp": true,
-						"zoom": ""
-					}
-				}
-			]
-		},
-		{
-			"title": "CWM",
-			"width": 1,
-			"row": {
-				"1": 87,
-				"2": 87,
-				"3": 11,
-				"4": 31,
-				"5": 31,
-				"9": 19,
-				"12": 19
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 3,
-				"4": 1,
-				"5": 2,
+				"2": 2,
+				"3": 2,
+				"4": 4,
+				"5": 4,
 				"9": 4,
 				"12": 4
 			},
@@ -314,8 +188,8 @@
 						"title": "EC003 TT-031",
 						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-031:Temp-R\"][\"value\"].toFixed(1)",
 						"units": "ºC",
-						"min_value": 0,
-						"max_value": 50
+						"min_value": "20",
+						"max_value": "28"
 					}
 				},
 				{
@@ -324,8 +198,8 @@
 						"title": "EC003 TT-021",
 						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-021:Temp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
+						"min_value": "20",
+						"max_value": "26"
 					}
 				},
 				{
@@ -334,8 +208,8 @@
 						"title": "EC002 TT-030",
 						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-030:Temp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
+						"min_value": "20",
+						"max_value": "28"
 					}
 				},
 				{
@@ -344,139 +218,149 @@
 						"title": "EC002 TT-020",
 						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-020:Temp-R\"][\"value\"].toFixed(1)",
 						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
-					}
-				},
-				{
-					"type": "gauge",
-					"settings": {
-						"title": "EC001 TT-018",
-						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-018:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "°C",
-						"min_value": 0,
-						"max_value": 100
+						"min_value": "20",
+						"max_value": "28"
 					}
 				}
 			]
 		},
 		{
-			"title": "CWH",
+			"title": "CWM trends",
 			"width": 1,
 			"row": {
-				"1": 39,
-				"2": 39,
-				"3": 39,
-				"4": 39,
-				"5": 63,
-				"12": 27,
-				"13": 27,
-				"14": 27
+				"1": 33,
+				"2": 33,
+				"3": 33,
+				"4": 33,
+				"5": 33,
+				"11": 33,
+				"12": 33
 			},
 			"col": {
 				"1": 1,
 				"2": 1,
 				"3": 1,
-				"4": 2,
-				"5": -24,
-				"12": 1,
-				"13": 1,
-				"14": 1
+				"4": 1,
+				"5": 1,
+				"11": 1,
+				"12": 1
 			},
-			"col_width": 2,
+			"col_width": 3,
 			"widgets": [
 				{
 					"type": "flot_extended_plugin",
 					"settings": {
 						"plot_type": "line",
 						"legend": true,
-						"height": 6,
-						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-003', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-003:Temp-R\"]},\n\t\t\t{label: 'EC-001 TT-004', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-004:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+						"height": 10,
+						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n         \t{label: 'EC-003 TT-031', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n            {label: 'EC-003 TT-031', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n            {label: 'EC-003 TT-031', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-031:Temp-R\"]},\n            {label: 'EC-003 TT-021', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-021:Temp-R\"]},\n            {label: 'EC-002 TT-030', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-030:Temp-R\"]},\n            {label: 'EC-002 TT-020', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-020:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
 						"x_timestamp": true,
+						"points": false,
+						"tooltip": true,
 						"zoom": ""
 					}
 				}
 			]
 		},
 		{
-			"title": "Instrument Air",
+			"title": "CWH live",
 			"width": 1,
 			"row": {
-				"1": 157,
-				"2": 105,
-				"3": 67,
-				"4": 49,
-				"5": 49,
-				"13": 35,
-				"15": 35,
-				"16": 35
+				"1": 117,
+				"2": 91,
+				"3": 77,
+				"4": 51,
+				"5": 51,
+				"9": 51,
+				"11": 51,
+				"14": 51
 			},
 			"col": {
 				"1": 1,
-				"2": 2,
-				"3": 2,
+				"2": 1,
+				"3": 3,
 				"4": 4,
 				"5": 5,
-				"13": 4,
-				"15": 4,
-				"16": 4
+				"9": 4,
+				"11": 4,
+				"14": 4
 			},
 			"col_width": 1,
 			"widgets": [
 				{
 					"type": "gauge",
 					"settings": {
-						"title": "TT-028",
-						"value": "datasources[\"CWS\"][\"InstrA:WtrC-TT-028:Temp-R\"][\"value\"].toField(3)",
-						"units": "ºC",
-						"min_value": 0,
+						"title": "EC003 TT-011",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-011:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "°C",
+						"min_value": "40",
 						"max_value": 50
 					}
 				},
 				{
 					"type": "gauge",
 					"settings": {
-						"title": "TT-0029",
-						"value": "datasources[\"CWS\"][\"InstrA:WtrC-TT-029:Temp-R\"][\"value\"].toFixed(1)",
-						"units": "ºC",
-						"min_value": 0,
-						"max_value": 50
+						"title": "EC003 TT-012",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-012:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "°C",
+						"min_value": "40",
+						"max_value": "52"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "EC002 TT-007",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-007:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "°C",
+						"min_value": "40",
+						"max_value": "50"
+					}
+				},
+				{
+					"type": "gauge",
+					"settings": {
+						"title": "EC002 TT-008",
+						"value": "datasources[\"CWS\"][\"CWS-G02:WtrC-TT-008:Temp-R\"][\"value\"].toFixed(1)",
+						"units": "°C",
+						"min_value": "40",
+						"max_value": "50"
 					}
 				}
 			]
 		},
 		{
-			"title": "Instrument Air",
+			"title": "CWH trends",
 			"width": 1,
 			"row": {
-				"1": 53,
-				"2": 53,
-				"3": 53,
-				"4": 53,
-				"5": 39,
-				"13": 35,
-				"15": 35,
-				"16": 35
+				"1": 55,
+				"2": 55,
+				"3": 55,
+				"4": 55,
+				"5": 55,
+				"12": 55,
+				"13": 55,
+				"14": 55
 			},
 			"col": {
 				"1": 1,
 				"2": 1,
 				"3": 1,
-				"4": 2,
-				"5": 3,
+				"4": 1,
+				"5": 1,
+				"12": 1,
 				"13": 1,
-				"15": 1,
-				"16": 1
+				"14": 1
 			},
-			"col_width": 2,
+			"col_width": 3,
 			"widgets": [
 				{
 					"type": "flot_extended_plugin",
 					"settings": {
 						"plot_type": "line",
 						"legend": true,
-						"height": 6,
-						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"2w\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"2w\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"1w\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"1w\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"2d\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"2d\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"1d\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"1d\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n         ];\n        break;\n\tcase \"4h\":\n         data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"4h\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"4h\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n         ];\n        break;\n\tcase \"1h\":\n         data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"1h\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"1h\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n         ];\n        break;\n\tcase \"live\":\n        data = [\n\t\t\t{label: 'Instrument Air TT-028', data: datasources[\"live\"][\"InstrA:WtrC-TT-028:Temp-R\"]},\n\t\t\t{label: 'Instrument Air TT-029', data: datasources[\"live\"][\"InstrA:WtrC-TT-029:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+						"height": 10,
+						"value": "var series = document.getElementById(\"time-series\").value;\nswitch(series){\n    case \"2w\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"2w\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"1w\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1w\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"2d\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"2d\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"1d\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1d\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"4h\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"4h\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"1h\":\n         data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"1h\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n\tcase \"live\":\n        data = [\n         \t{label: 'EC-003 TT-011', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-011:Temp-R\"]},\n         \t{label: 'EC-003 TT-012', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-012:Temp-R\"]},\n            {label: 'EC-002 TT-007', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-007:Temp-R\"]},\n            {label: 'EC-002 TT-008', data: datasources[\"live\"][\"CWS-G02:WtrC-TT-008:Temp-R\"]}\n        ];\n        break;\n}\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
 						"x_timestamp": true,
 						"zoom": ""
 					}
@@ -577,4 +461,4 @@
 		}
 	],
 	"columns": 4
-}
\ No newline at end of file
+}