panels: Minor adjustments for the new shellwip/gbsneto/dropthebomb

10 files changed, 1354 insertions, 1179 deletions

diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 5cbcdf118..32f122892 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -2314,17 +2314,6 @@ cc_color_panel_init (CcColorPanel *prefs)
                     G_CALLBACK (gcm_prefs_profiles_row_activated_cb),
                     prefs);
 
-  /* make larger by default */
-  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "scrolledwindow_assign"));
-  gtk_widget_set_size_request (widget, -1, 250);
-
-  /* force to be at least ~6 rows high */
-  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "scrolledwindow_devices"));
-  gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (widget),
-                                              300);
-
   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
                                                "toolbutton_device_default"));
   g_signal_connect (widget, "clicked",
@@ -2338,12 +2327,6 @@ cc_color_panel_init (CcColorPanel *prefs)
   g_signal_connect (widget, "clicked",
                     G_CALLBACK (gcm_prefs_calibrate_cb), prefs);
 
-  /* make devices toolbar sexy */
-  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-                                               "scrolledwindow_devices"));
-  context = gtk_widget_get_style_context (widget);
-  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
-
   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
                                                "toolbar_devices"));
   context = gtk_widget_get_style_context (widget);
@@ -2529,7 +2512,7 @@ cc_color_panel_init (CcColorPanel *prefs)
                     prefs);
   priv->list_box_size = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
-  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_devices"));
+  widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "frame_devices"));
   gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box));
   gtk_widget_show (GTK_WIDGET (priv->list_box));
 
diff --git a/panels/color/color.ui b/panels/color/color.ui
index 5680bf21d..b66a99122 100644
--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -752,246 +752,270 @@
       <action-widget response="0">button_assign_ok</action-widget>
     </action-widgets>
   </object>
-      <object class="GtkBox" id="dialog-vbox1">
+  <object class="GtkScrolledWindow" id="dialog-vbox1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">15</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
-        <property name="margin-start">6</property>
-        <property name="margin-end">6</property>
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
+
+        <!-- Stub boxes to make the content cover 1/3 of the screen -->
         <child>
-          <object class="GtkHBox" id="hbox3">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">9</property>
-            <child>
-              <object class="GtkLabel" id="label_intro">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Each device needs an up to date color profile to be color managed.</property>
-                <property name="wrap">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_padding">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLinkButton" id="linkbutton_help">
-                <property name="label" translatable="yes">Learn more</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Learn more about color management</property>
-                <property name="relief">none</property>
-                <property name="xalign">0.50999999046325684</property>
-                <property name="uri">help:gnome-help/color-whyimportant</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label_intro"/>
-                </accessibility>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
+            <property name="hexpand">True</property>
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="pack_type">end</property>
           </packing>
         </child>
+
+        <!-- Content -->
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <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="margin">24</property>
+            <property name="hexpand">True</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow_devices">
+              <object class="GtkBox" id="hbox3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">9</property>
+                <child>
+                  <object class="GtkLabel" id="label_intro">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Each device needs an up to date color profile to be color managed.</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkLabel" id="label_padding">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLinkButton" id="linkbutton_help">
+                    <property name="label" translatable="yes">Learn more</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_text" translatable="yes">Learn more about color management</property>
+                    <property name="relief">none</property>
+                    <property name="xalign">0.50999999046325684</property>
+                    <property name="uri">help:gnome-help/color-whyimportant</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="label_intro"/>
+                    </accessibility>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolbar" id="toolbar_devices">
-                <property name="can_focus">True</property>
-                <property name="show_arrow">False</property>
-                <property name="icon_size">1</property>
+              <object class="GtkBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkToolItem" id="left_button_group">
+                  <object class="GtkFrame" id="frame_devices">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToolbar" id="toolbar_devices">
+                    <property name="can_focus">True</property>
+                    <property name="show_arrow">False</property>
+                    <property name="icon_size">1</property>
                     <child>
