diff --git a/WebSites/contacts/dashboard.json b/WebSites/contacts/dashboard.json
index f1fd1e0e172235c9152fe21255cd5abe93968aa8..6c607a6f53e5be24431ac5b774a14f35a791ca9b 100644
--- a/WebSites/contacts/dashboard.json
+++ b/WebSites/contacts/dashboard.json
@@ -120,7 +120,7 @@
 			"title": "Test Stand 2",
 			"width": 1,
 			"row": {
-				"1": 21,
+				"1": 27,
 				"2": 7,
 				"3": 7,
 				"4": 7,
@@ -180,7 +180,7 @@
 			"title": "On-Call",
 			"width": 1,
 			"row": {
-				"1": 35,
+				"1": 41,
 				"2": 21,
 				"3": 7,
 				"4": 7,
@@ -189,7 +189,7 @@
 			},
 			"col": {
 				"1": 1,
-				"2": 1,
+				"2": 2,
 				"3": 3,
 				"4": 3,
 				"6": 3,
@@ -200,37 +200,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Message</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n                <div class=\"tw-value\" style=\"font-size: 20px; max-width: 100%;\">`+datasources[\"Contacts\"][\"NSO:Ops:OCMsg\"][\"value\"]+`</div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 2
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Contact Person",
-						"size": "regular",
-						"value": "datasources[\"Contacts\"][\"NSO:Ops:OC\"][\"value\"]",
-						"animate": true
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Phone</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCPhone\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCPhone\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Mobile</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCMobile\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCMobile\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Email</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 20px;\"><a href=\"mailto:`+datasources[\"Contacts\"][\"NSO:Ops:OCEmail\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCEmail\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
+						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OC\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OC\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
 						"height": 1
 					}
 				}
@@ -240,10 +210,10 @@
 			"title": "On-Call Cryogenic Expert",
 			"width": 1,
 			"row": {
-				"1": 49,
-				"2": 21,
-				"3": 21,
-				"4": 7,
+				"1": 45,
+				"2": 25,
+				"3": 11,
+				"4": 11,
 				"5": 7,
 				"6": 7,
 				"7": 7
@@ -251,8 +221,8 @@
 			"col": {
 				"1": 1,
 				"2": 2,
-				"3": 1,
-				"4": 4,
+				"3": 3,
+				"4": 3,
 				"5": 4,
 				"6": 4,
 				"7": 4
@@ -262,37 +232,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Message</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n                <div class=\"tw-value\" style=\"font-size: 20px; max-width: 100%;\">`+datasources[\"Contacts\"][\"NSO:Ops:OCCMsg\"][\"value\"]+`</div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 2
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Contact Person",
-						"size": "regular",
-						"value": "datasources[\"Contacts\"][\"NSO:Ops:OCC\"][\"value\"]",
-						"animate": true
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Phone</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCCPhone\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCCPhone\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Mobile</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCCMobile\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCCMobile\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Email</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 20px;\"><a href=\"mailto:`+datasources[\"Contacts\"][\"NSO:Ops:OCCEmail\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCCEmail\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
+						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCC\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCC\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
 						"height": 1
 					}
 				}
@@ -302,18 +242,18 @@
 			"title": "On-Call Infrastructure Expert",
 			"width": 1,
 			"row": {
-				"1": 63,
-				"2": 35,
-				"3": 21,
-				"4": 21,
+				"1": 49,
+				"2": 29,
+				"3": 15,
+				"4": 15,
 				"6": 21,
 				"7": 21
 			},
 			"col": {
 				"1": 1,
 				"2": 2,
-				"3": 2,
-				"4": 2,
+				"3": 3,
+				"4": 3,
 				"6": 1,
 				"7": 1
 			},
