diff --git a/src/main/resources/MainView.fxml b/src/main/resources/MainView.fxml
index 90b5ec4..b1342cf 100644
--- a/src/main/resources/MainView.fxml
+++ b/src/main/resources/MainView.fxml
@@ -63,11 +63,11 @@
          <children>
             <AnchorPane>
                <children>
-                  <Button layoutX="209.0" layoutY="1.0" mnemonicParsing="false" onAction="#handleSelectStationButtonPress" text="Select Station" />
-                  <Label layoutY="5.0" prefHeight="17.0" prefWidth="49.0" text="Station: " />
-                  <TextField fx:id="stationNameField" editable="false" layoutX="49.0" prefHeight="25.0" prefWidth="153.0" style="-fx-background-color: #EEEEEE; -fx-border-color: #AAAAAA;" text="My Station" />
+                  <Button layoutX="228.0" layoutY="1.0" mnemonicParsing="false" onAction="#handleSelectStationButtonPress" text="Select Station" />
+                  <Label layoutY="5.0" prefHeight="17.0" prefWidth="60.0" text="Station: " />
+                  <TextField fx:id="stationNameField" editable="false" layoutX="68.0" prefHeight="25.0" prefWidth="153.0" style="-fx-background-color: #EEEEEE; -fx-border-color: #AAAAAA;" text="My Station" />
                   <Button layoutX="602.0" layoutY="1.0" mnemonicParsing="false" onAction="#handleHelpButtonPress" text="Help" AnchorPane.rightAnchor="0.0" />
-                  <Button layoutX="532.0" layoutY="1.0" mnemonicParsing="false" text="Settings" AnchorPane.rightAnchor="49.0" />
+                  <Button layoutX="516.0" layoutY="1.0" mnemonicParsing="false" text="Settings" AnchorPane.rightAnchor="52.0" />
                </children>
             </AnchorPane>
             <AnchorPane prefHeight="50.0" prefWidth="640.0" GridPane.rowIndex="1">
@@ -77,7 +77,7 @@
                         <Font size="14.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lastRetrievedLabel" layoutX="183.0" layoutY="14.0" text="2024-12-25T12:59:47" AnchorPane.leftAnchor="183.0" AnchorPane.topAnchor="14.0">
+                  <Label fx:id="lastRetrievedLabel" layoutX="201.0" layoutY="15.0" text="2024-12-25T12:59:47" AnchorPane.leftAnchor="201.0" AnchorPane.topAnchor="15.0">
                      <font>
                         <Font size="14.0" />
                      </font>
diff --git a/src/main/resources/StationSelectionView.fxml b/src/main/resources/StationSelectionView.fxml
index 4dbb75f..bc4b7c6 100644
--- a/src/main/resources/StationSelectionView.fxml
+++ b/src/main/resources/StationSelectionView.fxml
@@ -16,7 +16,7 @@
       <Button layoutX="358.0" layoutY="17.0" mnemonicParsing="false" onAction="#handleAddButtonPress" prefHeight="25.0" prefWidth="26.0" text="+" AnchorPane.rightAnchor="55.0" AnchorPane.topAnchor="17.0" />
       <Button layoutX="391.0" layoutY="17.0" mnemonicParsing="false" onAction="#handleRemoveButtonPress" prefHeight="25.0" prefWidth="25.0" text="-" AnchorPane.rightAnchor="21.0" AnchorPane.topAnchor="17.0" />
       <ListView fx:id="stationListView" layoutX="14.0" layoutY="57.0" prefHeight="301.0" prefWidth="409.0" AnchorPane.bottomAnchor="42.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="57.0" />
-      <Button layoutX="313.0" layoutY="365.0" mnemonicParsing="false" onAction="#handleSelectButtonPress" text="Select" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="76.5" />
+      <Button layoutX="293.0" layoutY="366.0" mnemonicParsing="false" onAction="#handleSelectButtonPress" text="Select" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="85.0" />
       <Button layoutX="370.0" layoutY="365.0" mnemonicParsing="false" onAction="#handleCancelButtonPress" text="Cancel" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="15.5" />
    </children>
 </AnchorPane>