-                      <object class="GtkBox" id="left_button_group_box">
+                      <object class="GtkToolItem" id="left_button_group">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkButton" id="toolbutton_device_default">
-                            <property name="label" translatable="yes">_Set for all users</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="toolbutton_device_enable">
-                            <property name="label" translatable="yes">_Enable</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Set this profile for all users on this computer</property>
-                            <property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
-                            <property name="use_underline">True</property>
+                          <object class="GtkBox" id="left_button_group_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_device_default">
+                                <property name="label" translatable="yes">_Set for all users</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_device_enable">
+                                <property name="label" translatable="yes">_Enable</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_markup" translatable="yes">Set this profile for all users on this computer</property>
+                                <property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">True</property>
+                      </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolItem" id="right_button_group">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkBox" id="right_button_group_box">
+                      <object class="GtkToolItem" id="right_button_group">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkButton" id="toolbutton_profile_add">
-                            <property name="label" translatable="yes">_Add profile</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="toolbutton_device_calibrate">
-                            <property name="label" translatable="yes">_Calibrate…</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_text" translatable="yes">Calibrate the device</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="toolbutton_profile_remove">
-                            <property name="label" translatable="yes">_Remove profile</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="toolbutton_profile_view">
-                            <property name="label" translatable="yes">_View details</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
+                          <object class="GtkBox" id="right_button_group_box">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_profile_add">
+                                <property name="label" translatable="yes">_Add profile</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_device_calibrate">
+                                <property name="label" translatable="yes">_Calibrate…</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_text" translatable="yes">Calibrate the device</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_profile_remove">
+                                <property name="label" translatable="yes">_Remove profile</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="toolbutton_profile_view">
+                                <property name="label" translatable="yes">_View details</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
                     </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="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="label_no_devices">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Unable to detect any devices that can be color managed</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_no_devices">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Unable to detect any devices that can be color managed</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
+    </child>
+  </object>
   <object class="GtkListStore" id="liststore_assign">
     <columns>
       <!-- column-name title -->
diff --git a/panels/notifications/notifications.ui b/panels/notifications/notifications.ui
index d86f19f05..13ab3d51d 100644
--- a/panels/notifications/notifications.ui
+++ b/panels/notifications/notifications.ui
@@ -12,185 +12,211 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkBox" id="ccnotify-main-box">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_start">134</property>
-            <property name="margin_end">134</property>
-            <property name="margin_top">22</property>
-            <property name="margin_bottom">22</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
+
+            <!-- Stub boxes to make the content cover 1/3 of the screen -->
             <child>
-              <object class="GtkFrame" id="ccnotify-switchbox-frame">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_bottom">12</property>
                 <property name="hexpand">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+
+            <!-- Content -->
+            <child>
+              <object class="GtkBox" id="ccnotify-main-box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin">24</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
+                <property name="hexpand">True</property>
                 <child>
-                  <object class="GtkListBox" id="ccnotify-switch-listbox">
+                  <object class="GtkFrame" id="ccnotify-switchbox-frame">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_bottom">12</property>
                     <property name="hexpand">True</property>
-                    <property name="selection_mode">none</property>
-                    <property name="activate_on_single_click">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkListBoxRow" id="ccnotify-listboxrow-banners">
+                      <object class="GtkListBox" id="ccnotify-switch-listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="activatable">False</property>
-                        <property name="selectable">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="selection_mode">none</property>
+                        <property name="activate_on_single_click">False</property>
                         <child>
-                          <object class="GtkBox" id="ccnotify-box-banners">
+                          <object class="GtkListBoxRow" id="ccnotify-listboxrow-banners">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can_focus">True</property>
+                            <property name="activatable">False</property>
+                            <property name="selectable">False</property>
                             <child>
-                              <object class="GtkLabel" id="ccnotify-label-banners">
-                                <property name="height_request">32</property>
+                              <object class="GtkBox" id="ccnotify-box-banners">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_top">8</property>
-                                <property name="margin_bottom">8</property>
-                                <property name="hexpand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Notification _Popups</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">ccnotify-switch-banners</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="ccnotify-switch-banners">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="halign">end</property>
                                 <property name="valign">center</property>
-                                <property name="margin_end">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="ccnotify-label-banners">
+                                    <property name="height_request">32</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="margin_start">12</property>
+                                    <property name="margin_top">8</property>
+                                    <property name="margin_bottom">8</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Notification _Popups</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">ccnotify-switch-banners</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="ccnotify-switch-banners">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin_end">12</property>
+                                  </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>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkListBoxRow" id="ccnotify-listboxrow-screen">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="activatable">False</property>
-                        <property name="selectable">False</property>
                         <child>
-                          <object class="GtkBox" id="ccnotify-box-screen">
+                          <object class="GtkListBoxRow" id="ccnotify-listboxrow-screen">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
+                            <property name="can_focus">True</property>
+                            <property name="activatable">False</property>
+                            <property name="selectable">False</property>
                             <child>
