diff --git a/saw/src/main/java/saw/gui/frmVee.form b/saw/src/main/java/saw/gui/frmVee.form
index 4877e98f..77f13532 100644
--- a/saw/src/main/java/saw/gui/frmVee.form
+++ b/saw/src/main/java/saw/gui/frmVee.form
@@ -4354,10 +4354,10 @@
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane23">
+                <Container class="javax.swing.JScrollPane" name="scrSelectedEquip">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
-                    <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
+                    <Property name="verticalScrollBarPolicy" type="int" value="20"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
diff --git a/saw/src/main/java/saw/gui/frmVee.java b/saw/src/main/java/saw/gui/frmVee.java
index c55e6af5..d9e19fdc 100644
--- a/saw/src/main/java/saw/gui/frmVee.java
+++ b/saw/src/main/java/saw/gui/frmVee.java
@@ -1199,7 +1199,7 @@ private void initComponents() {
         chkFCSApollo = new javax.swing.JCheckBox();
         chkCASE = new javax.swing.JCheckBox();
         JPanel pnlSelected = new JPanel();
-        JScrollPane jScrollPane23 = new JScrollPane();
+        JScrollPane scrSelectedEquip = new JScrollPane();
         lstSelectedEquipment = new javax.swing.JList();
         JPanel pnlEquipInfo = new JPanel();
         JLabel jLabel38 = new JLabel();
@@ -3167,11 +3167,10 @@ public void mouseClicked( MouseEvent e ) {
         pnlSelected.setMinimumSize(new Dimension(212, 286));
         pnlSelected.setLayout(new javax.swing.BoxLayout(pnlSelected, javax.swing.BoxLayout.LINE_AXIS));
 
-        jScrollPane23.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        jScrollPane23.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+        scrSelectedEquip.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrSelectedEquip.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
 
-        lstSelectedEquipment.setModel( new javax.swing.DefaultListModel()
-        );
+        lstSelectedEquipment.setModel( new javax.swing.DefaultListModel() );
         lstSelectedEquipment.setMaximumSize(new Dimension(180, 225));
         lstSelectedEquipment.setMinimumSize(new Dimension(180, 225));
         lstSelectedEquipment.setPreferredSize(null);
@@ -3204,9 +3203,9 @@ public void mousePressed( MouseEvent e ) {
         };
         lstSelectedEquipment.addMouseListener( mlSelect );
         lstSelectedEquipment.setCellRenderer( new saw.gui.EquipmentSelectedRenderer( this ) );
-        jScrollPane23.setViewportView(lstSelectedEquipment);
+        scrSelectedEquip.setViewportView(lstSelectedEquipment);
 
-        pnlSelected.add(jScrollPane23);
+        pnlSelected.add(scrSelectedEquip);
 
         pnlEquipInfo.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Information"));
         pnlEquipInfo.setLayout(new java.awt.GridBagLayout());
diff --git a/saw/src/main/java/saw/gui/frmVeeWide.form b/saw/src/main/java/saw/gui/frmVeeWide.form
index bf31bc7e..2a3a28d7 100644
--- a/saw/src/main/java/saw/gui/frmVeeWide.form
+++ b/saw/src/main/java/saw/gui/frmVeeWide.form
@@ -4241,10 +4241,10 @@
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane23">
+                <Container class="javax.swing.JScrollPane" name="scrSelectedEquip">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
-                    <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
+                    <Property name="verticalScrollBarPolicy" type="int" value="20"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
diff --git a/saw/src/main/java/saw/gui/frmVeeWide.java b/saw/src/main/java/saw/gui/frmVeeWide.java
index 18684bc6..fe69ca62 100644
--- a/saw/src/main/java/saw/gui/frmVeeWide.java
+++ b/saw/src/main/java/saw/gui/frmVeeWide.java
@@ -2255,7 +2255,7 @@ public void mousePressed( MouseEvent e ) {
         };
         lstSelectedEquipment.addMouseListener( mlSelect );
         lstSelectedEquipment.setCellRenderer( new saw.gui.EquipmentSelectedRenderer( this ) );
-        scrSelectedEquip.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrSelectedEquip.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         scrSelectedEquip.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
         scrSelectedEquip.setViewportView(lstSelectedEquipment);
         pnlSelected.add(scrSelectedEquip);
diff --git a/ssw/src/main/java/ssw/gui/frmMain.form b/ssw/src/main/java/ssw/gui/frmMain.form
index ef5d33f7..cebc2613 100644
--- a/ssw/src/main/java/ssw/gui/frmMain.form
+++ b/ssw/src/main/java/ssw/gui/frmMain.form
@@ -4979,10 +4979,10 @@
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane23">
+                <Container class="javax.swing.JScrollPane" name="scrSelectedEquip">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
-                    <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
+                    <Property name="verticalScrollBarPolicy" type="int" value="20"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
@@ -6495,9 +6495,9 @@
                 <Property name="axis" type="int" value="3"/>
               </Layout>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane18">
+                <Container class="javax.swing.JScrollPane" name="scrEquipToPlace">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
diff --git a/ssw/src/main/java/ssw/gui/frmMain.java b/ssw/src/main/java/ssw/gui/frmMain.java
index 655f140c..8c0f860d 100644
--- a/ssw/src/main/java/ssw/gui/frmMain.java
+++ b/ssw/src/main/java/ssw/gui/frmMain.java
@@ -4913,7 +4913,7 @@ private void initComponents() {
         chkFCSApollo = new javax.swing.JCheckBox();
         chkClanCASE = new javax.swing.JCheckBox();
         pnlSelected = new javax.swing.JPanel();
-        jScrollPane23 = new javax.swing.JScrollPane();
+        scrSelectedEquip = new javax.swing.JScrollPane();
         lstSelectedEquipment = new javax.swing.JList();
         pnlControls = new javax.swing.JPanel();
         btnRemoveEquip = new javax.swing.JButton();
@@ -5009,7 +5009,7 @@ private void initComponents() {
         lstRLCrits = new javax.swing.JList();
         chkRLCASE2 = new javax.swing.JCheckBox();
         pnlEquipmentToPlace = new javax.swing.JPanel();
-        jScrollPane18 = new javax.swing.JScrollPane();
+        scrEquipToPlace = new javax.swing.JScrollPane();
         lstCritsToPlace = new javax.swing.JList();
         btnRemoveItemCrits = new javax.swing.JButton();
         onlLoadoutControls = new javax.swing.JPanel();
@@ -7632,11 +7632,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         pnlSelected.setMinimumSize(new java.awt.Dimension(212, 286));
         pnlSelected.setLayout(new javax.swing.BoxLayout(pnlSelected, javax.swing.BoxLayout.LINE_AXIS));
 
-        jScrollPane23.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        jScrollPane23.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+        scrSelectedEquip.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrSelectedEquip.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
 
-        lstSelectedEquipment.setModel( new javax.swing.DefaultListModel()
-        );
+        lstSelectedEquipment.setModel( new javax.swing.DefaultListModel() );
         lstSelectedEquipment.setMaximumSize(new java.awt.Dimension(180, 225));
         lstSelectedEquipment.setMinimumSize(new java.awt.Dimension(180, 225));
         lstSelectedEquipment.setPreferredSize(null);
@@ -7673,9 +7672,9 @@ public void mousePressed( MouseEvent e ) {
         };
         lstSelectedEquipment.addMouseListener( mlSelect );
         lstSelectedEquipment.setCellRenderer( new ssw.gui.EquipmentSelectedRenderer( this ) );
-        jScrollPane23.setViewportView(lstSelectedEquipment);
+        scrSelectedEquip.setViewportView(lstSelectedEquipment);
 
-        pnlSelected.add(jScrollPane23);
+        pnlSelected.add(scrSelectedEquip);
 
         pnlEquipment.add(pnlSelected, new org.netbeans.lib.awtextra.AbsoluteConstraints(492, 20, 230, 300));
 
@@ -8847,7 +8846,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         pnlEquipmentToPlace.setMinimumSize(new java.awt.Dimension(146, 330));
         pnlEquipmentToPlace.setLayout(new javax.swing.BoxLayout(pnlEquipmentToPlace, javax.swing.BoxLayout.PAGE_AXIS));
 
-        jScrollPane18.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrEquipToPlace.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
         lstCritsToPlace.setFont( PrintConsts.BaseCritFont );
         lstCritsToPlace.setModel(new javax.swing.AbstractListModel() {
@@ -8917,9 +8916,9 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
                 lstCritsToPlaceValueChanged(evt);
             }
         });
-        jScrollPane18.setViewportView(lstCritsToPlace);
+        scrEquipToPlace.setViewportView(lstCritsToPlace);
 
-        pnlEquipmentToPlace.add(jScrollPane18);
+        pnlEquipmentToPlace.add(scrEquipToPlace);
 
         btnRemoveItemCrits.setText("Remove Item");
         btnRemoveItemCrits.setEnabled(false);
@@ -14702,8 +14701,6 @@ private void setViewToolbar(boolean Visible)
     private javax.swing.JScrollPane jScrollPane14;
     private javax.swing.JScrollPane jScrollPane16;
     private javax.swing.JScrollPane jScrollPane17;
-    private javax.swing.JScrollPane jScrollPane18;
-    private javax.swing.JScrollPane jScrollPane23;
     private javax.swing.JSeparator jSeparator13;
     private javax.swing.JSeparator jSeparator14;
     private javax.swing.JSeparator jSeparator15;
@@ -14955,8 +14952,10 @@ private void setViewToolbar(boolean Visible)
     private javax.swing.JPanel pnlWeaponsManufacturers;
     private javax.swing.JScrollPane scpQuirkTable;
     private javax.swing.JScrollPane scpWeaponManufacturers;
+    private javax.swing.JScrollPane scrEquipToPlace;
     private javax.swing.JScrollPane scrLACrits;
     private javax.swing.JScrollPane scrRACrits;
+    private javax.swing.JScrollPane scrSelectedEquip;
     private javax.swing.JSpinner spnBoosterMP;
     private javax.swing.JSpinner spnCTArmor;
     private javax.swing.JSpinner spnCTRArmor;
diff --git a/ssw/src/main/java/ssw/gui/frmMainWide.form b/ssw/src/main/java/ssw/gui/frmMainWide.form
index e9b74ec3..0bd4a11d 100644
--- a/ssw/src/main/java/ssw/gui/frmMainWide.form
+++ b/ssw/src/main/java/ssw/gui/frmMainWide.form
@@ -6437,9 +6437,9 @@
                 <Property name="axis" type="int" value="3"/>
               </Layout>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane18">
+                <Container class="javax.swing.JScrollPane" name="scrEquipToPlace">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
diff --git a/ssw/src/main/java/ssw/gui/frmMainWide.java b/ssw/src/main/java/ssw/gui/frmMainWide.java
index 855846a7..1366108c 100644
--- a/ssw/src/main/java/ssw/gui/frmMainWide.java
+++ b/ssw/src/main/java/ssw/gui/frmMainWide.java
@@ -4943,7 +4943,7 @@ private void initComponents() {
         chkRACASE2 = new javax.swing.JCheckBox();
         chkRAAES = new javax.swing.JCheckBox();
         pnlEquipmentToPlace = new javax.swing.JPanel();
-        jScrollPane18 = new javax.swing.JScrollPane();
+        scrEquipToPlace = new javax.swing.JScrollPane();
         lstCritsToPlace = new javax.swing.JList();
         btnRemoveItemCrits = new javax.swing.JButton();
         btnAutoAllocate = new javax.swing.JButton();
@@ -8717,7 +8717,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         pnlEquipmentToPlace.setMinimumSize(new java.awt.Dimension(146, 330));
         pnlEquipmentToPlace.setLayout(new javax.swing.BoxLayout(pnlEquipmentToPlace, javax.swing.BoxLayout.PAGE_AXIS));
 
-        jScrollPane18.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        scrEquipToPlace.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
         lstCritsToPlace.setFont( PrintConsts.BaseCritFont );
         lstCritsToPlace.setModel(new javax.swing.AbstractListModel() {
@@ -8792,9 +8792,9 @@ public void keyPressed(java.awt.event.KeyEvent evt) {
                 lstCritsToPlaceKeyPressed(evt);
             }
         });
-        jScrollPane18.setViewportView(lstCritsToPlace);
+        scrEquipToPlace.setViewportView(lstCritsToPlace);
 
-        pnlEquipmentToPlace.add(jScrollPane18);
+        pnlEquipmentToPlace.add(scrEquipToPlace);
 
         btnRemoveItemCrits.setText("Remove Item");
         btnRemoveItemCrits.setEnabled(false);
@@ -14533,7 +14533,6 @@ private void setViewToolbar(boolean Visible)
     private javax.swing.JScrollPane jScrollPane14;
     private javax.swing.JScrollPane jScrollPane16;
     private javax.swing.JScrollPane jScrollPane17;
-    private javax.swing.JScrollPane jScrollPane18;
     private javax.swing.JSeparator jSeparator13;
     private javax.swing.JSeparator jSeparator14;
     private javax.swing.JSeparator jSeparator15;
@@ -14780,6 +14779,7 @@ private void setViewToolbar(boolean Visible)
     private javax.swing.JPanel pnlWeaponsManufacturers;
     private javax.swing.JScrollPane scpQuirkTable;
     private javax.swing.JScrollPane scpWeaponManufacturers;
+    private javax.swing.JScrollPane scrEquipToPlace;
     private javax.swing.JScrollPane scrLACrits;
     private javax.swing.JScrollPane scrRACrits;
     private javax.swing.JSpinner spnBoosterMP;