diff --git a/hexrdgui/resources/ui/physics_package_manager_dialog.ui b/hexrdgui/resources/ui/physics_package_manager_dialog.ui
index c29d9ffff..a3c64da36 100644
--- a/hexrdgui/resources/ui/physics_package_manager_dialog.ui
+++ b/hexrdgui/resources/ui/physics_package_manager_dialog.ui
@@ -644,14 +644,34 @@
          <attribute name="title">
           <string>Window</string>
          </attribute>
-         <layout class="QGridLayout" name="gridLayout_2">
-          <item row="3" column="1" colspan="3">
-           <widget class="ScientificDoubleSpinBox" name="window_thickness">
-            <property name="suffix">
-             <string> μm</string>
+         <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,0,0">
+          <item row="1" column="0" colspan="6">
+           <widget class="QLineEdit" name="window_material_input">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="singleStep">
-             <double>0.100000000000000</double>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <spacer name="window_vertical_spacer">
+            <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="3" column="0">
+           <widget class="QLabel" name="window_thickness_label">
+            <property name="text">
+             <string>Thickness</string>
+            </property>
+            <property name="buddy">
+             <cstring>window_thickness</cstring>
             </property>
            </widget>
           </item>
@@ -665,9 +685,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="3">
-           <widget class="QComboBox" name="window_material"/>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="window_density_label">
             <property name="text">
@@ -678,17 +695,17 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="window_thickness_label">
-            <property name="text">
-             <string>Thickness</string>
+          <item row="3" column="1" colspan="5">
+           <widget class="ScientificDoubleSpinBox" name="window_thickness">
+            <property name="suffix">
+             <string> μm</string>
             </property>
-            <property name="buddy">
-             <cstring>window_thickness</cstring>
+            <property name="singleStep">
+             <double>0.100000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" colspan="3">
+          <item row="2" column="1" colspan="5">
            <widget class="ScientificDoubleSpinBox" name="window_density">
             <property name="enabled">
              <bool>true</bool>
@@ -698,25 +715,8 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0" colspan="4">
-           <widget class="QLineEdit" name="window_material_input">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <spacer name="window_vertical_spacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
+          <item row="0" column="1" colspan="5">
+           <widget class="QComboBox" name="window_material"/>
           </item>
          </layout>
         </widget>
@@ -725,6 +725,16 @@
           <string>Pinhole</string>
          </attribute>
          <layout class="QGridLayout" name="gridLayout_6">
+          <item row="0" column="1" colspan="4">
+           <widget class="QComboBox" name="pinhole_material"/>
+          </item>
+          <item row="1" column="0" colspan="5">
+           <widget class="QLineEdit" name="pinhole_material_input">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="pinhole_material_label">
             <property name="text">
@@ -735,7 +745,17 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1" colspan="3">
+          <item row="3" column="0">
+           <widget class="QLabel" name="pinhole_thickness_label">
+            <property name="text">
+             <string>Thickness</string>
+            </property>
+            <property name="buddy">
+             <cstring>pinhole_thickness</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" colspan="4">
            <widget class="ScientificDoubleSpinBox" name="pinhole_thickness">
             <property name="suffix">
              <string> μm</string>
@@ -745,6 +765,23 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="pinhole_diameter_label">
+            <property name="text">
+             <string>Diameter</string>
+            </property>
+            <property name="buddy">
+             <cstring>pinhole_diameter</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="4">
+           <widget class="ScientificDoubleSpinBox" name="pinhole_diameter">
+            <property name="suffix">
+             <string> μm</string>
+            </property>
+           </widget>
+          </item>
           <item row="6" column="0">
            <spacer name="pinhole_vertical_spacer">
             <property name="orientation">
@@ -758,10 +795,7 @@
             </property>
            </spacer>
           </item>
-          <item row="0" column="1" colspan="3">
-           <widget class="QComboBox" name="pinhole_material"/>
-          </item>
-          <item row="2" column="1" colspan="3">
+          <item row="2" column="1" colspan="4">
            <widget class="ScientificDoubleSpinBox" name="pinhole_density">
             <property name="enabled">
              <bool>true</bool>
@@ -771,33 +805,6 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="pinhole_thickness_label">
-            <property name="text">
-             <string>Thickness</string>
-            </property>
-            <property name="buddy">
-             <cstring>pinhole_thickness</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="pinhole_diameter_label">
-            <property name="text">
-             <string>Diameter</string>
-            </property>
-            <property name="buddy">
-             <cstring>pinhole_diameter</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="4">
-           <widget class="QLineEdit" name="pinhole_material_input">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="pinhole_density_label">
             <property name="text">
@@ -808,13 +815,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1" colspan="3">
-           <widget class="ScientificDoubleSpinBox" name="pinhole_diameter">
-            <property name="suffix">
-             <string> μm</string>
-            </property>
-           </widget>
-          </item>
           <item row="5" column="0">
            <widget class="QLabel" name="absorption_length_label">
             <property name="text">
@@ -825,7 +825,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="1" colspan="3">
+          <item row="5" column="1" colspan="4">
            <widget class="ScientificDoubleSpinBox" name="absorption_length">
             <property name="singleStep">
              <double>0.100000000000000</double>
diff --git a/hexrdgui/waterfall_plot.py b/hexrdgui/waterfall_plot.py
index 6f5b7f808..e25cdab6b 100644
--- a/hexrdgui/waterfall_plot.py
+++ b/hexrdgui/waterfall_plot.py
@@ -195,6 +195,7 @@ def __init__(self, ax: Axes, line_data: LineData, parent: QWidget = None):
 
         # Add minimize, maximize, and close buttons
         self.setWindowFlags(
+            Qt.Tool |
             Qt.WindowMinimizeButtonHint |
             Qt.WindowMaximizeButtonHint |
             Qt.WindowCloseButtonHint