diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index f5e2e2fd..98d6a8a3 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -68,7 +68,7 @@ public class GameState implements Runnable {
 
     //Collision constants
     private static final Double MARK_COLLISION_DISTANCE = 15d;
-    public static final Double YACHT_COLLISION_DISTANCE = 25.0;
+    public static final Double YACHT_COLLISION_DISTANCE = 15.0;
     private static final Double BOUNCE_DISTANCE_MARK = 20.0;
     public static final Double BOUNCE_DISTANCE_YACHT = 30.0;
     private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 0667b894..8827438b 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -50,6 +50,8 @@ public class RaceViewController extends Thread {
     @FXML
     private Pane chatHistoryHolder;
     @FXML
+    private JFXButton chatToggleButton;
+    @FXML
     private TextField chatInput;
     @FXML
     private Label timerLabel;
@@ -85,6 +87,8 @@ public class RaceViewController extends Thread {
     public void initialize() {
         miniMapPane.setVisible(false);
         miniMapButton.setVisible(false);
+        chatHistoryHolder.setVisible(false);
+        chatToggleButton.setVisible(false);
         contentStackPane.setVisible(false);
         Image loadingImage = new Image("PP.png");
         loadingScreen.setImage(loadingImage);
@@ -120,6 +124,9 @@ public class RaceViewController extends Thread {
             chatHistoryHolder.heightProperty()
         );
 
+        contentStackPane.getChildren().remove(chatToggleButton);
+        contentStackPane.getChildren().add(chatToggleButton);
+
         contentStackPane.setOnMouseClicked(event -> {
             contentStackPane.requestFocus();
         });
@@ -146,6 +153,9 @@ public class RaceViewController extends Thread {
         contentStackPane.setVisible(true);
         miniMapPane.setVisible(true);
         miniMapButton.setVisible(true);
+        chatHistoryHolder.setVisible(true);
+        chatToggleButton.setVisible(true);
+
         Platform.runLater(() -> contentStackPane.requestFocus());
     }
 
@@ -197,6 +207,16 @@ public class RaceViewController extends Thread {
             }
         });
 
+        chatToggleButton.setOnMouseClicked((event) -> {
+            if (chatHistoryHolder.visibleProperty().get()) {
+                chatHistoryHolder.setVisible(false);
+                chatToggleButton.setText("+");
+            } else {
+                chatHistoryHolder.setVisible(true);
+                chatToggleButton.setText("—");
+            }
+        });
+
         Platform.runLater(() -> {
             contentStackPane.getChildren().add(0, gameView.getAssets());
             ((SubScene) gameView.getAssets()).widthProperty()
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 267779f5..45398d3b 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.*?>
+<?import java.lang.*?>
+<?import java.net.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXSpinner?>
 <?import com.jfoenix.controls.JFXTextField?>
@@ -15,6 +23,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
+
 <StackPane 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" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.RaceViewController">
         <children>
             <StackPane fx:id="contentStackPane" maxHeight="1.7976931348623157E308"
@@ -314,8 +323,7 @@
                     <Insets right="15.0" top="15.0" />
                 </StackPane.margin>
             </Pane>
-            <JFXButton fx:id="miniMapButton" text="—"
-              StackPane.alignment="TOP_RIGHT">
+            <JFXButton fx:id="miniMapButton" text="—" StackPane.alignment="TOP_RIGHT">
                 <font>
                     <Font size="15.0" />
                 </font>
@@ -330,6 +338,14 @@
                     <JFXSpinner layoutX="566.0" layoutY="692.0" radius="30.0"/>
                 </children>
             </AnchorPane>
+            <JFXButton fx:id="chatToggleButton" text="—" StackPane.alignment="BOTTOM_RIGHT">
+                <font>
+                    <Font size="15.0"/>
+                </font>
+                <StackPane.margin>
+                    <Insets bottom="70.0" right="10.0"/>
+                </StackPane.margin>
+            </JFXButton>
         </children>
     <stylesheets>
         <URL value="@../css/Master.css"/>