@@ -322,118 +262,28 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Message</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n                <div class=\"tw-value\" style=\"font-size: 20px; max-width: 100%;\">`+datasources[\"Contacts\"][\"NSO:Ops:OCIMsg\"][\"value\"]+`</div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 2
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Contact Person",
-						"size": "regular",
-						"value": "datasources[\"Contacts\"][\"NSO:Ops:OCI\"][\"value\"]",
-						"animate": true
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Phone</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCIPhone\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCIPhone\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Mobile</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCIMobile\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCIMobile\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Email</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 20px;\"><a href=\"mailto:`+datasources[\"Contacts\"][\"NSO:Ops:OCIEmail\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCIEmail\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
+						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCI\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCI\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
 						"height": 1
 					}
 				}
 			]
 		},
 		{
-			"title": "On-Call PSS Engineer",
+			"title": "On-Call Electrical Technician",
 			"width": 1,
 			"row": {
-				"1": 77,
-				"2": 35,
-				"3": 21,
-				"4": 21,
+				"1": 31,
+				"2": 33,
+				"3": 19,
+				"4": 19,
 				"6": 21,
 				"7": 21
 			},
 			"col": {
 				"1": 1,
-				"2": 1,
+				"2": 2,
 				"3": 3,
 				"4": 3,
-				"6": 2,
-				"7": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Message</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n                <div class=\"tw-value\" style=\"font-size: 20px; max-width: 100%;\">`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSMsg\"][\"value\"]+`</div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 2
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Contact Person",
-						"size": "regular",
-						"value": "datasources[\"Contacts\"][\"NSO:Ops:OCPSS\"][\"value\"]",
-						"animate": true
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Phone</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSPhone\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSPhone\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Mobile</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSMobile\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSMobile\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Email</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 20px;\"><a href=\"mailto:`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSEmail\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCPSSEmail\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "On-Call Electrical Technician",
-			"width": 1,
-			"row": {
-				"1": 91,
-				"2": 49,
-				"3": 35,
-				"4": 21,
-				"6": 21,
-				"7": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 4,
 				"6": 3,
 				"7": 3
 			},
@@ -442,37 +292,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Message</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n                <div class=\"tw-value\" style=\"font-size: 20px; max-width: 100%;\">`+datasources[\"Contacts\"][\"NSO:Ops:OCEMsg\"][\"value\"]+`</div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 2
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Contact Person",
-						"size": "regular",
-						"value": "datasources[\"Contacts\"][\"NSO:Ops:OCE\"][\"value\"]",
-						"animate": true
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Phone</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCEPhone\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCEPhone\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Mobile</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCEMobile\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCEMobile\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
-						"height": 1
-					}
-				},
-				{
-					"type": "html",
-					"settings": {
-						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            <h2 class=\"section-title tw-title tw-td\">Email</h2>\n        </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 20px;\"><a href=\"mailto:`+datasources[\"Contacts\"][\"NSO:Ops:OCEEmail\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCEEmail\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
+						"html": "doc=`\n<div class=\"widget\" data-bind=\"widget: true, css:{fillsize:fillSize}\">\n    <div class=\"tw-display\">\n        <div class=\"tw-tr\">\n            </div>\n        <div class=\"tw-tr\">\n        \t<div class=\"tw-value-wrapper tw-td\">\n\t\t\t\t<div class=\"tw-value\" style=\"position: static; font-size: 30px; margin-top: -5px\"><a href=\"tel:`+datasources[\"Contacts\"][\"NSO:Ops:OCE\"][\"value\"]+`\">`+datasources[\"Contacts\"][\"NSO:Ops:OCE\"][\"value\"]+`</a></div>\n                <div class=\"tw-unit\" style=\"display: none;\"></div>\n            </div>\n        </div>\n        <div class=\"tw-tr\"><div class=\"tw-sparkline tw-td\" style=\"display: none;\"></div>\n    </div>\n</div>\n`\nreturn doc;",
 						"height": 1
 					}
 				}
@@ -484,7 +304,7 @@
 			"name": "Contacts",
 			"type": "JSON",
 			"settings": {
-				"url": "/data/api/v1/caget/NSO:Ops:SID,NSO:Ops:Msg,NSO:Ops:Phone,NSO:Ops:SL,NSO:Ops:SLPhone,NSO:Ops:SLEmail,NSO:Ops:OP,NSO:Ops:OPPhone,NSO:Ops:OCMsg,NSO:Ops:OCPhone,NSO:Ops:OC,NSO:Ops:OCMobile,NSO:Ops:OCEmail,NSO:Ops:OCCMsg,NSO:Ops:OCCPhone,NSO:Ops:OCC,NSO:Ops:OCCMobile,NSO:Ops:OCCEmail,NSO:Ops:OCIMsg,NSO:Ops:OCIPhone,NSO:Ops:OCI,NSO:Ops:OCIMobile,NSO:Ops:OCIEmail,NSO:Ops:OCPSSMsg,NSO:Ops:OCPSSPhone,NSO:Ops:OCPSS,NSO:Ops:OCPSSMobile,NSO:Ops:OCPSSEmail,NSO:Ops:OCEMsg,NSO:Ops:OCEPhone,NSO:Ops:OCE,NSO:Ops:OCEMobile,NSO:Ops:OCEEmail,TS2:Ops:SID,TS2:Ops:Phone,TS2:Ops:SL,TS2:Ops:SLPhone,TS2:Ops:Msg,TS2:Ops:SLEmail",
+				"url": "/data/api/v1/caget/NSO:Ops:SID,NSO:Ops:Msg,NSO:Ops:SL,NSO:Ops:Phone,NSO:Ops:SLPhone,NSO:Ops:SLEmail,NSO:Ops:OP,NSO:Ops:OPPhone,TS2:Ops:Msg,TS2:Ops:SL,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLPhone,TS2:Ops:SLEmail,NSO:Ops:OC,NSO:Ops:OCC,NSO:Ops:OCI,NSO:Ops:OCE",
 				"use_thingproxy": false,
 				"refresh": 10,
 				"method": "GET"
@@ -498,5 +318,5 @@
 			}
 		}
 	],
-	"columns": 4
+	"columns": 3
 }