-                              <object class="GtkLabel" id="ccnotify-label-lock-screen">
-                                <property name="height_request">32</property>
+                              <object class="GtkBox" id="ccnotify-box-screen">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_top">8</property>
-                                <property name="margin_bottom">8</property>
-                                <property name="hexpand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Lock Screen Notifications</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">ccnotify-switch-lock-screen</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="ccnotify-switch-lock-screen">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="halign">end</property>
                                 <property name="valign">center</property>
-                                <property name="margin_end">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="ccnotify-label-lock-screen">
+                                    <property name="height_request">32</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="margin_start">12</property>
+                                    <property name="margin_top">8</property>
+                                    <property name="margin_bottom">8</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Lock Screen Notifications</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">ccnotify-switch-lock-screen</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="ccnotify-switch-lock-screen">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin_end">12</property>
+                                  </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>
                       </object>
                     </child>
+                    <child type="label_item">
+                      <placeholder/>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
-                <child type="label_item">
-                  <placeholder/>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="margin_start">3</property>
+                    <property name="label" translatable="yes" comments="List of applications.">Applications</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </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">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="margin_start">3</property>
-                <property name="label" translatable="yes" comments="List of applications.">Applications</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="ccnotify-app-frame">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkListBox" id="ccnotify-app-listbox">
+                  <object class="GtkFrame" id="ccnotify-app-frame">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="selection_mode">none</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkListBox" id="ccnotify-app-listbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="selection_mode">none</property>
+                      </object>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
-                </child>
-                <child>
-                  <placeholder/>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index db4e69a26..0558a43f0 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1683,8 +1683,6 @@ add_power_saving_section (CcPowerPanel *self)
   g_free (s);
   gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_margin_start (label, 56);
-  gtk_widget_set_margin_end (label, 56);
   gtk_widget_set_margin_bottom (label, 6);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
   gtk_widget_show (label);
@@ -1706,8 +1704,6 @@ add_power_saving_section (CcPowerPanel *self)
 
   box = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
-  gtk_widget_set_margin_start (box, 50);
-  gtk_widget_set_margin_end (box, 50);
   gtk_widget_set_margin_bottom (box, 24);
   gtk_widget_show (box);
   gtk_container_add (GTK_CONTAINER (box), widget);
@@ -2185,8 +2181,6 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
   g_free (s);
   gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_margin_start (label, 56);
-  gtk_widget_set_margin_end (label, 50);
   gtk_widget_set_margin_bottom (label, 6);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
   gtk_widget_show (label);
@@ -2210,8 +2204,6 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
 
   box = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
-  gtk_widget_set_margin_start (box, 50);
-  gtk_widget_set_margin_end (box, 50);
   gtk_widget_set_margin_bottom (box, 24);
   gtk_widget_show (box);
   gtk_container_add (GTK_CONTAINER (box), widget);
@@ -2357,9 +2349,6 @@ add_battery_section (CcPowerPanel *self)
   vbox = WID (priv->builder, "vbox_power");
 
   priv->battery_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_widget_set_margin_start (box, 50);
-  gtk_widget_set_margin_end (box, 50);
-  gtk_widget_set_margin_bottom (box, 6);
   gtk_widget_set_margin_bottom (box, 24);
   gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
 
@@ -2411,8 +2400,6 @@ add_device_section (CcPowerPanel *self)
   vbox = WID (priv->builder, "vbox_power");
 
   priv->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_widget_set_margin_start (box, 50);
-  gtk_widget_set_margin_end (box, 50);
   gtk_widget_set_margin_top (box, 6);
   gtk_widget_set_margin_bottom (box, 24);
   gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
@@ -2552,7 +2539,7 @@ cc_power_panel_init (CcPowerPanel *self)
   }
   up_client_changed (priv->up_client, NULL, self);
 
-  widget = WID (priv->builder, "vbox_power");
+  widget = WID (priv->builder, "main_box");
   box = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
diff --git a/panels/power/power.ui b/panels/power/power.ui
index 3619df60d..3f0a108ec 100644
--- a/panels/power/power.ui
+++ b/panels/power/power.ui
@@ -101,14 +101,42 @@
       <column type="gint"/>
     </columns>
   </object>
+  <object class="GtkBox" id="main_box">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+
+    <!-- Stub boxes to make the content cover 1/3 of the screen -->
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+      </packing>
+    </child>
+
+    <!-- Content -->
+    <child>
       <object class="GtkBox" id="vbox_power">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">12</property>
-        <property name="border_width">12</property>
+        <property name="margin">24</property>
         <property name="orientation">vertical</property>
         <property name="spacing">3</property>
+        <property name="hexpand">True</property>
       </object>
