diff --git a/VQI_PathwayEditorGUI.js b/VQI_PathwayEditorGUI.js
index a7dc8f4..c1187cd 100644
--- a/VQI_PathwayEditorGUI.js
+++ b/VQI_PathwayEditorGUI.js
@@ -475,7 +475,7 @@ var VQI_PathwayEditorGUI = function (parent) {
                 }
 
                 if (typeof (cy.$("node")[i].data("zIndex")) != "undefined") {
-                    cy.$("node")[i].style("zIndex", cy.$("node")[i].data("zIndex"));
+                    cy.$("node")[i].style("z-index", cy.$("node")[i].data("zIndex"));
                 }
             }
 
@@ -483,6 +483,10 @@ var VQI_PathwayEditorGUI = function (parent) {
                 if (typeof (cy.$("edge")[i].data("curveStyle")) != "undefined") {
                     cy.$("edge")[i].style("curve-style", cy.$("edge")[i].data("curveStyle"));
                 }
+				
+				if (typeof (cy.$("edge")[i].data("zOrder")) != "undefined") {
+                    cy.$("edge")[i].style("z-index", cy.$("edge")[i].data("zOrder"));
+                }
 
                 if (typeof (cy.$("edge")[i].data("segmentDistances")) != "undefined") {
                     cy.$("edge")[i].style("segment-distances", cy.$("edge")[i].data("segmentDistances"));
@@ -1377,7 +1381,7 @@ var VQI_PathwayEditorGUI = function (parent) {
             selectedForEditNodes.style("z-index", 0);
             selectedForEditNodes.data("zIndex", 0);
             selectedForEditEdges.style("z-index", 0);
-            selectedForEditEdges.data("zIndex", 0);
+            selectedForEditEdges.data("zOrder", 0);
             saveState();
         }
 
@@ -1386,7 +1390,7 @@ var VQI_PathwayEditorGUI = function (parent) {
             selectedForEditNodes.style("z-index", highestZOrder);
             selectedForEditNodes.data("zIndex", highestZOrder);
             selectedForEditEdges.style("z-index", highestZOrder);
-            selectedForEditEdges.data("zIndex", highestZOrder);
+            selectedForEditEdges.data("zOrder", highestZOrder);
             saveState();
         }