diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientUI.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientUI.java
index 5f27276..56ae368 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientUI.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientUI.java
@@ -23,10 +23,10 @@ public class ClientUI extends Application {
 
             // configure and show stage
             primaryStage.setScene(scene);
-            primaryStage.setMinWidth(420);
             primaryStage.setMinHeight(250);
             primaryStage.setTitle("Multichat Client");
             primaryStage.show();
+            primaryStage.setMinWidth(primaryStage.getWidth()); //use automatically computed size as Minimum Size.
         } catch(Exception e) {
             System.err.println("Error starting up UI" + e.getMessage());
         }
diff --git a/client/src/main/resources/ch/zhaw/pm2/multichat/client/ChatWindow.fxml b/client/src/main/resources/ch/zhaw/pm2/multichat/client/ChatWindow.fxml
index 57b6f12..263979e 100644
--- a/client/src/main/resources/ch/zhaw/pm2/multichat/client/ChatWindow.fxml
+++ b/client/src/main/resources/ch/zhaw/pm2/multichat/client/ChatWindow.fxml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 
-<BorderPane fx:id="rootPane" minWidth="-Infinity" prefHeight="500.0" prefWidth="420.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.pm2.multichat.client.ChatWindowController">
+<BorderPane fx:id="rootPane" minWidth="-Infinity" prefHeight="500.0" prefWidth="420.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.pm2.multichat.client.ChatWindowController">
    <top>
       <VBox BorderPane.alignment="CENTER">
          <children>
@@ -68,7 +76,7 @@
       </HBox>
    </bottom>
    <center>
-      <TextArea fx:id="messageArea" editable="false">
+      <TextArea fx:id="messageArea" editable="false" wrapText="true">
          <BorderPane.margin>
             <Insets left="5.0" right="5.0" />
          </BorderPane.margin>