diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index 9ced4226a..79be63ee7 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -76,7 +76,7 @@
          <string>Show Disabled Items</string>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="../../Resources/resources.qrc">
           <normaloff>:/page_white_delete.png</normaloff>:/page_white_delete.png</iconset>
         </property>
         <property name="checkable">
@@ -99,7 +99,7 @@
          <string>Show Empty Items</string>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="../../Resources/resources.qrc">
           <normaloff>:/page_white_database.png</normaloff>:/page_white_database.png</iconset>
         </property>
         <property name="checkable">
@@ -122,7 +122,7 @@
          <string>Export</string>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="../../Resources/resources.qrc">
           <normaloff>:/save.png</normaloff>:/save.png</iconset>
         </property>
         <property name="checkable">
@@ -313,7 +313,7 @@
                  <string>View the mesh input data</string>
                 </property>
                 <property name="pixmap">
-                 <pixmap>:/wireframe_mesh.png</pixmap>
+                 <pixmap resource="../../Resources/resources.qrc">:/wireframe_mesh.png</pixmap>
                 </property>
                 <property name="scaledContents">
                  <bool>true</bool>
@@ -368,7 +368,7 @@
                  <string/>
                 </property>
                 <property name="pixmap">
-                 <pixmap>:/topologies/topo_trilist.svg</pixmap>
+                 <pixmap resource="../../Resources/resources.qrc">:/topologies/topo_trilist.svg</pixmap>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
@@ -418,7 +418,7 @@
                  <string>View</string>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../../Resources/resources.qrc">
                   <normaloff>:/action.png</normaloff>:/action.png</iconset>
                 </property>
                 <property name="toolButtonStyle">
@@ -622,7 +622,7 @@
              <string>View</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/action.png</normaloff>:/action.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -642,7 +642,7 @@
              <string>Edit</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -662,7 +662,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/save.png</normaloff>:/save.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -723,7 +723,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="vsResGroup">
+            <widget class="CollapseGroupBox" name="vsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -775,7 +775,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsSamplerGroup">
+            <widget class="CollapseGroupBox" name="vsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -827,7 +827,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsCBufferGroup">
+            <widget class="CollapseGroupBox" name="vsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -879,7 +879,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="vsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -993,7 +993,7 @@
              <string>View</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/action.png</normaloff>:/action.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1013,7 +1013,7 @@
              <string>Edit</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1033,7 +1033,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/save.png</normaloff>:/save.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1091,7 +1091,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="hsResGroup">
+            <widget class="CollapseGroupBox" name="hsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1143,7 +1143,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsSamplerGroup">
+            <widget class="CollapseGroupBox" name="hsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1195,7 +1195,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsCBufferGroup">
+            <widget class="CollapseGroupBox" name="hsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1247,7 +1247,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="hsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1361,7 +1361,7 @@
              <string>View</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/action.png</normaloff>:/action.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1381,7 +1381,7 @@
              <string>Edit</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1401,7 +1401,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/save.png</normaloff>:/save.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1459,7 +1459,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="dsResGroup">
+            <widget class="CollapseGroupBox" name="dsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1511,7 +1511,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsSamplerGroup">
+            <widget class="CollapseGroupBox" name="dsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1563,7 +1563,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsCBufferGroup">
+            <widget class="CollapseGroupBox" name="dsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1615,7 +1615,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="dsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1729,7 +1729,7 @@
              <string>View</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/action.png</normaloff>:/action.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1749,7 +1749,7 @@
              <string>Edit</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1769,7 +1769,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/save.png</normaloff>:/save.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -1827,7 +1827,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="gsResGroup">
+            <widget class="CollapseGroupBox" name="gsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1879,7 +1879,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsSamplerGroup">
+            <widget class="CollapseGroupBox" name="gsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1931,115 +1931,111 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="soHLayout">
-             <item>
-              <widget class="QGroupBox" name="gsCBufferGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-                 <horstretch>5</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Constant Buffers</string>
-               </property>
-               <layout class="QHBoxLayout" name="horizontalLayout_17">
-                <property name="leftMargin">
-                 <number>2</number>
+            <widget class="CollapseGroupBox" name="gsCBufferGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>5</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Constant Buffers</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_17">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item>
+               <widget class="RDTreeWidget" name="gsCBuffers">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
                 </property>
