diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
index 7bcd7f0bc3c9701729f5a84e2fc84e1c336ab5ed..2b239bf94c3a1be718dd77820bc97b8fe498853f 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
@@ -164,7 +164,15 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 			for (Point p:pos) {
 				Graphics2D g2 = (Graphics2D) g;
                 g2.setStroke(roundLine);
-				g2.drawLine(p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y, pinArduino.get(assignment[counter]).x+posArduino.x, pinArduino.get(assignment[counter]).y+posArduino.y);
+                if (counter>5) {
+                	g2.drawLine(p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y, p.x+modules[i].getPosition().x, pinArduino.get(assignment[counter]).y+posArduino.y);
+                	g2.drawLine(p.x+modules[i].getPosition().x, pinArduino.get(assignment[counter]).y+posArduino.y, pinArduino.get(assignment[counter]).x+posArduino.x, pinArduino.get(assignment[counter]).y+posArduino.y);
+                } else {
+                g2.drawLine(p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y, p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y+90-(counter)*10);
+                g2.drawLine(p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y+90-(counter)*10, pinArduino.get(assignment[counter]).x+posArduino.x, p.y+modules[i].getPosition().y+90-(counter)*10);
+				g2.drawLine(pinArduino.get(assignment[counter]).x+posArduino.x, p.y+modules[i].getPosition().y+90-(counter)*10, pinArduino.get(assignment[counter]).x+posArduino.x, pinArduino.get(assignment[counter]).y+posArduino.y);
+                //g2.drawLine(p.x+modules[i].getPosition().x, p.y+modules[i].getPosition().y, pinArduino.get(assignment[counter]).x+posArduino.x, pinArduino.get(assignment[counter]).y+posArduino.y);
+                }
 				counter++;
 			}
 		}
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
index 6c04cf9dd1fd859c6cd2343eca6a8de45071ad6e..08fc2be2a571522e16d2363c4c00d21352d35e7d 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
@@ -34,7 +34,7 @@ public class ArduinoUno extends Modul {
 	private int led13 = 0;
 
 	public ArduinoUno(ImageIcon _icon,Simulator simu) {
-		int locx=100;
+		int locx=50;
 		int locy=50;
 		layerpane.setPreferredSize(new Dimension(587+locx, 418+locy));//587,418
 		JLabel chiplabel = new JLabel();
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
index 4cebd9fbe95639d20d32e6270b7c8ca4db1fa847..4254988fe2808adb80d2a57d2249e9bfd41da93f 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
@@ -85,7 +85,7 @@ public class Button extends Modul implements ActionListener {
 	}
 
 	public boolean connect(Arduino arduino) {
-		Pin tmpPin = arduino.getPin(3);
+		Pin tmpPin = arduino.getPin(5);
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);
 
@@ -93,7 +93,7 @@ public class Button extends Modul implements ActionListener {
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);
 
-		tmpPin = arduino.getPin(5);
+		tmpPin = arduino.getPin(3);
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);
 
diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
index 0c9257891aa3befeae13dd53ad56f20938170844..b9cc6d54b4d496a10d407d730ba9bef309ab6e90 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
@@ -63,7 +63,7 @@ public class RGB extends Modul {
 
 	public boolean connect(Arduino arduino) {
 		// TODO Pins= R G B ? Aktuell RBG
-		Pin tmpPin = arduino.getPin(9);
+		Pin tmpPin = arduino.getPin(11);
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);
 
@@ -71,7 +71,7 @@ public class RGB extends Modul {
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);
 
-		tmpPin = arduino.getPin(11);
+		tmpPin = arduino.getPin(9);
 		this.addPin(tmpPin);
 		tmpPin.setObserver(this);