diff --git a/src/app/page.tsx b/src/app/page.tsx
index e36b401..3b2c646 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -50,14 +50,19 @@ const layouts = [
     direction: 'row',
     first: {
       direction: 'column',
-      first: 'mapView:1',
-      second: 'waypointList:2',
+      first: 'orientationDisplay:1',
+      second: {
+        direction: 'row',
+        first: 'mapView:2',
+        second: 'motorStatusPanel:3',
+        splitPercentage: 60,
+      },
       splitPercentage: 60,
     },
     second: {
       direction: 'column',
-      first: 'videoControls:3',
-      second: 'armControlPanel:4',
+      first: 'videoControls:4',
+      second: 'armControlPanel:5',
       splitPercentage: 50,
     },
     splitPercentage: 60,
@@ -67,26 +72,21 @@ const layouts = [
     first: {
       direction: 'column',
       first: 'motorStatusPanel:1',
-      second: 'pdbRails:2',
+      second: {
+        direction: 'row',
+        first: 'pdbRails:2',
+        second: 'networkHealthMonitor:3',
+        splitPercentage: '50',
+      },
       splitPercentage: 60,
     },
     second: {
       direction: 'row',
-      first: {
-        direction: 'column',
-        first: 'networkHealthMonitor:3',
-        second: 'rosMonitor:4',
-        splitPercentage: 60
-      },
-      second: {
-        direction: 'column',
-        first: 'antennaControlPanel:5',
-        second: 'nodeStatusPanel:6',
-        splitPercentage: 20,
-      },
-      splitPercentage: 50,
+      first: 'webRTCClient:4',
+      second: 'nodeStatusPanel:5',
+      splitPercentage: 70,
     },
-    splitPercentage: 35,
+    splitPercentage: 30,
   },
   {
     direction: 'row',