diff --git a/src/components/base/cardEntry.rs b/src/components/base/cardEntry.rs
index 016e390..4ecb67e 100644
--- a/src/components/base/cardEntry.rs
+++ b/src/components/base/cardEntry.rs
@@ -59,18 +59,6 @@ impl CardEntry {
             let factory = &SignalListItemFactory::new();
             factory.connect_setup(|_, item| {
                 let item = item.downcast_ref::<gtk::ListItem>().unwrap();
-
-                let value = item.property_value("selected");
-                let value2 = item.property_value("item");
-
-                let result = value.get::<bool>().unwrap();
-
-                dbg!(result);
-
-                for x in item.list_properties() {
-
-                }
-
                 let label = gtk::Label::new(None);
                 label.set_halign(Align::Start);
                 item.property_expression("item")
@@ -79,7 +67,6 @@ impl CardEntry {
                 item.set_child(Some(&label));
             });
             entry.set_factory(Some(factory));
-
         }
         entry
     }
diff --git a/src/components/wifi/savedWifiEntry.rs b/src/components/wifi/savedWifiEntry.rs
index 390dcf2..51c40dc 100644
--- a/src/components/wifi/savedWifiEntry.rs
+++ b/src/components/wifi/savedWifiEntry.rs
@@ -9,16 +9,18 @@ use dbus::{Error, Path};
 use glib::subclass::types::ObjectSubclassIsExt;
 use glib::{clone, PropertySet};
 use gtk::gio;
+use gtk::prelude::ListBoxRowExt;
 
 glib::wrapper! {
     pub struct SavedWifiEntry(ObjectSubclass<savedWifiEntryImpl::SavedWifiEntry>)
-        @extends gtk::Box, gtk::Widget,
-        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
+        @extends adw::ActionRow, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget, gtk::ListBoxRow;
 }
 
 impl SavedWifiEntry {
     pub fn new(name: &String, path: Path<'static>) -> Self {
         let entry: SavedWifiEntry = Object::builder().build();
+        entry.set_activatable(false);
         let entryImp = entry.imp();
         // TODO handle edit
         entryImp.resetSavedWifiLabel.set_text(name);
diff --git a/src/components/wifi/savedWifiEntryImpl.rs b/src/components/wifi/savedWifiEntryImpl.rs
index 45b9898..baef5f9 100644
--- a/src/components/wifi/savedWifiEntryImpl.rs
+++ b/src/components/wifi/savedWifiEntryImpl.rs
@@ -1,4 +1,7 @@
 use std::cell::RefCell;
+use adw::ActionRow;
+use adw::subclass::preferences_row::PreferencesRowImpl;
+use adw::subclass::prelude::ActionRowImpl;
 
 use dbus::Path;
 use gtk::subclass::prelude::*;
@@ -26,7 +29,7 @@ unsafe impl Sync for SavedWifiEntry {}
 impl ObjectSubclass for SavedWifiEntry {
     const NAME: &'static str = "resetSavedWifiEntry";
     type Type = savedWifiEntry::SavedWifiEntry;
-    type ParentType = gtk::Box;
+    type ParentType = ActionRow;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -43,7 +46,11 @@ impl ObjectImpl for SavedWifiEntry {
     }
 }
 
-impl BoxImpl for SavedWifiEntry {}
+impl PreferencesRowImpl for SavedWifiEntry {}
+
+impl ListBoxRowImpl for SavedWifiEntry {}
+
+impl ActionRowImpl for SavedWifiEntry {}
 
 impl WidgetImpl for SavedWifiEntry {}
 
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 2f0cd6f..c7d0349 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -10,7 +10,7 @@ use crate::components::base::listEntry::ListEntry;
 use crate::components::base::utils::Listeners;
 use adw::glib;
 use adw::glib::Object;
-use adw::prelude::ListBoxRowExt;
+use adw::prelude::{ListBoxRowExt, PreferencesGroupExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::arg::{AppendAll, ReadAll, RefArg};
 use dbus::blocking::Connection;
@@ -48,6 +48,7 @@ impl WifiBox {
 
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
+        selfImp.resetSavedNetworks.set_activatable(true);
         selfImp
             .resetSavedNetworks
             .set_action_name(Some("navigation.push"));
@@ -76,9 +77,9 @@ pub fn scanForWifi(listeners: Arc<Listeners>, wifiBox: Arc<WifiBox>) {
                 let selfImp = wifibox_ref.imp();
                 for accessPoint in accessPoints {
                     let ssid = accessPoint.ssid.clone();
-                    let entry = Arc::new(ListEntry::new(&*WifiEntry::new(accessPoint, selfImp)));
+                    let entry = WifiEntry::new(accessPoint, selfImp);
                     wifiEntries.insert(ssid, entry.clone());
-                    selfImp.resetWifiList.append(&*entry);
+                    selfImp.resetWifiList.add(&*entry);
                 }
             });
         });
@@ -124,10 +125,9 @@ pub fn scanForWifi(listeners: Arc<Listeners>, wifiBox: Arc<WifiBox>) {
                                 if wifiEntries.get(&ssid).is_some() {
                                     return;
                                 }
-                                let entry =
-                                    Arc::new(ListEntry::new(&*WifiEntry::new(access_point.0, wifiBoxImpl.imp())));
+                                let entry = WifiEntry::new(access_point.0, wifiBoxImpl.imp());
                                 wifiEntries.insert(ssid, entry.clone());
-                                wifiBoxImpl.imp().resetWifiList.append(&*entry);
+                                wifiBoxImpl.imp().resetWifiList.add(&*entry);
                             });
                         });
                     }
