diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java
index a78f441c..f8ae9a1f 100644
--- a/visualiser/src/main/java/seng302/Controllers/RaceController.java
+++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java
@@ -84,6 +84,7 @@ public class RaceController extends Controller {
     public void updateMap(ObservableList<Boat> boats) {
         raceMap.setBoats(boats);
         raceMap.update();
+        raceBoundaries.draw();
     }
 
     /**
@@ -124,15 +125,6 @@ public class RaceController extends Controller {
         StreamedRace newRace = new StreamedRace(visualiserInput, this);
         //newRace.initialiseBoats();
 
-
-        raceBoundaries = new ResizableRaceMap(visualiserInput.getCourse());
-        raceBoundaries.setMouseTransparent(true);
-        raceBoundaries.widthProperty().bind(canvasBase.widthProperty());
-        raceBoundaries.heightProperty().bind(canvasBase.heightProperty());
-        raceBoundaries.draw();
-        raceBoundaries.setVisible(true);
-        canvasBase.getChildren().add(raceBoundaries);
-
         raceMap = new ResizableRaceCanvas(visualiserInput.getCourse());
         raceMap.setMouseTransparent(true);
         raceMap.widthProperty().bind(canvasBase.widthProperty());
@@ -141,7 +133,15 @@ public class RaceController extends Controller {
         raceMap.draw();
         raceMap.setVisible(true);
 
-        canvasBase.getChildren().add(raceMap);
+        canvasBase.getChildren().add(0, raceMap);
+
+        raceBoundaries = new ResizableRaceMap(visualiserInput.getCourse());
+        raceBoundaries.setMouseTransparent(true);
+        raceBoundaries.widthProperty().bind(canvasBase.widthProperty());
+        raceBoundaries.heightProperty().bind(canvasBase.heightProperty());
+        raceBoundaries.draw();
+        raceBoundaries.setVisible(true);
+        canvasBase.getChildren().add(0, raceBoundaries);
 
         race.setVisible(true);