diff --git a/main.pyw b/main.pyw
index 0363c54..de27917 100644
--- a/main.pyw
+++ b/main.pyw
@@ -41,6 +41,13 @@ class MainWindow(QMainWindow):
         # Widgets ##########################################
         self.lbl_device_name = Labels.MainLabel()
 
+        self.lbl_cpu_temp = Labels.SubLabel(value="🔳 CPU Temp:")
+        self.min_max_cur_cpu_temp = common.MinMaxCurrent()
+        self.prg_cpu_temp = QProgressBar(textVisible=False,
+                                         minimum=0,
+                                         maximum=105)
+        self.lbl_value_prg_cpu_temp = Labels.SubLabelValue()
+
         self.lbl_temp = Labels.SubLabel(value="💧 Liquid Temperature:")
         self.min_max_cur_temp = common.MinMaxCurrent()
         self.prg_temp = QProgressBar(textVisible=False,
@@ -61,13 +68,6 @@ class MainWindow(QMainWindow):
                                           minimum=1900,
                                           maximum=2700)
         self.lbl_value_prg_pumpspeed = Labels.SubLabelValue()
-        
-        self.lbl_cpu_temp = Labels.SubLabel(value="🔳 CPU Temp:")
-        self.min_max_cur_cpu_temp = common.MinMaxCurrent()
-        self.prg_cpu_temp = QProgressBar(textVisible=False,
-                                         minimum=0,
-                                         maximum=105)
-        self.lbl_value_prg_cpu_temp = Labels.SubLabelValue()
 
         self.btn_reset_min_max = QPushButton("Reset Min/Max")
         self.btn_reset_min_max.clicked.connect(self.on_reset_min_max)
@@ -78,6 +78,9 @@ class MainWindow(QMainWindow):
         widget = QWidget(self)
         layout = QVBoxLayout(widget)
         layout.addWidget(self.lbl_device_name)
+        layout.addWidget(self.lbl_cpu_temp)
+        layout.addWidget(self.prg_cpu_temp)
+        layout.addWidget(self.lbl_value_prg_cpu_temp)
         layout.addWidget(self.lbl_temp)
         layout.addWidget(self.prg_temp)
         layout.addWidget(self.lbl_value_prg_temp)
@@ -87,9 +90,6 @@ class MainWindow(QMainWindow):
         layout.addWidget(self.lbl_pumpspeed)
         layout.addWidget(self.prg_pumpspeed)
         layout.addWidget(self.lbl_value_prg_pumpspeed)
-        layout.addWidget(self.lbl_cpu_temp)
-        layout.addWidget(self.prg_cpu_temp)
-        layout.addWidget(self.lbl_value_prg_cpu_temp)
         layout.addWidget(self.lbl_fwvers)
         layout.addWidget(self.btn_reset_min_max)
 
@@ -119,25 +119,41 @@ class MainWindow(QMainWindow):
 
     def update_widgets(self):
         """ Update widgets using LiquidCTL library."""
-        self.lbl_device_name.setText(self.lctl.device_name)
-        self.prg_temp.setValue(self.lctl.device_temp)
-        self.lbl_value_prg_temp.setText(
-            self.min_max_cur_temp.builder(
-                self.lctl.device_temp, "°C"))
-        self.prg_fanspeed.setValue(self.lctl.device_fanSpeed)
-        self.lbl_value_prg_fanspeed.setText(
-            self.min_max_cur_fanspeed.builder(
-                self.lctl.device_fanSpeed, " rpm"))
-        self.prg_pumpspeed.setValue(self.lctl.device_pumpSpeed)
-        self.lbl_value_prg_pumpspeed.setText(
-            self.min_max_cur_pumpspeed.builder(
-                self.lctl.device_pumpSpeed, " rpm"))
-        if self.lctl.device_fwVers is not None:
-            self.lbl_fwvers.setText(f"Firmware: v{self.lctl.device_fwVers}")
-        self.prg_cpu_temp.setValue(self.svh.GetTemps(Component.CPU_AMD))
+
         self.lbl_value_prg_cpu_temp.setText(
             self.min_max_cur_cpu_temp.builder(
                 self.svh.GetTemps(Component.CPU_AMD), "°C"))
+        
+        self.prg_cpu_temp.setValue(
+            self.svh.GetTemps(Component.CPU_AMD))
+        
+        self.lbl_device_name.setText(
+            self.lctl.device_name)
+
+        self.prg_temp.setValue(
+            self.lctl.device_temp)
+
+        self.lbl_value_prg_temp.setText(
+            self.min_max_cur_temp.builder(
+                self.lctl.device_temp, "°C"))
+        
+        self.prg_fanspeed.setValue(
+            self.lctl.device_fanSpeed)
+
+        self.lbl_value_prg_fanspeed.setText(
+            self.min_max_cur_fanspeed.builder(
+                self.lctl.device_fanSpeed, " rpm"))
+        
+        self.prg_pumpspeed.setValue(
+            self.lctl.device_pumpSpeed)
+
+        self.lbl_value_prg_pumpspeed.setText(
+            self.min_max_cur_pumpspeed.builder(
+                self.lctl.device_pumpSpeed, " rpm"))
+        
+        if self.lctl.device_fwVers is not None:
+            self.lbl_fwvers.setText(f"Firmware: v{self.lctl.device_fwVers}")
+
         # print(f"CPU: {self.svh.GetTemps(Component.CPU_AMD)}°C")
         # print(f"GPU: {self.svh.GetTemps(Component.GPU_AMD)}°C")
         # print(f"MOBO: {self.svh.GetTemps(Component.MOBO_ASUS)}°C")