-                <property name="bottomMargin">
-                 <number>2</number>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
                 </property>
-                <item>
-                 <widget class="RDTreeWidget" name="gsCBuffers">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="soGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>4</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Stream Out</string>
-               </property>
-               <layout class="QHBoxLayout" name="soLayout_3">
-                <property name="leftMargin">
-                 <number>2</number>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>2</number>
-                </property>
-                <item>
-                 <widget class="RDTreeWidget" name="gsStreamOut">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="soGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>4</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Stream Out</string>
+             </property>
+             <layout class="QHBoxLayout" name="soLayout_3">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item>
+               <widget class="RDTreeWidget" name="gsStreamOut">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
+                </property>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
+                </property>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="CollapseGroupBox" name="gsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2279,7 +2275,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2295,7 +2291,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2311,7 +2307,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2345,7 +2341,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2462,7 +2458,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2491,7 +2487,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap>:/cross.png</pixmap>
+               <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -2772,7 +2768,7 @@
              <string>View</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/action.png</normaloff>:/action.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -2792,7 +2788,7 @@
              <string>Edit</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -2812,7 +2808,7 @@
              <string>Save</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../../Resources/resources.qrc">
               <normaloff>:/save.png</normaloff>:/save.png</iconset>
             </property>
             <property name="toolButtonStyle">
@@ -2870,7 +2866,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="psResGroup">
+            <widget class="CollapseGroupBox" name="psResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2922,7 +2918,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psSamplerGroup">
+            <widget class="CollapseGroupBox" name="psSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2974,7 +2970,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psCBufferGroup">
+            <widget class="CollapseGroupBox" name="psCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3026,7 +3022,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psSubroutineGroup">
+            <widget class="CollapseGroupBox" name="psSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3306,7 +3302,7 @@
                    <string/>
                   </property>
                   <property name="pixmap">
-                   <pixmap>:/cross.png</pixmap>
+                   <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -3397,7 +3393,7 @@
                    <string/>
                   </property>
                   <property name="pixmap">
-                   <pixmap>:/cross.png</pixmap>
+                   <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -3478,7 +3474,7 @@
                    <string/>
                   </property>
                   <property name="pixmap">
-                   <pixmap>:/cross.png</pixmap>
+                   <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -3504,7 +3500,7 @@
                    <string/>
                   </property>
                   <property name="pixmap">
-                   <pixmap>:/cross.png</pixmap>
+                   <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -3685,7 +3681,7 @@
                    <string/>
                   </property>
                   <property name="pixmap">
-                   <pixmap>:/cross.png</pixmap>
+                   <pixmap resource="../../Resources/resources.qrc">:/cross.png</pixmap>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -3920,7 +3916,7 @@
                 <string>View</string>
                </property>
                <property name="icon">
-                <iconset>
+                <iconset resource="../../Resources/resources.qrc">
                  <normaloff>:/action.png</normaloff>:/action.png</iconset>
                </property>
                <property name="toolButtonStyle">
@@ -3940,7 +3936,7 @@
                 <string>Edit</string>
                </property>
                <property name="icon">
-                <iconset>
+                <iconset resource="../../Resources/resources.qrc">
                  <normaloff>:/page_white_edit.png</normaloff>:/page_white_edit.png</iconset>
                </property>
                <property name="toolButtonStyle">
@@ -3960,7 +3956,7 @@
                 <string>Save</string>
                </property>
                <property name="icon">
-                <iconset>
+                <iconset resource="../../Resources/resources.qrc">
                  <normaloff>:/save.png</normaloff>:/save.png</iconset>
                </property>
                <property name="toolButtonStyle">
@@ -4036,7 +4032,7 @@
                 <string/>
                </property>
                <property name="icon">
-                <iconset>
+                <iconset resource="../../Resources/resources.qrc">
                  <normaloff>:/wrench.png</normaloff>:/wrench.png</iconset>
                </property>
                <property name="autoRaise">
