diff --git a/src/main/java/seng302/visualiser/controllers/ViewManager.java b/src/main/java/seng302/visualiser/controllers/ViewManager.java
index 5e3d6748..2f843a4c 100644
--- a/src/main/java/seng302/visualiser/controllers/ViewManager.java
+++ b/src/main/java/seng302/visualiser/controllers/ViewManager.java
@@ -221,6 +221,7 @@ public class ViewManager {
                     .getController();
                 keyBindingDialogController.setGameClient(this.gameClient);
                 keyBindingDialog.show();
+                decorator.requestFocus();
                 Sounds.playButtonClick();
             }
         }
diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java b/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
index c650bc59..1f638c5a 100644
--- a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
+++ b/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java
@@ -71,8 +71,7 @@ public class KeyBindingDialogController implements Initializable {
         buttons = new ArrayList<>();
         Collections.addAll(buttons,
             zoomInbtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
-            viewButton,
-            rightButton, leftButton, forwardButton, backwardButton);
+            viewButton, rightButton, leftButton, forwardButton, backwardButton);
         bindButtonWithAction();
         loadKeyBind();
 
@@ -91,9 +90,6 @@ public class KeyBindingDialogController implements Initializable {
         });
 
         closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
-
-        keyBindingDialogHeader.setFocusTraversable(true);
-        keyBindingDialogHeader.requestFocus();
     }
 
     /**
@@ -161,6 +157,7 @@ public class KeyBindingDialogController implements Initializable {
             + "-fx-background-color: -fx-pp-front-color; "
             + "-fx-text-fill: -fx-pp-theme-color; "
             + "-fx-font-size: 13;");
+        keyBindingDialogHeader.requestFocus();
     }
 
     /**
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 879b2f22..4ee22b65 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -7,17 +7,16 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
+
 <StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
-  maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
-  prefHeight="800.0" prefWidth="1200.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.0.111"
   xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="seng302.visualiser.controllers.RaceViewController">
     <children>
@@ -38,17 +37,15 @@
                   valignment="BOTTOM" vgrow="SOMETIMES"/>
             </rowConstraints>
             <children>
-                <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0"
-                  styleClass="timer">
+                <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0" styleClass="timer">
                     <columnConstraints>
                         <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
                           prefWidth="50.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0"
-                          minWidth="135.0" prefWidth="135.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
+                          prefWidth="135.0"/>
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0"
-                          vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                     </rowConstraints>
                     <opaqueInsets>
                         <Insets/>
@@ -80,25 +77,20 @@
                 </GridPane>
                 <GridPane GridPane.columnIndex="2">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-                          prefWidth="100.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-                          prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0"
-                          vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                     </rowConstraints>
                 </GridPane>
-                <GridPane fx:id="chatGridPane" GridPane.columnIndex="2"
-                  GridPane.rowIndex="2">
+                <GridPane fx:id="chatGridPane" GridPane.columnIndex="2" GridPane.rowIndex="2">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0"
-                          minWidth="390.0" prefWidth="390.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
+                          prefWidth="390.0"/>
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints maxHeight="1.7976931348623157E308"
-                          vgrow="SOMETIMES"/>
+                        <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES"/>
                         <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
                           vgrow="SOMETIMES"/>
                     </rowConstraints>
@@ -121,22 +113,21 @@
                                   minWidth="90.0" prefWidth="90.0"/>
                             </columnConstraints>
                             <rowConstraints>
-                                <RowConstraints maxHeight="50.0" minHeight="50.0"
-                                  prefHeight="50.0" valignment="CENTER" vgrow="SOMETIMES"/>
+                                <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0"
+                                  valignment="CENTER" vgrow="SOMETIMES"/>
                             </rowConstraints>
                             <children>
-                                <JFXButton fx:id="chatSend" alignment="CENTER"
-                                  buttonType="RAISED" maxHeight="-Infinity"
+                                <JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED"
+                                  focusTraversable="false" maxHeight="-Infinity"
                                   maxWidth="1.7976931348623157E308" minHeight="-Infinity"
                                   minWidth="-Infinity" prefHeight="35.0" text="SEND"
                                   GridPane.columnIndex="1">
                                     <GridPane.margin>
-                                        <Insets bottom="10.0" left="10.0" right="10.0"
-                                          top="10.0"/>
+                                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
                                     </GridPane.margin>
                                 </JFXButton>
-                                <JFXTextField fx:id="chatInput" maxHeight="35.0"
-                                  minHeight="-Infinity" prefHeight="35.0">
+                                <JFXTextField fx:id="chatInput" focusTraversable="false"
+                                  maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0">
                                     <GridPane.margin>
                                         <Insets bottom="10.0" left="20.0" right="10.0"/>
                                     </GridPane.margin>
@@ -158,29 +149,27 @@
                   prefHeight="150.0" prefWidth="240.0" GridPane.halignment="CENTER"
                   GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0"
-                          minWidth="110.0" prefWidth="110.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0"
-                          minWidth="10.0"
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="110.0" minWidth="110.0"
+                          prefWidth="110.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="132.0" minWidth="10.0"
                           prefWidth="132.0"/>
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints maxHeight="120.0" minHeight="120.0"
-                          prefHeight="120.0" vgrow="SOMETIMES"/>
+                        <RowConstraints maxHeight="120.0" minHeight="120.0" prefHeight="120.0"
+                          vgrow="SOMETIMES"/>
                         <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
                           vgrow="SOMETIMES"/>
                     </rowConstraints>
                     <children>
-                        <Label fx:id="positionLabel" text="Position:"
-                          GridPane.columnIndex="1" GridPane.halignment="LEFT"
-                          GridPane.rowSpan="2" GridPane.valignment="TOP">
+                        <Label fx:id="positionLabel" text="Position:" GridPane.columnIndex="1"
+                          GridPane.halignment="LEFT" GridPane.rowSpan="2" GridPane.valignment="TOP">
                             <padding>
                                 <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
                             </padding>
                         </Label>
-                        <Label fx:id="boatSpeedLabel" text="Boat Speed:"
-                          GridPane.columnIndex="1" GridPane.halignment="LEFT"
-                          GridPane.rowSpan="2" GridPane.valignment="CENTER">
+                        <Label fx:id="boatSpeedLabel" text="Boat Speed:" GridPane.columnIndex="1"
+                          GridPane.halignment="LEFT" GridPane.rowSpan="2"
+                          GridPane.valignment="CENTER">
                             <opaqueInsets>
                                 <Insets/>
                             </opaqueInsets>
@@ -189,8 +178,8 @@
                             </padding>
                         </Label>
                         <Label fx:id="boatHeadingLabel" text="Boat Heading:"
-                          GridPane.columnIndex="1" GridPane.halignment="LEFT"
-                          GridPane.rowSpan="2" GridPane.valignment="BOTTOM">
+                          GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2"
+                          GridPane.valignment="BOTTOM">
                             <padding>
                                 <Insets bottom="5.0" left="10.0" right="5.0" top="5.0"/>
                             </padding>
@@ -203,12 +192,12 @@
                             <rowConstraints>
                                 <RowConstraints maxHeight="120.0" minHeight="120.0"
                                   prefHeight="120.0" vgrow="SOMETIMES"/>
-                                <RowConstraints maxHeight="30.0" minHeight="30.0"
-                                  prefHeight="30.0" vgrow="SOMETIMES"/>
+                                <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
+                                  vgrow="SOMETIMES"/>
                             </rowConstraints>
                             <children>
-                                <ImageView fx:id="windImageView" fitHeight="92.0"
-                                  fitWidth="109.0" pickOnBounds="true" preserveRatio="true"
+                                <ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
+                                  pickOnBounds="true" preserveRatio="true"
                                   GridPane.halignment="CENTER" GridPane.rowSpan="2"
                                   GridPane.valignment="CENTER"/>
                                 <Label fx:id="windSpeedLabel" text="0.0 Knots"