+    </child>
+  </object>
 
   <object class="GtkDialog" id="automatic_suspend_dialog">
     <property name="can_focus">False</property>
diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
index 14bdc1b97..e9eeb019b 100644
--- a/panels/privacy/privacy.ui
+++ b/panels/privacy/privacy.ui
@@ -889,27 +889,48 @@ All the information we collect is made anonymous, and we will never share your d
       </object>
     </child>
   </object>
-      <object class="GtkBox" id="privacy_vbox">
+  <object class="GtkBox" id="privacy_vbox">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+
+    <!-- Stub boxes to make the content cover 1/3 of the screen -->
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+      </packing>
+    </child>
+
+    <!-- Content -->
+    <child>
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_start">134</property>
-        <property name="margin_end">134</property>
-        <property name="margin_top">22</property>
-        <property name="margin_bottom">22</property>
         <property name="orientation">vertical</property>
+        <property name="margin">24</property>
+        <property name="hexpand">True</property>
         <child>
           <object class="GtkFrame" id="frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="shadow_type">in</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
+     </child>
+   </object>
 
   <object class="GtkDialog" id="abrt_dialog">
     <property name="can_focus">False</property>
diff --git a/panels/region/region.ui b/panels/region/region.ui
index b28504f8e..3dbd9adb4 100644
--- a/panels/region/region.ui
+++ b/panels/region/region.ui
@@ -1,18 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-      <object class="GtkBox" id="vbox_region">
+  <object class="GtkBox" id="vbox_region">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+
+    <!-- Stub boxes to make the content cover 1/3 of the screen -->
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+      </packing>
+    </child>
+
+    <!-- Content -->
+    <child>
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="margin">24</property>
+        <property name="spacing">12</property>
+        <property name="hexpand">True</property>
         <child>
           <object class="GtkFrame" id="language_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_start">134</property>
-            <property name="margin_end">134</property>
-            <property name="margin_top">24</property>
-            <property name="margin_bottom">32</property>
+            <property name="margin_bottom">12</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkListBox" id="language_list">
@@ -186,10 +212,8 @@
           <object class="GtkBox" id="input_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_start">134</property>
-            <property name="margin_end">134</property>
-            <property name="margin_bottom">24</property>
             <property name="orientation">vertical</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="GtkBox" id="input_heading_row">
                 <property name="visible">True</property>
@@ -502,6 +526,7 @@
           <object class="GtkLabel" id="login-label">
            <property name="valign">end</property>
            <property name="vexpand">True</property>
+           <property name="hexpand">True</property>
            <property name="label" translatable="yes">Login settings are used by all users when logging into the system</property>
            <property name="margin_bottom">12</property>
            <style>
@@ -510,4 +535,6 @@
           </object>
         </child>
       </object>
+    </child>
+  </object>
 </interface>
diff --git a/panels/search/search.ui b/panels/search/search.ui
index 8e72e36d2..74dfbb308 100644
--- a/panels/search/search.ui
+++ b/panels/search/search.ui
@@ -6,114 +6,140 @@
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="margin-start">134</property>
-        <property name="margin-end">134</property>
-        <property name="margin-top">22</property>
-        <property name="margin-bottom">22</property>
+        <property name="can_focus">False</property>
+
+        <!-- Stub boxes to make the content cover 1/3 of the screen -->
         <child>
-          <object class="GtkFrame" id="search_frame">
+          <object class="GtkBox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
+
         <child>
-          <object class="GtkToolbar" id="search_toolbar">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="toolbar_style">icons</property>
-            <property name="show_arrow">False</property>
-            <property name="icon_size">1</property>
-            <style>
-              <class name="inline-toolbar"/>
-            </style>
+            <property name="hexpand">True</property>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+
+        <!-- Content -->
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="margin">24</property>
+            <property name="hexpand">True</property>
+            <child>
+              <object class="GtkFrame" id="search_frame">
+                <property name="visible">True</property>
+              </object>
+            </child>
             <child>
-              <object class="GtkToolItem" id="up_down_item">
+              <object class="GtkToolbar" id="search_toolbar">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="toolbar_style">icons</property>
+                <property name="show_arrow">False</property>
+                <property name="icon_size">1</property>
+                <style>
+                  <class name="inline-toolbar"/>
+                </style>
                 <child>
-                  <object class="GtkBox" id="up_down_box">
+                  <object class="GtkToolItem" id="up_down_item">
                     <property name="visible">True</property>
                     <child>
