diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 028ea1e3..2a2ce3d4 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -72,7 +72,6 @@ public class GameClient {
 
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
-        lobbyController.setPlayerListSource(clientLobbyList);
         lobbyController.disableReadyButton();
         lobbyController.setTitle("Connected to host - IP : " + ipAddress + " Port : " + portNumber);
         lobbyController.addCloseListener((exitCause) -> this.loadStartScreen());
@@ -93,7 +92,6 @@ public class GameClient {
         }
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
-        lobbyController.setPlayerListSource(clientLobbyList);
         lobbyController.setTitle("Hosting Lobby - IP : " + ipAddress + " Port : " + portNumber);
         lobbyController.addCloseListener(exitCause -> {
             if (exitCause == CloseStatus.READY) {
@@ -133,7 +131,11 @@ public class GameClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return fxmlLoader.getController();
+        LobbyController lobbyController = fxmlLoader.getController();
+        lobbyController.setPlayerListSource(clientLobbyList);
+        lobbyController.setPlayerID(socketThread.getClientId());
+
+        return lobbyController;
     }
 
     private void loadRaceView() {
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 809bd3b5..113ae70e 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -14,6 +14,7 @@ import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
+import seng302.visualiser.GameView;
 
 /**
  * A class describing the actions of the lobby screen
@@ -72,6 +73,7 @@ public class LobbyController {
     private List<TextArea> listViews = new ArrayList<>();
 
     private int MAX_NUM_PLAYERS = 8;
+    private Integer playerID;
 
     private List<LobbyCloseListener> lobbyListeners = new ArrayList<>();
     private ObservableList<String> players;
@@ -98,6 +100,9 @@ public class LobbyController {
         //Update players if one added.
         for (int i = 0; i < players.size(); i++) {
             listViews.get(i).setText(players.get(i));
+            if (playerID == (i + 1)) {
+                listViews.get(i).setText(listViews.get(i).getText() + " (YOU)");
+            }
             imageViews.get(i).setVisible(true);
         }
         //Update empty text fields if player left.
@@ -122,6 +127,11 @@ public class LobbyController {
         }
     }
 
+    @FXML
+    public void customize() {
+        System.out.println(playerID);
+    }
+
     @FXML
     public void leaveLobbyButtonPressed() {
         // TODO: 10/07/17 wmu16 - Finish function!
@@ -154,6 +164,10 @@ public class LobbyController {
         Platform.runLater(this::updatePlayers);
     }
 
+    public void setPlayerID(Integer id) {
+        playerID = id;
+    }
+
     public void disableReadyButton () {
         readyButton.setDisable(true);
         readyButton.setVisible(false);
diff --git a/src/main/resources/views/LobbyView.fxml b/src/main/resources/views/LobbyView.fxml
index 2ef91fd5..1280fb1c 100644
--- a/src/main/resources/views/LobbyView.fxml
+++ b/src/main/resources/views/LobbyView.fxml
@@ -35,6 +35,7 @@
       <GridPane prefHeight="166.0" prefWidth="1530.0" GridPane.rowIndex="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>
         <rowConstraints>
@@ -42,7 +43,8 @@
         </rowConstraints>
          <children>
             <Button fx:id="readyButton" focusTraversable="false" mnemonicParsing="false" onAction="#readyButtonPressed" prefWidth="101.0" text="Ready" GridPane.halignment="CENTER" />
-            <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
+            <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
+            <Button focusTraversable="false" mnemonicParsing="false" onAction="#customize" text="Customization" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
          </children>
       </GridPane>
       <GridPane GridPane.rowIndex="1">