diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
index 669a9a3aedd17756b26548799391062b6a41aeab..ad6ec21525a7a3b56eb510d6997919681b7201c1 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/auto/KielerAutoLayouter.java
@@ -17,6 +17,8 @@ $Id$
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.base.ui.layout.auto;
 
+import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_CONNECTOR_SIZE;
+import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_HEIGHT;
 import static org.fortiss.tooling.base.utils.LayoutDataUtils.getNodeSize;
 import static org.fortiss.tooling.base.utils.LayoutDataUtils.setNodePosition;
 
@@ -76,16 +78,10 @@ import de.cau.cs.kieler.klay.layered.LayeredLayoutProvider;
  * @author offtermatt, barner
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 1A25EB9AE5984C3C687BEF6B4566F949
+ * @ConQAT.Rating YELLOW Hash: D34F2640E49CACAC2B6B776E3BF8E48E
  */
 public class KielerAutoLayouter implements IAutoLayouter {
 
-	/** Minimum mode width for layout. */
-	private static final int NODE_MIN_WIDTH = 150;
-
-	/** Height per port (used to derive minimum height of layouted element. */
-	private static final int PORT_HEIGHT = 20;
-
 	/** Mapping from {@link IHierarchicElement}s to {@link KNode}s. */
 	private EMap<IHierarchicElement, KNode> modelElementsToKNodes;
 
@@ -286,8 +282,9 @@ public class KielerAutoLayouter implements IAutoLayouter {
 			Dimension dimension = getNodeSize((ILayoutedModelElement)curElement);
 
 			int portNmbr = Math.max(inputPorts.size(), outputPorts.size());
-			curLayout.setHeight(Math.max((1 + 2 * portNmbr) * PORT_HEIGHT, dimension.getHeight()));
-			curLayout.setWidth(Math.max(NODE_MIN_WIDTH, dimension.getWidth()));
+			curLayout.setHeight(Math.max((1 + 2 * portNmbr) * DEFAULT_CONNECTOR_SIZE,
+					dimension.getHeight()));
+			curLayout.setWidth(Math.max(DEFAULT_SHAPE_MINIMUM_HEIGHT, dimension.getWidth()));
 
 			curKNode.setParent(parentNode);
 			modelElementsToKNodes.put(curElement, curKNode);
@@ -309,8 +306,8 @@ public class KielerAutoLayouter implements IAutoLayouter {
 		for(IConnector curPort : hierarchicElement.getConnectors()) {
 			KNode virtual = KimlUtil.createInitializedNode();
 			KShapeLayout virtualLayout = virtual.getData(KShapeLayout.class);
-			virtualLayout.setHeight(PORT_HEIGHT);
-			virtualLayout.setWidth(2 * PORT_HEIGHT);
+			virtualLayout.setHeight(DEFAULT_CONNECTOR_SIZE);
+			virtualLayout.setWidth(2 * DEFAULT_CONNECTOR_SIZE);
 			virtual.setParent(parentNode);
 
 			KPort k = KimlUtil.createInitializedPort();
@@ -367,7 +364,7 @@ public class KielerAutoLayouter implements IAutoLayouter {
 		KPort k = KimlUtil.createInitializedPort();
 		k.setNode(knode);
 		KShapeLayout portLayout = k.getData(KShapeLayout.class);
-		portLayout.setHeight(PORT_HEIGHT);
+		portLayout.setHeight(DEFAULT_CONNECTOR_SIZE);
 
 		connectorsToKPorts.put(connector, k);
 		return k;