diff --git a/sample_interface/src/app/components/Header.tsx b/sample_interface/src/app/components/Header.tsx
index 92601db7d..231c57b1b 100644
--- a/sample_interface/src/app/components/Header.tsx
+++ b/sample_interface/src/app/components/Header.tsx
@@ -35,80 +35,69 @@ export function Header() {
   };
 
   return (
-    <div className="bg-gray-950 border-b border-gray-700 px-2 py-1 flex items-start gap-2 text-xs">
-      {/* Logo (left) */}
-      <div className="flex items-center gap-1 pt-0.5">
-        <img src={TCKLogo} alt="TCK" className="w-6 h-6" />
-        <span className="text-white font-semibold">RTU</span>
+    <div className="bg-gray-950 border-b border-gray-700 px-2 py-1 flex items-start gap-1 text-xs">
+      {/* Left side - all status items in one row */}
+      <div className="flex items-center gap-1">
+        {/* Date */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">DATE:</span>
+          <span className="text-blue-400 font-mono">{formatDate(currentTime)}</span>
+        </div>
+
+        {/* Time */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">TIME:</span>
+          <span className="text-green-400 font-mono">{formatTime(currentTime)}</span>
+        </div>
+
+        {/* Station */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">STATION:</span>
+          <span className="text-white font-semibold">{data.station.id}</span>
+        </div>
+
+        {/* Comm */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          {isOnline ? (
+            <>
+              <Wifi className="w-3 h-3 text-green-500" />
+              <span className="text-green-500">{data.communication.percentage}%</span>
+            </>
+          ) : (
+            <>
+              <WifiOff className="w-3 h-3 text-red-500" />
+              <span className="text-red-500">OFF</span>
+            </>
+          )}
+        </div>
+
+        {/* Ver */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">VER:</span>
+          <span className="text-white">{data.station.version}</span>
+        </div>
+
+        {/* Solar */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">SOLAR:</span>
+          <span className="text-yellow-500 font-mono">{data.voltage.solar.toFixed(1)}V</span>
+        </div>
+
+        {/* Battery */}
+        <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
+          <span className="text-gray-400">BATTERY:</span>
+          <span className={`font-mono ${data.voltage.batteryStatus === 'HIGH' ? 'text-green-500' : 'text-red-500'}`}>
+            {data.voltage.battery.toFixed(1)}V
+          </span>
+          <span className={`text-xs px-1 rounded ${data.voltage.batteryStatus === 'HIGH' ? 'bg-green-500/20 text-green-500' : 'bg-red-500/20 text-red-500'}`}>
+            {data.voltage.batteryStatus}
+          </span>
+        </div>
       </div>
 
-      {/* Right side - two rows */}
-      <div className="flex-1 flex flex-col items-end gap-1">
-        {/* Top row: LOGIN (rightmost) */}
-        <div className="flex items-center gap-2">
-          <LoginIndicator isLoggedIn={isLoggedIn} />
-        </div>
-
-        {/* Bottom row: all other status items */}
-        <div className="flex items-center gap-2 flex-wrap justify-end">
-          {/* Time */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Time:</span>
-            <span className="text-green-400 font-mono font-semibold">{formatTime(currentTime)}</span>
-          </div>
-
-          {/* Date */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Date:</span>
-            <span className="text-blue-400 font-mono font-semibold">{formatDate(currentTime)}</span>
-          </div>
-
-          {/* Station ID */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Station:</span>
-            <span className="text-white font-semibold">{data.station.id}</span>
-          </div>
-
-          {/* Comm Status */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            {isOnline ? (
-              <>
-                <Wifi className="w-3 h-3 text-green-500" />
-                <span className="text-green-500">
-                  {data.communication.asu}ASU/{data.communication.dBm}dBm({data.communication.percentage}%)
-                </span>
-              </>
-            ) : (
-              <>
-                <WifiOff className="w-3 h-3 text-red-500" />
-                <span className="text-red-500">OFFLINE</span>
-              </>
-            )}
-          </div>
-
-          {/* Version */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Ver:</span>
-            <span className="text-white">{data.station.version}</span>
-          </div>
-
-          {/* Solar Voltage */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Solar:</span>
-            <span className="text-yellow-500 font-mono">{data.voltage.solar.toFixed(1)}V</span>
-          </div>
-
-          {/* Battery Voltage */}
-          <div className="flex items-center gap-1 px-2 py-0.5 bg-gray-800 rounded">
-            <span className="text-gray-400">Battery:</span>
-            <span className={`font-mono ${data.voltage.batteryStatus === 'HIGH' ? 'text-green-500' : 'text-red-500'}`}>
-              {data.voltage.battery.toFixed(1)}V
-            </span>
-            <span className={`text-xs px-1 rounded ${data.voltage.batteryStatus === 'HIGH' ? 'bg-green-500/20 text-green-500' : 'bg-red-500/20 text-red-500'}`}>
-              {data.voltage.batteryStatus}
-            </span>
-          </div>
-        </div>
+      {/* Right side - LOGIN (two rows, rightmost) */}
+      <div className="ml-auto">
+        <LoginIndicator isLoggedIn={isLoggedIn} />
       </div>
     </div>
   );