diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 65833154..d00e16fe 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -1,15 +1,19 @@
-OBSWebSocket.Settings.DialogTitle="WebSocket Server Settings"
+OBSWebSocket.Settings.DialogTitle="obs-websocket Settings"
+
+OBSWebSocket.Settings.PluginSettingsTitle="Plugin Settings"
 OBSWebSocket.Settings.ServerEnable="Enable WebSocket server"
 OBSWebSocket.Settings.AlertsEnable="Enable System Tray Alerts"
 OBSWebSocket.Settings.DebugEnable="Enable Debug Logging"
 OBSWebSocket.Settings.DebugEnableHoverText="Changing this requires the WebSocket server to restart. However, changing this will not automatically restart the obs-websocket server."
+
+OBSWebSocket.Settings.ServerSettingsTitle="Server Settings"
 OBSWebSocket.Settings.AuthRequired="Enable Authentication"
 OBSWebSocket.Settings.Password="Server Password"
 OBSWebSocket.Settings.GeneratePassword="Generate Password"
-OBSWebSocket.Settings.ShowConnectInfo="Show Connect Info"
 OBSWebSocket.Settings.ServerPort="Server Port"
-OBSWebSocket.Settings.ConnectedSessionsTitle="Connected WebSocket Sessions"
+OBSWebSocket.Settings.ShowConnectInfo="Show Connect Info"
 
+OBSWebSocket.SessionTable.Title="Connected WebSocket Sessions"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Remote Address"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Session Duration"
 OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Messages In/Out"
diff --git a/src/forms/SettingsDialog.ui b/src/forms/SettingsDialog.ui
index 59a0b544..cb1431c3 100644
--- a/src/forms/SettingsDialog.ui
+++ b/src/forms/SettingsDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>675</width>
-    <height>437</height>
+    <height>565</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -25,126 +25,169 @@
   <property name="windowTitle">
    <string>OBSWebSocket.Settings.DialogTitle</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="pluginSettingsGroupBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="title">
+      <string>OBSWebSocket.Settings.PluginSettingsTitle</string>
      </property>
+     <layout class="QFormLayout" name="formLayout">
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <item row="1" column="0">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>150</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="enableWebSocketServerCheckBox">
+        <property name="text">
+         <string>OBSWebSocket.Settings.ServerEnable</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="enableSystemTrayAlertsCheckBox">
+        <property name="text">
+         <string>OBSWebSocket.Settings.AlertsEnable</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="enableDebugLoggingCheckBox">
+        <property name="toolTip">
+         <string>OBSWebSocket.Settings.DebugEnableHoverText</string>
+        </property>
+        <property name="text">
+         <string>OBSWebSocket.Settings.DebugEnable</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <layout class="QFormLayout" name="mainForm">
-     <item row="0" column="0">
-      <widget class="QLabel" name="enableWebSocketServerLabel">
-       <property name="text">
-        <string>OBSWebSocket.Settings.ServerEnable</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QCheckBox" name="enableWebSocketServerCheckBox">
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="enableSystemTrayAlertsLabel">
-       <property name="text">
-        <string>OBSWebSocket.Settings.AlertsEnable</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="enableSystemTrayAlertsCheckBox"/>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="enableDebugLoggingLabel">
-       <property name="toolTip">
-        <string>OBSWebSocket.Settings.DebugEnableHoverText</string>
-       </property>
-       <property name="text">
-        <string>OBSWebSocket.Settings.DebugEnable</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="enableDebugLoggingCheckBox">
-       <property name="toolTip">
-        <string>OBSWebSocket.Settings.DebugEnableHoverText</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="enableAuthenticationLabel">
-       <property name="text">
-        <string>OBSWebSocket.Settings.AuthRequired</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="enableAuthenticationCheckBox"/>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="serverPasswordLabel">
-       <property name="text">
-        <string>OBSWebSocket.Settings.Password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLineEdit" name="serverPasswordLineEdit">
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="generatePasswordButton">
-         <property name="text">
-          <string>OBSWebSocket.Settings.GeneratePassword</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="serverPortLabel">
-       <property name="text">
-        <string>OBSWebSocket.Settings.ServerPort</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QSpinBox" name="serverPortSpinBox">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>65534</number>
-       </property>
-       <property name="value">
-        <number>4444</number>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QPushButton" name="showConnectInfoButton">
-       <property name="text">
-        <string>OBSWebSocket.Settings.ShowConnectInfo</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item>
+    <widget class="QGroupBox" name="serverSettingsGroupBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>OBSWebSocket.Settings.ServerSettingsTitle</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_3">
+      <property name="labelAlignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="serverPortLabel">
+        <property name="text">
+         <string>OBSWebSocket.Settings.ServerPort</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="serverPortSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>65534</number>
+        </property>
+        <property name="value">
+         <number>4444</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="enableAuthenticationCheckBox">
+        <property name="text">
+         <string>OBSWebSocket.Settings.AuthRequired</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="serverPasswordLabel">
+        <property name="text">
+         <string>OBSWebSocket.Settings.Password</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLineEdit" name="serverPasswordLineEdit">
+          <property name="echoMode">
+           <enum>QLineEdit::Password</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="generatePasswordButton">
+          <property name="text">
+           <string>OBSWebSocket.Settings.GeneratePassword</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="0">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>150</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="1">
+       <widget class="QPushButton" name="showConnectInfoButton">
+        <property name="text">
+         <string>OBSWebSocket.Settings.ShowConnectInfo</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="websocketSessionGroupBox">
+   <item>
+    <widget class="QGroupBox" name="sessionTableGroupBox">
      <property name="minimumSize">
       <size>
        <width>0</width>
@@ -152,7 +195,7 @@
       </size>
      </property>
      <property name="title">
-      <string>OBSWebSocket.Settings.ConnectedSessionsTitle</string>
+      <string>OBSWebSocket.SessionTable.Title</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
@@ -208,6 +251,16 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>