diff --git a/tools/plotjuggler/layouts/camera-timings.xml b/tools/plotjuggler/layouts/camera-timings.xml
index bef2adb00b..5cc1650909 100644
--- a/tools/plotjuggler/layouts/camera-timings.xml
+++ b/tools/plotjuggler/layouts/camera-timings.xml
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <root>
- <tabbed_widget parent="main_window" name="Main Window">
-  <Tab containers="1" tab_name="SOF / EOF">
+ <tabbed_widget name="Main Window" parent="main_window">
+  <Tab tab_name="SOF / EOF (encodeIdx)" containers="1">
    <Container>
     <DockSplitter orientation="-" sizes="0.500885;0.499115" count="2">
      <DockArea name="...">
-      <plot flip_x="false" mode="TimeSeries" style="Lines" flip_y="false">
-       <range right="780.030468" bottom="35000000.000000" top="65000000.000000" left="0.108134"/>
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="35000000.000000" left="0.000000" top="65000000.000000" right="630.006367"/>
        <limitY max="6.5e+07" min="3.5e+07"/>
        <curve color="#1f77b4" name="/driverEncodeIdx/timestampSof">
-        <transform alias="/driverEncodeIdx/timestampSof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/driverEncodeIdx/timestampSof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
        <curve color="#d62728" name="/roadEncodeIdx/timestampSof">
-        <transform alias="/roadEncodeIdx/timestampSof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/roadEncodeIdx/timestampSof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
        <curve color="#1ac938" name="/wideRoadEncodeIdx/timestampSof">
-        <transform alias="/wideRoadEncodeIdx/timestampSof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/wideRoadEncodeIdx/timestampSof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
       </plot>
      </DockArea>
      <DockArea name="...">
-      <plot flip_x="false" mode="TimeSeries" style="Lines" flip_y="false">
-       <range right="780.030468" bottom="35000000.000000" top="65000000.000000" left="0.108134"/>
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="35000000.000000" left="0.000000" top="65000000.000000" right="630.006367"/>
        <limitY max="6.5e+07" min="3.5e+07"/>
        <curve color="#f14cc1" name="/driverEncodeIdx/timestampEof">
-        <transform alias="/driverEncodeIdx/timestampEof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/driverEncodeIdx/timestampEof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
        <curve color="#9467bd" name="/roadEncodeIdx/timestampEof">
-        <transform alias="/roadEncodeIdx/timestampEof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/roadEncodeIdx/timestampEof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
        <curve color="#17becf" name="/wideRoadEncodeIdx/timestampEof">
-        <transform alias="/wideRoadEncodeIdx/timestampEof[Derivative]" name="Derivative">
+        <transform name="Derivative" alias="/wideRoadEncodeIdx/timestampEof[Derivative]">
          <options lineEdit="1.0" radioChecked="radioCustom"/>
         </transform>
        </curve>
@@ -49,19 +49,19 @@
     </DockSplitter>
    </Container>
   </Tab>
-  <Tab containers="1" tab_name="model timings">
+  <Tab tab_name="model timings" containers="1">
    <Container>
     <DockSplitter orientation="-" sizes="0.5;0.5" count="2">
      <DockArea name="...">
-      <plot flip_x="false" mode="TimeSeries" style="Lines" flip_y="false">
-       <range right="780.030468" bottom="0.018421" top="0.030813" left="0.108134"/>
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="0.015143" left="0.000000" top="0.016865" right="630.006367"/>
        <limitY/>
        <curve color="#ff7f0e" name="/modelV2/modelExecutionTime"/>
       </plot>
      </DockArea>
      <DockArea name="...">
-      <plot flip_x="false" mode="TimeSeries" style="Lines" flip_y="false">
-       <range right="780.030468" bottom="-0.100000" top="0.100000" left="0.108134"/>
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="-0.100000" left="0.000000" top="0.100000" right="630.006367"/>
        <limitY/>
        <curve color="#f14cc1" name="/modelV2/frameDropPerc"/>
       </plot>
@@ -69,12 +69,12 @@
     </DockSplitter>
    </Container>
   </Tab>
-  <Tab containers="1" tab_name="sensor info">
+  <Tab tab_name="sensor info" containers="1">
    <Container>
     <DockSplitter orientation="-" sizes="1" count="1">
      <DockArea name="...">
-      <plot flip_x="false" mode="TimeSeries" style="Lines" flip_y="false">
-       <range right="780.030468" bottom="1.900000" top="2.100000" left="0.108134"/>
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="-0.100000" left="0.000000" top="0.100000" right="630.006367"/>
        <limitY/>
        <curve color="#bcbd22" name="/driverCameraState/sensor"/>
        <curve color="#1f77b4" name="/roadCameraState/sensor"/>
@@ -84,7 +84,55 @@
     </DockSplitter>
    </Container>
   </Tab>
-  <currentTabIndex index="0"/>
+  <Tab tab_name="SOF / EOF (cameraState)" containers="1">
+   <Container>
+    <DockSplitter orientation="-" sizes="0.500885;0.499115" count="2">
+     <DockArea name="...">
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="35000000.000000" left="0.000000" top="65000000.000000" right="630.006367"/>
+       <limitY max="6.5e+07" min="3.5e+07"/>
+       <curve color="#1f77b4" name="/driverCameraState/timestampSof">
+        <transform name="Derivative" alias="/driverCameraState/timestampSof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+       <curve color="#d62728" name="/roadCameraState/timestampSof">
+        <transform name="Derivative" alias="/roadCameraState/timestampSof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+       <curve color="#1ac938" name="/wideRoadCameraState/timestampSof">
+        <transform name="Derivative" alias="/wideRoadCameraState/timestampSof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+      </plot>
+     </DockArea>
+     <DockArea name="...">
+      <plot flip_x="false" mode="TimeSeries" flip_y="false" style="Lines">
+       <range bottom="35000000.000000" left="0.000000" top="65000000.000000" right="630.006367"/>
+       <limitY max="6.5e+07" min="3.5e+07"/>
+       <curve color="#ff7f0e" name="/driverCameraState/timestampEof">
+        <transform name="Derivative" alias="/driverCameraState/timestampEof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+       <curve color="#f14cc1" name="/roadCameraState/timestampEof">
+        <transform name="Derivative" alias="/roadCameraState/timestampEof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+       <curve color="#9467bd" name="/wideRoadCameraState/timestampEof">
+        <transform name="Derivative" alias="/wideRoadCameraState/timestampEof[Derivative]">
+         <options lineEdit="1.0" radioChecked="radioCustom"/>
+        </transform>
+       </curve>
+      </plot>
+     </DockArea>
+    </DockSplitter>
+   </Container>
+  </Tab>
+  <currentTabIndex index="3"/>
  </tabbed_widget>
  <use_relative_time_offset enabled="1"/>
  <!-- - - - - - - - - - - - - - - -->