diff --git a/Applicatie/ControlPanel.java b/Applicatie/ControlPanel.java
index d135e2c..f5bd63a 100644
--- a/Applicatie/ControlPanel.java
+++ b/Applicatie/ControlPanel.java
@@ -26,10 +26,11 @@ public class ControlPanel extends JPanel
 		super();
 		BoxLayout box = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(box);
+		
 		setPreferredSize(new Dimension(0,50));
 		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
 		setBackground(new Color(220, 220, 220));
-		
+		setFocusable(false);
 		
 		JPanel simulatorPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
 		simulatorPanel.setPreferredSize(new Dimension(350,50));
diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java
index 2f606c0..06003b6 100644
--- a/Applicatie/Panel.java
+++ b/Applicatie/Panel.java
@@ -27,6 +27,7 @@ import javax.swing.JPanel;
 import javax.swing.Timer;
 
 import Agenda.Agenda;
+import Listeners.WindowFocusListener;
 import Listeners.Mouse;
 import Listeners.MouseMotion;
 import Listeners.MouseWheel;
@@ -112,7 +113,7 @@ public class Panel extends JPanel implements ActionListener
 			entranceImage = ImageIO.read(new File("images/entranceIcon.png"));
 			wallImage = ImageIO.read(new File("images/wallIcon.png"));
 			foodImage = ImageIO.read(new File("images/foodIcon.png"));
-			waypointImage = ImageIO.read(new File("images/waypointIcon.png"));
+			waypointImage = ImageIO.read(new File("images/waypoint.png"));
 			background = grass;
 		}
 		catch (IOException e)
@@ -141,6 +142,9 @@ public class Panel extends JPanel implements ActionListener
 		addMouseMotionListener(new MouseMotion(this));
 
 		addMouseWheelListener(new MouseWheel(this));
+		
+		addFocusListener(new WindowFocusListener(this));
+		
 		t = new Timer(1000 / 10, this);
 	}
 
@@ -223,7 +227,7 @@ public class Panel extends JPanel implements ActionListener
 	{
 		super.paintComponent(g);
 		Graphics2D g2 = (Graphics2D) g;
-		g2.setClip(new Rectangle2D.Double(0, 0, getWidth(), 300));
+		g2.setClip(new Rectangle2D.Double(0, 0, getWidth(), 150));
 		Stroke old = g2.getStroke();
 		g2.setStroke(new BasicStroke(10));
 		g2.drawLine(0, 150, getWidth(), 150);
@@ -483,6 +487,9 @@ public class Panel extends JPanel implements ActionListener
 	 */
 	public void startPath()
 	{
+		pp.clearSelected();
+		setSelectedObject(null);
+		clearObjectSelection();
 		setClickedOption("Path");
 		currentPath = new Path();
 		paths.add(currentPath);
diff --git a/Applicatie/PropertiesPanel.java b/Applicatie/PropertiesPanel.java
index 792dd4e..adf6df8 100644
--- a/Applicatie/PropertiesPanel.java
+++ b/Applicatie/PropertiesPanel.java
@@ -56,6 +56,7 @@ public class PropertiesPanel extends JPanel
 		setPreferredSize(new Dimension(200, 0));
 		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
 		setBackground(new Color(220, 220, 220));
+		setFocusable(false);
 
 		// NAME "PROPERTIES"
 		JPanel propPanel = new JPanel();
diff --git a/Listeners/WindowFocusListener.java b/Listeners/WindowFocusListener.java
new file mode 100644
index 0000000..65b45dc
--- /dev/null
+++ b/Listeners/WindowFocusListener.java
@@ -0,0 +1,25 @@
+package Listeners;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+
+import Applicatie.Panel;
+
+public class WindowFocusListener implements FocusListener
+{
+	Panel p;
+	
+	public WindowFocusListener(Panel p)
+	{
+		this.p = p;
+	}
+
+	@Override
+	public void focusGained(FocusEvent e){}
+
+	@Override
+	public void focusLost(FocusEvent e)
+	{
+		p.requestFocus();
+	}
+}