diff --git a/src/main/resources/StationSettingsView.fxml b/src/main/resources/StationSettingsView.fxml
index 3a91653..e7e1cf8 100644
--- a/src/main/resources/StationSettingsView.fxml
+++ b/src/main/resources/StationSettingsView.fxml
@@ -26,7 +26,7 @@
                <children>
                   <FlowPane alignment="CENTER_LEFT" prefHeight="41.0" prefWidth="640.0">
                      <children>
-                        <Label prefHeight="17.0" prefWidth="49.0" text="Station: " />
+                        <Label prefHeight="17.0" prefWidth="58.0" text="Station: " />
                         <TextField fx:id="stationNameField" style="-fx-border-color: #AAAAAA;" text="My Station">
                            <FlowPane.margin>
                               <Insets right="10.0" />
@@ -40,9 +40,9 @@
                   <Separator prefWidth="200.0" />
                   <AnchorPane prefHeight="77.0" prefWidth="578.0">
                      <children>
-                        <FlowPane alignment="CENTER_LEFT" layoutX="8.0" layoutY="7.0" prefHeight="63.0" prefWidth="216.0">
+                        <FlowPane alignment="CENTER_LEFT" layoutX="8.0" layoutY="7.0" prefHeight="63.0" prefWidth="229.0">
                            <children>
-                              <Label prefHeight="38.0" prefWidth="103.0" text="Digit group size: (only for display)" textAlignment="RIGHT" textOverrun="CLIP" wrapText="true">
+                              <Label prefHeight="38.0" prefWidth="116.0" text="Digit group size: (only for display)" textAlignment="RIGHT" textOverrun="CLIP" wrapText="true">
                                  <FlowPane.margin>
                                     <Insets right="10.0" />
                                  </FlowPane.margin>
@@ -50,7 +50,7 @@
                               <Spinner fx:id="digitsPerGroupSpinner" editable="true" prefHeight="25.0" prefWidth="96.0" />
                            </children>
                         </FlowPane>
-                        <FlowPane alignment="CENTER_LEFT" layoutX="233.0" layoutY="7.0" prefHeight="63.0" prefWidth="216.0">
+                        <FlowPane alignment="CENTER_LEFT" layoutX="244.0" layoutY="7.0" prefHeight="63.0" prefWidth="216.0">
                            <children>
                               <Label prefHeight="38.0" prefWidth="109.0" text="Message length:" textAlignment="RIGHT" textOverrun="CLIP">
                                  <FlowPane.margin>
@@ -92,7 +92,7 @@
                         <TextField fx:id="usernameField" layoutX="245.0" layoutY="95.0" prefHeight="25.0" prefWidth="124.0" AnchorPane.rightAnchor="209.0" />
                         <PasswordField fx:id="passwordField" layoutX="444.0" layoutY="95.0" prefHeight="25.0" prefWidth="135.0" AnchorPane.rightAnchor="0.0" />
                         <TextField fx:id="externalProgramCommandField" layoutX="-2.0" layoutY="131.0" prefHeight="25.0" prefWidth="580.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="0.0" />
-                        <Button fx:id="testConnectionButton" layoutX="464.0" layoutY="7.0" mnemonicParsing="false" onAction="#handleTestConnectionButtonPress" text="Test connection" />
+                        <Button fx:id="testConnectionButton" layoutX="464.0" layoutY="7.0" mnemonicParsing="false" onAction="#handleTestConnectionButtonPress" text="Test connection" AnchorPane.rightAnchor="0.0" />
                         <Label fx:id="connectionTestStatusLabel" alignment="CENTER_RIGHT" layoutX="136.0" layoutY="11.0" prefHeight="17.0" prefWidth="317.0" textAlignment="RIGHT" AnchorPane.leftAnchor="136.0" AnchorPane.rightAnchor="125.0" />
                      
                    </children>