diff --git a/src/main/java/seng302/visualiser/MiniMap.java b/src/main/java/seng302/visualiser/MiniMap.java
index 3d626c14..8c9377dd 100644
--- a/src/main/java/seng302/visualiser/MiniMap.java
+++ b/src/main/java/seng302/visualiser/MiniMap.java
@@ -43,11 +43,13 @@ public class MiniMap extends MapPreview {
             boatIcons.put(yacht, boatIcon);
             boatIcon.getTransforms().add(new Rotate(0));
             yacht.addLocationListener((boat, lat, lon, heading, sailIn, velocity) -> {
-                Polygon bi = boatIcons.get(boat);
-                Point2D p2d = scaledPoint.findScaledXY(lat, lon);
-                bi.setLayoutX(p2d.getX());
-                bi.setLayoutY(p2d.getY());
-                ((Rotate) bi.getTransforms().get(0)).setAngle(heading);
+                Platform.runLater(() -> {
+                    Polygon bi = boatIcons.get(boat);
+                    Point2D p2d = scaledPoint.findScaledXY(lat, lon);
+                    bi.setLayoutX(p2d.getX());
+                    bi.setLayoutY(p2d.getY());
+                    ((Rotate) bi.getTransforms().get(0)).setAngle(heading);
+                });
             });
         }
         Platform.runLater(() -> {
diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java b/src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java
index 5f30c2e6..d45b1341 100644
--- a/src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java
+++ b/src/main/java/seng302/visualiser/fxObjects/assets_2D/Marker2D.java
@@ -28,8 +28,7 @@ public class Marker2D extends Group {
         mark.setRadius(5);
         mark.setCenterX(0);
         mark.setCenterY(0);
-        Platform.runLater(() -> this.getChildren()
-            .addAll(mark, new Group())); //Empty group placeholder or arrows.
+        Platform.runLater(() -> this.getChildren().add(mark));
     }
 
     /**
@@ -82,13 +81,9 @@ public class Marker2D extends Group {
 
     private void showArrow(List<Group> arrowList, int arrowListIndex) {
         if (arrowListIndex < arrowList.size()) {
-            if (arrowListIndex == 1) {
-                ;
-            }
-            Platform.runLater(() -> {
-                this.getChildren().remove(1);
-                this.getChildren().add(arrowList.get(arrowListIndex));
-            });
+            Platform.runLater(() ->
+                this.getChildren().setAll(mark, arrowList.get(arrowListIndex))
+            );
         }
     }