diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index a5eef1f0..81a052fb 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -196,21 +196,21 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
         if (Math.floorMod(random.nextInt(), 2) == 0){
             direction += random.nextInt(4);
-            windSpeed += random.nextInt(20) + 50;
+            windSpeed += random.nextInt(20) + 459;
         }
         else{
             direction -= random.nextInt(4);
-            windSpeed -= random.nextInt(20) + 50;
+            windSpeed -= random.nextInt(20) + 459;
         }
 
         direction = Math.floorMod(direction, 360);
 
         if (windSpeed > MAX_WIND_SPEED){
-            windSpeed -= random.nextInt(1000);
+            windSpeed -= random.nextInt(500);
         }
 
         if (windSpeed <= MIN_WIND_SPEED){
-            windSpeed += random.nextInt(1000);
+            windSpeed += random.nextInt(500);
         }
 
         GameState.setWindSpeed(Double.valueOf(windSpeed));
diff --git a/src/main/resources/css/DJB-Get-Digital.ttf b/src/main/resources/css/DJB-Get-Digital.ttf
deleted file mode 100644
index 4cd9ec7d..00000000
Binary files a/src/main/resources/css/DJB-Get-Digital.ttf and /dev/null differ
diff --git a/src/main/resources/css/RaceView.css b/src/main/resources/css/RaceView.css
index 63191b7e..11e8f285 100644
--- a/src/main/resources/css/RaceView.css
+++ b/src/main/resources/css/RaceView.css
@@ -1,13 +1,15 @@
 @font-face {
-    src: url("DJB-Get-Digital.ttf");
+    src: url("digital-7-mono.ttf");
 }
 
 #timerGrid{
     -fx-background-color: rgba(255, 255, 255, 0.6);
+    -fx-effect: -fx-pp-dropshadow-light;
 }
 
-.timer Label {
-    -fx-font-family: "DJB Get Digital" !important;
+GridPane .timer * {
+    -fx-font-family: "Digital-7 Mono" !important;
+    -fx-font-size: 30;
 }
 
 #timerLabel{
@@ -19,19 +21,26 @@
 }
 
 #chatGridPane {
-    -fx-background-color: rgba(255, 255, 255, 0.6);
+    -fx-background-color: transparent;
 }
 
 #chatHistoryHolder {
+    -fx-background-color: rgba(255, 255, 255, 0.6);
+    -fx-effect: -fx-pp-dropshadow-light;
+}
 
+#chatInputHolder {
+    -fx-background-color: rgba(255, 255, 255, 0.6);
+    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 #windGridPane {
     -fx-background-color: rgba(255, 255, 255, 0.6);
+    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 #windHolder {
-    -fx-background-color: -fx-pp-front-color;
+    -fx-background-color: rgba(255, 255, 255, 0.5);
 }
 
 #chatSend {
@@ -52,5 +61,5 @@
 }
 
 #windImageView {
-    -fx-image: url("/images/wind.png");
+    -fx-image: url("/images/wind-180.png");
 }
\ No newline at end of file
diff --git a/src/main/resources/css/digital-7-mono.ttf b/src/main/resources/css/digital-7-mono.ttf
new file mode 100644
index 00000000..602b1959
Binary files /dev/null and b/src/main/resources/css/digital-7-mono.ttf differ
diff --git a/src/main/resources/images/wind-180.png b/src/main/resources/images/wind-180.png
new file mode 100644
index 00000000..6d94e53a
Binary files /dev/null and b/src/main/resources/images/wind-180.png differ
diff --git a/src/main/resources/images/wind.png b/src/main/resources/images/wind.png
index c4502a87..3cbdd32a 100644
Binary files a/src/main/resources/images/wind.png and b/src/main/resources/images/wind.png differ
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 159b8e48..4a8f64e2 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -14,8 +14,11 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
-
-<AnchorPane fx:id="rvAnchorPane" 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.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.RaceViewController">
+<AnchorPane fx:id="rvAnchorPane" 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="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">
 
@@ -29,13 +32,15 @@
         <rowConstraints>
             <RowConstraints maxHeight="70.0" minHeight="70.0" prefHeight="70.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES" />
-            <RowConstraints maxHeight="200.0" minHeight="200.0" prefHeight="200.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="250.0" minHeight="250.0" prefHeight="250.0"
+              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="130.0" minWidth="130.0" prefWidth="130.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="135.0" minWidth="135.0"
+                    prefWidth="135.0"/>
               </columnConstraints>
               <rowConstraints>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -76,15 +81,17 @@
             </GridPane>
              <GridPane fx:id="chatGridPane" GridPane.columnIndex="2" GridPane.rowIndex="2">
               <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="300.0" prefWidth="300.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="100.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="390.0" minWidth="390.0"
+                    prefWidth="390.0"/>
               </columnConstraints>
               <rowConstraints>
                   <RowConstraints maxHeight="1.7976931348623157E308" vgrow="SOMETIMES" />
-                  <RowConstraints maxHeight="50.0" minHeight="50.0" prefHeight="50.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0"
+                    vgrow="SOMETIMES"/>
               </rowConstraints>
                <children>
-                   <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
+                   <Pane fx:id="chatHistoryHolder" prefHeight="200.0" prefWidth="200.0"
+                     GridPane.hgrow="ALWAYS" GridPane.valignment="BOTTOM" GridPane.vgrow="ALWAYS">
                        <GridPane.margin>
                            <Insets />
                        </GridPane.margin>
@@ -92,19 +99,47 @@
                            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                        </padding>
                    </Pane>
-                   <JFXButton fx:id="chatSend" alignment="CENTER" buttonType="RAISED" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" text="SEND" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                   <GridPane fx:id="chatInputHolder" GridPane.rowIndex="1">
+                       <columnConstraints>
+                           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                           <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="90.0"
+                             prefWidth="90.0"/>
+                       </columnConstraints>
+                       <rowConstraints>
+                           <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" 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"/>
+                               </GridPane.margin>
+                           </JFXButton>
+                           <JFXTextField fx:id="chatInput" maxHeight="35.0" minHeight="-Infinity"
+                             prefHeight="35.0">
+                               <GridPane.margin>
+                                   <Insets bottom="10.0" left="20.0" right="10.0"/>
+                               </GridPane.margin>
+                               <padding>
+                                   <Insets right="15.0"/>
+                               </padding>
+                           </JFXTextField>
+                       </children>
                        <GridPane.margin>
-                           <Insets left="10.0" right="10.0" />
+                           <Insets top="10.0"/>
                        </GridPane.margin>
-                   </JFXButton>
-                   <JFXTextField fx:id="chatInput" maxHeight="35.0" minHeight="-Infinity" prefHeight="35.0" GridPane.rowIndex="1">
-                       <GridPane.margin>
-                           <Insets left="10.0" />
-                       </GridPane.margin>
-                   </JFXTextField>
+                   </GridPane>
                </children>
+                 <GridPane.margin>
+                     <Insets bottom="10.0" right="10.0"/>
+                 </GridPane.margin>
              </GridPane>
-             <GridPane fx:id="windGridPane" prefHeight="161.0" prefWidth="240.0" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="BOTTOM">
+             <GridPane fx:id="windGridPane" maxHeight="-Infinity" maxWidth="-Infinity"
+               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" prefWidth="132.0" />