diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 612d5313..8dba6f66 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -10,6 +10,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Point2D;
 import javafx.scene.Scene;
+import javafx.scene.SubScene;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
@@ -176,7 +177,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         updateOrder(raceState.getPlayerPositions());
         gameView = new GameView3D();
 //        gameView.setFrameRateFXText(fpsDisplay);
-        Platform.runLater(() -> contentAnchorPane.getChildren().add(0, gameView.getAssets()));
+        Platform.runLater(() -> {
+            contentAnchorPane.getChildren().add(0, gameView.getAssets());
+            ((SubScene) gameView.getAssets()).widthProperty()
+                .bind(ViewManager.getInstance().getStage().widthProperty());
+            ((SubScene) gameView.getAssets()).heightProperty()
+                .bind(ViewManager.getInstance().getStage().heightProperty());
+            System.out.println(((SubScene) gameView.getAssets()).getHeight());
+            System.out.println(((SubScene) gameView.getAssets()).getWidth());
+
+        });
         gameView.setBoats(new ArrayList<>(participants.values()));
         gameView.updateBorder(raceData.getCourseLimit());
         gameView.updateTokens(raceData.getTokens());
diff --git a/src/main/java/seng302/visualiser/controllers/ViewManager.java b/src/main/java/seng302/visualiser/controllers/ViewManager.java
index d4cc1fa7..06e6c527 100644
--- a/src/main/java/seng302/visualiser/controllers/ViewManager.java
+++ b/src/main/java/seng302/visualiser/controllers/ViewManager.java
@@ -34,6 +34,11 @@ public class ViewManager {
     private HashMap<String, String> properties; //TODO is this the best way to do this??
     private ObservableList<String> playerList;
     private Logger logger = LoggerFactory.getLogger(ViewManager.class);
+
+    public Stage getStage() {
+        return stage;
+    }
+
     private Stage stage;
 
     private ViewManager() {
@@ -170,21 +175,31 @@ public class ViewManager {
         Platform.runLater(() -> {
             try {
                 stage.close();
+                stage = new Stage();
 
-                Scene scene = new Scene(loader.load());
+                JFXDecorator decorator = new JFXDecorator(stage, loader.load(), false, true, true);
+                decorator.setCustomMaximize(true);
+                decorator.applyCss();
+                decorator.getStylesheets()
+                    .add(getClass().getResource("/css/master.css").toExternalForm());
+
+                Scene scene = new Scene(decorator);
                 // set key press event to catch key stoke
                 scene.setOnKeyPressed(gameClient::keyPressed);
                 scene.setOnKeyReleased(gameClient::keyReleased);
 
-                Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
-                stage = new Stage();
+                // uncomment to make it full screen
+//                Rectangle2D visualBounds = Screen.getPrimary().getVisualBounds();
+//                stage.setX(visualBounds.getMinX());
+//                stage.setY(visualBounds.getMinY());
+//                stage.setWidth(visualBounds.getWidth());
+//                stage.setHeight(visualBounds.getHeight());
+//                stage.setMaximized(true);
+//                stage.setFullScreen(true);
+
+                stage.setMinHeight(500);
+                stage.setMinWidth(800);
                 stage.setOnCloseRequest(e -> closeAll());
-                stage.setX(visualBounds.getMinX());
-                stage.setY(visualBounds.getMinY());
-                stage.setWidth(visualBounds.getWidth());
-                stage.setHeight(visualBounds.getHeight());
-                stage.setMaximized(true);
-                stage.setFullScreen(true);
                 stage.setScene(scene);
                 stage.show();
             } catch (Exception e) {
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 8a14b1a2..faa0190e 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -5,12 +5,15 @@
 <?import javafx.scene.layout.*?>
 
 <AnchorPane fx:id="rvAnchorPane" maxHeight="1.7976931348623157E308"
-  maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0"
-  prefWidth="800.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8"
+  maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
+  prefWidth="1200.0" style="-fx-background-color: skyblue;" xmlns="http://javafx.com/javafx/8"
   xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="seng302.visualiser.controllers.RaceViewController">
    <children>
-      <StackPane fx:id="contentAnchorPane" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+       <StackPane fx:id="contentAnchorPane" maxHeight="1.7976931348623157E308"
+         maxWidth="1.7976931348623157E308" prefHeight="800.0" prefWidth="1200.0"
+         AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+         AnchorPane.topAnchor="0.0">
 
       </StackPane>
       <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">