@@ -163,9 +163,8 @@ pub fn show_stored_connections(wifiBox: Arc<WifiBox>) {
                     // TODO include button for settings
                     let name =
                         &String::from_utf8(connection.1).unwrap_or_else(|_| String::from(""));
-                    let entry = ListEntry::new(&SavedWifiEntry::new(name, connection.0));
-                    entry.set_activatable(false);
-                    selfImp.resetStoredWifiList.append(&entry);
+                    let entry = SavedWifiEntry::new(name, connection.0);
+                    selfImp.resetStoredWifiList.add(&entry);
                 }
             });
         });
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index 8d15cbe..a4e3030 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -4,7 +4,7 @@ use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate, ListBox, Switch};
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
-use adw::NavigationView;
+use adw::{ActionRow, ComboRow, NavigationView, PreferencesGroup};
 
 use crate::components::base::listEntry::ListEntry;
 use crate::components::wifi::wifiEntry::WifiEntry;
@@ -16,18 +16,20 @@ pub struct WifiBox {
     #[template_child]
     pub resetWifiNavigation: TemplateChild<NavigationView>,
     #[template_child]
-    pub resetWifiDetails: TemplateChild<ListBox>,
+    pub resetWifiDetails: TemplateChild<PreferencesGroup>,
     #[template_child]
-    pub resetSavedNetworks: TemplateChild<ListEntry>,
+    pub resetWiFiDevice: TemplateChild<ComboRow>,
+    #[template_child]
+    pub resetSavedNetworks: TemplateChild<ActionRow>,
     #[template_child]
     pub resetWifiSwitch: TemplateChild<Switch>,
     #[template_child]
-    pub resetWifiList: TemplateChild<ListBox>,
+    pub resetWifiList: TemplateChild<PreferencesGroup>,
     #[template_child]
-    pub resetStoredWifiList: TemplateChild<ListBox>,
+    pub resetStoredWifiList: TemplateChild<PreferencesGroup>,
     #[template_child]
     pub resetAvailableNetworks: TemplateChild<ListEntry>,
-    pub wifiEntries: Arc<Mutex<HashMap<Vec<u8>, Arc<ListEntry>>>>,
+    pub wifiEntries: Arc<Mutex<HashMap<Vec<u8>, Arc<WifiEntry>>>>,
     pub savedWifiEntries: Arc<Mutex<Vec<ListEntry>>>,
 }
 
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 12582f9..87d09da 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use adw::glib;
 use adw::glib::{Object, PropertySet};