-                       <object class="GtkButton" id="up_button">
-                         <property name="visible">True</property>
-                         <child internal-child="accessible">
-                           <object class="AtkObject" id="up_button_a11y">
-                             <property name="accessible-name" translatable="yes">Move Up</property>
+                      <object class="GtkBox" id="up_down_box">
+                        <property name="visible">True</property>
+                        <child>
+                           <object class="GtkButton" id="up_button">
+                             <property name="visible">True</property>
+                             <child internal-child="accessible">
+                               <object class="AtkObject" id="up_button_a11y">
+                                 <property name="accessible-name" translatable="yes">Move Up</property>
+                               </object>
+                             </child>
+                             <child>
+                                <object class="GtkImage" id="up_image">
+                                  <property name="visible">True</property>
+                                  <property name="icon-name">go-up-symbolic</property>
+                                  <property name="icon-size">1</property>
+                                </object>
+                             </child>
                            </object>
-                         </child>
-                         <child>
-                            <object class="GtkImage" id="up_image">
-                              <property name="visible">True</property>
-                              <property name="icon-name">go-up-symbolic</property>
-                              <property name="icon-size">1</property>
-                            </object>
-                         </child>
-                       </object>
-                    </child>
-                    <child>
-                       <object class="GtkButton" id="down_button">
-                         <property name="visible">True</property>
-                         <child internal-child="accessible">
-                           <object class="AtkObject" id="down_button_a11y">
-                             <property name="accessible-name" translatable="yes">Move Down</property>
+                        </child>
+                        <child>
+                           <object class="GtkButton" id="down_button">
+                             <property name="visible">True</property>
+                             <child internal-child="accessible">
+                               <object class="AtkObject" id="down_button_a11y">
+                                 <property name="accessible-name" translatable="yes">Move Down</property>
+                               </object>
+                             </child>
+                             <child>
+                                <object class="GtkImage" id="down_image">
+                                  <property name="visible">True</property>
+                                  <property name="icon-name">go-down-symbolic</property>
+                                  <property name="icon-size">1</property>
+                                </object>
+                             </child>
                            </object>
-                         </child>
-                         <child>
-                            <object class="GtkImage" id="down_image">
-                              <property name="visible">True</property>
-                              <property name="icon-name">go-down-symbolic</property>
-                              <property name="icon-size">1</property>
-                            </object>
-                         </child>
-                       </object>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="sep1">
-                <property name="visible">True</property>
-                <property name="draw">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="settings_item">
-                <property name="visible">True</property>
                 <child>
-                  <object class="GtkBox" id="i_s_ud_box">
+                  <object class="GtkSeparatorToolItem" id="sep1">
+                    <property name="visible">True</property>
+                    <property name="draw">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolItem" id="settings_item">
                     <property name="visible">True</property>
                     <child>
-                       <object class="GtkButton" id="settings_button">
-                         <property name="visible">True</property>
-                         <child internal-child="accessible">
-                           <object class="AtkObject" id="settings_button_a11y">
-                             <property name="accessible-name" translatable="yes">Preferences</property>
+                      <object class="GtkBox" id="i_s_ud_box">
+                        <property name="visible">True</property>
+                        <child>
+                           <object class="GtkButton" id="settings_button">
+                             <property name="visible">True</property>
+                             <child internal-child="accessible">
+                               <object class="AtkObject" id="settings_button_a11y">
+                                 <property name="accessible-name" translatable="yes">Preferences</property>
+                               </object>
+                             </child>
+                             <child>
+                                <object class="GtkImage" id="settings_image">
+                                  <property name="visible">True</property>
+                                  <property name="icon-name">emblem-system-symbolic</property>
+                                  <property name="icon-size">1</property>
+                                </object>
+                             </child>
                            </object>
-                         </child>
-                         <child>
-                            <object class="GtkImage" id="settings_image">
-                              <property name="visible">True</property>
-                              <property name="icon-name">emblem-system-symbolic</property>
-                              <property name="icon-size">1</property>
-                            </object>
-                         </child>
-                       </object>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </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>
+       </child>
       </object>
-   </child>
+    </child>
  </object>
 </interface>
diff --git a/panels/sharing/sharing.ui b/panels/sharing/sharing.ui
index 67441720a..ea4701d46 100644
--- a/panels/sharing/sharing.ui
+++ b/panels/sharing/sharing.ui
@@ -2,13 +2,37 @@
 <!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-      <object class="GtkBox" id="sharing-panel">