@@ -4094,7 +4090,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="csResGroup">
+            <widget class="CollapseGroupBox" name="csResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4146,7 +4142,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csUAVGroup">
+            <widget class="CollapseGroupBox" name="csUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4198,7 +4194,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csSamplerGroup">
+            <widget class="CollapseGroupBox" name="csSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4250,7 +4246,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csCBufferGroup">
+            <widget class="CollapseGroupBox" name="csCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4302,7 +4298,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csSubroutineGroup">
+            <widget class="CollapseGroupBox" name="csSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4364,23 +4360,31 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDLabel</class>
-   <extends>QLabel</extends>
-   <header>Widgets/Extended/RDLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDLabel</class>
+   <extends>QLabel</extends>
+   <header>Widgets/Extended/RDLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>PipelineFlowChart</class>
    <extends>QFrame</extends>
    <header>Widgets/PipelineFlowChart.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>CollapseGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Widgets/CollapseGroupBox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../Resources/resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
index 33b3f5f25..ed582633a 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>868</width>
-    <height>491</height>
+    <height>574</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -164,7 +164,7 @@
    <item>
     <widget class="QTabWidget" name="stagesTabs">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <property name="documentMode">
       <bool>true</bool>
@@ -203,7 +203,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>432</height>
+            <height>515</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
@@ -583,6 +583,12 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
            </spacer>
           </item>
          </layout>
@@ -602,7 +608,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>383</height>
+            <height>466</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -619,7 +625,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="vsResGroup">
+            <widget class="CollapseGroupBox" name="vsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -671,7 +677,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsUAVGroup">
+            <widget class="CollapseGroupBox" name="vsUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -723,7 +729,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsSamplerGroup">
+            <widget class="CollapseGroupBox" name="vsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -775,7 +781,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsCBufferGroup">
+            <widget class="CollapseGroupBox" name="vsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -952,6 +958,12 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
            </spacer>
           </item>
          </layout>
@@ -971,7 +983,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>383</height>
+            <height>466</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -988,7 +1000,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="hsResGroup">
+            <widget class="CollapseGroupBox" name="hsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1040,7 +1052,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsUAVGroup">
+            <widget class="CollapseGroupBox" name="hsUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1092,7 +1104,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsSamplerGroup">
+            <widget class="CollapseGroupBox" name="hsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1144,7 +1156,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="hsCBufferGroup">
+            <widget class="CollapseGroupBox" name="hsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1321,6 +1333,12 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
            </spacer>
           </item>
          </layout>
@@ -1340,7 +1358,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>383</height>
+            <height>466</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1357,7 +1375,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="dsResGroup">
+            <widget class="CollapseGroupBox" name="dsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1409,7 +1427,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsUAVGroup">
+            <widget class="CollapseGroupBox" name="dsUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1461,7 +1479,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsSamplerGroup">
+            <widget class="CollapseGroupBox" name="dsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1513,7 +1531,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="dsCBufferGroup">
+            <widget class="CollapseGroupBox" name="dsCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1690,6 +1708,12 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
            </spacer>
           </item>
          </layout>
@@ -1709,7 +1733,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>383</height>
+            <height>466</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1726,7 +1750,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="gsResGroup">
+            <widget class="CollapseGroupBox" name="gsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1778,7 +1802,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsUAVGroup">
+            <widget class="CollapseGroupBox" name="gsUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1830,7 +1854,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsSamplerGroup">
+            <widget class="CollapseGroupBox" name="gsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1882,112 +1906,108 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="soHLayout">
-             <item>
-              <widget class="QGroupBox" name="gsCBufferGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-                 <horstretch>5</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Constant Buffers</string>
-               </property>
-               <layout class="QHBoxLayout" name="horizontalLayout_17">
-                <property name="leftMargin">
-                 <number>2</number>
+            <widget class="CollapseGroupBox" name="gsCBufferGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>5</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Constant Buffers</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_17">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item>
+               <widget class="RDTreeWidget" name="gsCBuffers">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
                 </property>
