diff --git a/qt/OpenRGBServerInfoPage.cpp b/qt/OpenRGBServerInfoPage.cpp
index 331512ca..4cc2c1a4 100644
--- a/qt/OpenRGBServerInfoPage.cpp
+++ b/qt/OpenRGBServerInfoPage.cpp
@@ -48,6 +48,7 @@ void OpenRGBServerInfoPage::UpdateInfo()
 
     ui->ServerClientTree->clear();
     ui->ServerClientTree->setColumnCount(2);
+    ui->ServerClientTree->setHeaderLabels(QStringList() << "Client IP" << "Client Name");
     for(unsigned int client_idx = 0; client_idx < network_server->GetNumClients(); client_idx++)
     {
         QTreeWidgetItem * new_item = new QTreeWidgetItem();
diff --git a/qt/OpenRGBServerInfoPage.ui b/qt/OpenRGBServerInfoPage.ui
index 3b382ad5..8c35f182 100644
--- a/qt/OpenRGBServerInfoPage.ui
+++ b/qt/OpenRGBServerInfoPage.ui
@@ -14,6 +14,20 @@
    <string>Frame</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="3">
+    <widget class="QPushButton" name="ServerStopButton">
+     <property name="text">
+      <string>Stop Server</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="ServerPortLabel">
+     <property name="text">
+      <string>Server Port:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="2">
     <spacer name="horizontalSpacer">
      <property name="orientation">
@@ -27,6 +41,20 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="3">
+    <widget class="QPushButton" name="ServerStartButton">
+     <property name="text">
+      <string>Start Server</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QTreeWidget" name="ServerClientTree">
+     <property name="columnCount">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="ServerStatusLabel">
      <property name="text">
@@ -41,36 +69,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="ServerPortLabel">
-     <property name="text">
-      <string>Server Port:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QPushButton" name="ServerStartButton">
-     <property name="text">
-      <string>Start Server</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="4">
-    <widget class="QTreeWidget" name="ServerClientTree">
-     <column>
-      <property name="text">
-       <string notr="true">1</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QPushButton" name="ServerStopButton">
-     <property name="text">
-      <string>Stop Server</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="ServerPortValue">
      <property name="sizePolicy">
@@ -81,6 +79,13 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="ServerClientsLabel">
+     <property name="text">
+      <string>Connected Clients:</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>