+  <object class="GtkBox"  id="sharing-panel">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+
+    <!-- Stub boxes to make the content cover 1/3 of the screen -->
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_start">134</property>
-        <property name="margin_end">134</property>
-        <property name="margin_top">22</property>
-        <property name="margin_bottom">22</property>
+        <property name="hexpand">True</property>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+      </packing>
+    </child>
+
+    <!-- Content -->
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin">24</property>
+        <property name="hexpand">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="label6">
@@ -239,6 +263,8 @@
           </packing>
         </child>
       </object>
+    </child>
+  </object>
   <object class="GtkDialog" id="personal-file-sharing-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index ab0c0c4a7..e40346149 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -41,73 +41,70 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkBox" id="universal_access_content">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_start">50</property>
-                <property name="margin_end">50</property>
-                <property name="margin_top">24</property>
-                <property name="margin_bottom">24</property>
-                <property name="orientation">vertical</property>
+                <property name="hexpand">True</property>
+
+                <!-- Stub boxes to make the content cover 1/3 of the screen -->
                 <child>
-                  <object class="GtkBox" id="section_status">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_bottom">24</property>
-                    <child>
-                      <object class="GtkLabel" id="heading_status">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Always Show Universal Access Menu</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">switch_status</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="switch_status">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="hexpand">True</property>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="pack_type">end</property>
                   </packing>
                 </child>
+
+                <!-- Content -->
                 <child>
-                  <object class="GtkBox" id="section_seeing">
+                  <object class="GtkBox" id="universal_access_content">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_bottom">24</property>
+                    <property name="margin">24</property>
                     <property name="orientation">vertical</property>
+                    <property name="hexpand">True</property>
                     <child>
-                      <object class="GtkLabel" id="heading_seeing">
+                      <object class="GtkBox" id="section_status">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_start">6</property>
-                        <property name="margin_end">6</property>
-                        <property name="margin_bottom">6</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Seeing</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation target="list_seeing" type="label-for"/>
-                        </accessibility>
+                        <property name="margin_bottom">24</property>
+                        <child>
+                          <object class="GtkLabel" id="heading_status">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Always Show Universal Access Menu</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">switch_status</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="switch_status">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -116,302 +113,337 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame_seeing">
+                      <object class="GtkBox" id="section_seeing">
                         <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="margin_bottom">24</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkListBox" id="list_seeing">
+                          <object class="GtkLabel" id="heading_seeing">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="selection-mode">none</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_start">6</property>
+                            <property name="margin_end">6</property>
+                            <property name="margin_bottom">6</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Seeing</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                             <accessibility>
-                              <relation target="heading_seeing" type="labelled-by"/>
+                              <relation target="list_seeing" type="label-for"/>
                             </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame_seeing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkListBoxRow" id="row_highcontrast">
+                              <object class="GtkListBox" id="list_seeing">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="selectable">False</property>
-                                <property name="activatable">False</property>
+                                <property name="selection-mode">none</property>
+                                <accessibility>
+                                  <relation target="heading_seeing" type="labelled-by"/>
+                                </accessibility>
                                 <child>
-                                  <object class="GtkBox" id="box_highcontrast">
+                                  <object class="GtkListBoxRow" id="row_highcontrast">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="selectable">False</property>
+                                    <property name="activatable">False</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_highcontrast">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_High Contrast</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">value_highcontrast</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSwitch" id="value_highcontrast">
+                                      <object class="GtkBox" id="box_highcontrast">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_highcontrast">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_High Contrast</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">value_highcontrast</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSwitch" id="value_highcontrast">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_large_text">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="selectable">False</property>
-                                <property name="activatable">False</property>
                                 <child>
-                                  <object class="GtkBox" id="box_large_text">
+                                  <object class="GtkListBoxRow" id="row_large_text">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="selectable">False</property>
+                                    <property name="activatable">False</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_large_text">
+                                      <object class="GtkBox" id="box_large_text">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Large Text</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">value_large_text</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSwitch" id="value_large_text">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_large_text">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Large Text</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">value_large_text</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSwitch" id="value_large_text">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_cursor_size">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_cursor_size">
+                                  <object class="GtkListBoxRow" id="row_cursor_size">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkLabel" id="heading_cursor_size">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="label" translatable="yes">C_ursor Size</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="value_cursor_size">
+                                      <object class="GtkBox" id="box_cursor_size">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="label">24 pixels</property>
-                                        <property name="xalign">1</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_cursor_size">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="label" translatable="yes">C_ursor Size</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="xalign">0</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_cursor_size">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="label">24 pixels</property>
+                                            <property name="xalign">1</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_zoom">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_zoom">
+                                  <object class="GtkListBoxRow" id="row_zoom">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_zoom">
+                                      <object class="GtkBox" id="box_zoom">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Zoom</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_zoom">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_zoom">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Zoom</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_zoom">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_screen_reader">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_screen_reader">
+                                  <object class="GtkListBoxRow" id="row_screen_reader">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_screen_reader">
+                                      <object class="GtkBox" id="box_screen_reader">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Screen _Reader</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_screen_reader">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_screen_reader">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Screen _Reader</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_screen_reader">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_sound_keys">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_sound_keys">
+                                  <object class="GtkListBoxRow" id="row_sound_keys">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_sound_keys">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Sound Keys</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_sound_keys">
+                                      <object class="GtkBox" id="box_sound_keys">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_sound_keys">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Sound Keys</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_sound_keys">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
                               </object>
                             </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
                           </object>
