diff --git a/busmaster_config.cfx b/busmaster_config.cfx
index 1d78160..90a1543 100644
--- a/busmaster_config.cfx
+++ b/busmaster_config.cfx
@@ -326,8 +326,8 @@
     <CAN_Signal_Watch>
       <Message>
         <Id>529</Id>
-        <Signal>posX</Signal>
         <Signal>posY</Signal>
+        <Signal>posX</Signal>
       </Message>
       <Message>
         <Id>1040</Id>
@@ -345,8 +345,14 @@
         <Id>337</Id>
         <Signal>SteeringPosition</Signal>
       </Message>
+      <Message>
+        <Id>1585</Id>
+        <Signal>BatteryVoltage</Signal>
+      </Message>
       <Message>
         <Id>1311</Id>
+        <Signal>STAT_HOMING_ATTAINED</Signal>
+        <Signal>STAT_HOMING_ERROR</Signal>
       </Message>
       <Message>
         <Id>1294</Id>
@@ -360,18 +366,18 @@
         <Signal>headlights</Signal>
       </Message>
       <Window_Position>
-        <Visibility>SHOWNORMAL</Visibility>
+        <Visibility>SHOWMINIMIZED</Visibility>
         <WindowPlacement>HIDE</WindowPlacement>
-        <Top>186</Top>
-        <Left>513</Left>
-        <Right>960</Right>
-        <Bottom>747</Bottom>
+        <Top>161</Top>
+        <Left>610</Left>
+        <Right>1057</Right>
+        <Bottom>722</Bottom>
       </Window_Position>
       <COLUMN_WIDTH>
-        <MESSAGE_COLUMN>86</MESSAGE_COLUMN>
-        <Raw_Val_Column>86</Raw_Val_Column>
-        <Physical_Val_Column>172</Physical_Val_Column>
-        <Signal_Column>86</Signal_Column>
+        <MESSAGE_COLUMN>0</MESSAGE_COLUMN>
+        <Raw_Val_Column>0</Raw_Val_Column>
+        <Physical_Val_Column>0</Physical_Val_Column>
+        <Signal_Column>0</Signal_Column>
       </COLUMN_WIDTH>
     </CAN_Signal_Watch>
     <J1939_Signal_Watch>
@@ -417,17 +423,17 @@
         <Axis_Color>255</Axis_Color>
         <X_Grid_Lines>10</X_Grid_Lines>
         <Y_Grid_Lines>5</Y_Grid_Lines>
-        <Active_Axis>2</Active_Axis>
+        <Active_Axis>1</Active_Axis>
         <Selected_Action>0</Selected_Action>
         <Show_Grid>TRUE</Show_Grid>
         <Display_Type>NORMAL</Display_Type>
       </GRAPH_PARAMETERS>
       <GRAPH_ELEMENT>
-        <Message_ID>1586</Message_ID>
-        <Message_Name>DISPLAY_CURRENT</Message_Name>
+        <Message_ID>1585</Message_ID>
+        <Message_Name>DISPLAY_VOLTAGE</Message_Name>
         <Frame_Format/>
-        <Element_Name>BatteryCurrent</Element_Name>
-        <Value_Type>Physical</Value_Type>
+        <Element_Name>BatteryVoltage</Element_Name>
+        <Value_Type>Raw</Value_Type>
         <Line_Type>SOLID</Line_Type>
         <Line_Color>65280</Line_Color>
         <Point_Type>2</Point_Type>
@@ -439,10 +445,10 @@
       <Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <Window_Position>HIDE</Window_Position>
-        <Top>39</Top>
-        <Left>74</Left>
-        <Bottom>586</Bottom>
-        <Right>1399</Right>
+        <Top>11</Top>
+        <Left>290</Left>
+        <Bottom>558</Bottom>
+        <Right>1615</Right>
       </Window_Position>
       <Splitter_Window_Col_0>
         <CxIdeal>479</CxIdeal>
@@ -569,10 +575,10 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>181</Top>
-        <Left>12</Left>
-        <Bottom>459</Bottom>
-        <Right>361</Right>
+        <Top>179</Top>
+        <Left>10</Left>
+        <Bottom>457</Bottom>
+        <Right>359</Right>
       </Interpretation_Window_Position>
     </CAN_Message_Window>
     <J1939_Message_Window>
@@ -669,10 +675,10 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>181</Top>
-        <Left>12</Left>
-        <Bottom>459</Bottom>
-        <Right>361</Right>
+        <Top>179</Top>
+        <Left>10</Left>
+        <Bottom>457</Bottom>
+        <Right>359</Right>
       </Interpretation_Window_Position>
     </J1939_Message_Window>
     <LIN_Message_Window>
@@ -754,20 +760,20 @@
       <Interpretation_Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>RESTORETOMAXIMIZED</WindowPlacement>
-        <Top>181</Top>
-        <Left>12</Left>
-        <Bottom>459</Bottom>
-        <Right>361</Right>
+        <Top>179</Top>
+        <Left>10</Left>
+        <Bottom>457</Bottom>
+        <Right>359</Right>
       </Interpretation_Window_Position>
     </LIN_Message_Window>
     <CAN_Tx_Window>
       <Window_Position>
         <Visibility>SHOWNORMAL</Visibility>
         <WindowPlacement>SETMINPOSITION</WindowPlacement>
-        <Top>4</Top>
-        <Left>648</Left>
-        <Bottom>659</Bottom>
-        <Right>1508</Right>
+        <Top>-1</Top>
+        <Left>1035</Left>
+        <Bottom>654</Bottom>
+        <Right>1895</Right>
       </Window_Position>
       <Message_List>
         <Message>