diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java
new file mode 100644
index 0000000..5f67325
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java
@@ -0,0 +1,18 @@
+package graphicalrefactor.actions;
+
+import java.awt.event.ActionEvent;
+import graphicalrefactor.editor.Editor;
+
+public class DAGLayoutAction extends AbstractEditorAction {
+
+	public DAGLayoutAction(Editor editor) {
+		super("DAG Layout", editor);
+		// TODO Auto-generated constructor stub
+	}
+	
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		editor.setDAGLayout();
+	}
+
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
index 4d51c71..0a0e3a1 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -15,14 +16,17 @@
 import com.mxgraph.model.mxCell;
 import com.mxgraph.model.mxGeometry;
 import com.mxgraph.model.mxGraphModel;
+import com.mxgraph.model.mxIGraphModel;
 import com.mxgraph.util.mxConstants;
 import com.mxgraph.util.mxPoint;
+import com.mxgraph.util.mxRectangle;
 import com.mxgraph.view.mxGraph;
 
 import algorithms.NecessityOfStoringResourceStates;
 import algorithms.SelectableDataTransfers;
 import algorithms.UpdateConflictCheck;
 import code.ast.CompilationUnit;
+import graphicalrefactor.layouts.*;
 import models.Edge;
 import models.Node;
 import models.dataConstraintModel.ChannelGenerator;
@@ -242,6 +246,17 @@
 
 		return graph;
 	}
+	
+	public void setDAGLayout() {
+		Object parent = graph.getDefaultParent();
+		graph.getModel().beginUpdate();
+		try {
+			DAGLayout ctl = new DAGLayout(graph);
+			ctl.execute(parent);
+		} finally {
+			graph.getModel().endUpdate();
+		}
+	}
 
 	public void setTreeLayout() {
 		Object parent = graph.getDefaultParent();
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java
new file mode 100644
index 0000000..5e73b21
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java
@@ -0,0 +1,80 @@
+package graphicalrefactor.layouts;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.mxgraph.layout.mxGraphLayout;
+import com.mxgraph.model.mxCell;
+import com.mxgraph.model.mxICell;
+import com.mxgraph.model.mxIGraphModel;
+import com.mxgraph.util.mxRectangle;
+import com.mxgraph.view.mxCellState;
+import com.mxgraph.view.mxGraph;
+import com.mxgraph.view.mxGraphView;
+
+import models.dataConstraintModel.ChannelGenerator;
+import models.dataConstraintModel.IdentifierTemplate;
+
+public class DAGLayout extends mxGraphLayout {
+
+	public DAGLayout(mxGraph arg0) {
+		super(arg0);
+	}
+	
+	public void execute(Object parent) {
+		mxIGraphModel model = graph.getModel();
+		model.beginUpdate();
+		
+		try {
+			List<List<mxCell>> map = new ArrayList<List<mxCell>>();
+			List<String> moved = new ArrayList<String>();
+			
+			for (int i = 0; i < model.getChildCount(parent); i++) {
+				
+				mxCell cell = (mxCell) model.getChildAt(parent, i);
+				
+				if (model.isVertex(cell)) {
+					mxGraphView view = graph.getView();
+					mxCellState state = view.getState(cell);
+					double x = state.getX();
+					double y = state.getY();
+					double w = state.getWidth();
+					double h = state.getHeight();
+					
+					if(!"ellipse".equals(state.getStyle().get("shape")) && (cell.getEdgeCount() == 1)) {
+						map.get(map.size()).add(cell);
+						mxCell next = (mxCell) cell.getTarget();
+						lines(map, next);
+					}
+				}
+			}
+		}
+		finally {
+			model.endUpdate();
+		}
+	}
+	
+	public boolean firstmove(List<String> moved, String id) {
+		for (int i = 0; i < moved.size(); i++) {
+			if(moved.get(i) == id) return false;
+		}
+		return true;
+	}
+	
+	public void lines(List<List<mxCell>> mapping, mxCell next) {
+		mapping.get(mapping.size()-1).add(next);
+		for(int i = 0; i < next.getEdgeCount(); i++) {
+			if(next != (mxCell) next.getTarget()) {
+				if(i > 0) {
+					List<mxCell> newline = new ArrayList<mxCell>(mapping.get(mapping.size()-1));
+					mapping.add(newline);
+					lines(mapping, (mxCell) next.getTarget());
+				} else {
+					lines(mapping, (mxCell) next.getTarget());
+				}
+			}
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
index 1584119..e678111 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
@@ -7,6 +7,7 @@
 
 import graphicalrefactor.actions.AbstractEditorAction;
 import graphicalrefactor.actions.CircleLayoutAction;
+import graphicalrefactor.actions.DAGLayoutAction;
 import graphicalrefactor.actions.ExitAction;
 import graphicalrefactor.actions.OpenAction;
 import graphicalrefactor.actions.JavaPrototypeGenerateAction;
@@ -24,6 +25,7 @@
 	private OpenAction openAction = null;
 	private JavaPrototypeGenerateAction javaPrototypeGenerateAction = null;
 	private JerseyPrototypeGenerateAction jerseyPrototypeGenerateAction = null;
+	private DAGLayoutAction dagLayoutAction = null;
 	private TreeLayoutAction treeLayoutAction = null;
 	private CircleLayoutAction circleLayoutAction = null;
 	
@@ -38,6 +40,7 @@
 		menu.add(new ExitAction());
 		
 		menu = add(new JMenu("Layout"));
+		menu.add(dagLayoutAction  = new DAGLayoutAction(graphicalModelRefactor.getEditor()));
 		menu.add(treeLayoutAction  = new TreeLayoutAction(graphicalModelRefactor.getEditor()));
 		menu.add(circleLayoutAction   = new CircleLayoutAction(graphicalModelRefactor.getEditor()));