diff --git a/web/gui/src/main/webapp/json/ev/colors/ev_37_onos.json b/web/gui/src/main/webapp/json/ev/colors/ev_37_onos.json
new file mode 100644
index 0000000..a5cef11
--- /dev/null
+++ b/web/gui/src/main/webapp/json/ev/colors/ev_37_onos.json
@@ -0,0 +1,14 @@
+{
+  "event": "updateInstance",
+  "payload": {
+    "id": "192.168.56.101",
+    "ip": "192.168.56.101",
+    "online": true,
+    "uiAttached": true,
+    "switches": 4,
+    "labels": [
+      "192.168.56.101",
+      "192.168.56.101"
+    ]
+  }
+}
diff --git a/web/gui/src/main/webapp/json/ev/colors/ev_38_onos.json b/web/gui/src/main/webapp/json/ev/colors/ev_38_onos.json
new file mode 100644
index 0000000..65cae8d
--- /dev/null
+++ b/web/gui/src/main/webapp/json/ev/colors/ev_38_onos.json
@@ -0,0 +1,14 @@
+{
+  "event": "updateInstance",
+  "payload": {
+    "id": "onos-master",
+    "ip": "192.168.0.7",
+    "online": false,
+    "uiAttached": false,
+    "switches": 300,
+    "labels": [
+      "onos-master",
+      "192.168.0.7"
+    ]
+  }
+}
diff --git a/web/gui/src/main/webapp/json/ev/colors/scenario.json b/web/gui/src/main/webapp/json/ev/colors/scenario.json
index a457123..dd17828 100644
--- a/web/gui/src/main/webapp/json/ev/colors/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/colors/scenario.json
@@ -7,6 +7,7 @@
     "lastAuto": 29
   },
   "description": [
-    "Press 'S' to load initial events."
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events."
   ]
 }
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_18_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_18_onos.json
index 07ebf97..4168e11 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_18_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_18_onos.json
@@ -2,7 +2,10 @@
   "event": "updateInstance",
   "payload": {
     "id": "onos-3",
+    "ip": "192.168.3.3",
     "online": true,
+    "uiAttached": false,
+    "switches": 2,
     "labels": [
       "onos-3",
       "192.168.3.3"
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_19_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_19_onos.json
index 9498d1d..2e95539 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_19_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_19_onos.json
@@ -2,7 +2,10 @@
   "event": "updateInstance",
   "payload": {
     "id": "onos-3",
+    "ip": "192.168.3.3",
     "online": false,
+    "uiAttached": false,
+    "switches": 2,
     "labels": [
       "onos-3",
       "192.168.3.3"
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_1_onos.json
index 06d8680..287538e 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_1_onos.json
@@ -2,7 +2,10 @@
   "event": "addInstance",
   "payload": {
     "id": "192.168.56.101",
+    "ip": "192.168.56.101",
     "online": true,
+    "uiAttached": false,
+    "switches": 2,
     "labels": [
       "192.168.56.101",
       "127.0.0.1"
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_2_onos.json
index be2aefb..bbf6c64 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_2_onos.json
@@ -2,7 +2,10 @@
   "event": "addInstance",
   "payload": {
     "id": "onos-2",
+    "ip": "192.168.2.2",
     "online": true,
+    "uiAttached": true,
+    "switches": 1,
     "labels": [
       "onos-2",
       "192.168.2.2"
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_3_onos.json
index bfa1785..0459e10 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_3_onos.json
@@ -2,7 +2,10 @@
   "event": "addInstance",
   "payload": {
     "id": "onos-3",
+    "ip": "192.168.3.3",
     "online": false,
+    "uiAttached": false,
+    "switches": 2,
     "labels": [
       "onos-3",
       "192.168.3.3"
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_5_onos.json
index 352a835..d99b0fe 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_5_onos.json
@@ -4,7 +4,7 @@
     "id": "of:0000ffffffff0003",
     "type": "switch",
     "online": true,
-    "master": "local",
+    "master": "192.168.56.101",
     "labels": [
       "0000ffffffff0003",
       "FF:FF:FF:FF:00:03",
diff --git a/web/gui/src/main/webapp/json/ev/instances/ev_8_onos.json b/web/gui/src/main/webapp/json/ev/instances/ev_8_onos.json
index dfff514..d3bb143 100644
--- a/web/gui/src/main/webapp/json/ev/instances/ev_8_onos.json
+++ b/web/gui/src/main/webapp/json/ev/instances/ev_8_onos.json
@@ -4,7 +4,7 @@
     "id": "of:0000ffffffffff03",
     "type": "roadm",
     "online": true,
-    "master": "local",
+    "master": "192.168.56.101",
     "labels": [
       "0000ffffffffff03",
       "FF:FF:FF:FF:FF:03",
diff --git a/web/gui/src/main/webapp/json/ev/instances/scenario.json b/web/gui/src/main/webapp/json/ev/instances/scenario.json
index 807a51b2..503edfc 100644
--- a/web/gui/src/main/webapp/json/ev/instances/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/instances/scenario.json
@@ -7,10 +7,10 @@
     "lastAuto": 17
   },
   "description": [
-    "Visualizing ONOS instances.",
+    "Press 'I' to show instance pane.",
+    "Press 'H' to show hosts.",
     "",
-    "Press 'S' to load initial events.",
-    "",
-    "Press spacebar to complete the scenario..."
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events."
   ]
 }
diff --git a/web/gui/src/main/webapp/json/ev/links/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/links/ev_1_onos.json
index d7f69d3..46803a2 100644
--- a/web/gui/src/main/webapp/json/ev/links/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/links/ev_1_onos.json
@@ -2,7 +2,10 @@
   "event": "addInstance",
   "payload": {
     "id": "local",
+    "ip": "127.0.0.1",
     "online": true,
+    "uiAttached": true,
+    "switches": 43,
     "labels": [
       "local",
       "127.0.0.1"
diff --git a/web/gui/src/main/webapp/json/ev/links/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/links/ev_2_onos.json
index 352a835..46e56f6 100644
--- a/web/gui/src/main/webapp/json/ev/links/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/links/ev_2_onos.json
@@ -6,9 +6,9 @@
     "online": true,
     "master": "local",
     "labels": [
-      "0000ffffffff0003",
-      "FF:FF:FF:FF:00:03",
-      "sw-3"
+      "",
+      "sw-3",
+      "0000ffffffff0003"
     ],
     "metaUi": {
       "x": 282,
diff --git a/web/gui/src/main/webapp/json/ev/links/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/links/ev_3_onos.json
index d52db4e..c32cd28 100644
--- a/web/gui/src/main/webapp/json/ev/links/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/links/ev_3_onos.json
@@ -6,9 +6,9 @@
     "online": true,
     "master": "local",
     "labels": [
-      "0000ffffffff0007",
-      "FF:FF:FF:FF:00:07",
-      "sw-7"
+      "",
+      "sw-7",
+      "0000ffffffff0007"
     ],
     "metaUi": {
       "x": 530,
diff --git a/web/gui/src/main/webapp/json/ev/links/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/links/ev_4_onos.json
index 9f2c260..375fccc 100644
--- a/web/gui/src/main/webapp/json/ev/links/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/links/ev_4_onos.json
@@ -6,9 +6,9 @@
     "online": true,
     "master": "local",
     "labels": [
-      "0000ffffffff0008",
-      "FF:FF:FF:FF:00:08",
-      "sw-8"
+      "",
+      "sw-8",
+      "0000ffffffff0008"
     ],
     "metaUi": {
       "x": 734,
diff --git a/web/gui/src/main/webapp/json/ev/links/scenario.json b/web/gui/src/main/webapp/json/ev/links/scenario.json
index b1988ca..2cef0aa 100644
--- a/web/gui/src/main/webapp/json/ev/links/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/links/scenario.json
@@ -7,10 +7,9 @@
     "lastAuto": 13
   },
   "description": [
-    "Develop link event handling.",
+    "Press 'H' to show hosts.",
     "",
-    "Press 'S' to load initial events.",
-    "",
-    "Press spacebar to complete the scenario..."
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events."
   ]
 }
diff --git a/web/gui/src/main/webapp/json/ev/simple/scenario.json b/web/gui/src/main/webapp/json/ev/simple/scenario.json
index 4c55b2d..4f2ae60 100644
--- a/web/gui/src/main/webapp/json/ev/simple/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/simple/scenario.json
@@ -8,6 +8,10 @@
     "lastAuto": 0
   },
   "description": [
+    "Press 'H' to show hosts.",
+    "",
+    "Press '-' to fire further events.",
+    "",
     "1. add device [8] (offline)",
     "2. add device [3] (offline)",
     "3. update device [8] (online, label3 change)",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
index ec0f258..e07a3c7 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_10_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff04",
-      "FF:FF:FF:FF:FF:04",
-      "?"
+      "",
+      "opt-4",
+      "0000ffffffffff04"
     ],
     "metaUi": {
       "x": 322,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
index 04e6754..71efaf3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_11_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff000A",
-      "FF:FF:FF:FF:00:0A",
-      "?"
+      "",
+      "sw-A",
+      "0000ffffffff000A"
     ],
     "metaUi": {
       "x": 832,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
index c778cd5..7d9fe61 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_12_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0001",
-      "FF:FF:FF:FF:00:01",
-      "?"
+      "",
+      "sw-1",
+      "0000ffffffff0001"
     ],
     "metaUi": {
       "x": 167,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
index a0cc21f..12937b4 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_13_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff01",
-      "FF:FF:FF:FF:FF:01",
-      "?"
+      "",
+      "opt-1",
+      "0000ffffffffff01"
     ],
     "metaUi": {
       "x": 227,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
index 93127a8..c4f9790 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_14_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0004",
-      "FF:FF:FF:FF:00:04",
-      "?"
+      "",
+      "sw-4",
+      "0000ffffffff0004"
     ],
     "metaUi": {
       "x": 317,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
index f2d6891..6a51e77 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_15_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff0A",
-      "FF:FF:FF:FF:FF:0A",
-      "?"
+      "",
+      "opt-A",
+      "0000ffffffffff0A"
     ],
     "metaUi": {
       "x": 840,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
index 3b0db4b..ba243ba5 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_16_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff09",
-      "FF:FF:FF:FF:FF:09",
-      "?"
+      "",
+      "opt-9",
+      "0000ffffffffff09"
     ],
     "metaUi": {
       "x": 1010,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
index 69c62b9..1a7e24b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_17_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff02/20-of:0000ffffffffff05/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff02",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
index d11f13e..5f9f7d7 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_18_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff000A/2-of:0000ffffffffff0A/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff000A",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
index 1349a3b..5c928ee 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_19_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/10-of:0000ffffffffff02/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
index 00a3e17..bd07ae6 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_1_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff08",
-      "FF:FF:FF:FF:FF:08",
-      "?"
+      "",
+      "opt-B",
+      "0000ffffffffff08"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
index e4d2161..44705d5 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_20_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/21-of:0000ffffffffff05/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "21",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
index ccdad88..0fa67d2 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_21_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0001/2-of:0000ffffffffff01/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0001",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
index 52a4a02..0edde2a 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_22_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff09/20-of:0000ffffffffff0A/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff09",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
index be778551..5443b41 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_23_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff07",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
index 6ae5192..5e7bb99 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_24_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff02/10-of:0000ffffffffff01/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff02",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
index 7fabce6..1d0e976 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_25_onos.json
@@ -2,12 +2,13 @@
   "event": "addLink",
   "payload": {
     "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
+    "type": "optical",
+    "online": true,
+    "linkWidth": 2,
     "src": "of:0000ffffffffff04",
     "srcPort": "27",
     "dst": "of:0000ffffffffff08",
     "dstPort": "10",
-    "type": "optical",
-    "linkWidth": 2,
     "props" : {
       "BW": "30 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
index b89a287..9f2cd7b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_26_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0003/2-of:0000ffffffffff03/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0003",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
index 112a33e..23ccc22 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_27_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff09/1-of:0000ffffffff0009/2",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff09",
     "srcPort": "1",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
index 52207df..84be94f 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_28_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/30-of:0000ffffffffff04/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
index c4660a3..be5c696 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_29_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/20-of:0000ffffffffff09/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
index 8d4fbfa..b00c689 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_2_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff03",
-      "FF:FF:FF:FF:FF:03",
-      "?"
+      "",
+      "opt-3",
+      "0000ffffffffff03"
     ],
     "metaUi": {
       "x": 95,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
index e23cc2a..283d300 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_30_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff0A",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
index a798e53..965f76b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_31_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffff0004/2-of:0000ffffffffff04/1",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffff0004",
     "srcPort": "2",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
index aac204f..3d90bfa 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_32_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/1-of:0000ffffffff0007/2",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff07",
     "srcPort": "1",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
index ab23e93..7b17dda 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_33_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff06",
-      "FF:FF:FF:FF:FF:06",
-      "?"
+      "",
+      "opt-6",
+      "0000ffffffffff06"
     ],
     "metaUi": {
       "x": 336,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
index 09be8e6..a75a345 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_34_onos.json
@@ -2,12 +2,13 @@
   "event": "addLink",
   "payload": {
     "id": "of:0000ffffffffff06/20-of:0000ffffffffff05/30",
+    "type": "optical",
+    "online": true,
+    "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "20",
     "dst": "of:0000ffffffffff05",
     "dstPort": "30",
-    "type": "optical",
-    "linkWidth": 4,
     "props" : {
       "BW": "70 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
index 4b612e9..055a80d 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_35_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff03/20-of:0000ffffffffff06/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff03",
     "srcPort": "20",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
index cddb929..addcc6d 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_36_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
     "type": "optical",
+    "online": true,
     "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
index 6f608cd..42adbf9 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_37_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": false,
     "labels": [
-      "0000ffffffffff08",
-      "FF:FF:FF:FF:FF:08",
-      "?"
+      "",
+      "opt-8",
+      "0000ffffffffff08"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
index 09a0339..5479f6e 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_38_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff07",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
index a85cee6..13c2cf2 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_39_onos.json
@@ -2,12 +2,13 @@
   "event": "removeLink",
   "payload": {
     "id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
+    "type": "optical",
+    "online": false,
+    "linkWidth": 2,
     "src": "of:0000ffffffffff04",
     "srcPort": "27",
     "dst": "of:0000ffffffffff08",
     "dstPort": "10",
-    "type": "optical",
-    "linkWidth": 2,
     "props" : {
       "BW": "30 G"
     }
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
index b4c3537..eb1da81 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_3_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0007",
-      "FF:FF:FF:FF:00:07",
-      "?"
+      "",
+      "sw-7",
+      "0000ffffffff0007"
     ],
     "metaUi": {
       "x": 890,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
index 1b95d24..7a9c1e1 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_40_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff0A",
     "srcPort": "10",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
index 1efc1f6..fb2fa45 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_41_onos.json
@@ -3,6 +3,7 @@
   "payload": {
     "id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
     "type": "optical",
+    "online": false,
     "linkWidth": 4,
     "src": "of:0000ffffffffff06",
     "srcPort": "30",
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
index 053b963..495d69b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_4_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0009",
-      "FF:FF:FF:FF:00:09",
-      "?"
+      "",
+      "sw-9",
+      "0000ffffffff0009"
     ],
     "metaUi": {
       "x": 1004,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
index 332bfdb..0fe4341 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_5_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff02",
-      "FF:FF:FF:FF:FF:02",
-      "?"
+      "",
+      "opt-2",
+      "0000ffffffffff02"
     ],
     "metaUi": {
       "x": 211,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
index c764bc1..7557c02 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_6_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0003",
-      "FF:FF:FF:FF:00:03",
-      "?"
+      "",
+      "sw-3",
+      "0000ffffffff0003"
     ],
     "metaUi": {
       "x": 114,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
index 25a6dce..ed90ac3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_7_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff07",
-      "FF:FF:FF:FF:FF:07",
-      "?"
+      "",
+      "opt-7",
+      "0000ffffffffff07"
     ],
     "metaUi": {
       "x": 925,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
index a4082d1..f9f429b 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_8_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": false,
     "labels": [
-      "0000ffffffffff06",
-      "FF:FF:FF:FF:FF:06",
-      "?"
+      "",
+      "opt-6",
+      "0000ffffffffff06"
     ],
     "metaUi": {
       "x": 336,
diff --git a/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json b/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
index 0f497c0..72d8fed 100644
--- a/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
+++ b/web/gui/src/main/webapp/json/ev/startup/ev_9_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff05",
-      "FF:FF:FF:FF:FF:05",
-      "?"
+      "",
+      "opt-5",
+      "0000ffffffffff05"
     ],
     "metaUi": {
       "x": 539,
diff --git a/web/gui/src/main/webapp/json/ev/startup/scenario.json b/web/gui/src/main/webapp/json/ev/startup/scenario.json
index 089d53a..0fe1dd3 100644
--- a/web/gui/src/main/webapp/json/ev/startup/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/startup/scenario.json
@@ -11,9 +11,8 @@
     "Loads 16 devices (10 optical, 6 packet)",
     " and their associated links.",
     "",
-    "Press 'S' to load initial events.",
-    "",
-    "Press spacebar to complete the scenario...",
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events...",
     " * 4 events - device online, add 3 links",
     " * 5 events - device offline, remove 4 links"
   ]
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
index 2866f3f..6c08070 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_11_onos.json
@@ -2,7 +2,7 @@
   "event": "addLink",
   "payload": {
     "id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
-    "type": "direct",
+    "type": "optical",
     "online": true,
     "linkWidth": 2,
     "src": "of:0000ffffffffff08",
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
index 657900c..3b76e53 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_15_onos.json
@@ -4,21 +4,28 @@
   "payload": {
     "paths": [
       {
-        "intentId": "0x4321",
+        "class": "primary",
         "links": [
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
           "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
         ],
-        "class": "primary"
+        "labels": [
+          "20 bytes",
+          "20 bytes"
+        ]
       },
       {
-        "intentId": "0xbab3",
+        "class": "primary optical",
         "links": [
           "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
           "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
           "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
         ],
-        "class": "primary optical"
+        "labels": [
+          "24 bytes",
+          "some bits",
+          "foo bars"
+        ]
       }
     ]
   }
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
index 5198454..4f42d41 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_16_onos.json
@@ -4,21 +4,28 @@
   "payload": {
     "paths": [
       {
-        "intentId": "0x4321",
+        "class": "secondary",
         "links": [
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
           "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
         ],
-        "class": "secondary"
+        "labels": [
+          "35 bytes",
+          "35 bytes"
+        ]
       },
       {
-        "intentId": "0xbab3",
+        "class": "secondary optical",
         "links": [
           "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
           "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
           "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
         ],
-        "class": "secondary optical"
+        "labels": [
+          "24 bytes",
+          "some bits",
+          "foo bars"
+        ]
       }
     ]
   }
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
index 0a1fd74..f53b3e4 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_17_onos.json
@@ -4,21 +4,30 @@
   "payload": {
     "paths": [
       {
-        "intentId": "0x4321",
+        "class": "animated",
+        "traffic": true,
         "links": [
           "0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
           "0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
         ],
-        "class": "animated"
+        "labels": [
+          "47 bytes",
+          "47 bytes"
+        ]
       },
       {
-        "intentId": "0xbab3",
+        "class": "animated optical",
+        "traffic": true,
         "links": [
           "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
           "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
           "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
         ],
-        "class": "animated optical"
+        "labels": [
+          "24 bytes",
+          "some bits",
+          "foo bars"
+        ]
       }
     ]
   }
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
index 571ba99..7ecaa88 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_18_onos.json
@@ -4,46 +4,52 @@
   "payload": {
     "paths": [
       {
-        "intentId": "0x1234",
+        "class": "primary",
+        "traffic": false,
         "links": [
           "of:0000ffffffff0008/2-of:0000ffffffff0003/1"
         ],
-        "class": "primary"
+        "labels": [""]
       },
       {
-        "intentId": "0x4321",
+        "class": "secondary",
+        "traffic": false,
         "links": [
           "of:0000ffffffff0003/9-of:0000ffffffff0007/2"
         ],
-        "class": "secondary"
+        "labels": [""]
       },
       {
-        "intentId": "0xbabe",
+        "class": "animated",
+        "traffic": true,
         "links": [
           "of:0000ffffffff0008/4-of:0000ffffffff0007/1"
         ],
-        "class": "animated"
+        "labels": [""]
       },
       {
-        "intentId": "0xbab1",
+        "class": "primary optical",
+        "traffic": false,
         "links": [
           "of:0000ffffffff0008/4-of:0000ffffffffff08/1"
         ],
-        "class": "primary optical"
+        "labels": [""]
       },
       {
-        "intentId": "0xbab2",
+        "class": "secondary optical",
+        "traffic": false,
         "links": [
           "of:0000ffffffff0003/4-of:0000ffffffffff03/1"
         ],
-        "class": "secondary optical"
+        "labels": [""]
       },
       {
-        "intentId": "0xbab3",
+        "class": "animated optical",
+        "traffic": true,
         "links": [
           "of:0000ffffffffff08/4-of:0000ffffffffff03/1"
         ],
-        "class": "animated optical"
+        "labels": [""]
       }
     ]
   }
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
index 6d3c08a..5f8aae0 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_19_onos.json
@@ -2,7 +2,6 @@
   "event": "showTraffic",
   "sid": 1,
   "payload": {
-    "paths": [
-    ]
+    "paths": []
   }
 }
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
index 1357cef..0a4c853 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_1_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0008",
-      "FF:FF:FF:FF:00:08",
-      "sw-8"
+      "",
+      "sw-8",
+      "0000ffffffff0008"
     ],
     "metaUi": {
       "x": 734,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
index df9b623..bdc52fa 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_2_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0003",
-      "FF:FF:FF:FF:00:03",
-      "sw-3"
+      "",
+      "sw-3",
+      "0000ffffffff0003"
     ],
     "metaUi": {
       "x": 282,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
index d49d597..0a064b2 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_3_onos.json
@@ -5,9 +5,9 @@
     "type": "switch",
     "online": true,
     "labels": [
-      "0000ffffffff0007",
-      "FF:FF:FF:FF:00:07",
-      "sw-7"
+      "",
+      "sw-7",
+      "0000ffffffff0007"
     ],
     "metaUi": {
       "x": 530,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
index 631ed27..5326092 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_4_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff08",
-      "FF:FF:FF:FF:FF:08",
-      "opt-8"
+      "",
+      "opt-8",
+      "0000ffffffffff08"
     ],
     "metaUi": {
       "x": 734,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json b/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
index 4c8cc7c..266d22a 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/ev_5_onos.json
@@ -5,9 +5,9 @@
     "type": "roadm",
     "online": true,
     "labels": [
-      "0000ffffffffff03",
-      "FF:FF:FF:FF:FF:03",
-      "opt-3"
+      "",
+      "opt-3",
+      "0000ffffffffff03"
     ],
     "metaUi": {
       "x": 282,
diff --git a/web/gui/src/main/webapp/json/ev/traffic/scenario.json b/web/gui/src/main/webapp/json/ev/traffic/scenario.json
index 06f9bf8..9eb9a69 100644
--- a/web/gui/src/main/webapp/json/ev/traffic/scenario.json
+++ b/web/gui/src/main/webapp/json/ev/traffic/scenario.json
@@ -9,8 +9,9 @@
   "description": [
     "Figure out primary, secondary and animated link visualizations.",
     "",
-    "Press 'S' to load initial events.",
+    "Press 'H' to show hosts.",
     "",
-    "Press spacebar to complete the scenario..."
+    "Press '=' to load initial events.",
+    "Press '-' to fire further events."
   ]
 }