diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml
index 11c4c3e..86e2518 100644
--- a/client/src/main/resources/fxml/ChatScene.fxml
+++ b/client/src/main/resources/fxml/ChatScene.fxml
@@ -13,43 +13,24 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane fx:id="scene" hgap="5.0" maxHeight="-Infinity"
-	maxWidth="-Infinity" minHeight="400.0" minWidth="350.0"
-	prefHeight="400.0" prefWidth="600.0" vgap="2.0"
-	xmlns="http://javafx.com/javafx/11.0.1"
-	xmlns:fx="http://javafx.com/fxml/1"
-	fx:controller="envoy.client.ui.controller.ChatScene">
+<GridPane fx:id="scene" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="350.0" prefHeight="1152.0" prefWidth="2042.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.ChatScene">
 	<columnConstraints>
-		<ColumnConstraints hgrow="NEVER" minWidth="60.0"
-			prefWidth="160.0" />
-		<ColumnConstraints hgrow="ALWAYS"
-			maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="357.0" />
-		<ColumnConstraints hgrow="ALWAYS"
-			maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="7.0"
-			prefWidth="357.0" />
+		<ColumnConstraints hgrow="NEVER" maxWidth="327.99997965494794" minWidth="60.0" prefWidth="322.6666259765625" />
+		<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="1567.3333740234375" />
 	</columnConstraints>
 	<rowConstraints>
-		<RowConstraints maxHeight="-Infinity"
-			minHeight="-Infinity" prefHeight="50.0" vgrow="NEVER" />
-		<RowConstraints maxHeight="-Infinity"
-			minHeight="-Infinity" prefHeight="20.0" vgrow="NEVER" />
-		<RowConstraints maxHeight="1.7976931348623157E308"
-			minHeight="50.0" prefHeight="155.14286150251115" vgrow="ALWAYS" />
-		<RowConstraints maxHeight="-Infinity"
-			minHeight="-Infinity" prefHeight="20.0" vgrow="NEVER" />
-		<RowConstraints maxHeight="120.0" minHeight="40.0"
-			prefHeight="60.0" vgrow="NEVER" />
-		<RowConstraints maxHeight="-Infinity"
-			minHeight="-Infinity" prefHeight="40.0" vgrow="NEVER" />
+		<RowConstraints maxHeight="76.66667175292969" minHeight="-Infinity" prefHeight="76.66667175292969" vgrow="NEVER" />
+		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="50.0" prefHeight="969.3332926432291" vgrow="ALWAYS" />
+		<RowConstraints maxHeight="59.3333740234375" minHeight="-Infinity" prefHeight="22.666748046875" vgrow="NEVER" />
+		<RowConstraints maxHeight="120.0" minHeight="40.0" prefHeight="83.333251953125" vgrow="NEVER" />
 	</rowConstraints>
 	<children>
-		<ListView fx:id="chatList" onMouseClicked="#chatListClicked"
-			prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1"
-			GridPane.rowSpan="2147483647">
+		<ListView fx:id="chatList" onMouseClicked="#chatListClicked" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" GridPane.rowSpan="2147483647">
 			<GridPane.margin>
-				<Insets bottom="5.0" left="10.0" />
+				<Insets right="4.0" top="1.0" />
 			</GridPane.margin>
 			<padding>
 				<Insets bottom="5.0" left="5.0" right="2.0" top="5.0" />
@@ -57,14 +38,12 @@
 			<contextMenu>
 				<ContextMenu anchorLocation="CONTENT_TOP_LEFT">
 					<items>
-						<MenuItem fx:id="deleteContactMenuItem"
-							mnemonicParsing="false" onAction="#deleteContact" text="Delete" />
+						<MenuItem fx:id="deleteContactMenuItem" mnemonicParsing="false" onAction="#deleteContact" text="Delete" />
 					</items>
 				</ContextMenu>
 			</contextMenu>
 		</ListView>
