diff --git a/src/jrex/JRexFrame.form b/src/jrex/JRexFrame.form
index a8c4938..bba9b29 100644
--- a/src/jrex/JRexFrame.form
+++ b/src/jrex/JRexFrame.form
@@ -102,9 +102,9 @@
                   </Group>
                   <Component id="scrollTable" alignment="1" pref="711" max="32767" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="btnPivot" linkSize="1" min="-2" max="-2" attributes="0"/>
+                      <Component id="btnPivotWideToLong" linkSize="1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jButton1" linkSize="1" min="-2" max="-2" attributes="0"/>
+                      <Component id="btnPivotLongToWide" linkSize="1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="btnTranspose" linkSize="1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
@@ -134,8 +134,8 @@
                       <Component id="scrollTable" pref="113" max="32767" attributes="0"/>
                       <EmptySpace min="-2" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="btnPivot" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="btnPivotWideToLong" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="btnPivotLongToWide" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="btnTranspose" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                   </Group>
@@ -145,9 +145,6 @@
           <SubComponents>
             <Component class="javax.swing.JButton" name="btnClear">
               <Properties>
-                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-                  <Connection code="UIManager.getIcon(&quot;FileView.fileIcon&quot;)" type="code"/>
-                </Property>
                 <Property name="text" type="java.lang.String" value="Clear"/>
                 <Property name="name" type="java.lang.String" value="btnClear" noResource="true"/>
               </Properties>
@@ -157,9 +154,6 @@
             </Component>
             <Component class="javax.swing.JButton" name="btnLoad">
               <Properties>
-                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-                  <Connection code="UIManager.getIcon(&quot;FileView.directoryIcon&quot;)&#xa;" type="code"/>
-                </Property>
                 <Property name="text" type="java.lang.String" value="Open"/>
                 <Property name="name" type="java.lang.String" value="btnLoad" noResource="true"/>
               </Properties>
@@ -268,20 +262,23 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbReplaceActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="btnPivot">
+            <Component class="javax.swing.JButton" name="btnPivotWideToLong">
               <Properties>
                 <Property name="text" type="java.lang.String" value="Pivot Wide to Long"/>
-                <Property name="name" type="java.lang.String" value="btnPivot" noResource="true"/>
+                <Property name="name" type="java.lang.String" value="btnPivotWideToLong" noResource="true"/>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPivotActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPivotWideToLongActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="jButton1">
+            <Component class="javax.swing.JButton" name="btnPivotLongToWide">
               <Properties>
                 <Property name="text" type="java.lang.String" value="Pivot Long to Wide"/>
-                <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
+                <Property name="name" type="java.lang.String" value="btnPivotLongToWide" noResource="true"/>
               </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPivotLongToWideActionPerformed"/>
+              </Events>
             </Component>
             <Component class="javax.swing.JButton" name="btnTranspose">
               <Properties>
@@ -463,9 +460,6 @@
             </Component>
             <Component class="javax.swing.JButton" name="btnSave">
               <Properties>
-                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-                  <Connection code="UIManager.getIcon(&quot;FileView.floppyDriveIcon&quot;)" type="code"/>
-                </Property>
                 <Property name="text" type="java.lang.String" value="Save"/>
                 <Property name="name" type="java.lang.String" value="btnSave" noResource="true"/>
               </Properties>