-                <property name="bottomMargin">
-                 <number>2</number>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
                 </property>
-                <item>
-                 <widget class="RDTreeWidget" name="gsCBuffers">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="soGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>4</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Stream Out</string>
-               </property>
-               <layout class="QHBoxLayout" name="soLayout_3">
-                <property name="leftMargin">
-                 <number>2</number>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="CollapseGroupBox" name="soGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>4</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Stream Out</string>
+             </property>
+             <layout class="QHBoxLayout" name="soLayout_3">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item>
+               <widget class="RDTreeWidget" name="gsStreamOut">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
                 </property>
-                <property name="bottomMargin">
-                 <number>2</number>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
                 </property>
-                <item>
-                 <widget class="RDTreeWidget" name="gsStreamOut">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
+                </property>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
            </item>
           </layout>
          </widget>
@@ -2662,6 +2682,12 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
            </spacer>
           </item>
          </layout>
@@ -2681,7 +2707,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>383</height>
+            <height>466</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_14">
@@ -2698,7 +2724,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="psResGroup">
+            <widget class="CollapseGroupBox" name="psResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2750,7 +2776,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psUAVGroup">
+            <widget class="CollapseGroupBox" name="psUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2802,7 +2828,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psSamplerGroup">
+            <widget class="CollapseGroupBox" name="psSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2854,7 +2880,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="psCBufferGroup">
+            <widget class="CollapseGroupBox" name="psCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2942,7 +2968,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>432</height>
+            <height>515</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_6">
@@ -3769,7 +3795,7 @@
             <x>0</x>
             <y>0</y>
             <width>868</width>
-            <height>369</height>
+            <height>452</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_15">
@@ -3786,7 +3812,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="csResGroup">
+            <widget class="CollapseGroupBox" name="csResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3838,7 +3864,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csUAVGroup">
+            <widget class="CollapseGroupBox" name="csUAVGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3890,7 +3916,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csSamplerGroup">
+            <widget class="CollapseGroupBox" name="csSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3942,7 +3968,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csCBufferGroup">
+            <widget class="CollapseGroupBox" name="csCBufferGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4004,22 +4030,28 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDLabel</class>
-   <extends>QLabel</extends>
-   <header>Widgets/Extended/RDLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDLabel</class>
+   <extends>QLabel</extends>
+   <header>Widgets/Extended/RDLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>PipelineFlowChart</class>
    <extends>QFrame</extends>
    <header>Widgets/PipelineFlowChart.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>CollapseGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Widgets/CollapseGroupBox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
index 62a5634cf..bf1b1d440 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
@@ -164,7 +164,7 @@
    <item>
     <widget class="QTabWidget" name="stagesTabs">
      <property name="currentIndex">
-      <number>4</number>
+      <number>0</number>
      </property>
      <property name="documentMode">
       <bool>true</bool>
@@ -633,7 +633,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="vsTexGroup">
+            <widget class="CollapseGroupBox" name="vsTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -685,7 +685,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsSamplerGroup">
+            <widget class="CollapseGroupBox" name="vsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -737,7 +737,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsUBOGroup">
+            <widget class="CollapseGroupBox" name="vsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -789,7 +789,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsReadWriteGroup">
+            <widget class="CollapseGroupBox" name="vsReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -841,7 +841,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="vsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1068,7 +1068,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="tcsTexGroup">
+            <widget class="CollapseGroupBox" name="tcsTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1120,7 +1120,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tcsSamplerGroup">
+            <widget class="CollapseGroupBox" name="tcsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1172,7 +1172,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tcsUBOGroup">
+            <widget class="CollapseGroupBox" name="tcsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1224,7 +1224,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tcsReadWriteGroup">
+            <widget class="CollapseGroupBox" name="tcsReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1276,7 +1276,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tcsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="tcsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1503,7 +1503,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="tesTexGroup">
+            <widget class="CollapseGroupBox" name="tesTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1555,7 +1555,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tesSamplerGroup">
+            <widget class="CollapseGroupBox" name="tesSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1607,7 +1607,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tesUBOGroup">
+            <widget class="CollapseGroupBox" name="tesUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1659,7 +1659,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tesReadWriteGroup">
+            <widget class="CollapseGroupBox" name="tesReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1711,7 +1711,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tesSubroutineGroup">
+            <widget class="CollapseGroupBox" name="tesSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1921,7 +1921,7 @@
             <x>0</x>
             <y>0</y>
             <width>857</width>