-		<Label fx:id="contactLabel" prefHeight="27.0" prefWidth="134.0"
-			GridPane.columnSpan="2">
+		<Label fx:id="contactLabel" prefHeight="27.0" prefWidth="134.0" GridPane.columnSpan="2">
 			<GridPane.margin>
 				<Insets left="10.0" />
 			</GridPane.margin>
@@ -72,10 +51,7 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
 		</Label>
-		<Button fx:id="settingsButton" mnemonicParsing="true"
-			onAction="#settingsButtonClicked" text="_Settings"
-			GridPane.columnIndex="1" GridPane.columnSpan="2147483647"
-			GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
+		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
 			<GridPane.margin>
 				<Insets bottom="10.0" right="10.0" top="10.0" />
 			</GridPane.margin>
@@ -83,81 +59,61 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
 		</Button>
-		<ListView fx:id="messageList" GridPane.columnIndex="1"
-			GridPane.columnSpan="2147483647" GridPane.rowIndex="1"
-			GridPane.rowSpan="2">
+		<ListView fx:id="messageList" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" GridPane.rowSpan="2">
 			<GridPane.margin>
-				<Insets left="5.0" right="10.0" />
+				<Insets />
 			</GridPane.margin>
 			<padding>
 				<Insets bottom="5.0" left="5.0" right="2.0" top="5.0" />
 			</padding>
 		</ListView>
-		<ButtonBar buttonMinWidth="40.0" GridPane.columnIndex="1"
-			GridPane.columnSpan="2147483647" GridPane.halignment="CENTER"
-			GridPane.rowIndex="5" GridPane.valignment="BOTTOM">
-			<GridPane.margin>
-				<Insets right="10.0" />
-			</GridPane.margin>
-			<buttons>
-				<Button fx:id="rotateButton" mnemonicParsing="false"
-					onAction="#doABarrelRoll">
-					<padding>
-						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-					</padding>
-				</Button>
-				<Button fx:id="attachmentButton" disable="true"
-					mnemonicParsing="false" onAction="#attachmentButtonClicked">
-					<padding>
-						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-					</padding>
-				</Button>
-				<Button fx:id="voiceButton" disable="true"
-					onAction="#voiceButtonClicked">
-					<padding>
-						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-					</padding>
-				</Button>
-				<Button fx:id="postButton" defaultButton="true"
-					disable="true" mnemonicParsing="true" onAction="#postMessage"
-					text="_Post">
-					<tooltip>
-						<Tooltip anchorLocation="WINDOW_TOP_LEFT" autoHide="true"
-							maxWidth="350.0"
-							text="Click this button to send the message. If it is disabled, you first have to select a contact to send it to. A message may automatically be sent when you press (Ctrl + ) Enter, according to your preferences. Additionally sends a message when pressing &quot;Alt&quot; + &quot;P&quot;."
-							wrapText="true" />
-					</tooltip>
-					<contextMenu>
-						<ContextMenu anchorLocation="CONTENT_TOP_LEFT">
-							<items>
-								<MenuItem mnemonicParsing="false"
-									onAction="#copyAndPostMessage" text="Copy and Send" />
-							</items>
-						</ContextMenu>
-					</contextMenu>
-					<padding>
-						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-					</padding>
-				</Button>
-			</buttons>
-		</ButtonBar>
-		<TextArea fx:id="messageTextArea" disable="true"
-			onInputMethodTextChanged="#messageTextUpdated"
-			onKeyPressed="#checkPostConditions" onKeyTyped="#checkKeyCombination"
-			prefHeight="200.0" prefWidth="200.0" wrapText="true"
-			GridPane.columnIndex="1" GridPane.columnSpan="2147483647"
-			GridPane.rowIndex="4">
-			<GridPane.margin>
-				<Insets bottom="10.0" left="5.0" right="10.0" top="3.0" />
-			</GridPane.margin>
-			<opaqueInsets>
-				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-			</opaqueInsets>
-		</TextArea>
-		<Button mnemonicParsing="true"
-			onAction="#addContactButtonClicked" text="_Add Contacts"
-			GridPane.halignment="CENTER" GridPane.rowIndex="5"
-			GridPane.valignment="CENTER">
+      <HBox alignment="CENTER" spacing="4.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
+         <children>
+      		<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#checkPostConditions" onKeyTyped="#checkKeyCombination" prefHeight="200.0" prefWidth="1300.0" wrapText="true">
+      			<opaqueInsets>
+      				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+      			</opaqueInsets>
+      		</TextArea>
+      		<ButtonBar buttonMinWidth="40.0">
+      			<buttons>
+      				<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postMessage" text="Post">
+      					<tooltip>
+      						<Tooltip anchorLocation="WINDOW_TOP_LEFT" autoHide="true" maxWidth="350.0" text="Click this button to send the message. If it is disabled, you first have to select a contact to send it to. A message may automatically be sent when you press (Ctrl + ) Enter, according to your preferences. Additionally sends a message when pressing &quot;Alt&quot; + &quot;P&quot;." wrapText="true" />
+      					</tooltip>
+      					<contextMenu>
+      						<ContextMenu anchorLocation="CONTENT_TOP_LEFT">
+      							<items>
+      								<MenuItem mnemonicParsing="false" onAction="#copyAndPostMessage" text="Copy and Send" />
+      							</items>
+      						</ContextMenu>
+      					</contextMenu>
+      					<padding>
+      						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+      					</padding>
+      				</Button>
+      				<Button fx:id="voiceButton" disable="true" onAction="#voiceButtonClicked">
+      					<padding>
+      						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+      					</padding>
+      				</Button>
+      				<Button fx:id="attachmentButton" disable="true" mnemonicParsing="false" onAction="#attachmentButtonClicked">
+      					<padding>
+      						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+      					</padding>
+      				</Button>
+      				<Button fx:id="rotateButton" mnemonicParsing="false" onAction="#doABarrelRoll">
+      					<padding>
+      						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+      					</padding>
+      				</Button>
+      			</buttons>
+      		</ButtonBar>
+         </children>
+         <GridPane.margin>
+            <Insets bottom="40.0" top="10.0" />
+         </GridPane.margin>
+      </HBox>
+		<Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
 			<padding>
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
@@ -165,11 +121,7 @@
 				<Insets bottom="10.0" left="10.0" right="5.0" />
 			</GridPane.margin>
 		</Button>
