diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
index 9dc8998..d0c1158 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
@@ -1,102 +1,99 @@
 package application;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JFrame;
-
+import application.editor.Editor;
 import application.views.NavigationWindow;
 import com.mxgraph.model.mxCell;
 import com.mxgraph.model.mxGeometry;
 import com.mxgraph.model.mxGraphModel;
-import com.mxgraph.swing.mxGraphComponent;
 import com.mxgraph.swing.handler.mxRubberband;
-import com.mxgraph.swing.view.mxICellEditor;
+import com.mxgraph.swing.mxGraphComponent;
 import com.mxgraph.util.mxEvent;
 import com.mxgraph.util.mxEventObject;
 import com.mxgraph.util.mxEventSource.mxIEventListener;
 import com.mxgraph.view.mxGraph;
 
-import application.editor.Editor;
-import application.editor.DataTransferModelingCellEditor;
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ApplicationWindow extends JFrame {
-	private static final long serialVersionUID = -8690140317781055614L;
-	public static final String title = "Visual Modeling Tool";
-	
-	private Editor editor = null;
-	private mxGraph graph = null;
-	private mxGraphComponent graphComponent = null;
-	
-	private ApplicationMenuBar menuBar = null;
-	private NavigationWindow navigationWindow;
+    private static final long serialVersionUID = -8690140317781055614L;
+    public static final String title = "Visual Modeling Tool";
 
-	public ApplicationWindow() {
-		setTitle(title);
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		
-		this.graph = new mxGraph() {
-			public boolean isPort(Object cell) {
-				mxGeometry geo = getCellGeometry(cell);
-				
-				return (geo != null) ? geo.isRelative() : false;
-			}
-			
-			public boolean isCellFoldable(Object cell, boolean collapse) {
-				return false;
-			}
-		};
-		
-		this.graphComponent = new mxGraphComponent(graph);
-		
-		this.editor = new Editor(graphComponent);
-		
-		graph.getModel().addListener(mxEvent.CHANGE, new mxIEventListener() {
-			public void invoke(Object sender, mxEventObject evt) {
-				List<mxCell> terminals = new ArrayList<>();
-				mxCell cell = null;
-				for (Object change: ((List) evt.getProperties().get("changes"))) {
-					if (change instanceof mxGraphModel.mxTerminalChange) {
-						mxGraphModel.mxTerminalChange terminalChange = (mxGraphModel.mxTerminalChange) change;
-						cell = (mxCell) terminalChange.getCell();
-						mxCell terminal = (mxCell) terminalChange.getTerminal();
-						terminals.add(terminal);
-					}
-				}
-				if (terminals.size() == 2) {
-					if (!editor.connectEdge(cell, terminals.get(0), terminals.get(1))) {
-						graph.removeCells(new mxCell[] {cell});
-					}
-				}
-			}
-		});
-		getContentPane().add(graphComponent);
-		new mxRubberband(graphComponent);
-		graph.setAllowDanglingEdges(false);
-		graph.setCellsDisconnectable(true);
-				
-		menuBar = new ApplicationMenuBar(this);
-		setJMenuBar(menuBar);
-		setSize(870, 640);
+    private Editor editor = null;
+    private mxGraph graph = null;
+    private mxGraphComponent graphComponent = null;
 
-		navigationWindow = new NavigationWindow(this, editor);
-		navigationWindow.setVisible(true);
-	}
+    private ApplicationMenuBar menuBar = null;
+    private NavigationWindow navigationWindow;
 
-	public mxGraph getGraph() {
-		return graph;
-	}
+    public ApplicationWindow() {
+        setTitle(title);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-	public mxGraphComponent getGraphComponent() {
-		return graphComponent;
-	}
+        this.graph = new mxGraph() {
+            public boolean isPort(Object cell) {
+                mxGeometry geo = getCellGeometry(cell);
 
-	public Editor getEditor() {
-		return editor;
-	}
+                return (geo != null) ? geo.isRelative() : false;
+            }
 
-	public void setEditor(Editor editor) {
-		this.editor = editor;
-	}
+            public boolean isCellFoldable(Object cell, boolean collapse) {
+                return false;
+            }
+        };
+
+        this.graphComponent = new mxGraphComponent(graph);
+
+        this.editor = new Editor(graphComponent);
+
+        graph.getModel().addListener(mxEvent.CHANGE, new mxIEventListener() {
+            public void invoke(Object sender, mxEventObject evt) {
+                List<mxCell> terminals = new ArrayList<>();
+                mxCell cell = null;
+                for (Object change : ((List) evt.getProperties().get("changes"))) {
+                    if (change instanceof mxGraphModel.mxTerminalChange) {
+                        mxGraphModel.mxTerminalChange terminalChange = (mxGraphModel.mxTerminalChange) change;
+                        cell = (mxCell) terminalChange.getCell();
+                        mxCell terminal = (mxCell) terminalChange.getTerminal();
+                        terminals.add(terminal);
+                    }
+                }
+                if (terminals.size() == 2) {
+                    if (!editor.connectEdge(cell, terminals.get(0), terminals.get(1))) {
+                        graph.removeCells(new mxCell[]{cell});
+                    }
+                }
+            }
+        });
+        getContentPane().add(graphComponent);
+        new mxRubberband(graphComponent);
+        graph.setAllowDanglingEdges(false);
+        graph.setCellsDisconnectable(true);
+
+        menuBar = new ApplicationMenuBar(this);
+        setJMenuBar(menuBar);
+        setSize(870, 640);
+
+        navigationWindow = new NavigationWindow(this, editor);
+        navigationWindow.setVisible(true);
+        editor.addStageChangeListener(navigationWindow);
+    }
+
+    public mxGraph getGraph() {
+        return graph;
+    }
+
+    public mxGraphComponent getGraphComponent() {
+        return graphComponent;
+    }
+
+    public Editor getEditor() {
+        return editor;
+    }
+
+    public void setEditor(Editor editor) {
+        this.editor = editor;
+    }
 
 }