diff --git a/src/main/resources/AddPrefixView.fxml b/src/main/resources/AddPrefixView.fxml
index 56997e7..81ffc34 100644
--- a/src/main/resources/AddPrefixView.fxml
+++ b/src/main/resources/AddPrefixView.fxml
@@ -5,6 +5,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="92.0" prefWidth="367.0" stylesheets="@css/application.css" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="name.nathanmcrae.numbersstation.AddPrefixController">
    <children>
@@ -12,8 +13,11 @@
          <children>
             <Button fx:id="okButton" layoutX="89.0" layoutY="67.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="OK" AnchorPane.bottomAnchor="15.0" AnchorPane.rightAnchor="89.0" />
             <Button fx:id="cancelButton" layoutX="169.0" layoutY="67.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="65.0" text="Cancel" AnchorPane.bottomAnchor="15.0" AnchorPane.rightAnchor="9.0" />
-            <Label layoutX="14.0" layoutY="14.0" text="Enter a message prefix / identifier:" />
-            <TextField fx:id="prefixField" layoutX="203.0" layoutY="10.0" prefHeight="25.0" prefWidth="105.0" AnchorPane.leftAnchor="203.0" AnchorPane.rightAnchor="10.0" />
+            <Label layoutX="14.0" layoutY="14.0" text="Enter a message prefix / identifier:">
+               <font>
+                  <Font name="Liberation Sans" size="13.0" />
+               </font></Label>
+            <TextField fx:id="prefixField" layoutX="216.0" layoutY="10.0" prefHeight="25.0" prefWidth="86.0" AnchorPane.leftAnchor="216.0" AnchorPane.rightAnchor="10.0" />
          </children>
       </AnchorPane>
    </children>
diff --git a/src/main/resources/ListenerView.fxml b/src/main/resources/ListenerView.fxml
index 47e3e2b..af32d21 100644
--- a/src/main/resources/ListenerView.fxml
+++ b/src/main/resources/ListenerView.fxml
@@ -76,7 +76,7 @@
                      </font>
                   </Label>
                   <Button layoutX="554.0" layoutY="14.0" mnemonicParsing="false" text="Staton Settings" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0" />
-                  <Button layoutX="414.0" layoutY="14.0" mnemonicParsing="false" text="Retrieve now" AnchorPane.rightAnchor="121.0" AnchorPane.topAnchor="14.0" />
+                  <Button layoutX="403.0" layoutY="14.0" mnemonicParsing="false" text="Retrieve now" AnchorPane.rightAnchor="123.0" AnchorPane.topAnchor="14.0" />
                </children>
             </AnchorPane>
             <Label text="Messages">
diff --git a/src/main/resources/MainView.fxml b/src/main/resources/MainView.fxml
index c312547..2cbb9a3 100644
--- a/src/main/resources/MainView.fxml
+++ b/src/main/resources/MainView.fxml
@@ -42,6 +42,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
+<?scenebuilder-stylesheet css/application.css?>
 
 <AnchorPane stylesheets="@css/application.css" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="name.nathanmcrae.numbersstation.MainController">
    <children>
@@ -54,7 +55,7 @@
                <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" style="-fx-background-color: #EEEEEE; -fx-border-color: #AAAAAA;" text="My 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="602.0" layoutY="1.0" mnemonicParsing="false" text="Help" AnchorPane.rightAnchor="0.0" />
                   <Button layoutX="532.0" layoutY="1.0" mnemonicParsing="false" text="Settings" AnchorPane.rightAnchor="49.0" />
                </children>
diff --git a/src/main/resources/NotificationView.fxml b/src/main/resources/NotificationView.fxml
index 30bfb54..3aeb156 100644
--- a/src/main/resources/NotificationView.fxml
+++ b/src/main/resources/NotificationView.fxml
@@ -42,7 +42,7 @@
    <children>
       <Label fx:id="titleLabel" layoutX="86.0" layoutY="24.0" text="Notification title (this sure is a title)">
          <font>
-            <Font name="System Bold" size="16.0" />
+            <Font name="Liberation Sans Bold" size="16.0" />
          </font>
       </Label>
       <Button fx:id="dismissButton" layoutX="325.0" layoutY="139.0" mnemonicParsing="false" onMousePressed="#handleDismissButtonPressed" text="Dismiss" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" />
diff --git a/src/main/resources/StationSelectionView.fxml b/src/main/resources/StationSelectionView.fxml
index 1429490..6733441 100644
--- a/src/main/resources/StationSelectionView.fxml
+++ b/src/main/resources/StationSelectionView.fxml
@@ -13,7 +13,7 @@
             <Font size="20.0" />
          </font>
       </Label>
-      <Button layoutX="358.0" layoutY="17.0" mnemonicParsing="false" onAction="#handleAddButtonPress" text="+" AnchorPane.rightAnchor="54.5" AnchorPane.topAnchor="17.0" />
+      <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" onMousePressed="#handleSelectButtonPress" text="Select" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="76.5" />
diff --git a/src/main/resources/StationSettingsView.fxml b/src/main/resources/StationSettingsView.fxml
index 29df60c..29bcda5 100644
--- a/src/main/resources/StationSettingsView.fxml
+++ b/src/main/resources/StationSettingsView.fxml
@@ -89,7 +89,7 @@
                         </RadioButton>
                         <Label layoutX="182.0" layoutY="99.0" text="Username:" AnchorPane.rightAnchor="340.0" />
                         <Label layoutX="380.0" layoutY="99.0" text="Password:" AnchorPane.rightAnchor="142.0" />
-                        <TextField fx:id="usernameField" layoutX="245.0" layoutY="95.0" prefHeight="25.0" prefWidth="135.0" AnchorPane.rightAnchor="198.0" />
+                        <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" onMousePressed="#handleTestConnectionButtonPress" text="Test connection" />