-            <height>454</height>
+            <height>538</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -1938,7 +1938,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="gsTexGroup">
+            <widget class="CollapseGroupBox" name="gsTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -1990,7 +1990,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsSamplerGroup">
+            <widget class="CollapseGroupBox" name="gsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2042,165 +2042,161 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="xfbHLayout">
-             <item>
-              <widget class="QGroupBox" name="gsUBOGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-                 <horstretch>5</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Uniforms and UBOs</string>
-               </property>
-               <layout class="QHBoxLayout" name="horizontalLayout_41">
-                <property name="leftMargin">
-                 <number>2</number>
+            <widget class="CollapseGroupBox" name="gsUBOGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+               <horstretch>5</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Uniforms and UBOs</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_41">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item>
+               <widget class="RDTreeWidget" name="gsUBOs">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
                 </property>
-                <property name="bottomMargin">
-                 <number>2</number>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
                 </property>
-                <item>
-                 <widget class="RDTreeWidget" name="gsUBOs">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item>
-              <widget class="QGroupBox" name="xfbGroup">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>4</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="title">
-                <string>Transform Feedback</string>
-               </property>
-               <layout class="QGridLayout" name="gridLayout_3">
-                <property name="leftMargin">
-                 <number>2</number>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
                 </property>
-                <property name="topMargin">
-                 <number>2</number>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
                 </property>
-                <property name="rightMargin">
-                 <number>2</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>2</number>
-                </property>
-                <item row="0" column="0">
-                 <layout class="QHBoxLayout" name="xfbPaused_HLayout">
-                  <item>
-                   <widget class="RDLabel" name="xfbObj">
-                    <property name="frameShape">
-                     <enum>QFrame::Box</enum>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="xfbPausedLabel">
-                    <property name="text">
-                     <string>Paused:</string>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="xfbPaused">
-                    <property name="text">
-                     <string/>
-                    </property>
-                    <property name="pixmap">
-                     <pixmap resource="../../Resources/resources.qrc">:/tick.png</pixmap>
-                    </property>
-                    <property name="alignment">
-                     <set>Qt::AlignCenter</set>
-                    </property>
-                    <property name="margin">
-                     <number>0</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <spacer name="horizontalSpacer_2">
-                    <property name="orientation">
-                     <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                     <size>
-                      <width>40</width>
-                      <height>20</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
-                 </layout>
-                </item>
-                <item row="4" column="0" colspan="2">
-                 <widget class="RDTreeWidget" name="xfbBuffers">
-                  <property name="frameShape">
-                   <enum>QFrame::Box</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Plain</enum>
-                  </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
-                  <property name="showDropIndicator" stdset="0">
-                   <bool>false</bool>
-                  </property>
-                  <property name="rootIsDecorated">
-                   <bool>false</bool>
-                  </property>
-                  <property name="allColumnsShowFocus">
-                   <bool>true</bool>
-                  </property>
-                  <attribute name="headerStretchLastSection">
-                   <bool>false</bool>
-                  </attribute>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsReadWriteGroup">
+            <widget class="CollapseGroupBox" name="xfbGroup">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>4</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string>Transform Feedback</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_3">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
+               <number>2</number>
+              </property>
+              <item row="0" column="0">
+               <layout class="QHBoxLayout" name="xfbPaused_HLayout">
+                <item>
+                 <widget class="RDLabel" name="xfbObj">
+                  <property name="frameShape">
+                   <enum>QFrame::Box</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="xfbPausedLabel">
+                  <property name="text">
+                   <string>Paused:</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="xfbPaused">
+                  <property name="text">
+                   <string/>
+                  </property>
+                  <property name="pixmap">
+                   <pixmap resource="../../Resources/resources.qrc">:/tick.png</pixmap>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_2">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item row="4" column="0" colspan="2">
+               <widget class="RDTreeWidget" name="xfbBuffers">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
+                </property>
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <property name="showDropIndicator" stdset="0">
+                 <bool>false</bool>
+                </property>
+                <property name="rootIsDecorated">
+                 <bool>false</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="CollapseGroupBox" name="gsReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -2252,7 +2248,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="gsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3355,7 +3351,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="fsTexGroup">
+            <widget class="CollapseGroupBox" name="fsTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3407,7 +3403,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="fsSamplerGroup">
+            <widget class="CollapseGroupBox" name="fsSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3459,7 +3455,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="fsUBOGroup">
+            <widget class="CollapseGroupBox" name="fsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3511,7 +3507,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="fsReadWriteGroup">
+            <widget class="CollapseGroupBox" name="fsReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -3563,7 +3559,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="fsSubroutineGroup">
+            <widget class="CollapseGroupBox" name="fsSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4297,7 +4293,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="csTexGroup">
+            <widget class="CollapseGroupBox" name="csTexGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4349,7 +4345,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csSamplerGroup">
+            <widget class="CollapseGroupBox" name="csSamplerGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4401,7 +4397,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csUBOGroup">
+            <widget class="CollapseGroupBox" name="csUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4453,7 +4449,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csReadWriteGroup">
+            <widget class="CollapseGroupBox" name="csReadWriteGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4505,7 +4501,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csSubroutineGroup">
+            <widget class="CollapseGroupBox" name="csSubroutineGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
@@ -4567,22 +4563,28 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDLabel</class>
-   <extends>QLabel</extends>
-   <header>Widgets/Extended/RDLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDLabel</class>
+   <extends>QLabel</extends>
+   <header>Widgets/Extended/RDLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>PipelineFlowChart</class>
    <extends>QFrame</extends>
    <header>Widgets/PipelineFlowChart.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>CollapseGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Widgets/CollapseGroupBox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
