diff --git a/malcontent-control/main.ui b/malcontent-control/main.ui
index 22c12b1..831e5d6 100644
--- a/malcontent-control/main.ui
+++ b/malcontent-control/main.ui
@@ -41,102 +41,114 @@
         </child>
         <child>
           <object class="GtkStack" id="main_stack">
+
             <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="MctUserSelector" id="user_selector">
-                    <property name="user-manager">user_manager</property>
-                    <property name="show-administrators">False</property>
-                    <accessibility>
-                      <relation name="controls">user_controls</relation>
-                    </accessibility>
-                  </object>
-                </child>
-                <child>
-                  <object class="MctUserControls" id="user_controls">
-                    <!-- Content is set in code; this string is just a placeholder -->
-                    <property name="description">It’s recommended that restrictions are set as part of an ongoing conversation with $name. Read guidance on what to consider.</property>
-                    <property name="height-request">270</property>
-                    <property name="dbus-connection">dbus_connection</property>
-                    <property name="vexpand">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">controls</property>
-              </packing>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="MctUserSelector" id="user_selector">
+                        <property name="user-manager">user_manager</property>
+                        <property name="show-administrators">False</property>
+                        <accessibility>
+                          <relation name="controls">user_controls</relation>
+                        </accessibility>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="MctUserControls" id="user_controls">
+                        <!-- Content is set in code; this string is just a placeholder -->
+                        <property name="description">It’s recommended that restrictions are set as part of an ongoing conversation with $name. Read guidance on what to consider.</property>
+                        <property name="height-request">270</property>
+                        <property name="dbus-connection">dbus_connection</property>
+                        <property name="vexpand">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
 
             <child>
-              <object class="AdwStatusPage">
-                <property name="title" translatable="yes">Permission Required</property>
-                <property name="description" translatable="yes">Permission is required to view and change user parental controls settings.</property>
-                <property name="icon-name">org.freedesktop.MalcontentControl</property>
-                <child>
-                  <object class="GtkLockButton" id="lock_button">
-                    <property name="halign">center</property>
-                    <property name="can-default">True</property>
-                    <property name="has-default">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">unlock</property>
-              </packing>
+                <property name="child">
+                  <object class="AdwStatusPage">
+                    <property name="title" translatable="yes">Permission Required</property>
+                    <property name="description" translatable="yes">Permission is required to view and change user parental controls settings.</property>
+                    <property name="icon-name">org.freedesktop.MalcontentControl</property>
+                    <child>
+                      <object class="GtkLockButton" id="lock_button">
+                        <property name="halign">center</property>
+                        <property name="can-default">True</property>
+                        <property name="has-default">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
             </child>
 
             <child>
-              <object class="AdwStatusPage">
-                <property name="icon-name">system-users-symbolic</property>
-                <property name="title" translatable="yes">No Standard User Accounts</property>
-                <property name="description" translatable="yes">Parental controls can only be applied to standard user
-    accounts. These can be created in the user settings.</property>
-                <child>
-                  <object class="GtkButton" id="user_accounts_panel_button">
-                    <property name="label" translatable="yes">_User Settings</property>
-                    <property name="halign">center</property>
-                    <property name="can-default">True</property>
-                    <property name="has-default">True</property>
-                    <property name="use-underline">True</property>
-                    <style>
-                      <class name="suggested-action"/>
-                    </style>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name">no-other-users</property>
-              </packing>
-            </child>
-
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <child type="center">
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Loading…</property>
-                    <attributes>
-                      <attribute name="scale" value="1.4"/>
-                    </attributes>
+                <property name="child">
+                  <object class="AdwStatusPage">
+                    <property name="icon-name">system-users-symbolic</property>
+                    <property name="title" translatable="yes">No Standard User Accounts</property>
+                    <property name="description" translatable="yes">Parental controls can only be applied to standard user
+        accounts. These can be created in the user settings.</property>
+                    <child>
+                      <object class="GtkButton" id="user_accounts_panel_button">
+                        <property name="label" translatable="yes">_User Settings</property>
+                        <property name="halign">center</property>
+                        <property name="can-default">True</property>
+                        <property name="has-default">True</property>
+                        <property name="use-underline">True</property>
+                        <style>
+                          <class name="suggested-action"/>
+                        </style>
+                      </object>
+                    </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">loading</property>
-              </packing>
             </child>
 
             <child>
-              <object class="AdwStatusPage" id="error_page">
-                <property name="icon-name">dialog-error-symbolic</property>
+              <object class="GtkStackPage">
+                <property name="name">loading</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <child type="center">
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Loading…</property>
+                        <attributes>
+                          <attribute name="scale" value="1.4"/>
+                        </attributes>
+                      </object>
+                    </child>
+                  </object>
+                </property>
               </object>
-              <packing>
-                <property name="name">error</property>
-              </packing>
             </child>
+
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">error</property>
+                <property name="child">
+                  <object class="AdwStatusPage" id="error_page">
+                    <property name="icon-name">dialog-error-symbolic</property>
+                  </object>
+                </property>
+              </object>
+            </child>
+
           </object>
         </child>
       </object>