diff --git a/res/ui/ensemble_screen.ui b/res/ui/ensemble_screen.ui
index 87b6626..206097d 100644
--- a/res/ui/ensemble_screen.ui
+++ b/res/ui/ensemble_screen.ui
@@ -123,12 +123,14 @@
                 <property name="can-focus">False</property>
                 <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="HdyClamp">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="border-width">18</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="maximum-size">800</property>
                     <child>
                       <object class="GtkBox" id="recording_box">
                         <property name="visible">True</property>
@@ -142,7 +144,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Recordings</property>
                             <attributes>
-                              <attribute name="size" value="12288"/>
+                              <attribute name="weight" value="bold"/>
                             </attributes>
                           </object>
                           <packing>
@@ -168,11 +170,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/res/ui/person_screen.ui b/res/ui/person_screen.ui
index 0bfcaf6..f649a33 100644
--- a/res/ui/person_screen.ui
+++ b/res/ui/person_screen.ui
@@ -123,27 +123,58 @@
                 <property name="can-focus">False</property>
                 <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="HdyClamp">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="border-width">18</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="maximum-size">800</property>
                     <child>
-                      <object class="GtkBox" id="work_box">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="orientation">vertical</property>
-                        <property name="spacing">12</property>
+                        <property name="spacing">18</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkBox" id="work_box">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Works</property>
-                            <attributes>
-                              <attribute name="size" value="12288"/>
-                            </attributes>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Works</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="work_frame">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">in</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -152,13 +183,42 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="work_frame">
+                          <object class="GtkBox" id="recording_box">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="label-xalign">0</property>
-                            <property name="shadow-type">in</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
                             <child>
-                              <placeholder/>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="label" translatable="yes">Recordings</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="recording_frame">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">in</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -168,56 +228,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="recording_box">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Recordings</property>
-                            <attributes>
-                              <attribute name="size" value="12288"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="recording_frame">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="label-xalign">0</property>
-                            <property name="shadow-type">in</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/res/ui/recording_screen.ui b/res/ui/recording_screen.ui
index 0916c2a..782bd98 100644
--- a/res/ui/recording_screen.ui
+++ b/res/ui/recording_screen.ui
@@ -76,12 +76,14 @@
                 <property name="can-focus">False</property>
                 <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="HdyClamp">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="border-width">18</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="maximum-size">800</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
@@ -95,7 +97,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Tracks</property>
                             <attributes>
-                              <attribute name="size" value="12288"/>
+                              <attribute name="weight" value="bold"/>
                             </attributes>
                           </object>
                           <packing>
@@ -121,11 +123,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -137,9 +134,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">True</property>
diff --git a/res/ui/work_screen.ui b/res/ui/work_screen.ui
index 87b6626..206097d 100644
--- a/res/ui/work_screen.ui
+++ b/res/ui/work_screen.ui
@@ -123,12 +123,14 @@
                 <property name="can-focus">False</property>
                 <property name="shadow-type">none</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="HdyClamp">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="border-width">18</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">18</property>
+                    <property name="margin-bottom">12</property>
+                    <property name="maximum-size">800</property>
                     <child>
                       <object class="GtkBox" id="recording_box">
                         <property name="visible">True</property>
@@ -142,7 +144,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Recordings</property>
                             <attributes>
-                              <attribute name="size" value="12288"/>
+                              <attribute name="weight" value="bold"/>
                             </attributes>
                           </object>
                           <packing>
@@ -168,11 +170,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>