diff --git a/client/src/main/resources/fxml/ContactSearchScene.fxml b/client/src/main/resources/fxml/ContactSearchScene.fxml
index a77dfd6..9705bca 100644
--- a/client/src/main/resources/fxml/ContactSearchScene.fxml
+++ b/client/src/main/resources/fxml/ContactSearchScene.fxml
@@ -8,12 +8,19 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.ContactSearchScene">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity"
+	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1"
+	fx:controller="envoy.client.ui.controller.ContactSearchScene">
 	<children>
 		<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
 			<children>
-				<ClearableTextField fx:id="searchBar" prefWidth="310.0">
-					<textField onInputMethodTextChanged="#sendRequest" onKeyTyped="#sendRequest" prefColumnCount="22" promptText="Enter username to search for">
+				<ClearableTextField fx:id="searchBar"
+					prefWidth="310.0">
+					<textField onInputMethodTextChanged="#sendRequest"
+						onKeyTyped="#sendRequest" prefColumnCount="22"
+						promptText="Enter username to search for">
 					</textField>
 					<HBox.margin>
 						<Insets bottom="5.0" left="5.0" right="5.0" top="15.0" />
@@ -22,10 +29,14 @@
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</padding>
 					<tooltip>
-						<Tooltip text="Enter a name. If an account by that name exists, it will be displayed below." wrapText="true" />
+						<Tooltip
+							text="Enter a name. If an account by that name exists, it will be displayed below."
+							wrapText="true" />
 					</tooltip>
 				</ClearableTextField>
-				<Button mnemonicParsing="false" onAction="#newGroupButtonClicked" prefHeight="26.0" prefWidth="139.0" text="New Group">
+				<Button mnemonicParsing="false"
+					onAction="#newGroupButtonClicked" prefHeight="26.0"
+					prefWidth="139.0" text="New Group">
 					<HBox.margin>
 						<Insets bottom="5.0" left="30.0" right="5.0" top="5.0" />
 					</HBox.margin>
@@ -35,7 +46,8 @@
 				</Button>
 			</children>
 		</HBox>
-		<ListView fx:id="userList" onMouseClicked="#chatListClicked" prefHeight="314.0" prefWidth="600.0">
+		<ListView fx:id="userList" onMouseClicked="#chatListClicked"
+			prefHeight="314.0" prefWidth="600.0">
 			<padding>
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
@@ -43,7 +55,8 @@
 				<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
 			</VBox.margin>
 		</ListView>
-		<Button cancelButton="true" mnemonicParsing="true" onAction="#backButtonClicked" text="_Back">
+		<Button cancelButton="true" mnemonicParsing="true"
+			onAction="#backButtonClicked" text="_Back">
 			<VBox.margin>
 				<Insets bottom="10.0" left="10.0" />
 			</VBox.margin>
@@ -51,7 +64,9 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
 			<tooltip>
-				<Tooltip autoHide="true" text="Takes you back to the screen where you can chat with others" wrapText="true" />
+				<Tooltip autoHide="true"
+					text="Takes you back to the screen where you can chat with others"
+					wrapText="true" />
 			</tooltip>
 		</Button>
 	</children>
diff --git a/client/src/main/resources/fxml/GroupCreationScene.fxml b/client/src/main/resources/fxml/GroupCreationScene.fxml
index 897955b..a570afb 100644
--- a/client/src/main/resources/fxml/GroupCreationScene.fxml
+++ b/client/src/main/resources/fxml/GroupCreationScene.fxml
@@ -11,12 +11,18 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.GroupCreationScene">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity"
+	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1"
+	fx:controller="envoy.client.ui.controller.GroupCreationScene">
 	<children>
 		<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
 			<children>
 				<ClearableTextField fx:id="groupNameField">
-					<textField onInputMethodTextChanged="#textUpdated" onKeyTyped="#textUpdated" prefColumnCount="22" promptText="Enter Group Name" />
+					<textField onInputMethodTextChanged="#textUpdated"
+						onKeyTyped="#textUpdated" prefColumnCount="22"
+						promptText="Enter Group Name" />
 					<HBox.margin>
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</HBox.margin>
@@ -24,7 +30,9 @@
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</padding>
 					<tooltip>
-						<Tooltip text="Enter something. A group with this name will be created." wrapText="true" />
+						<Tooltip
+							text="Enter something. A group with this name will be created."
+							wrapText="true" />
 					</tooltip>
 				</ClearableTextField>
 			</children>
@@ -37,7 +45,8 @@
 				<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 			</padding>
 		</Label>
-		<ListView fx:id="userList" onMouseClicked="#chatListClicked" prefHeight="314.0" prefWidth="600.0">
+		<ListView fx:id="userList" onMouseClicked="#chatListClicked"
+			prefHeight="314.0" prefWidth="600.0">
 			<VBox.margin>
 				<Insets bottom="5.0" left="10.0" right="10.0" top="5.0" />
 			</VBox.margin>
@@ -47,12 +56,16 @@
 		</ListView>
 		<BorderPane prefHeight="50.0">
 			<left>
-				<Button cancelButton="true" mnemonicParsing="true" onAction="#backButtonClicked" text="_Back" BorderPane.alignment="CENTER">
+				<Button cancelButton="true" mnemonicParsing="true"
+					onAction="#backButtonClicked" text="_Back"
+					BorderPane.alignment="CENTER">
 					<padding>
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</padding>
 					<tooltip>
-						<Tooltip autoHide="true" text="Takes you back to the screen where you can chat with others" wrapText="true" />
+						<Tooltip autoHide="true"
+							text="Takes you back to the screen where you can chat with others"
+							wrapText="true" />
 					</tooltip>
 					<BorderPane.margin>
 						<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -60,7 +73,10 @@
 				</Button>
 			</left>
 			<right>
-				<Button fx:id="createButton" alignment="CENTER_RIGHT" defaultButton="true" disable="true" mnemonicParsing="false" onAction="#createButtonClicked" text="Create" BorderPane.alignment="CENTER">
+				<Button fx:id="createButton" alignment="CENTER_RIGHT"
+					defaultButton="true" disable="true" mnemonicParsing="false"
+					onAction="#createButtonClicked" text="Create"
+					BorderPane.alignment="CENTER">
 					<padding>
 						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 					</padding>