diff --git a/src/libsysprof-gtk/style.css b/src/libsysprof-gtk/style.css
index db0e31c6..ce16809b 100644
--- a/src/libsysprof-gtk/style.css
+++ b/src/libsysprof-gtk/style.css
@@ -63,14 +63,6 @@ callgraphview row:not(:selected) treeexpander symbol.unwindable {
   background-color: alpha(@error_color, .1);
 }
 
-marktable {
-  font-size: .9em;
-}
-
-markchart {
-  font-size: .9em;
-}
-
 timeruler {
   min-height: 24px;
   font-size: 0.833em;
diff --git a/src/libsysprof-gtk/sysprof-mark-chart.c b/src/libsysprof-gtk/sysprof-mark-chart.c
index b99d936f..42a1148e 100644
--- a/src/libsysprof-gtk/sysprof-mark-chart.c
+++ b/src/libsysprof-gtk/sysprof-mark-chart.c
@@ -166,6 +166,7 @@ sysprof_mark_chart_class_init (SysprofMarkChartClass *klass)
 
   g_resources_register (libsysprof_gtk_get_resource ());
 
+  g_type_ensure (SYSPROF_TYPE_MARK_CHART_ITEM);
   g_type_ensure (SYSPROF_TYPE_MARK_CHART_ROW);
   g_type_ensure (SYSPROF_TYPE_DOCUMENT_MARK);
 }
diff --git a/src/libsysprof-gtk/sysprof-mark-chart.ui b/src/libsysprof-gtk/sysprof-mark-chart.ui
index b9cba141..1faede9c 100644
--- a/src/libsysprof-gtk/sysprof-mark-chart.ui
+++ b/src/libsysprof-gtk/sysprof-mark-chart.ui
@@ -48,10 +48,10 @@
         <child>
           <object class="GtkInscription">
             <property name="xalign">1</property>
-            <property name="nat-chars">35</property>
-            <property name="min-chars">35</property>
+            <property name="nat-chars">30</property>
+            <property name="min-chars">30</property>
             <property name="margin-end">8</property>
-            <property name="text-overflow">clip</property>
+            <property name="text-overflow">ellipsize-end</property>
             <binding name="text">
               <lookup name="name" type="SysprofMarkCatalog">
                 <lookup name="catalog" type="SysprofMarkChartItem">
diff --git a/src/libsysprof-gtk/sysprof-tracks-view.ui b/src/libsysprof-gtk/sysprof-tracks-view.ui
index 32d3f09e..e3a428d5 100644
--- a/src/libsysprof-gtk/sysprof-tracks-view.ui
+++ b/src/libsysprof-gtk/sysprof-tracks-view.ui
@@ -41,6 +41,7 @@
         <child>
           <object class="GtkScrolledWindow">
             <property name="hscrollbar-policy">never</property>
+            <property name="propagate-natural-height">true</property>
             <property name="vexpand">true</property>
             <child>
               <object class="GtkListView" id="list_view">
diff --git a/src/libsysprof-gtk/tests/test-tracks.c b/src/libsysprof-gtk/tests/test-tracks.c
index 295d53bc..6c826df0 100644
--- a/src/libsysprof-gtk/tests/test-tracks.c
+++ b/src/libsysprof-gtk/tests/test-tracks.c
@@ -148,6 +148,8 @@ test_tracks_class_init (TestTracksClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/test-tracks.ui");
 
   g_type_ensure (SYSPROF_TYPE_TRACKS_VIEW);
+  g_type_ensure (SYSPROF_TYPE_MARK_CHART);
+  g_type_ensure (SYSPROF_TYPE_MARK_TABLE);
 }
 
 static void
diff --git a/src/libsysprof-gtk/tests/test-tracks.ui b/src/libsysprof-gtk/tests/test-tracks.ui
index f24feecc..21d6959e 100644
--- a/src/libsysprof-gtk/tests/test-tracks.ui
+++ b/src/libsysprof-gtk/tests/test-tracks.ui
@@ -17,7 +17,7 @@
                     <property name="text-overflow">ellipsize-end</property>
                     <binding name="text">
                       <lookup name="title" type="AdwTabPage">
-                        <lookup name="selected-page">tab_view</lookup>
+                        <lookup name="selected-page">tracks_view</lookup>
                       </lookup>
                     </binding>
                   </object>
@@ -28,27 +28,75 @@
         </child>
         <child type="top">
           <object class="AdwTabBar">
-            <property name="view">tab_view</property>
+            <property name="view">tracks_view</property>
           </object>
         </child>
         <property name="content">
-          <object class="AdwTabView" id="tab_view">
+          <object class="GtkPaned">
+            <property name="orientation">vertical</property>
             <child>
-              <object class="AdwTabPage">
-                <binding name="title">
-                  <lookup name="title" type="SysprofDocument">
-                    <lookup name="document" type="SysprofSession">
-                      <lookup name="session">TestTracks</lookup>
-                    </lookup>
-                  </lookup>
-                </binding>
-                <property name="child">
-                  <object class="SysprofTracksView">
-                    <binding name="session">
-                      <lookup name="session">TestTracks</lookup>
+              <object class="AdwTabView" id="tracks_view">
+                <child>
+                  <object class="AdwTabPage">
+                    <binding name="title">
+                      <lookup name="title" type="SysprofDocument">
+                        <lookup name="document" type="SysprofSession">
+                          <lookup name="session">TestTracks</lookup>
+                        </lookup>
+                      </lookup>
                     </binding>
+                    <property name="child">
+                      <object class="SysprofTracksView">
+                        <binding name="session">
+                          <lookup name="session">TestTracks</lookup>
+                        </binding>
+                      </object>
+                    </property>
                   </object>
-                </property>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <property name="vexpand">true</property>
+                <child>
+                  <object class="GtkStackSwitcher">
+                    <property name="halign">center</property>
+                    <property name="stack">data_stack</property>
+                    <property name="margin-top">3</property>
+                    <property name="margin-bottom">3</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStack" id="data_stack">
+                    <property name="vexpand">true</property>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="title">Mark Table</property>
+                        <property name="child">
+                          <object class="SysprofMarkTable">
+                            <binding name="session">
+                              <lookup name="session">TestTracks</lookup>
+                            </binding>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkStackPage">
+                        <property name="title">Mark Chart</property>
+                        <property name="child">
+                          <object class="SysprofMarkChart">
+                            <binding name="session">
+                              <lookup name="session">TestTracks</lookup>
+                            </binding>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>