diff --git a/racevisionGame/src/main/java/shared/model/Constants.java b/racevisionGame/src/main/java/shared/model/Constants.java
index 6d1c35a8..a02fcd8c 100644
--- a/racevisionGame/src/main/java/shared/model/Constants.java
+++ b/racevisionGame/src/main/java/shared/model/Constants.java
@@ -28,7 +28,7 @@ public class Constants {
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
      * E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
      */
-    public static final int RaceTimeScale = 2;
+    public static final int RaceTimeScale = 20;
 
     /**
      * The race pre-start time, in milliseconds. 30 seconds.
diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css
index 39903bdb..c7159caf 100644
--- a/racevisionGame/src/main/resources/css/dayMode.css
+++ b/racevisionGame/src/main/resources/css/dayMode.css
@@ -56,6 +56,7 @@
     -fx-graphic: url("/visualiser/images/arrow.png");
 }
 
+
 #nextButton {
     -fx-background-image: url("/visualiser/images/ArrowRoundRight.png");
     -fx-background-size: 60px;
@@ -64,6 +65,7 @@
     -fx-focus-color: transparent;
     -fx-background-color: transparent;
 }
+
 #nextButton:pressed {
     -fx-background-image: url("/visualiser/images/ArrowRoundRightClicked.png");
     -fx-background-size: 60px;
@@ -101,3 +103,217 @@
     -fx-border-width: 3;
 }
 
+/* Title menu buttons */
+#hostAGameBtn {
+    -fx-background-image: url("/visualiser/images/hostAGameBtn.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#hostAGameBtn:pressed {
+    -fx-background-image: url("/visualiser/images/hostAGameBtnPressed.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#btnJoin {
+    -fx-background-image: url("/visualiser/images/joinAGameBtn.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#btnJoin:pressed {
+    -fx-background-image: url("/visualiser/images/joinAGameBtnPressed.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#tutorialButton {
+    -fx-background-image: url("/visualiser/images/howToPlayBtn.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#tutorialButton:pressed {
+    -fx-background-image: url("/visualiser/images/howToPlayBtnPressed.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#controlsBtn {
+    -fx-background-image: url("/visualiser/images/controlsBtn.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#controlsBtn:pressed {
+    -fx-background-image: url("/visualiser/images/controlsBtnPressed.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+/* host game lobby buttons */
+
+#hostGameBtn {
+    -fx-background-image: url("/visualiser/images/startGameBtn.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#hostGameBtn:pressed {
+    -fx-background-image: url("/visualiser/images/startGameBtnPressed.png");
+    -fx-background-size: 150px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#mainMenuBtn {
+    -fx-background-image: url("/visualiser/images/mainMenuBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+
+#mainMenuBtn:pressed {
+    -fx-background-image: url("/visualiser/images/mainMenuBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+/* match browsing lobby buttons */
+
+#addBtn {
+    -fx-background-image: url("/visualiser/images/addBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#addBtn:pressed {
+    -fx-background-image: url("/visualiser/images/addBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#refreshBtn {
+    -fx-background-image: url("/visualiser/images/refreshBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#refreshBtn:pressed {
+    -fx-background-image: url("/visualiser/images/refreshBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#refreshBtn {
+    -fx-background-image: url("/visualiser/images/refreshBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#joinGameBtn {
+    -fx-background-image: url("/visualiser/images/participateBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#joinGameBtn:pressed {
+    -fx-background-image: url("/visualiser/images/participateBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#spectateButton {
+    -fx-background-image: url("/visualiser/images/spectateBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#spectateButton:pressed {
+    -fx-background-image: url("/visualiser/images/spectateBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+/* in-game lobby buttons */
+
+#quitBtn {
+    -fx-background-image: url("/visualiser/images/quitBtn.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
+
+#quitBtn:pressed {
+    -fx-background-image: url("/visualiser/images/quitBtnPressed.png");
+    -fx-background-size: 115px;
+    -fx-background-repeat: no-repeat;
+    -fx-background-position: center center;
+    -fx-focus-color: transparent;
+    -fx-background-color: transparent;
+}
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png
new file mode 100644
index 00000000..be04d4fe
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png
new file mode 100644
index 00000000..0289a2e9
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/JoinAGameBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/addBtn.png b/racevisionGame/src/main/resources/visualiser/images/addBtn.png
new file mode 100644
index 00000000..e7df63a2
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/addBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png
new file mode 100644
index 00000000..3ce9fdcd
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/addBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png b/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png
new file mode 100644
index 00000000..9af6c7f8
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/cancelBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png
new file mode 100644
index 00000000..58bf2227
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/cancelBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png b/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png
new file mode 100644
index 00000000..4042382a
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/controlsBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png
new file mode 100644
index 00000000..bcb5b951
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/controlsBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png
new file mode 100644
index 00000000..56656b92
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png
new file mode 100644
index 00000000..5dea25cc
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/hostAGameBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png
new file mode 100644
index 00000000..8bf6b96d
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png
new file mode 100644
index 00000000..2ae2a63a
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/howToPlayBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png
new file mode 100644
index 00000000..60a8435e
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png
new file mode 100644
index 00000000..8d6048e9
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/mainMenuBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/okBtn.png b/racevisionGame/src/main/resources/visualiser/images/okBtn.png
new file mode 100644
index 00000000..7f9d636c
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/okBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png
new file mode 100644
index 00000000..8bb6f9a9
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/okBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/participateBtn.png b/racevisionGame/src/main/resources/visualiser/images/participateBtn.png
new file mode 100644
index 00000000..0926afed
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/participateBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png
new file mode 100644
index 00000000..2c296328
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/participateBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/quitBtn.png b/racevisionGame/src/main/resources/visualiser/images/quitBtn.png
new file mode 100644
index 00000000..1387f565
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/quitBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png
new file mode 100644
index 00000000..0b47b32e
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/quitBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png b/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png
new file mode 100644
index 00000000..0f2c2cb8
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/refreshBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png
new file mode 100644
index 00000000..86185747
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/refreshBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png b/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png
new file mode 100644
index 00000000..d462f072
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/spectateBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png
new file mode 100644
index 00000000..1c7c39e1
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/spectateBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/startBtn.png b/racevisionGame/src/main/resources/visualiser/images/startBtn.png
new file mode 100644
index 00000000..ad79020c
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png
new file mode 100644
index 00000000..fa4eacaa
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png b/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png
new file mode 100644
index 00000000..4b2a651d
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startGameBtn.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png b/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png
new file mode 100644
index 00000000..c3421b3c
Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/startGameBtnPressed.png differ
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
index 18658445..d2c236ba 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
@@ -24,7 +24,7 @@
     <children>
       <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.3);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="2">
+            <Button fx:id="quitBtn" maxHeight="500.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" GridPane.rowIndex="2">
                <GridPane.margin>
                   <Insets left="20.0" />
                </GridPane.margin>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
index cf82c285..2c2dd682 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostGame.fxml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -10,7 +16,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostGameController">
+<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostGameController">
     <children>
         <GridPane layoutY="14.0" AnchorPane.bottomAnchor="-14.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="14.0">
             <columnConstraints>
@@ -19,12 +25,12 @@
                 <ColumnConstraints hgrow="SOMETIMES" maxWidth="170.0" minWidth="10.0" prefWidth="170.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="435.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="79.0" minHeight="60.0" prefHeight="71.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="455.0" minHeight="10.0" prefHeight="395.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="164.0" minHeight="80.0" prefHeight="134.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <children>
-                <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                <Button fx:id="hostGameBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#hostGamePressed" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
                     <font>
                         <Font size="20.0" />
                     </font>
@@ -42,7 +48,7 @@
                         <Font size="17.0" />
                     </font>
                 </Label>
-                <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu" GridPane.halignment="LEFT" GridPane.valignment="TOP">
+                <Button fx:id="mainMenuBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed" GridPane.halignment="LEFT" GridPane.valignment="TOP">
                     <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                     </GridPane.margin>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
index 6e02b4cf..6b3ccaf1 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -13,20 +18,20 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
+<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
    <children>
       <GridPane fx:id="connection" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="600.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="600.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="303.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="477.0" />
          </columnConstraints>
          <rowConstraints>
-            <RowConstraints maxHeight="182.0" minHeight="10.0" prefHeight="182.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="434.0" minHeight="10.0" prefHeight="434.0" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="174.0" minHeight="10.0" prefHeight="174.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="182.0" minHeight="10.0" prefHeight="116.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="434.0" minHeight="10.0" prefHeight="348.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="174.0" minHeight="10.0" prefHeight="157.0" vgrow="SOMETIMES" />
          </rowConstraints>
          <children>
-            <TableView fx:id="lobbyTable" prefHeight="200.0" prefWidth="1080.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+            <TableView fx:id="lobbyTable" prefHeight="342.0" prefWidth="680.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
                <columns>
                   <TableColumn fx:id="gameNameColumn" prefWidth="223.0" text="Game Name" />
                   <TableColumn fx:id="hostNameColumn" prefWidth="280.0" text="Host Name" />
@@ -44,23 +49,22 @@
             <GridPane fx:id="ipPortGridPane" GridPane.rowIndex="2">
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                </columnConstraints>
                <rowConstraints>
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                </rowConstraints>
                <children>
-                  <TextField fx:id="addressFld" promptText="Address">
+                  <TextField fx:id="addressFld" promptText="Address" GridPane.valignment="TOP">
                      <GridPane.margin>
-                        <Insets left="50.0" right="20.0" />
+                        <Insets left="50.0" right="20.0" top="20.0" />
                      </GridPane.margin>
                      <opaqueInsets>
                         <Insets />
                      </opaqueInsets>
                   </TextField>
-                  <TextField fx:id="portFld" promptText="Port Number" GridPane.columnIndex="1">
+                  <TextField fx:id="portFld" promptText="Port Number">
                      <GridPane.margin>
-                        <Insets left="20.0" right="20.0" />
+                        <Insets left="50.0" right="20.0" />
                      </GridPane.margin>
                   </TextField>
                </children>
@@ -70,31 +74,31 @@
             </GridPane>
             <GridPane fx:id="buttonsGridPane" GridPane.columnIndex="1" GridPane.rowIndex="2">
                <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="145.0" minWidth="10.0" prefWidth="132.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="133.0" minWidth="10.0" prefWidth="125.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="181.0" minWidth="10.0" prefWidth="132.0" />
                </columnConstraints>
                <rowConstraints>
                   <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                </rowConstraints>
                <children>
-                  <Button mnemonicParsing="false" onAction="#refreshBtnPressed" text="Refresh" GridPane.columnIndex="1">
+                  <Button fx:id="refreshBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#refreshBtnPressed" GridPane.columnIndex="1">
                      <GridPane.margin>
-                        <Insets left="10.0" right="10.0" />
+                        <Insets />
                      </GridPane.margin></Button>
-                  <Button mnemonicParsing="false" onAction="#addConnectionPressed" text="Add">
+                  <Button fx:id="addBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#addConnectionPressed">
                      <GridPane.margin>
-                        <Insets left="20.0" />
+                        <Insets />
                      </GridPane.margin></Button>
                   <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="8.0" GridPane.columnIndex="2">
                      <children>
-                        <Button fx:id="joinGameBtn" mnemonicParsing="false" onAction="#connectParticipate" text="Participate!" />
-                        <Button fx:id="spectateButton" mnemonicParsing="false" onAction="#connectSpectate" text="Spectate!" />
+                        <Button fx:id="joinGameBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#connectParticipate" prefHeight="50.0" prefWidth="125.0" />
+                        <Button fx:id="spectateButton" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#connectSpectate" prefHeight="50.0" prefWidth="125.0" />
                      </children>
                   </VBox>
                </children>
             </GridPane>
-            <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu">
+            <Button fx:id="mainMenuBtn" maxHeight="50.0" maxWidth="125.0" mnemonicParsing="false" onAction="#menuBtnPressed">
                <GridPane.margin>
                   <Insets left="50.0" />
                </GridPane.margin>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
index 36824db9..84d660e5 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
@@ -9,7 +13,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
+<AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
    <children>
       <GridPane fx:id="view3DContainer" prefHeight="600.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
@@ -35,14 +39,14 @@
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Button fx:id="btnJoin" mnemonicParsing="false" onAction="#joinAGame" prefHeight="31.0" prefWidth="130.0" text="Join a Game" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+            <Button fx:id="btnJoin" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#joinAGame" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
                <font>
                   <Font name="System Font" size="13.0" />
                </font>
             </Button>
-            <Button mnemonicParsing="false" onAction="#showControls" text="Controls" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
-            <Button fx:id="tutorialButton" mnemonicParsing="false" onAction="#tutorialStartPressed" text="How to Play" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
-            <Button mnemonicParsing="false" onAction="#hostAGame" prefHeight="31.0" prefWidth="130.0" text="Host a Game" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+            <Button fx:id="controlsBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#showControls" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+            <Button fx:id="tutorialButton" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#tutorialStartPressed" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+            <Button fx:id="hostAGameBtn" maxHeight="80.0" maxWidth="200.0" mnemonicParsing="false" onAction="#hostAGame" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
             <RadioButton fx:id="nightModeRD" mnemonicParsing="false" onAction="#setNightMode" text="Night Mode" textFill="WHITE" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
             <RadioButton fx:id="dayModeRD" mnemonicParsing="false" onAction="#setDayMode" selected="true" text="Day Mode" textFill="WHITE" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="5" />
             <Label text="Smooth Sailing" textFill="WHITE" GridPane.columnSpan="2" GridPane.halignment="RIGHT">