-                        </child>
-                        <child type="label_item">
-                          <placeholder/>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -420,568 +452,563 @@
                         <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>
-                <child>
-                  <object class="GtkBox" id="section_hearing">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_bottom">24</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel" id="heading_hearing">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">6</property>
-                        <property name="margin_end">6</property>
-                        <property name="margin_bottom">6</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Hearing</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation target="list_hearing" type="label-for"/>
-                        </accessibility>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
                     <child>
-                      <object class="GtkFrame" id="frame_hearing">
+                      <object class="GtkBox" id="section_hearing">
                         <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="margin_bottom">24</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkListBox" id="list_hearing">
+                          <object class="GtkLabel" id="heading_hearing">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="selection-mode">none</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_start">6</property>
+                            <property name="margin_end">6</property>
+                            <property name="margin_bottom">6</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Hearing</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                             <accessibility>
-                              <relation target="heading_hearing" type="labelled-by"/>
+                              <relation target="list_hearing" type="label-for"/>
                             </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame_hearing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkListBoxRow" id="row_visual_alerts">
+                              <object class="GtkListBox" id="list_hearing">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="selection-mode">none</property>
+                                <accessibility>
+                                  <relation target="heading_hearing" type="labelled-by"/>
+                                </accessibility>
                                 <child>
-                                  <object class="GtkBox" id="box_visual_alerts">
+                                  <object class="GtkListBoxRow" id="row_visual_alerts">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_visual_alerts">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Visual Alerts</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_visual_alerts">
+                                      <object class="GtkBox" id="box_visual_alerts">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_visual_alerts">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Visual Alerts</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_visual_alerts">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
                               </object>
                             </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
-                        <child type="label_item">
-                          <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">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="section_typing">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_bottom">24</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel" id="heading_typing">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">6</property>
-                        <property name="margin_end">6</property>
-                        <property name="margin_bottom">6</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Typing</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation target="list_typing" type="label-for"/>
-                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame_typing">
+                      <object class="GtkBox" id="section_typing">
                         <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="margin_bottom">24</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkListBox" id="list_typing">
+                          <object class="GtkLabel" id="heading_typing">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="selection-mode">none</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_start">6</property>
+                            <property name="margin_end">6</property>
+                            <property name="margin_bottom">6</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Typing</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                             <accessibility>
-                              <relation target="heading_typing" type="labelled-by"/>
+                              <relation target="list_typing" type="label-for"/>
                             </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame_typing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkListBoxRow" id="row_screen_keyboard">
+                              <object class="GtkListBox" id="list_typing">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="selectable">False</property>
-                                <property name="activatable">False</property>
+                                <property name="selection-mode">none</property>
+                                <accessibility>
+                                  <relation target="heading_typing" type="labelled-by"/>
+                                </accessibility>
                                 <child>
-                                  <object class="GtkBox" id="box_screen_keyboard">
+                                  <object class="GtkListBoxRow" id="row_screen_keyboard">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="selectable">False</property>
+                                    <property name="activatable">False</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_screen_keyboard">
+                                      <object class="GtkBox" id="box_screen_keyboard">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Screen _Keyboard</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">screen_keyboard_switch</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSwitch" id="screen_keyboard_switch">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_screen_keyboard">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Screen _Keyboard</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">screen_keyboard_switch</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSwitch" id="screen_keyboard_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_repeat_keys">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_repeat_keys">
+                                  <object class="GtkListBoxRow" id="row_repeat_keys">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_repeat_keys">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">R_epeat Keys</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_repeat_keys">
+                                      <object class="GtkBox" id="box_repeat_keys">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_repeat_keys">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">R_epeat Keys</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_repeat_keys">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_cursor_blinking">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_row_cursor_blinking">
+                                  <object class="GtkListBoxRow" id="row_cursor_blinking">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_row_cursor_blinking">
+                                      <object class="GtkBox" id="box_row_cursor_blinking">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Cursor _Blinking</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_row_cursor_blinking">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_row_cursor_blinking">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Cursor _Blinking</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_row_cursor_blinking">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_accessx">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_accessx">
+                                  <object class="GtkListBoxRow" id="row_accessx">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_accessx">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Typing Assist (AccessX)</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_accessx">
+                                      <object class="GtkBox" id="box_accessx">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_accessx">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Typing Assist (AccessX)</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_accessx">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
                               </object>
                             </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
