diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java
index 5e5c4aea..b96a39b3 100644
--- a/src/main/java/seng302/controllers/LobbyController.java
+++ b/src/main/java/seng302/controllers/LobbyController.java
@@ -80,7 +80,7 @@ public class LobbyController implements Initializable, Observer{
     private static ObservableList<String> seventhCompetitor = FXCollections.observableArrayList();
     private static ObservableList<String> eighthCompetitor = FXCollections.observableArrayList();
     private ClientStateQueryingRunnable clientStateQueryingRunnable;
-    private static List<ImageView> gifImageViews;
+    private static List<ImageView> imageViews;
     private static List<ListView> listViews;
 
     private int MAX_NUM_PLAYERS = 8;
@@ -114,8 +114,8 @@ public class LobbyController implements Initializable, Observer{
             readyButton.setDisable(true);
         }
 
-        gifImageViews = new ArrayList<>();
-        Collections.addAll(gifImageViews, firstImageView, secondImageView, thirdImageView, fourthImageView,
+        imageViews = new ArrayList<>();
+        Collections.addAll(imageViews, firstImageView, secondImageView, thirdImageView, fourthImageView,
                 fifthImageView, sixthImageView, seventhImageView, eighthImageView);
         listViews = new ArrayList<>();
         Collections.addAll(listViews, firstListView, secondListView, thirdListView, fourthListView, fifthListView,
@@ -153,49 +153,37 @@ public class LobbyController implements Initializable, Observer{
 
     private void initialiseListView() {
         listViews.forEach(listView -> listView.getItems().clear());
-        gifImageViews.forEach(gif -> gif.setVisible(false));
+        imageViews.forEach(gif -> gif.setVisible(false));
         competitors.forEach(ol -> ol.removeAll());
 
         List<Integer> ids = new ArrayList<>(ClientState.getBoats().keySet());
         for (int i = 0; i < ids.size(); i++) {
             competitors.get(i).add(String.format("Player ID: %d", ids.get(i)));
             listViews.get(i).setItems(competitors.get(i));
-            gifImageViews.get(i).setVisible(true);
+            imageViews.get(i).setVisible(true);
         }
     }
 
-    private void initialiseLobbyControllerThread() {
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Platform.runLater(new Runnable() {
-                    @Override
-                    public void run() {
-
-                    }
-                });
-            }
-        });
-        thread.start();
-    }
-
     private void initialiseImageView() {
-        Image image1 = new Image(getClass().getResourceAsStream("/ParrotGif/alistair.gif"));
-        firstImageView.setImage(image1);
-        Image image2 = new Image(getClass().getResourceAsStream("/ParrotGif/calum.gif"));
-        secondImageView.setImage(image2);
-        Image image3 = new Image(getClass().getResourceAsStream("/ParrotGif/haoming.gif"));
-        thirdImageView.setImage(image3);
-        Image image4 = new Image(getClass().getResourceAsStream("/ParrotGif/kusal.gif"));
-        fourthImageView.setImage(image4);
-        Image image5 = new Image(getClass().getResourceAsStream("/ParrotGif/michael.gif"));
-        fifthImageView.setImage(image5);
-        Image image6 = new Image(getClass().getResourceAsStream("/ParrotGif/peter.gif"));
-        sixthImageView.setImage(image6);
-        Image image7 = new Image(getClass().getResourceAsStream("/ParrotGif/ryan.gif"));
-        seventhImageView.setImage(image7);
-        Image image8 = new Image(getClass().getResourceAsStream("/ParrotGif/will.gif"));
-        eighthImageView.setImage(image8);
+        for (int i = 0; i < MAX_NUM_PLAYERS; i++) {
+            imageViews.get(i).setImage(new Image(getClass().getResourceAsStream("/pics/sail.png")));
+        }
+//        Image image1 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        firstImageView.setImage(image1);
+//        Image image2 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        secondImageView.setImage(image2);
+//        Image image3 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        thirdImageView.setImage(image3);
+//        Image image4 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        fourthImageView.setImage(image4);
+//        Image image5 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        fifthImageView.setImage(image5);
+//        Image image6 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        sixthImageView.setImage(image6);
+//        Image image7 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        seventhImageView.setImage(image7);
+//        Image image8 = new Image(getClass().getResourceAsStream("/pics/sail.png"));
+//        eighthImageView.setImage(image8);
     }
 
     @FXML
diff --git a/src/main/resources/ParrotGif/alistair.gif b/src/main/resources/pics/alistair.gif
similarity index 100%
rename from src/main/resources/ParrotGif/alistair.gif
rename to src/main/resources/pics/alistair.gif
diff --git a/src/main/resources/ParrotGif/calum.gif b/src/main/resources/pics/calum.gif
similarity index 100%
rename from src/main/resources/ParrotGif/calum.gif
rename to src/main/resources/pics/calum.gif
diff --git a/src/main/resources/ParrotGif/haoming.gif b/src/main/resources/pics/haoming.gif
similarity index 100%
rename from src/main/resources/ParrotGif/haoming.gif
rename to src/main/resources/pics/haoming.gif
diff --git a/src/main/resources/ParrotGif/kusal.gif b/src/main/resources/pics/kusal.gif
similarity index 100%
rename from src/main/resources/ParrotGif/kusal.gif
rename to src/main/resources/pics/kusal.gif
diff --git a/src/main/resources/ParrotGif/michael.gif b/src/main/resources/pics/michael.gif
similarity index 100%
rename from src/main/resources/ParrotGif/michael.gif
rename to src/main/resources/pics/michael.gif
diff --git a/src/main/resources/ParrotGif/parrot.gif b/src/main/resources/pics/parrot.gif
similarity index 100%
rename from src/main/resources/ParrotGif/parrot.gif
rename to src/main/resources/pics/parrot.gif
diff --git a/src/main/resources/ParrotGif/peter.gif b/src/main/resources/pics/peter.gif
similarity index 100%
rename from src/main/resources/ParrotGif/peter.gif
rename to src/main/resources/pics/peter.gif
diff --git a/src/main/resources/ParrotGif/ryan.gif b/src/main/resources/pics/ryan.gif
similarity index 100%
rename from src/main/resources/ParrotGif/ryan.gif
rename to src/main/resources/pics/ryan.gif
diff --git a/src/main/resources/pics/sail.png b/src/main/resources/pics/sail.png
new file mode 100644
index 00000000..7335918c
Binary files /dev/null and b/src/main/resources/pics/sail.png differ
diff --git a/src/main/resources/ParrotGif/will.gif b/src/main/resources/pics/will.gif
similarity index 100%
rename from src/main/resources/ParrotGif/will.gif
rename to src/main/resources/pics/will.gif