diff --git a/src/main/java/it/polimi/ingsw/gc19/View/GUI/SceneController/SetupController.java b/src/main/java/it/polimi/ingsw/gc19/View/GUI/SceneController/SetupController.java
index 8d70eaf0..b4e2ba4e 100644
--- a/src/main/java/it/polimi/ingsw/gc19/View/GUI/SceneController/SetupController.java
+++ b/src/main/java/it/polimi/ingsw/gc19/View/GUI/SceneController/SetupController.java
@@ -104,8 +104,12 @@ private void initialize(){
             throw new RuntimeException(e);
         }
 
-        ((Region) chat.getChildren().getFirst()).setPrefHeight(super.getStage().getHeight() -
-                                                                           (this.availableColorsPane.getHeight() + this.privateGoalCardSelectionPane.getHeight() + this.privateGoalCardSelectionPane.getHeight()));
+        /*((Region) chat.getChildren().getFirst()).setPrefHeight(super.getStage().getHeight() -
+                                                                           (this.availableColorsPane.getHeight() + this.privateGoalCardSelectionPane.getHeight() + this.privateGoalCardSelectionPane.getHeight()));*/
+
+        //((Region) chat.getChildren().getFirst()).setPrefHeight(Double.MAX_VALUE);
+
+        resizeChat();
 
         try{
             FXMLLoader loader = new FXMLLoader();
@@ -138,6 +142,8 @@ private void initialize(){
         }
 
         setBackgrounds();
+
+        resizeChat();
     }
 
     /**
@@ -212,6 +218,9 @@ private void buildInitialCardHBox(){
                 });
             }
         }
+        else{
+            rightVBox.getChildren().remove(initialCardOrientationPane);
+        }
     }
 
     /**
@@ -238,6 +247,9 @@ private void buildPrivateGoalCardSelectionHBox(){
 
             this.goalCardsHBox.getChildren().addAll(cardButtons);
         }
+        else{
+            rightVBox.getChildren().remove(privateGoalCardSelectionPane);
+        }
     }
 
     /**
@@ -250,12 +262,10 @@ private void buildAvailableColorsPane(){
             this.hbox.getChildren().clear();
             hbox.getChildren().addAll(colorButtonFactory(this.getLocalModel().getAvailableColors()));
         }
-
-        if(getLocalModel().getPersonalStation().getChosenColor() != null){
-            ArrayList<Button> button = colorButtonFactory(List.of(this.getLocalModel().getPersonalStation().getChosenColor()));
-
-            this.hbox.getChildren().clear();
-            this.hbox.getChildren().add(button.getFirst());
+        else{
+            if(getLocalModel().getPersonalStation() != null && getLocalModel().getPersonalStation().getChosenColor() != null) {
+                rightVBox.getChildren().remove(availableColorsPane);
+            }
         }
     }
 
@@ -328,7 +338,13 @@ private Button buildColorButton(Color c, Circle circlePawn) {
      * Resizes {@link #chat} to fill empty space on {@link #rightVBox}.
      */
     private void resizeChat(){
-        ((Region) chat.getChildren().getFirst()).setPrefHeight(((ScrollPane) chat.getChildren().getFirst()).getHeight() + 0.25 * ((Region) chat.getParent()).getHeight());
+        //((Region) chat.getChildren().getFirst()).setPrefHeight(((ScrollPane) chat.getChildren().getFirst()).getHeight() + 0.25 * ((Region) chat.getParent()).getHeight());
+
+        ((Region) chat.getChildren().getFirst()).setPrefHeight(super.getStage().getHeight() -
+                                                                       this.rightVBox.getChildren().stream()
+                                                                                                   .filter(f -> !f.equals(chat))
+                                                                                                   .mapToDouble(f -> ((Region) f).getHeight())
+                                                                                                   .sum());
     }
 
     /**