diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index 35faa4c..0d83b2d 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -11,7 +11,6 @@ MainWindow::MainWindow(QUrl ws_url, QWidget *parent)
       m_error_dialog(new NetworkError(this))
 {
     ui->setupUi(this);
-    this->setWindowTitle("Simulator Selector");
     INSERT_SIMULATOR(Cable_Tester);
     INSERT_SIMULATOR(Can_Debugger);
     INSERT_SIMULATOR(Scope_Mux_Tester);
diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index a3e05d7..d58b161 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Simulator Selector</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
diff --git a/client/networkerror.cpp b/client/networkerror.cpp
index a6f7f87..e35364e 100644
--- a/client/networkerror.cpp
+++ b/client/networkerror.cpp
@@ -6,8 +6,6 @@ NetworkError::NetworkError(QWidget *parent) : QDialog(parent), ui(new Ui::Networ
     ui->setupUi(this);
     connect(ui->exit, &QPushButton::clicked, this, &QCoreApplication::quit, Qt::QueuedConnection);
     connect(ui->close, &QPushButton::clicked, this, [=, this] { this->close(); });
-
-    this->setWindowTitle("Error");
 }
 
 void NetworkError::set_error(QString error)
diff --git a/client/networkerror.ui b/client/networkerror.ui
index a114f4c..e9a642a 100644
--- a/client/networkerror.ui
+++ b/client/networkerror.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Error</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
@@ -28,7 +28,7 @@
         <string>Oops, an error occured</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -38,7 +38,7 @@
         <string>Error...</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
diff --git a/client/simulators/can_debugger.cpp b/client/simulators/can_debugger.cpp
index 8993408..e746ed6 100644
--- a/client/simulators/can_debugger.cpp
+++ b/client/simulators/can_debugger.cpp
@@ -5,7 +5,6 @@ Can_Debugger::Can_Debugger(Web_socket_wrapper *web_socket, QWidget *parent)
     : Simulator_base("Can Debugger", web_socket, parent), ui(new Ui::Can_Debugger)
 {
     ui->setupUi(this);
-    this->setWindowTitle("CAN Debugger");
 
     this->push_ui_item(ui->can_transceive);
 }
diff --git a/client/simulators/can_debugger.ui b/client/simulators/can_debugger.ui
index fed44e9..1062502 100644
--- a/client/simulators/can_debugger.ui
+++ b/client/simulators/can_debugger.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>CAN Debugger</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout_8">