index 1a1db2c1f..9b91459c6 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui
@@ -621,7 +621,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="vsResGroup">
+            <widget class="CollapseGroupBox" name="vsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -673,7 +673,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="vsUBOGroup">
+            <widget class="CollapseGroupBox" name="vsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -888,7 +888,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="tcsResGroup">
+            <widget class="CollapseGroupBox" name="tcsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -940,7 +940,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tcsUBOGroup">
+            <widget class="CollapseGroupBox" name="tcsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -1155,7 +1155,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="tesResGroup">
+            <widget class="CollapseGroupBox" name="tesResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -1207,7 +1207,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="tesUBOGroup">
+            <widget class="CollapseGroupBox" name="tesUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -1422,7 +1422,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="gsResGroup">
+            <widget class="CollapseGroupBox" name="gsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -1474,7 +1474,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="gsUBOGroup">
+            <widget class="CollapseGroupBox" name="gsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -2421,7 +2421,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="fsResGroup">
+            <widget class="CollapseGroupBox" name="fsResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -2473,7 +2473,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="fsUBOGroup">
+            <widget class="CollapseGroupBox" name="fsUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -3216,7 +3216,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="QGroupBox" name="csResGroup">
+            <widget class="CollapseGroupBox" name="csResGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -3268,7 +3268,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="csUBOGroup">
+            <widget class="CollapseGroupBox" name="csUBOGroup">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
                <horstretch>0</horstretch>
@@ -3330,22 +3330,28 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RDLabel</class>
-   <extends>QLabel</extends>
-   <header>Widgets/Extended/RDLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>RDTreeWidget</class>
    <extends>QTreeView</extends>
    <header>Widgets/Extended/RDTreeWidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>RDLabel</class>
+   <extends>QLabel</extends>
+   <header>Widgets/Extended/RDLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>PipelineFlowChart</class>
    <extends>QFrame</extends>
    <header>Widgets/PipelineFlowChart.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>CollapseGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>Widgets/CollapseGroupBox.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../Resources/resources.qrc"/>