diff --git a/ui/newgraphdialog.ui b/ui/newgraphdialog.ui
index 9b2f036e..46d7684c 100644
--- a/ui/newgraphdialog.ui
+++ b/ui/newgraphdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>681</width>
-    <height>828</height>
+    <height>797</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,2">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,1,2">
      <item>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
@@ -49,57 +49,183 @@
         <widget class="CANDataGrid" name="gridData" native="true">
          <property name="minimumSize">
           <size>
-           <width>300</width>
-           <height>300</height>
+           <width>280</width>
+           <height>280</height>
           </size>
          </property>
          <property name="baseSize">
           <size>
-           <width>300</width>
-           <height>300</height>
+           <width>280</width>
+           <height>280</height>
           </size>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="label_11">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Graph a DBC Signal:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_19">
+         <property name="text">
+          <string>Node:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="cbNodes"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_9">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Message:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="cbMessages"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_10">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Signal:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="cbSignals"/>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnCopySignal">
+         <property name="text">
+          <string>Copy Signal Parameters</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="lblMsgStatus">
+         <property name="font">
+          <font>
+           <pointsize>12</pointsize>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>30</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,1">
+     <item>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
         <widget class="QLabel" name="label_14">
          <property name="text">
-          <string>Data Len:</string>
+          <string>Bit Len:</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="0" column="1">
         <widget class="QLineEdit" name="txtDataLen"/>
        </item>
-       <item row="4" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="label_13">
          <property name="text">
           <string>Little Endian</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="1" column="1">
         <widget class="QCheckBox" name="cbIntel">
          <property name="text">
           <string>  (LSB First)</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Signed:</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="2" column="1">
         <widget class="QCheckBox" name="cbSigned">
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="6" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_4">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
@@ -109,71 +235,96 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="3" column="1">
         <widget class="QLineEdit" name="txtMask"/>
        </item>
-       <item row="7" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Bias:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="4" column="1">
         <widget class="QLineEdit" name="txtBias"/>
        </item>
-       <item row="8" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
           <string>Scale</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="1">
+       <item row="5" column="1">
         <widget class="QLineEdit" name="txtScale"/>
        </item>
-       <item row="9" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">
           <string>Stride</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="1">
+       <item row="6" column="1">
         <widget class="QLineEdit" name="txtStride"/>
        </item>
-       <item row="12" column="0">
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_18">
+         <property name="text">
+          <string>Associated Bus</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QLineEdit" name="editBus">
+         <property name="text">
+          <string>-1</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout_3">
+       <item row="0" column="0">
         <widget class="QLabel" name="label_16">
          <property name="text">
           <string>Only Points</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="1">
+       <item row="0" column="1">
         <widget class="QCheckBox" name="cbOnlyPoints">
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="13" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="label_17">
          <property name="text">
           <string>Point Style</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="1">
+       <item row="1" column="1">
         <widget class="QComboBox" name="coPointStyle"/>
        </item>
-       <item row="14" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="label_15">
          <property name="text">
           <string>Line Thickness</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="1">
+       <item row="2" column="1">
         <widget class="QSpinBox" name="spinLineWidth">
          <property name="maximum">
           <number>15</number>
@@ -183,14 +334,14 @@
          </property>
         </widget>
        </item>
-       <item row="15" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_8">
          <property name="text">
           <string>Line Color</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="1">
+       <item row="3" column="1">
         <widget class="QPushButton" name="colorSwatch">
          <property name="autoFillBackground">
           <bool>true</bool>
@@ -203,14 +354,14 @@
          </property>
         </widget>
        </item>
-       <item row="16" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label55">
          <property name="text">
           <string>Fill Color</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="1">
+       <item row="4" column="1">
         <widget class="QPushButton" name="fillSwatch">
          <property name="autoFillBackground">
           <bool>true</bool>
@@ -223,148 +374,17 @@
          </property>
         </widget>
        </item>
-       <item row="17" column="1">
-        <widget class="QPushButton" name="btnAddGraph">
-         <property name="text">
-          <string>Add this graph</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="1">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="11" column="0">
-        <widget class="QLabel" name="label_18">
-         <property name="text">
-          <string>Associated Bus</string>
-         </property>
-        </widget>
-       </item>
-       <item row="11" column="1">
-        <widget class="QLineEdit" name="editBus">
-         <property name="text">
-          <string>-1</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QLabel" name="label_11">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Graph a DBC Signal:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_19">
-         <property name="text">
-          <string>Node:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="cbNodes"/>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_9">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Message:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="cbMessages"/>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_10">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Signal:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="cbSignals"/>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnCopySignal">
-         <property name="text">
-          <string>Copy Signal Parameters</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="lblMsgStatus">
-         <property name="font">
-          <font>
-           <pointsize>12</pointsize>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QPushButton" name="btnAddGraph">
+     <property name="text">
+      <string>Add this graph</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -378,15 +398,6 @@
  <tabstops>
   <tabstop>txtName</tabstop>
   <tabstop>txtID</tabstop>
-  <tabstop>txtDataLen</tabstop>
-  <tabstop>cbIntel</tabstop>
-  <tabstop>cbSigned</tabstop>
-  <tabstop>txtMask</tabstop>
-  <tabstop>txtBias</tabstop>
-  <tabstop>txtScale</tabstop>
-  <tabstop>txtStride</tabstop>
-  <tabstop>colorSwatch</tabstop>
-  <tabstop>btnAddGraph</tabstop>
   <tabstop>cbMessages</tabstop>
   <tabstop>cbSignals</tabstop>
   <tabstop>btnCopySignal</tabstop>