-use adw::prelude::{ButtonExt, EditableExt, PopoverExt};
+use adw::prelude::{ActionRowExt, ButtonExt, EditableExt, PopoverExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
 use dbus::{Error, Path};
@@ -22,8 +22,8 @@ use super::savedWifiEntry::SavedWifiEntry;
 
 glib::wrapper! {
     pub struct WifiEntry(ObjectSubclass<wifiEntryImpl::WifiEntry>)
-        @extends gtk::Box, gtk::Widget,
-        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
+        @extends adw::ActionRow, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget, gtk::ListBoxRow;
 }
 
 unsafe impl Send for WifiEntry {}
@@ -66,8 +66,9 @@ impl WifiEntry {
             *wifiName = String::from(name);
         }
         entryImp.accessPoint.set(access_point);
-        let gesture = GestureClick::new();
-        gesture.connect_released(clone!(@weak entryImp => move |_, _, _, _| {
+
+        entry.set_activatable(true);
+        entry.connect_activated(clone!(@weak entryImp => move |_| {
             let access_point = entryImp.accessPoint.borrow();
             if access_point.connected {
                 click_disconnect();
@@ -77,7 +78,6 @@ impl WifiEntry {
                 click_new_network(new_entry.clone());
             }
         }));
-        entry.add_controller(gesture);
         entry.setupCallbacks(wifiBox);
         entry
     }
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index 2d58aaa..cc44c09 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -3,11 +3,11 @@ use crate::components::wifi::wifiEntry;
 use gtk::subclass::prelude::*;
 use gtk::{glib, Button, CompositeTemplate, Image, Label};
 use std::cell::RefCell;
-use std::sync::Arc;
+use adw::ActionRow;
+use adw::subclass::preferences_row::PreferencesRowImpl;
+use adw::subclass::prelude::ActionRowImpl;
 use ReSet_Lib::network::network::{AccessPoint, WifiStrength};
 
-use super::wifiBox::WifiBox;
-
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
 #[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")]
@@ -36,7 +36,7 @@ unsafe impl Sync for WifiEntry {}
 impl ObjectSubclass for WifiEntry {
     const NAME: &'static str = "resetWifiEntry";
     type Type = wifiEntry::WifiEntry;
-    type ParentType = gtk::Box;
+    type ParentType = ActionRow;
 
     fn class_init(klass: &mut Self::Class) {
         klass.bind_template();
@@ -53,7 +53,11 @@ impl ObjectImpl for WifiEntry {
     }
 }
 
-impl BoxImpl for WifiEntry {}
+impl PreferencesRowImpl for WifiEntry {}
+
+impl ListBoxRowImpl for WifiEntry {}
+
+impl ActionRowImpl for WifiEntry {}
 
 impl WidgetImpl for WifiEntry {}
 
diff --git a/src/components/wifi/wifiOptions.rs b/src/components/wifi/wifiOptions.rs
index 404219f..1dfb17a 100644
--- a/src/components/wifi/wifiOptions.rs
+++ b/src/components/wifi/wifiOptions.rs
@@ -34,12 +34,12 @@ impl WifiOptions {
         selfImp.resetWifiName.set_subtitle(&*conn.settings.name);
         selfImp.resetWifiAutoConnect.set_active(conn.settings.autoconnect);
         selfImp.resetWifiMetered.set_active(if conn.settings.metered != -1 { true } else { false });
-        // match conn.device.borrow() {
-        //     TypeSettings::WIFI(wifi) => {}
-        //     TypeSettings::ETHERNET(ethernet) => {}
-        //     TypeSettings::VPN(vpn) => {}
-        //     TypeSettings::None => {}
-        // };
+        match &conn.device {
+            TypeSettings::WIFI(wifi) => {}
+            TypeSettings::ETHERNET(ethernet) => {}
+            TypeSettings::VPN(vpn) => {}
+            TypeSettings::None => {}
+        };
         // IPv4
         selfImp.resetIP4Method.set_selected(conn.ipv4.dns_method.to_i32() as u32);
         self.setIP4Visibility(conn.ipv4.dns_method.to_i32() as u32);
diff --git a/src/components/window/windowImpl.rs b/src/components/window/windowImpl.rs
index 662a3b2..c468dcc 100644
--- a/src/components/window/windowImpl.rs
+++ b/src/components/window/windowImpl.rs
@@ -30,8 +30,6 @@ pub struct Window {
     #[template_child]
     pub resetSideBarToggle: TemplateChild<Button>,
     #[template_child]
-    pub resetPath: TemplateChild<Box>,
-    #[template_child]
     pub resetPopoverMenu: TemplateChild<PopoverMenu>,
     #[template_child]
     pub resetClose: TemplateChild<Button>,
diff --git a/src/resources/resetAudioInput.ui b/src/resources/resetAudioInput.ui
index 9a85e3f..3b94899 100644
--- a/src/resources/resetAudioInput.ui
+++ b/src/resources/resetAudioInput.ui
@@ -19,20 +19,15 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">output</property>
+            <property name="title">output</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="AdwPreferencesGroup">
-                    <child>
-                      <object class="AdwComboRow" id="resetSourceDropdown">
-                        <property name="title">Input Device</property>
-                        <property name="use-subtitle">True</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="AdwActionRow" id="resetSourceRow">
-                        <property name="title">Devices</property>
+                        <property name="title">Input Devices</property>
                         <child>
                           <object class="GtkImage">
                             <property name="icon-name">go-previous-symbolic-rtl</property>
@@ -50,6 +45,12 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="AdwComboRow" id="resetSourceDropdown">
+                        <property name="title">Default Input Device</property>
+                        <property name="use-subtitle">True</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
@@ -125,6 +126,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">sources</property>
+            <property name="title">sources</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
@@ -183,6 +185,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">profileConfiguration</property>
+            <property name="title">profileConfiguration</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
diff --git a/src/resources/resetAudioOutput.ui b/src/resources/resetAudioOutput.ui
index 287ce77..20df4e6 100644
--- a/src/resources/resetAudioOutput.ui
+++ b/src/resources/resetAudioOutput.ui
@@ -19,20 +19,15 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">output</property>
+            <property name="title">output</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="AdwPreferencesGroup">
-                    <child>
-                      <object class="AdwComboRow" id="resetSinkDropdown">
-                        <property name="title">Output Device</property>
-                        <property name="use-subtitle">True</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="AdwActionRow" id="resetSinksRow">
-                        <property name="title">Devices</property>
+                        <property name="title">Output Devices</property>
                         <child>
                           <object class="GtkImage">
                             <property name="icon-name">go-previous-symbolic-rtl</property>
@@ -50,6 +45,12 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="AdwComboRow" id="resetSinkDropdown">
+                        <property name="title">Default Output Device</property>
+                        <property name="use-subtitle">True</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
@@ -125,6 +126,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">outputDevices</property>
+            <property name="title">outputDevices</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
@@ -186,6 +188,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">profileConfiguration</property>
+            <property name="title">profileConfiguration</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui
index 315ebdd..1539afd 100644
--- a/src/resources/resetBluetooth.ui
+++ b/src/resources/resetBluetooth.ui
@@ -32,6 +32,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">main</property>
+            <property name="title">main</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
@@ -167,6 +168,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">visibility</property>
+            <property name="title">visibility</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index f57b434..098a5c5 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -24,39 +24,18 @@
                 <child>
                   <object class="GtkBox">
                     <property name="valign">start</property>
-                    <child>
-                      <object class="GtkButton" id="resetBack">
-                        <property name="has-frame">False</property>
-                        <property name="icon-name">go-previous-symbolic</property>
-                        <property name="valign">start</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkButton" id="resetSideBarToggle">
                         <property name="icon-name">sidebar-show-symbolic</property>
                         <property name="visible">False</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="resetForward">
-                        <property name="has-frame">False</property>
-                        <property name="icon-name">go-previous-symbolic-rtl</property>
-                        <property name="valign">start</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="resetPath">
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
-                        <property name="hexpand-set">True</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkMenuButton">
                         <property name="can-shrink">True</property>
                         <property name="halign">end</property>
                         <property name="has-frame">False</property>
+                        <property name="hexpand">True</property>
                         <property name="hexpand-set">True</property>
                         <property name="icon-name">open-menu-symbolic</property>
                         <property name="popover">
diff --git a/src/resources/resetSavedWifiEntry.ui b/src/resources/resetSavedWifiEntry.ui
index 6fbdf98..097da11 100644
--- a/src/resources/resetSavedWifiEntry.ui
+++ b/src/resources/resetSavedWifiEntry.ui
@@ -2,26 +2,39 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetSavedWifiEntry" parent="GtkBox">
-    <property name="spacing">5</property>
-    <child>
-      <object class="GtkLabel" id="resetSavedWifiLabel">
-        <property name="margin-start">5</property>
+  <requires lib="libadwaita" version="1.0"/>
+  <template class="resetSavedWifiEntry" parent="AdwActionRow">
+    <property name="activatable">False</property>
+    <property name="child">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkLabel" id="resetSavedWifiLabel">
+            <property name="ellipsize">end</property>
+            <property name="hexpand">True</property>
+            <property name="label">LoremIpsumInternet</property>
+            <property name="margin-end">10</property>
+            <property name="single-line-mode">True</property>
+            <property name="width-request">200</property>
+            <property name="xalign">0.0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetEditSavedWifiButton">
+            <property name="halign">end</property>
+            <property name="has-frame">False</property>
+            <property name="hexpand">True</property>
+            <property name="icon-name">document-edit-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetDeleteSavedWifiButton">
+            <property name="halign">start</property>
+            <property name="has-frame">False</property>
+            <property name="icon-name">user-trash-symbolic</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
       </object>
-    </child>
-    <child>
-      <object class="GtkButton" id="resetEditSavedWifiButton">
-        <property name="halign">end</property>
-        <property name="has-frame">False</property>
-        <property name="hexpand">True</property>
-        <property name="icon-name">document-edit-symbolic</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkButton" id="resetDeleteSavedWifiButton">
-        <property name="has-frame">False</property>
-        <property name="icon-name">user-trash-symbolic</property>
-      </object>
-    </child>
+    </property>
   </template>
 </interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 7fcfb10..7771d27 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -4,7 +4,7 @@
   <ui>
 	(3,1,None,"resetMainWindow.ui",None,None,None,None,None,None,None),
 	(4,7,None,"resetWiFi.ui",None,None,None,None,None,None,None),
-	(5,2,None,"resetWifiEntry.ui",None,None,None,None,None,None,None),
+	(5,12,None,"resetWifiEntry.ui",None,None,None,None,None,None,None),
 	(6,1,None,"resetSidebarEntry.ui",None,None,None,None,None,None,None),
 	(7,1,None,"resetInputStreamEntry.ui",None,None,None,None,None,None,None),
 	(8,1,None,"resetAudioOutput.ui",None,None,None,None,None,None,None),
@@ -15,7 +15,7 @@
 	(14,3,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
 	(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
 	(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
-	(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
+	(17,5,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None),
 	(18,1,None,"resetSinkEntry.ui",None,None,None,None,None,None,None),
 	(19,1,None,"resetSourceEntry.ui",None,None,None,None,None,None,None),
 	(20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
@@ -37,12 +37,9 @@
 	(3,20,"GtkSearchEntry","resetSearchEntry",19,None,None,None,None,None),
 	(3,24,"GtkWindowHandle",None,3,None,None,None,None,None),
 	(3,25,"GtkBox",None,24,None,None,None,None,None),
-	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,1,None),
-	(3,27,"GtkButton","resetBack",25,None,None,None,None,None),
-	(3,28,"GtkButton","resetForward",25,None,None,None,2,None),
-	(3,31,"GtkButton","resetClose",25,None,None,None,5,None),
-	(3,33,"GtkMenuButton",None,25,None,None,None,4,None),
-	(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
+	(3,26,"GtkButton","resetSideBarToggle",25,None,None,None,None,None),
+	(3,31,"GtkButton","resetClose",25,None,None,None,2,None),
+	(3,33,"GtkMenuButton",None,25,None,None,None,1,None),
 	(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
 	(3,36,"GtkBox",None,35,None,None,None,-1,None),
 	(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None),
@@ -58,15 +55,12 @@
 	(4,152,"AdwNavigationView","resetWifiNavigation",7,None,None,None,1,None),
 	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
 	(4,154,"GtkBox",None,153,None,None,None,None,None),
-	(4,155,"GtkListBox","resetWifiDetails",154,None,None,None,1,None),
 	(4,164,"GtkBox",None,154,None,None,None,2,None),
 	(4,165,"GtkLabel",None,164,None,None,None,None,None),
 	(4,166,"GtkScrolledWindow",None,164,None,None,None,1,None),
 	(4,167,"GtkViewport",None,166,None,None,None,None,None),
-	(4,168,"GtkListBox","resetWifiList",167,None,None,None,None,None),
 	(4,174,"AdwNavigationPage",None,152,None,None,None,2,None),
 	(4,175,"GtkBox",None,174,None,None,None,None,None),
-	(4,178,"GtkListBox","resetStoredWifiList",175,None,None,None,2,None),
 	(4,182,"GtkBox",None,7,None,None,None,None,None),
 	(4,183,"GtkLabel",None,182,None,None,None,None,None),
 	(4,184,"GtkSwitch","resetWifiSwitch",182,None,None,None,1,None),
@@ -75,23 +69,21 @@
 	(4,187,"GtkBox",None,186,None,None,None,None,None),
 	(4,188,"GtkLabel",None,187,None,None,None,None,None),
 	(4,189,"GtkImage",None,187,None,None,None,1,None),
-	(4,190,"GtkLabel",None,175,None,None,None,1,None),
-	(4,191,"resetListBoxRow",None,155,None,None,None,1,None),
-	(4,192,"GtkBox",None,191,None,None,None,None,None),
-	(4,193,"GtkLabel",None,192,None,None,None,None,None),
-	(4,194,"GtkDropDown","resetWiFiDevice",192,None,None,None,1,None),
-	(4,195,"resetListBoxRow","resetSavedNetworks",155,None,None,None,1,None),
-	(4,196,"GtkBox",None,195,None,None,None,None,None),
-	(4,197,"GtkLabel",None,196,None,None,None,None,None),
-	(4,198,"GtkImage",None,196,None,None,None,1,None),
-	(5,2,"GtkBox","resetWifiEntry",None,None,None,None,None,None),
-	(5,3,"GtkBox",None,2,None,None,None,None,None),
-	(5,4,"GtkImage","resetWifiStrength",3,None,None,None,None,None),
-	(5,5,"GtkImage","resetWifiEncrypted",3,None,None,None,1,None),
-	(5,6,"GtkLabel","resetWifiLabel",2,None,None,None,1,None),
-	(5,7,"GtkButton","resetWifiEditButton",2,None,None,None,4,None),
-	(5,8,"GtkImage","resetWifiConnected",2,None,None,None,3,None),
-	(5,11,"resetPopup","resetWifiPopup",2,None,None,None,-1,None),
+	(4,199,"AdwPreferencesGroup","resetWifiDetails",154,None,None,None,None,None),
+	(4,200,"AdwComboRow","resetWiFiDevice",199,None,None,None,-1,None),
+	(4,201,"AdwActionRow","resetSavedNetworks",199,None,None,None,-1,None),
+	(4,202,"GtkImage",None,201,None,None,None,None,None),
+	(4,203,"AdwPreferencesGroup","resetWifiList",167,None,None,None,-1,None),
+	(4,204,"AdwPreferencesGroup","resetStoredWifiList",175,None,None,None,1,None),
+	(5,12,"AdwActionRow","resetWifiEntry",None,None,None,None,-1,None),
+	(5,13,"GtkBox",None,12,None,None,None,None,None),
+	(5,14,"GtkBox",None,13,None,None,None,None,None),
+	(5,15,"GtkImage","resetWifiStrength",14,None,None,None,None,None),
+	(5,16,"GtkImage","resetWifiEncrypted",14,None,None,None,1,None),
+	(5,18,"GtkLabel","resetWifiLabel",13,None,None,None,1,None),
+	(5,19,"GtkImage","resetWifiConnected",13,None,None,None,3,None),
+	(5,20,"GtkButton","resetWifiEditButton",13,None,None,None,2,None),
+	(5,21,"resetPopup","resetWifiPopup",13,None,None,None,4,None),
 	(6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None),
 	(6,2,"GtkBox",None,1,None,None,None,-1,None),
 	(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
@@ -140,12 +132,12 @@
 	(8,122,"GtkImage",None,120,None,None,None,1,None),
 	(8,123,"GtkLabel",None,117,None,None,None,1,None),
 	(8,130,"AdwPreferencesGroup",None,56,None,None,None,None,None),
-	(8,131,"AdwComboRow","resetSinkDropdown",130,None,None,None,None,None),
 	(8,132,"AdwActionRow","resetSinksRow",130,None,None,None,1,None),
 	(8,133,"GtkImage",None,132,None,None,None,None,None),
 	(8,134,"AdwActionRow","resetCardsRow",130,None,None,None,2,None),
 	(8,135,"GtkImage",None,134,None,None,None,None,None),
 	(8,136,"AdwPreferencesGroup","resetCards",116,None,None,None,1,None),
+	(8,137,"AdwComboRow","resetSinkDropdown",130,None,None,None,2,None),
 	(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
 	(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
 	(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
@@ -220,11 +212,11 @@
 	(12,59,"GtkLabel",None,53,None,None,None,1,None),
 	(12,66,"AdwPreferencesGroup","resetCards",53,None,None,None,2,None),
 	(12,67,"AdwPreferencesGroup",None,15,None,None,None,None,None),
-	(12,68,"AdwComboRow","resetSourceDropdown",67,None,None,None,-1,None),
 	(12,69,"AdwActionRow","resetSourceRow",67,None,None,None,-1,None),
 	(12,70,"AdwActionRow","resetCardsRow",67,None,None,None,2,None),
 	(12,71,"GtkImage",None,69,None,None,None,-1,None),
 	(12,72,"GtkImage",None,70,None,None,None,None,None),
+	(12,73,"AdwComboRow","resetSourceDropdown",67,None,None,None,2,None),
 	(13,11,"GtkBox","resetOutputStreamEntry",None,None,None,None,None,None),
 	(13,12,"GtkBox",None,11,None,None,None,None,None),
 	(13,13,"GtkLabel","resetSourceName",12,None,None,None,None,None),
@@ -243,10 +235,11 @@
 	(16,11,"GtkPasswordEntry","resetPopupEntry",10,None,None,None,None,None),
 	(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None),
 	(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None),
-	(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
-	(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,None,None),
-	(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
-	(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,2,None),
+	(17,5,"AdwActionRow","resetSavedWifiEntry",None,None,None,None,None,None),
+	(17,7,"GtkBox",None,5,None,None,None,None,None),
+	(17,11,"GtkLabel","resetSavedWifiLabel",7,None,None,None,None,None),
+	(17,12,"GtkButton","resetDeleteSavedWifiButton",7,None,None,None,2,None),
+	(17,14,"GtkButton","resetEditSavedWifiButton",7,None,None,None,1,None),
 	(18,1,"GtkBox","resetSinkEntry",None,None,None,None,None,None),
 	(18,2,"GtkBox",None,1,None,None,None,None,None),
 	(18,3,"GtkLabel","resetSinkName",2,None,None,None,None,None),
@@ -349,12 +342,6 @@
 	(3,25,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,26,"GtkButton","icon-name","sidebar-show-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,26,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
-	(3,27,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(3,27,"GtkButton","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
-	(3,27,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(3,28,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(3,28,"GtkButton","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
-	(3,28,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(3,31,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,31,"GtkButton","icon-name","window-close-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,31,"GtkWidget","css-classes","resetClose",None,None,None,None,None,None,None,None,None),
@@ -365,13 +352,10 @@
 	(3,33,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","popover",None,None,None,None,None,35,None,None,None,None),
 	(3,33,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(3,33,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
-	(3,34,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(3,34,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(3,34,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
-	(3,34,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(3,35,"GtkPopover","child",None,None,None,None,None,36,None,None,None,None),
 	(3,36,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(3,38,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
@@ -399,37 +383,19 @@
 	(4,7,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,153,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
+	(4,153,"AdwNavigationPage","title","main",None,None,None,None,None,None,None,None,None),
 	(4,154,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,155,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,164,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(4,164,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkLabel","justify","right",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkLabel","label","Available networks",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(4,165,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(4,166,"GtkScrolledWindow","min-content-height","100",None,None,None,None,None,None,None,None,None),
 	(4,166,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,168,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,174,"AdwNavigationPage","tag","saved",None,None,None,None,None,None,None,None,None),
+	(4,174,"AdwNavigationPage","title","saved",None,None,None,None,None,None,None,None,None),
 	(4,175,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
-	(4,178,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(4,182,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(4,183,"GtkLabel","label","WiFi",None,None,None,None,None,None,None,None,None),
 	(4,183,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
@@ -453,43 +419,35 @@
 	(4,189,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(4,189,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,189,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(4,190,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
-	(4,190,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(4,190,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,192,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,192,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,193,"GtkLabel","label","WiFi Device",None,None,None,None,None,None,None,None,None),
-	(4,194,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,194,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,194,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(4,196,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
-	(4,197,"GtkLabel","label","Saved Networks",None,None,None,None,None,None,None,None,None),
-	(4,197,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(4,198,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
-	(4,198,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(4,198,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(4,198,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(5,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(5,3,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
-	(5,4,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
-	(5,5,"GtkImage","icon-name","system-lock-screen-symbolic",None,None,None,None,None,None,None,None,None),
-	(5,5,"GtkImage","pixel-size","9",None,None,None,None,None,None,None,None,None),
-	(5,5,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(5,5,"GtkWidget","margin-bottom","6",None,None,None,None,None,None,None,None,None),
-	(5,5,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkLabel","label","LoremIpsumInternet",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
-	(5,6,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
-	(5,7,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(5,7,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
-	(5,7,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(5,7,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(5,8,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(5,8,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(4,200,"AdwPreferencesRow","title","WiFi Device",None,None,None,None,None,None,None,None,None),
+	(4,201,"AdwPreferencesRow","title","Saved Networks",None,None,None,None,None,None,None,None,None),
+	(4,202,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(4,202,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(4,202,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(4,202,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(4,204,"AdwPreferencesGroup","title","Saved Networks",None,None,None,None,None,None,None,None,None),
+	(5,12,"GtkListBoxRow","child",None,None,None,None,None,13,None,None,None,None),
+	(5,13,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
+	(5,14,"GtkWidget","width-request","35",None,None,None,None,None,None,None,None,None),
+	(5,15,"GtkImage","icon-name","network-wireless-signal-excellent-symbolic",None,None,None,None,None,None,None,None,None),
+	(5,16,"GtkImage","icon-name","system-lock-screen-symbolic",None,None,None,None,None,None,None,None,None),
+	(5,16,"GtkImage","pixel-size","9",None,None,None,None,None,None,None,None,None),
+	(5,16,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(5,16,"GtkWidget","margin-bottom","6",None,None,None,None,None,None,None,None,None),
+	(5,16,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkLabel","label","LoremIpsumInternet",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
+	(5,18,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
+	(5,19,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(5,19,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(5,20,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(5,20,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
+	(5,20,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(5,20,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
 	(6,1,"GtkListBoxRow","child",None,None,None,None,None,2,None,None,None,None),
 	(6,1,"GtkWidget","css-classes","resetSidebarEntry",None,None,None,None,None,None,None,None,None),
 	(6,2,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
@@ -531,8 +489,10 @@
 	(8,53,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(8,53,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(8,55,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None),
+	(8,55,"AdwNavigationPage","title","output",None,None,None,None,None,None,None,None,None),
 	(8,56,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,71,"AdwNavigationPage","tag","outputDevices",None,None,None,None,None,None,None,None,None),
+	(8,71,"AdwNavigationPage","title","outputDevices",None,None,None,None,None,None,None,None,None),
 	(8,72,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,85,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,85,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
@@ -580,6 +540,7 @@
 	(8,115,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(8,116,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None),
+	(8,116,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(8,117,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,118,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(8,118,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
@@ -595,16 +556,17 @@
 	(8,122,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(8,122,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(8,122,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(8,131,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
-	(8,131,"AdwPreferencesRow","title","Output Device",None,None,None,None,None,None,None,None,None),
-	(8,132,"AdwPreferencesRow","title","Devices",None,None,None,None,None,None,None,None,None),
+	(8,132,"AdwPreferencesRow","title","Output Devices",None,None,None,None,None,None,None,None,None),
 	(8,133,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
 	(8,134,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
 	(8,135,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
 	(8,136,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
+	(8,137,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
+	(8,137,"AdwPreferencesRow","title","Default Output Device",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,120,"AdwNavigationPage","tag","main",None,None,None,None,None,None,None,None,None),
+	(10,120,"AdwNavigationPage","title","main",None,None,None,None,None,None,None,None,None),
 	(10,121,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(10,122,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
@@ -641,6 +603,7 @@
 	(10,136,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(10,136,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
 	(10,138,"AdwNavigationPage","tag","visibility",None,None,None,None,None,None,None,None,None),
+	(10,138,"AdwNavigationPage","title","visibility",None,None,None,None,None,None,None,None,None),
 	(10,142,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
 	(10,143,"GtkLabel","label","Bluetooth",None,None,None,None,None,None,None,None,None),
 	(10,143,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
@@ -712,6 +675,7 @@
 	(12,12,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(12,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(12,14,"AdwNavigationPage","tag","output",None,None,None,None,None,None,None,None,None),
+	(12,14,"AdwNavigationPage","title","output",None,None,None,None,None,None,None,None,None),
 	(12,15,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,22,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,22,"GtkWidget","margin-bottom","10",None,None,None,None,None,None,None,None,None),
@@ -736,6 +700,7 @@
 	(12,31,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None),
 	(12,31,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
 	(12,34,"AdwNavigationPage","tag","sources",None,None,None,None,None,None,None,None,None),
+	(12,34,"AdwNavigationPage","title","sources",None,None,None,None,None,None,None,None,None),
 	(12,42,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,43,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(12,43,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
@@ -761,6 +726,7 @@
 	(12,51,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(12,51,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
 	(12,52,"AdwNavigationPage","tag","profileConfiguration",None,None,None,None,None,None,None,None,None),
+	(12,52,"AdwNavigationPage","title","profileConfiguration",None,None,None,None,None,None,None,None,None),
 	(12,53,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,54,"GtkListBox","show-separators","True",None,None,None,None,None,None,None,None,None),
 	(12,54,"GtkWidget","css-classes","boxed-list",None,None,None,None,None,None,None,None,None),
@@ -777,12 +743,12 @@
 	(12,58,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(12,58,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(12,66,"AdwPreferencesGroup","title","Devices",None,None,None,None,None,None,None,None,None),
-	(12,68,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
-	(12,68,"AdwPreferencesRow","title","Input Device",None,None,None,None,None,None,None,None,None),
-	(12,69,"AdwPreferencesRow","title","Devices",None,None,None,None,None,None,None,None,None),
+	(12,69,"AdwPreferencesRow","title","Input Devices",None,None,None,None,None,None,None,None,None),
 	(12,70,"AdwPreferencesRow","title","Profile Settings",None,None,None,None,None,None,None,None,None),
 	(12,71,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
 	(12,72,"GtkImage","icon-name","go-previous-symbolic-rtl",None,None,None,None,None,None,None,None,None),
+	(12,73,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
+	(12,73,"AdwPreferencesRow","title","Default Input Device",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(13,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
@@ -831,14 +797,23 @@
 	(16,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
 	(16,12,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(16,13,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
-	(17,1,"GtkBox","spacing","5",None,None,None,None,None,None,None,None,None),
-	(17,2,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
-	(17,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(17,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
-	(17,3,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(17,3,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,5,"GtkListBoxRow","activatable","False",None,None,None,None,None,None,None,None,None),
+	(17,5,"GtkListBoxRow","child",None,None,None,None,None,7,None,None,None,None),
+	(17,11,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkLabel","label","LoremIpsumInternet",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
+	(17,11,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
+	(17,12,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,12,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,12,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
+	(17,12,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(17,14,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
+	(17,14,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
+	(17,14,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(17,14,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(18,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(18,1,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(18,1,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
diff --git a/src/resources/resetWiFi.ui b/src/resources/resetWiFi.ui
index b02b965..687cbcc 100644
--- a/src/resources/resetWiFi.ui
+++ b/src/resources/resetWiFi.ui
@@ -34,59 +34,26 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">main</property>
+            <property name="title">main</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkListBox" id="resetWifiDetails">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup" id="resetWifiDetails">
                     <child>
-                      <object class="resetListBoxRow">
-                        <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <property name="margin-start">5</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">WiFi Device</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkDropDown" id="resetWiFiDevice">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="valign">center</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                      <object class="AdwComboRow" id="resetWiFiDevice">
+                        <property name="title">WiFi Device</property>
                       </object>
                     </child>
                     <child>
-                      <object class="resetListBoxRow" id="resetSavedNetworks">
+                      <object class="AdwActionRow" id="resetSavedNetworks">
+                        <property name="title">Saved Networks</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="height-request">40</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label">Saved Networks</property>
-                                <property name="margin-start">5</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="halign">end</property>
-                                <property name="hexpand">True</property>
-                                <property name="icon-name">go-previous-symbolic-rtl</property>
-                                <property name="margin-end">5</property>
-                              </object>
-                            </child>
+                          <object class="GtkImage">
+                            <property name="halign">end</property>
+                            <property name="hexpand">True</property>
+                            <property name="icon-name">go-previous-symbolic-rtl</property>
+                            <property name="margin-end">5</property>
                           </object>
                         </child>
                       </object>
@@ -95,6 +62,7 @@
                 </child>
                 <child>
                   <object class="GtkBox">
+                    <property name="margin-top">10</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel">
@@ -111,15 +79,7 @@
                         <child>
                           <object class="GtkViewport">
                             <child>
-                              <object class="GtkListBox" id="resetWifiList">
-                                <property name="css-classes">boxed-list</property>
-                                <property name="margin-bottom">10</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-top">5</property>
-                                <property name="show-separators">True</property>
-                                <property name="valign">start</property>
-                              </object>
+                              <object class="AdwPreferencesGroup" id="resetWifiList"/>
                             </child>
                           </object>
                         </child>
@@ -134,6 +94,7 @@
         <child>
           <object class="AdwNavigationPage">
             <property name="tag">saved</property>
+            <property name="title">saved</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
@@ -172,21 +133,8 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="halign">start</property>
-                    <property name="label">Saved Networks</property>
-                    <property name="margin-start">5</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkListBox" id="resetStoredWifiList">
-                    <property name="css-classes">boxed-list</property>
-                    <property name="margin-bottom">10</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-top">5</property>
-                    <property name="show-separators">True</property>
-                    <property name="valign">start</property>
+                  <object class="AdwPreferencesGroup" id="resetStoredWifiList">
+                    <property name="title">Saved Networks</property>
                   </object>
                 </child>
               </object>
diff --git a/src/resources/resetWifiEntry.ui b/src/resources/resetWifiEntry.ui
index 6f9880c..3f6f6f0 100644
--- a/src/resources/resetWifiEntry.ui
+++ b/src/resources/resetWifiEntry.ui
@@ -2,54 +2,59 @@
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <template class="resetWifiEntry" parent="GtkBox">
-    <property name="margin-start">5</property>
-    <child>
-      <object class="resetPopup" id="resetWifiPopup"/>
-    </child>
-    <child>
+  <requires lib="libadwaita" version="1.0"/>
+  <template class="resetWifiEntry" parent="AdwActionRow">
+    <property name="child">
       <object class="GtkBox">
-        <property name="width-request">35</property>
+        <property name="margin-start">5</property>
         <child>
-          <object class="GtkImage" id="resetWifiStrength">
-            <property name="icon-name">network-wireless-signal-excellent-symbolic</property>
+          <object class="GtkBox">
+            <property name="width-request">35</property>
+            <child>
+              <object class="GtkImage" id="resetWifiStrength">
+                <property name="icon-name">network-wireless-signal-excellent-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="resetWifiEncrypted">
+                <property name="halign">start</property>
+                <property name="icon-name">system-lock-screen-symbolic</property>
+                <property name="margin-bottom">6</property>
+                <property name="pixel-size">9</property>
+                <property name="valign">end</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkImage" id="resetWifiEncrypted">
+          <object class="GtkLabel" id="resetWifiLabel">
+            <property name="ellipsize">end</property>
+            <property name="hexpand">True</property>
+            <property name="label">LoremIpsumInternet</property>
+            <property name="margin-end">10</property>
+            <property name="single-line-mode">True</property>
+            <property name="width-request">200</property>
+            <property name="xalign">0.0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="resetWifiEditButton">
             <property name="halign">start</property>
-            <property name="icon-name">system-lock-screen-symbolic</property>
-            <property name="margin-bottom">6</property>
-            <property name="pixel-size">9</property>
-            <property name="valign">end</property>
+            <property name="has-frame">False</property>
+            <property name="icon-name">document-edit-symbolic</property>
+            <property name="valign">center</property>
           </object>
         </child>
+        <child>
+          <object class="GtkImage" id="resetWifiConnected">
+            <property name="halign">end</property>
+            <property name="valign">center</property>
+          </object>
+        </child>
+        <child>
+          <object class="resetPopup" id="resetWifiPopup"/>
+        </child>
       </object>
-    </child>
-    <child>
-      <object class="GtkLabel" id="resetWifiLabel">
-        <property name="ellipsize">end</property>
-        <property name="hexpand">True</property>
-        <property name="label">LoremIpsumInternet</property>
-        <property name="margin-end">10</property>
-        <property name="single-line-mode">True</property>
-        <property name="width-request">200</property>
-        <property name="xalign">0.0</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImage" id="resetWifiConnected">
-        <property name="halign">end</property>
-        <property name="valign">center</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkButton" id="resetWifiEditButton">
-        <property name="halign">start</property>
-        <property name="has-frame">False</property>
-        <property name="icon-name">document-edit-symbolic</property>
-        <property name="valign">center</property>
-      </object>
-    </child>
+    </property>
   </template>
 </interface>