-		<Label id="remainingCharsLabel" fx:id="remainingChars"
-			ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0"
-			prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME"
-			textOverrun="LEADING_WORD_ELLIPSIS" visible="false"
-			GridPane.columnIndex="1" GridPane.rowIndex="3">
+		<Label id="remainingCharsLabel" fx:id="remainingChars" ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2">
 			<GridPane.margin>
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</GridPane.margin>
@@ -180,14 +132,10 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</opaqueInsets>
 			<tooltip>
-				<Tooltip
-					text="Shows how many chars you can still enter in this message"
-					wrapText="true" />
+				<Tooltip text="Shows how many chars you can still enter in this message" wrapText="true" />
 			</tooltip>
 		</Label>
-		<Label fx:id="infoLabel" text="Something happened"
-			textFill="#faa007" visible="false" wrapText="true"
-			GridPane.columnIndex="1">
+		<Label fx:id="infoLabel" text="Something happened" textFill="#faa007" visible="false" wrapText="true" GridPane.columnIndex="1">
 			<GridPane.margin>
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</GridPane.margin>
@@ -195,10 +143,7 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
 		</Label>
-		<ImageView fx:id="attachmentView" pickOnBounds="true"
-			preserveRatio="true" visible="false" GridPane.columnIndex="1"
-			GridPane.columnSpan="2147483647" GridPane.halignment="RIGHT"
-			GridPane.rowIndex="3">
+		<ImageView fx:id="attachmentView" pickOnBounds="true" preserveRatio="true" visible="false" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
 			<viewport>
 				<Rectangle2D height="20.0" width="20.0" />
 			</viewport>