-                        <child type="label_item">
-                          <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">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="section_pointing">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkLabel" id="heading_pointing">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_start">6</property>
-                        <property name="margin_end">6</property>
-                        <property name="margin_bottom">6</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Pointing &amp; Clicking</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation target="list_pointing" type="label-for"/>
-                        </accessibility>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame_pointing">
+                      <object class="GtkBox" id="section_pointing">
                         <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>
                         <child>
-                          <object class="GtkListBox" id="list_pointing">
+                          <object class="GtkLabel" id="heading_pointing">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="selection-mode">none</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_start">6</property>
+                            <property name="margin_end">6</property>
+                            <property name="margin_bottom">6</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Pointing &amp; Clicking</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                             <accessibility>
-                              <relation target="heading_pointing" type="labelled-by"/>
+                              <relation target="list_pointing" type="label-for"/>
                             </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame_pointing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkListBoxRow" id="row_mouse_keys">
+                              <object class="GtkListBox" id="list_pointing">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="selectable">False</property>
-                                <property name="activatable">False</property>
+                                <property name="selection-mode">none</property>
+                                <accessibility>
+                                  <relation target="heading_pointing" type="labelled-by"/>
+                                </accessibility>
                                 <child>
-                                  <object class="GtkBox" id="box_mouse_keys">
+                                  <object class="GtkListBoxRow" id="row_mouse_keys">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="selectable">False</property>
+                                    <property name="activatable">False</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_mouse_keys">
+                                      <object class="GtkBox" id="box_mouse_keys">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Mouse Keys</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">mouse_keys_switch</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSwitch" id="mouse_keys_switch">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_mouse_keys">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Mouse Keys</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">mouse_keys_switch</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkSwitch" id="mouse_keys_switch">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_click_assist">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_click_assist">
+                                  <object class="GtkListBoxRow" id="row_click_assist">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_click_assist">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Click Assist</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="value_click_assist">
+                                      <object class="GtkBox" id="box_click_assist">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Off</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_click_assist">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Click Assist</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="value_click_assist">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Off</property>
+                                          </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>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBoxRow" id="row_double_click_delay">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <child>
-                                  <object class="GtkBox" id="box_double_click_delay">
+                                  <object class="GtkListBoxRow" id="row_double_click_delay">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="heading_double_click_delay">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">_Double-Click Delay</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkScale" id="scale_double_click_delay">
+                                      <object class="GtkBox" id="box_double_click_delay">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="adjustment">double-click-delay-adjustment</property>
-                                        <property name="draw_value">False</property>
-                                        <property name="margin_start">20</property>
-                                        <property name="margin_end">20</property>
-                                        <property name="margin_top">6</property>
-                                        <property name="margin_bottom">6</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject" id="double_click_scale-atkobject">
-                                            <property name="AtkObject::accessible-description" translatable="yes">Double-Click Delay</property>
+                                        <child>
+                                          <object class="GtkLabel" id="heading_double_click_delay">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">_Double-Click Delay</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkScale" id="scale_double_click_delay">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="adjustment">double-click-delay-adjustment</property>
+                                            <property name="draw_value">False</property>
+                                            <property name="margin_start">20</property>
+                                            <property name="margin_end">20</property>
+                                            <property name="margin_top">6</property>
+                                            <property name="margin_bottom">6</property>
+                                            <child internal-child="accessible">
+                                              <object class="AtkObject" id="double_click_scale-atkobject">
+                                                <property name="AtkObject::accessible-description" translatable="yes">Double-Click Delay</property>
+                                              </object>
+                                            </child>
                                           </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
                           </object>
-                        </child>
-                        <child type="label_item">
-                          <placeholder/>
+                          <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>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">4</property>
-                  </packing>
                 </child>
               </object>
             </child>