diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.ui b/qrenderdoc/Windows/Dialogs/LiveCapture.ui
index 67b8a84f6..216d69748 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.ui
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.ui
@@ -84,9 +84,6 @@
        </spacer>
       </item>
      </layout>
-     <zorder>connectionIcon</zorder>
-     <zorder>connectionStatus</zorder>
-     <zorder>connectionSpacer</zorder>
     </widget>
    </item>
    <item>
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index fdd6ed710..a67013663 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -899,7 +899,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Constant Buffers</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_27">
           <property name="leftMargin">
            <number>2</number>
           </property>
@@ -979,7 +979,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Class Instances</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_1">
           <property name="leftMargin">
            <number>2</number>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
index 8c43bb7c0..12464dad6 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui
@@ -856,7 +856,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Samplers</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_1">
           <property name="leftMargin">
            <number>2</number>
           </property>
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
index 6a425af29..aae8b03b3 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui
@@ -731,7 +731,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Samplers</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_1">
           <property name="leftMargin">
            <number>2</number>
           </property>
@@ -896,7 +896,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Read/Write Bindings</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_17">
           <property name="leftMargin">
            <number>2</number>
           </property>
@@ -986,7 +986,7 @@ padding: 0px;</string>
          <property name="title">
           <string>Shader Subroutines</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <layout class="QHBoxLayout" name="horizontalLayout_40">
           <property name="leftMargin">
            <number>2</number>
           </property>
@@ -2522,7 +2522,7 @@ padding: 0px;</string>
            <property name="title">
             <string>Uniforms and UBOs</string>
            </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_17">
+           <layout class="QHBoxLayout" name="horizontalLayout_41">
             <property name="leftMargin">
              <number>2</number>
             </property>