diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 72425247d..95c616c2e 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -60,13 +60,11 @@ struct _CcInfoOverviewPanel
   CcListRow       *disk_row;
   CcListRow       *gnome_version_row;
   CcListRow       *graphics_row;
-  GtkListBox      *hardware_box;
   CcListRow       *hardware_model_row;
   GtkDialog       *hostname_editor;
   CcHostnameEntry *hostname_entry;
   CcListRow       *hostname_row;
   CcListRow       *memory_row;
-  GtkListBox      *os_box;
   GtkPicture      *os_logo;
   CcListRow       *os_name_row;
   CcListRow       *os_type_row;
@@ -939,13 +937,11 @@ cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, disk_row);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, gnome_version_row);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, graphics_row);
-  gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_box);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_model_row);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_editor);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_entry);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_row);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, memory_row);
-  gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_box);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_logo);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_name_row);
   gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_type_row);
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index 19d46675c..85fc413e0 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -3,165 +3,142 @@
   <!-- interface-requires gtk+ 3.0 -->
   <template class="CcInfoOverviewPanel" parent="CcPanel">
     <child>
-      <object class="GtkScrolledWindow">
-        <property name="min-content-height">480</property>
-        <property name="hscrollbar-policy">never</property>
+      <object class="AdwPreferencesPage">
         <child>
-          <object class="AdwClamp">
-            <property name="margin_top">32</property>
-            <property name="margin_bottom">32</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">12</property>
+          <object class="AdwPreferencesGroup">
+
             <child>
-              <object class="GtkBox">
-                <property name="valign">center</property>
-                <property name="spacing">30</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkPicture" id="os_logo">
-                    <property name="can-shrink">False</property>
-                    <property name="alternative-text" translatable="yes">System Logo</property>
-                  </object>
-                </child>
-
-                <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
-                    <style>
-                      <class name="boxed-list" />
-                    </style>
-
-                    <!-- Device name -->
-                    <child>
-                      <object class="CcListRow" id="hostname_row">
-                        <property name="title" translatable="yes">Device Name</property>
-                        <property name="secondary-label" bind-source="hostname_entry" bind-property="text" bind-flags="sync-create" />
-                        <property name="show-arrow">True</property>
-                      </object>
-                    </child>
-
-                  </object>
-                </child>
-
-                <child>
-                  <object class="GtkListBox" id="hardware_box">
-                    <property name="selection-mode">none</property>
-                    <style>
-                      <class name="boxed-list" />
-                    </style>
-
-                    <!-- Hardware Model -->
-                    <child>
-                      <object class="CcListRow" id="hardware_model_row">
-                        <property name="visible">False</property>
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Hardware Model</property>
-                      </object>
-                    </child>
-
-                    <!-- Memory -->
-                    <child>
-                      <object class="CcListRow" id="memory_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Memory</property>
-                      </object>
-                    </child>
-
-                    <!-- Processor -->
-                    <child>
-                      <object class="CcListRow" id="processor_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Processor</property>
-                      </object>
-                    </child>
-
-                    <!-- Graphics -->
-                    <child>
-                      <object class="CcListRow" id="graphics_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Graphics</property>
-                      </object>
-                    </child>
-
-                    <!-- Disk Capacity -->
-                    <child>
-                      <object class="CcListRow" id="disk_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Disk Capacity</property>
-                        <property name="secondary-label" translatable="yes">Calculating…</property>
-                      </object>
-                    </child>
-
-                  </object>
-                </child>
-
-                <child>
-                  <object class="GtkListBox" id="os_box">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
-                    <style>
-                      <class name="boxed-list" />
-                    </style>
-
-                    <!-- OS Name -->
-                    <child>
-                      <object class="CcListRow" id="os_name_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes"
-                                  comments="translators: this field contains the distro name and version">OS Name</property>
-                      </object>
-                    </child>
-
-                    <!-- OS Type -->
-                    <child>
-                      <object class="CcListRow" id="os_type_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">OS Type</property>
-                      </object>
-                    </child>
-
-                    <!-- GNOME Version -->
-                    <child>
-                      <object class="CcListRow" id="gnome_version_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">GNOME Version</property>
-                        <property name="secondary-label">3.0</property>
-                      </object>
-                    </child>
-
-                    <!-- Windowing System -->
-                    <child>
-                      <object class="CcListRow" id="windowing_system_row">
-                        <property name="activatable">False</property>
-                        <property name="title" translatable="yes">Windowing System</property>
-                      </object>
-                    </child>
-
-                    <!-- Virtualization -->
-                    <child>
-                      <object class="CcListRow" id="virtualization_row">
-                        <property name="visible">False</property>
-                        <property name="title" translatable="yes">Virtualization</property>
-                        <property name="activatable">False</property>
-                      </object>
-                    </child>
-
-                    <!-- Software Updates -->
-                    <child>
-                      <object class="CcListRow" id="software_updates_row">
-                        <property name="title" translatable="yes">Software Updates</property>
-                        <property name="icon-name">go-next-symbolic</property>
-                      </object>
-                    </child>
-
-                  </object>
-                </child>
-
+              <object class="GtkPicture" id="os_logo">
+                <property name="can-shrink">False</property>
+                <property name="alternative-text" translatable="yes">System Logo</property>
               </object>
             </child>
+
           </object>
         </child>
+
+        <child>
+          <object class="AdwPreferencesGroup">
+
+            <!-- Device name -->
+            <child>
+              <object class="CcListRow" id="hostname_row">
+                <property name="title" translatable="yes">Device Name</property>
+                <property name="secondary-label" bind-source="hostname_entry" bind-property="text" bind-flags="sync-create" />
+                <property name="show-arrow">True</property>
+                <signal name="activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
+              </object>
+            </child>
+
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwPreferencesGroup">
+
+            <!-- Hardware Model -->
+            <child>
+              <object class="CcListRow" id="hardware_model_row">
+                <property name="visible">False</property>
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Hardware Model</property>
+              </object>
+            </child>
+
+            <!-- Memory -->
+            <child>
+              <object class="CcListRow" id="memory_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Memory</property>
+              </object>
+            </child>
+
+            <!-- Processor -->
+            <child>
+              <object class="CcListRow" id="processor_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Processor</property>
+              </object>
+            </child>
+
+            <!-- Graphics -->
+            <child>
+              <object class="CcListRow" id="graphics_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Graphics</property>
+              </object>
+            </child>
+
+            <!-- Disk Capacity -->
+            <child>
+              <object class="CcListRow" id="disk_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Disk Capacity</property>
+                <property name="secondary-label" translatable="yes">Calculating…</property>
+              </object>
+            </child>
+
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwPreferencesGroup">
+
+            <!-- OS Name -->
+            <child>
+              <object class="CcListRow" id="os_name_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes"
+                          comments="translators: this field contains the distro name and version">OS Name</property>
+              </object>
+            </child>
+
+            <!-- OS Type -->
+            <child>
+              <object class="CcListRow" id="os_type_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">OS Type</property>
+              </object>
+            </child>
+
+            <!-- GNOME Version -->
+            <child>
+              <object class="CcListRow" id="gnome_version_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">GNOME Version</property>
+                <property name="secondary-label">3.0</property>
+              </object>
+            </child>
+
+            <!-- Windowing System -->
+            <child>
+              <object class="CcListRow" id="windowing_system_row">
+                <property name="activatable">False</property>
+                <property name="title" translatable="yes">Windowing System</property>
+              </object>
+            </child>
+
+            <!-- Virtualization -->
+            <child>
+              <object class="CcListRow" id="virtualization_row">
+                <property name="visible">False</property>
+                <property name="title" translatable="yes">Virtualization</property>
+                <property name="activatable">False</property>
+              </object>
+            </child>
+
+            <!-- Software Updates -->
+            <child>
+              <object class="CcListRow" id="software_updates_row">
+                <property name="title" translatable="yes">Software Updates</property>
+                <property name="icon-name">go-next-symbolic</property>
+                <signal name="activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
+              </object>
+            </child>
+
+          </object>
+        </child>
+
       </object>
     </child>
   </template>