From d3afe5675e1a46acd00c49d98bc5e2d3b838cd93 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Sun, 26 Nov 2023 16:16:37 +0100
Subject: [PATCH] Add apply button for wifi options Start setting values in
 connection

---
 Cargo.toml                             |   1 +
 src/components/wifi/wifiOptions.rs     |  75 +++-
 src/components/wifi/wifiOptionsImpl.rs |   6 +-
 src/resources/resetUI.cmb              | 253 +++++++-------
 src/resources/resetWifiOptions.ui      | 454 +++++++++++++------------
 5 files changed, 434 insertions(+), 355 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 96602b3..2a8cbf1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,7 @@ tokio = { version = "1.33.0", features = [
   "sync",
 ] }
 fork = "0.1.22"
+regex = "1.10.2"
 
 [build-dependencies]
 glib-build-tools = "0.18.0"
diff --git a/src/components/wifi/wifiOptions.rs b/src/components/wifi/wifiOptions.rs
index 6b32cbb..a1f66eb 100644
--- a/src/components/wifi/wifiOptions.rs
+++ b/src/components/wifi/wifiOptions.rs
@@ -5,8 +5,9 @@ use adw::glib::Object;
 use adw::prelude::{ActionRowExt, ComboRowExt, PreferencesGroupExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::arg::PropMap;
-use glib::{PropertySet, ObjectExt};
+use glib::{clone, ObjectExt, PropertySet};
 use gtk::prelude::{EditableExt, WidgetExt};
+use regex::Regex;
 use ReSet_Lib::network::connection::{Connection, Enum, TypeSettings};
 
 use crate::components::wifi::wifiAddressEntry::WifiAddressEntry;
@@ -24,7 +25,8 @@ impl WifiOptions {
         let wifiOption: Arc<WifiOptions> = Arc::new(Object::builder().build());
         wifiOption.imp().connection.set(connection);
         wifiOption.initializeUI();
-        setupCallbacks(wifiOption)
+        setupCallbacks(&wifiOption);
+        wifiOption
     }
 
     pub fn initializeUI(&self) {
@@ -35,8 +37,25 @@ impl WifiOptions {
         selfImp.resetWifiAutoConnect.set_active(conn.settings.autoconnect);
         selfImp.resetWifiMetered.set_active(conn.settings.metered != -1);
         match &conn.device {
-            TypeSettings::WIFI(_wifi) => {}
-            TypeSettings::ETHERNET(_ethernet) => {}
+            TypeSettings::WIFI(wifi) => {
+                selfImp.resetWifiLinkSpeed.set_visible(false);
+                selfImp.resetWifiIP4Addr.set_visible(false);
+                selfImp.resetWifiIP6Addr.set_visible(false);
+                selfImp.resetWifiDNS.set_visible(false);
+                selfImp.resetWifiGateway.set_visible(false);
+                selfImp.resetWifiLastUsed.set_visible(true);
+                selfImp.resetWifiMac.set_subtitle(&*wifi.cloned_mac_address);
+            }
+            TypeSettings::ETHERNET(ethernet) => {
+                selfImp.resetWifiLinkSpeed.set_visible(true);
+                selfImp.resetWifiIP4Addr.set_visible(true);
+                selfImp.resetWifiIP6Addr.set_visible(true);
+                selfImp.resetWifiDNS.set_visible(true);
+                selfImp.resetWifiGateway.set_visible(true);
+                selfImp.resetWifiLastUsed.set_visible(false);
+                selfImp.resetWifiMac.set_subtitle(&*ethernet.cloned_mac_address);
+                selfImp.resetWifiLinkSpeed.set_subtitle(&*ethernet.speed.to_string());
+            }
             TypeSettings::VPN(_vpn) => {}
             TypeSettings::None => {}
         };
@@ -147,20 +166,48 @@ impl WifiOptions {
     }
 }
 
-fn setupCallbacks(wifiOptions: Arc<WifiOptions>) -> Arc<WifiOptions> {
+fn setupCallbacks(wifiOptions: &Arc<WifiOptions>) {
     let imp = wifiOptions.imp();
-    let wifiOptionsRef = wifiOptions.clone();
-    let wifiOptionsRef2 = wifiOptions.clone();
 
-    imp.resetIP4Method.connect_selected_notify(move |dropdown| {
+    // General
+    imp.resetWifiAutoConnect.connect_active_notify(clone!(@weak imp => move |x| {
+        imp.connection.borrow_mut().settings.autoconnect = x.is_active();
+    }));
+    imp.resetWifiMetered.connect_active_notify(clone!(@weak imp => move |x| {
+        imp.connection.borrow_mut().settings.metered = if x.is_active() { 1 } else { 2 };
+    }));
+    // IPv4
+    let wifiOptionsIP4 = wifiOptions.clone();
+    imp.resetIP4Method.connect_selected_notify(clone!(@weak imp => move |dropdown| {
         let selected = dropdown.selected();
-        wifiOptionsRef.setIP4Visibility(selected);
-    });
-    imp.resetIP6Method.connect_selected_notify(move |dropdown| {
+        wifiOptionsIP4.setIP4Visibility(selected);
+    }));
+
+    // TODO not finished
+    let dnsRegex = Regex::new(r"^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$").unwrap();
+    imp.resetIP4DNS.connect_changed(clone!(@weak imp => move |entry| {
+        let dnsInput = entry.text();
+        let mut conn = imp.connection.borrow_mut();
+        conn.ipv4.dns.clear();
+        for dnsEntry in dnsInput.as_str().split(',').collect::<Vec<&str>>() {
+            if dnsRegex.is_match(dnsEntry) {
+                imp.resetIP4DNS.remove_css_class("error");
+                let dnsParts = dnsEntry.split('.')
+                    .map(|s| s.parse::<u8>().unwrap())
+                    .collect::<Vec<u8>>();
+                conn.ipv4.dns.push(dnsParts);
+            } else {
+                imp.resetIP4DNS.add_css_class("error");
+            }
+        }
+    }));
+    // IPv6
+    let wifiOptionsIP6 = wifiOptions.clone();
+    imp.resetIP6Method.connect_selected_notify(clone!(@weak imp => move |dropdown| {
         let selected = dropdown.selected();
-        wifiOptionsRef2.setIP6Visibility(selected);
-    });
-    wifiOptions
+        wifiOptionsIP6.setIP6Visibility(selected);
+    }));
+    // Security
 }
 
 pub fn getValueFromKey(map: &PropMap, key: &str) -> String {
diff --git a/src/components/wifi/wifiOptionsImpl.rs b/src/components/wifi/wifiOptionsImpl.rs
index 5c0cee7..58033b3 100644
--- a/src/components/wifi/wifiOptionsImpl.rs
+++ b/src/components/wifi/wifiOptionsImpl.rs
@@ -4,7 +4,7 @@ use adw::{ActionRow, ComboRow, EntryRow, NavigationPage, PreferencesGroup, Switc
 use adw::subclass::prelude::NavigationPageImpl;
 use crate::components::wifi::{wifiOptions};
 use gtk::subclass::prelude::*;
-use gtk::{glib, CompositeTemplate};
+use gtk::{glib, CompositeTemplate, Button};
 use ReSet_Lib::network::connection::Connection;
 
 #[allow(non_snake_case)]
@@ -27,6 +27,8 @@ pub struct WifiOptions {
     #[template_child]
     pub resetWifiDNS: TemplateChild<ActionRow>,
     #[template_child]
+    pub resetWifiLastUsed: TemplateChild<ActionRow>,
+    #[template_child]
     pub resetWifiAutoConnect: TemplateChild<SwitchRow>,
     #[template_child]
     pub resetWifiMetered: TemplateChild<SwitchRow>,
@@ -54,6 +56,8 @@ pub struct WifiOptions {
     pub resetIP6RoutesGroup: TemplateChild<PreferencesGroup>,
     // Security
     // Misc
+    #[template_child]
+    pub wifiOptionsApplyButton: TemplateChild<Button>,
     pub connection: Rc<RefCell<Connection>>
 }
 
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index cc4290a..2a325c1 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -253,50 +253,53 @@
 	(19,24,"GtkSeparator",None,13,None,None,None,2,None),
 	(20,2,"AdwComboRow","resetCardEntry",None,None,None,None,None,None),
 	(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
-	(21,2,"GtkNotebook",None,1,None,None,None,-1,None),
-	(21,5,"GtkBox",None,2,None,None,None,None,None),
-	(21,6,"GtkLabel",None,2,None,"tab",None,1,None),
-	(21,7,"GtkBox",None,2,None,None,None,2,None),
-	(21,8,"GtkLabel",None,2,None,"tab",None,3,None),
-	(21,9,"GtkLabel",None,2,None,"tab",None,5,None),
-	(21,10,"GtkLabel",None,2,None,"tab",None,7,None),
-	(21,11,"GtkBox",None,2,None,None,None,4,None),
-	(21,12,"GtkBox",None,2,None,None,None,6,None),
-	(21,13,"AdwPreferencesGroup",None,5,None,None,None,-1,None),
-	(21,14,"AdwActionRow","resetWifiName",13,None,None,None,None,None),
-	(21,16,"AdwActionRow","resetWifiMac",13,None,None,None,1,None),
-	(21,17,"AdwSwitchRow","resetWifiAutoConnect",13,None,None,None,7,None),
-	(21,18,"AdwSwitchRow","resetWifiMetered",13,None,None,None,8,None),
-	(21,19,"AdwPreferencesGroup",None,7,None,None,None,None,None),
-	(21,20,"AdwComboRow","resetIP4Method",19,None,None,None,-1,None),
-	(21,21,"AdwEntryRow","resetIP4DNS",19,None,None,None,-1,None),
-	(21,22,"AdwEntryRow","resetIP4Gateway",19,None,None,None,2,None),
-	(21,23,"AdwPreferencesGroup","resetIP4AddressGroup",7,None,None,None,1,None),
-	(21,24,"AdwPreferencesGroup","resetIP4RoutesGroup",7,None,None,None,2,None),
-	(21,25,"GtkStringList",None,20,None,None,None,-1,None),
-	(21,26,"GtkBox",None,24,None,None,None,-1,None),
-	(21,27,"GtkLabel",None,26,None,None,None,-1,None),
-	(21,28,"GtkSwitch",None,26,None,None,None,-1,None),
-	(21,29,"AdwPreferencesGroup",None,11,None,None,None,None,None),
-	(21,30,"AdwComboRow","resetIP6Method",29,None,None,None,None,None),
-	(21,31,"GtkStringList",None,30,None,None,None,None,None),
-	(21,32,"AdwEntryRow","resetIP6DNS",29,None,None,None,1,None),
-	(21,33,"AdwEntryRow","resetIP6Gateway",29,None,None,None,2,None),
-	(21,34,"AdwPreferencesGroup","resetIP6AddressGroup",11,None,None,None,1,None),
-	(21,35,"AdwPreferencesGroup","resetIP6RoutesGroup",11,None,None,None,2,None),
-	(21,36,"GtkBox",None,35,None,None,None,None,None),
-	(21,37,"GtkLabel",None,36,None,None,None,None,None),
-	(21,38,"GtkSwitch",None,36,None,None,None,1,None),
-	(21,39,"AdwPreferencesGroup",None,12,None,None,None,None,None),
-	(21,40,"AdwComboRow",None,39,None,None,None,None,None),
-	(21,41,"GtkStringList",None,40,None,None,None,None,None),
-	(21,42,"AdwEntryRow",None,39,None,None,None,1,None),
-	(21,44,"AdwPasswordEntryRow",None,39,None,None,None,2,None),
-	(21,45,"AdwActionRow","resetWifiLinkSpeed",13,None,None,None,2,None),
-	(21,46,"AdwActionRow","resetWifiIP4Addr",13,None,None,None,3,None),
-	(21,47,"AdwActionRow","resetWifiIP6Addr",13,None,None,None,4,None),
-	(21,48,"AdwActionRow","resetWifiGateway",13,None,None,None,5,None),
-	(21,49,"AdwActionRow","resetWifiDNS",13,None,None,None,6,None),
+	(21,52,"GtkBox",None,1,None,None,None,-1,None),
+	(21,53,"GtkNotebook",None,52,None,None,None,None,None),
+	(21,54,"GtkBox",None,53,None,None,None,None,None),
+	(21,55,"AdwPreferencesGroup",None,54,None,None,None,None,None),
+	(21,56,"AdwActionRow","resetWifiName",55,None,None,None,None,None),
+	(21,57,"AdwActionRow","resetWifiMac",55,None,None,None,1,None),
+	(21,58,"AdwActionRow","resetWifiLinkSpeed",55,None,None,None,2,None),
+	(21,59,"AdwActionRow","resetWifiIP4Addr",55,None,None,None,3,None),
+	(21,60,"AdwActionRow","resetWifiIP6Addr",55,None,None,None,4,None),
+	(21,61,"AdwActionRow","resetWifiGateway",55,None,None,None,5,None),
+	(21,62,"AdwActionRow","resetWifiDNS",55,None,None,None,6,None),
+	(21,63,"AdwActionRow","resetWifiLastUsed",55,None,None,None,7,None),
+	(21,64,"AdwSwitchRow","resetWifiAutoConnect",55,None,None,None,8,None),
+	(21,65,"AdwSwitchRow","resetWifiMetered",55,None,None,None,9,None),
+	(21,66,"GtkLabel",None,53,None,"tab",None,1,None),
+	(21,67,"GtkBox",None,53,None,None,None,2,None),
+	(21,68,"AdwPreferencesGroup",None,67,None,None,None,None,None),
+	(21,69,"AdwComboRow","resetIP4Method",68,None,None,None,None,None),
+	(21,70,"GtkStringList",None,69,None,None,None,None,None),
+	(21,71,"AdwEntryRow","resetIP4DNS",68,None,None,None,1,None),
+	(21,72,"AdwEntryRow","resetIP4Gateway",68,None,None,None,2,None),
+	(21,73,"AdwPreferencesGroup","resetIP4AddressGroup",67,None,None,None,1,None),
+	(21,74,"AdwPreferencesGroup","resetIP4RoutesGroup",67,None,None,None,2,None),
+	(21,75,"GtkBox",None,74,None,None,None,None,None),
+	(21,76,"GtkLabel",None,75,None,None,None,None,None),
+	(21,77,"GtkSwitch",None,75,None,None,None,1,None),
+	(21,78,"GtkLabel",None,53,None,"tab",None,3,None),
+	(21,79,"GtkBox",None,53,None,None,None,4,None),
+	(21,80,"AdwPreferencesGroup",None,79,None,None,None,None,None),
+	(21,81,"AdwComboRow","resetIP6Method",80,None,None,None,None,None),
+	(21,82,"GtkStringList",None,81,None,None,None,None,None),
+	(21,83,"AdwEntryRow","resetIP6DNS",80,None,None,None,1,None),
+	(21,84,"AdwEntryRow","resetIP6Gateway",80,None,None,None,2,None),
+	(21,85,"AdwPreferencesGroup","resetIP6AddressGroup",79,None,None,None,1,None),
+	(21,86,"AdwPreferencesGroup","resetIP6RoutesGroup",79,None,None,None,2,None),
+	(21,87,"GtkBox",None,86,None,None,None,None,None),
+	(21,88,"GtkLabel",None,87,None,None,None,None,None),
+	(21,89,"GtkSwitch",None,87,None,None,None,1,None),
+	(21,90,"GtkLabel",None,53,None,"tab",None,5,None),
+	(21,91,"GtkBox",None,53,None,None,None,6,None),
+	(21,92,"AdwPreferencesGroup",None,91,None,None,None,None,None),
+	(21,93,"AdwComboRow",None,92,None,None,None,None,None),
+	(21,94,"GtkStringList",None,93,None,None,None,None,None),
+	(21,95,"AdwEntryRow",None,92,None,None,None,1,None),
+	(21,96,"AdwPasswordEntryRow",None,92,None,None,None,2,None),
+	(21,97,"GtkLabel",None,53,None,"tab",None,7,None),
+	(21,98,"GtkButton","wifiOptionsApplyButton",52,None,None,None,1,None),
 	(22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None),
 	(22,2,"AdwExpanderRow","resetAddressRow",1,None,None,None,-1,None),
 	(22,3,"AdwEntryRow","resetAddressAddress",2,None,None,None,-1,None),
@@ -793,60 +796,66 @@
 	(19,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(19,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(20,2,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
-	(21,2,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
-	(21,2,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
-	(21,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(21,6,"GtkLabel","label","General",None,None,None,None,None,None,None,None,None),
-	(21,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(21,8,"GtkLabel","label","IPv4",None,None,None,None,None,None,None,None,None),
-	(21,9,"GtkLabel","label","IPv6",None,None,None,None,None,None,None,None,None),
-	(21,10,"GtkLabel","label","Security",None,None,None,None,None,None,None,None,None),
-	(21,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(21,12,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(21,14,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
-	(21,14,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,16,"AdwPreferencesRow","title","MAC-Address",None,None,None,None,None,None,None,None,None),
-	(21,16,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,17,"AdwPreferencesRow","title","Connect automatically",None,None,None,None,None,None,None,None,None),
-	(21,18,"AdwPreferencesRow","title","Metered Connection",None,None,None,None,None,None,None,None,None),
-	(21,20,"AdwComboRow","model",None,None,None,None,None,25,None,None,None,None),
-	(21,20,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
-	(21,21,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
-	(21,22,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
-	(21,23,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
-	(21,23,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(21,24,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,26,None,None,None,None),
-	(21,24,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
-	(21,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(21,27,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
-	(21,27,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(21,28,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(21,30,"AdwComboRow","model",None,None,None,None,None,31,None,None,None,None),
-	(21,30,"AdwPreferencesRow","title","IPv6 Method",None,None,None,None,None,None,None,None,None),
-	(21,32,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
-	(21,33,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
-	(21,34,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
-	(21,34,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(21,35,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,36,None,None,None,None),
-	(21,35,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
-	(21,35,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
-	(21,37,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
-	(21,37,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
-	(21,38,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
-	(21,40,"AdwComboRow","model",None,None,None,None,None,41,None,None,None,None),
-	(21,40,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
-	(21,42,"AdwPreferencesRow","title","Username",None,None,None,None,None,None,None,None,None),
-	(21,44,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
-	(21,45,"AdwPreferencesRow","title","Link Speed",None,None,None,None,None,None,None,None,None),
-	(21,45,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,46,"AdwPreferencesRow","title","IPv4 Address",None,None,None,None,None,None,None,None,None),
-	(21,46,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,47,"AdwPreferencesRow","title","IPv6 Address",None,None,None,None,None,None,None,None,None),
-	(21,47,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,48,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
-	(21,48,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
-	(21,49,"AdwPreferencesRow","title","DNS",None,None,None,None,None,None,None,None,None),
-	(21,49,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,52,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(21,53,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
+	(21,53,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
+	(21,54,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(21,56,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
+	(21,56,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,57,"AdwPreferencesRow","title","MAC-Address",None,None,None,None,None,None,None,None,None),
+	(21,57,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,58,"AdwPreferencesRow","title","Link Speed",None,None,None,None,None,None,None,None,None),
+	(21,58,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,59,"AdwPreferencesRow","title","IPv4 Address",None,None,None,None,None,None,None,None,None),
+	(21,59,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,60,"AdwPreferencesRow","title","IPv6 Address",None,None,None,None,None,None,None,None,None),
+	(21,60,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,61,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
+	(21,61,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,62,"AdwPreferencesRow","title","DNS",None,None,None,None,None,None,None,None,None),
+	(21,62,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,63,"AdwPreferencesRow","title","Last Used",None,None,None,None,None,None,None,None,None),
+	(21,63,"GtkWidget","css-classes","property",None,None,None,None,None,None,None,None,None),
+	(21,64,"AdwPreferencesRow","title","Connect automatically",None,None,None,None,None,None,None,None,None),
+	(21,65,"AdwPreferencesRow","title","Metered Connection",None,None,None,None,None,None,None,None,None),
+	(21,66,"GtkLabel","label","General",None,None,None,None,None,None,None,None,None),
+	(21,67,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(21,69,"AdwComboRow","model",None,None,None,None,None,70,None,None,None,None),
+	(21,69,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
+	(21,71,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
+	(21,72,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
+	(21,73,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
+	(21,73,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(21,74,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,75,None,None,None,None),
+	(21,74,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
+	(21,74,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(21,76,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
+	(21,76,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(21,77,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(21,78,"GtkLabel","label","IPv4",None,None,None,None,None,None,None,None,None),
+	(21,79,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(21,81,"AdwComboRow","model",None,None,None,None,None,82,None,None,None,None),
+	(21,81,"AdwPreferencesRow","title","IPv6 Method",None,None,None,None,None,None,None,None,None),
+	(21,83,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
+	(21,84,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
+	(21,85,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
+	(21,85,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(21,86,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,87,None,None,None,None),
+	(21,86,"AdwPreferencesGroup","title","Routes",None,None,None,None,None,None,None,None,None),
+	(21,86,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(21,88,"GtkLabel","label","Automatic",None,None,None,None,None,None,None,None,None),
+	(21,88,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
+	(21,89,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(21,90,"GtkLabel","label","IPv6",None,None,None,None,None,None,None,None,None),
+	(21,91,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
+	(21,93,"AdwComboRow","model",None,None,None,None,None,94,None,None,None,None),
+	(21,93,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
+	(21,95,"AdwPreferencesRow","title","Username",None,None,None,None,None,None,None,None,None),
+	(21,96,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
+	(21,97,"GtkLabel","label","Security",None,None,None,None,None,None,None,None,None),
+	(21,98,"GtkButton","label","Apply",None,None,None,None,None,None,None,None,None),
+	(21,98,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(21,98,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(22,2,"AdwPreferencesRow","title","Add new Address",None,None,None,None,None,None,None,None,None),
 	(22,2,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(22,3,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
@@ -873,29 +882,6 @@
 	(8,99,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(12,25,"GtkScale",1,1,None,None,None,None,None,None),
 	(12,25,"GtkScale",2,2,"100%",1,None,None,None,None),
-	(21,25,"GtkStringList",1,1,None,None,None,None,None,None),
-	(21,25,"GtkStringList",2,2,"Automatic (DHCP)",1,None,None,None,None),
-	(21,25,"GtkStringList",2,3,"Manual",1,None,None,None,None),
-	(21,25,"GtkStringList",2,4,"Link-Local Only",1,None,None,None,None),
-	(21,25,"GtkStringList",2,5,"Shared to other computers",1,None,None,None,None),
-	(21,25,"GtkStringList",2,6,"Disabled",1,None,None,None,None),
-	(21,31,"GtkStringList",1,1,None,None,None,None,None,None),
-	(21,31,"GtkStringList",2,2,"Automatic",1,None,None,None,None),
-	(21,31,"GtkStringList",2,3,"Automatic (DHCP)",1,None,None,None,None),
-	(21,31,"GtkStringList",2,4,"Manual",1,None,None,None,None),
-	(21,31,"GtkStringList",2,5,"Link-Local Only",1,None,None,None,None),
-	(21,31,"GtkStringList",2,6,"Shared to other computers",1,None,None,None,None),
-	(21,31,"GtkStringList",2,7,"Disabled",1,None,None,None,None),
-	(21,41,"GtkStringList",1,1,None,None,None,None,None,None),
-	(21,41,"GtkStringList",2,2,"None",1,None,None,None,None),
-	(21,41,"GtkStringList",2,3,"Enhanced Open",1,None,None,None,None),
-	(21,41,"GtkStringList",2,4,"WEP 40/128-bit Key (Hex or ASCII)",1,None,None,None,None),
-	(21,41,"GtkStringList",2,5,"WEP 128-bit Passphrase",1,None,None,None,None),
-	(21,41,"GtkStringList",2,6,"LEAP",1,None,None,None,None),
-	(21,41,"GtkStringList",2,7,"Dynamic WEP (802.1X)",1,None,None,None,None),
-	(21,41,"GtkStringList",2,8,"WPA &amp; WPA2 Personal",1,None,None,None,None),
-	(21,41,"GtkStringList",2,9,"WPA &amp; WPA2 Enterprise",1,None,None,None,None),
-	(21,41,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None),
 	(13,38,"GtkScale",1,1,None,None,None,None,None,None),
 	(13,38,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(7,20,"GtkScale",1,1,None,None,None,None,None,None),
@@ -903,7 +889,30 @@
 	(18,20,"GtkScale",1,1,None,None,None,None,None,None),
 	(18,20,"GtkScale",2,2,"100%",1,None,None,None,None),
 	(19,20,"GtkScale",1,1,None,None,None,None,None,None),
-	(19,20,"GtkScale",2,2,"100%",1,None,None,None,None)
+	(19,20,"GtkScale",2,2,"100%",1,None,None,None,None),
+	(21,70,"GtkStringList",1,1,None,None,None,None,None,None),
+	(21,70,"GtkStringList",2,2,"Automatic (DHCP)",1,None,None,None,None),
+	(21,70,"GtkStringList",2,3,"Manual",1,None,None,None,None),
+	(21,70,"GtkStringList",2,4,"Link-Local Only",1,None,None,None,None),
+	(21,70,"GtkStringList",2,5,"Shared to other computers",1,None,None,None,None),
+	(21,70,"GtkStringList",2,6,"Disabled",1,None,None,None,None),
+	(21,82,"GtkStringList",1,1,None,None,None,None,None,None),
+	(21,82,"GtkStringList",2,2,"Automatic",1,None,None,None,None),
+	(21,82,"GtkStringList",2,3,"Automatic (DHCP)",1,None,None,None,None),
+	(21,82,"GtkStringList",2,4,"Manual",1,None,None,None,None),
+	(21,82,"GtkStringList",2,5,"Link-Local Only",1,None,None,None,None),
+	(21,82,"GtkStringList",2,6,"Shared to other computers",1,None,None,None,None),
+	(21,82,"GtkStringList",2,7,"Disabled",1,None,None,None,None),
+	(21,94,"GtkStringList",1,1,None,None,None,None,None,None),
+	(21,94,"GtkStringList",2,2,"None",1,None,None,None,None),
+	(21,94,"GtkStringList",2,3,"Enhanced Open",1,None,None,None,None),
+	(21,94,"GtkStringList",2,4,"WEP 40/128-bit Key (Hex or ASCII)",1,None,None,None,None),
+	(21,94,"GtkStringList",2,5,"WEP 128-bit Passphrase",1,None,None,None,None),
+	(21,94,"GtkStringList",2,6,"LEAP",1,None,None,None,None),
+	(21,94,"GtkStringList",2,7,"Dynamic WEP (802.1X)",1,None,None,None,None),
+	(21,94,"GtkStringList",2,8,"WPA &amp; WPA2 Personal",1,None,None,None,None),
+	(21,94,"GtkStringList",2,9,"WPA &amp; WPA2 Enterprise",1,None,None,None,None),
+	(21,94,"GtkStringList",2,10,"WPA3 Personal",1,None,None,None,None)
   </object_data>
   <object_data_arg>
 	(3,42,"GtkWidget",2,2,"name","b"),
diff --git a/src/resources/resetWifiOptions.ui b/src/resources/resetWifiOptions.ui
index ff5a81d..d98be20 100644
--- a/src/resources/resetWifiOptions.ui
+++ b/src/resources/resetWifiOptions.ui
@@ -5,252 +5,270 @@
   <requires lib="libadwaita" version="1.4"/>
   <template class="resetWifiOptions" parent="AdwNavigationPage">
     <child>
-      <object class="GtkNotebook">
-        <property name="scrollable">True</property>
-        <property name="show-border">False</property>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
+          <object class="GtkNotebook">
+            <property name="scrollable">True</property>
+            <property name="show-border">False</property>
             <child>
-              <object class="AdwPreferencesGroup">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="AdwActionRow" id="resetWifiName">
-                    <property name="css-classes">property</property>
-                    <property name="title">WiFi Name</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiMac">
-                    <property name="css-classes">property</property>
-                    <property name="title">MAC-Address</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiLinkSpeed">
-                    <property name="css-classes">property</property>
-                    <property name="title">Link Speed</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiIP4Addr">
-                    <property name="css-classes">property</property>
-                    <property name="title">IPv4 Address</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiIP6Addr">
-                    <property name="css-classes">property</property>
-                    <property name="title">IPv6 Address</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiGateway">
-                    <property name="css-classes">property</property>
-                    <property name="title">Gateway</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwActionRow" id="resetWifiDNS">
-                    <property name="css-classes">property</property>
-                    <property name="title">DNS</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwSwitchRow" id="resetWifiAutoConnect">
-                    <property name="title">Connect automatically</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwSwitchRow" id="resetWifiMetered">
-                    <property name="title">Metered Connection</property>
+                  <object class="AdwPreferencesGroup">
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiName">
+                        <property name="css-classes">property</property>
+                        <property name="title">WiFi Name</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiMac">
+                        <property name="css-classes">property</property>
+                        <property name="title">MAC-Address</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiLinkSpeed">
+                        <property name="css-classes">property</property>
+                        <property name="title">Link Speed</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiIP4Addr">
+                        <property name="css-classes">property</property>
+                        <property name="title">IPv4 Address</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiIP6Addr">
+                        <property name="css-classes">property</property>
+                        <property name="title">IPv6 Address</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiGateway">
+                        <property name="css-classes">property</property>
+                        <property name="title">Gateway</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiDNS">
+                        <property name="css-classes">property</property>
+                        <property name="title">DNS</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwActionRow" id="resetWifiLastUsed">
+                        <property name="css-classes">property</property>
+                        <property name="title">Last Used</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwSwitchRow" id="resetWifiAutoConnect">
+                        <property name="title">Connect automatically</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwSwitchRow" id="resetWifiMetered">
+                        <property name="title">Metered Connection</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="label">General</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="label">General</property>
+              </object>
+            </child>
             <child>
-              <object class="AdwPreferencesGroup">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="AdwComboRow" id="resetIP4Method">
-                    <property name="model">
-                      <object class="GtkStringList">
-                        <items>
-                          <item>Automatic (DHCP)</item>
-                          <item>Manual</item>
-                          <item>Link-Local Only</item>
-                          <item>Shared to other computers</item>
-                          <item>Disabled</item>
-                        </items>
+                  <object class="AdwPreferencesGroup">
+                    <child>
+                      <object class="AdwComboRow" id="resetIP4Method">
+                        <property name="model">
+                          <object class="GtkStringList">
+                            <items>
+                              <item>Automatic (DHCP)</item>
+                              <item>Manual</item>
+                              <item>Link-Local Only</item>
+                              <item>Shared to other computers</item>
+                              <item>Disabled</item>
+                            </items>
+                          </object>
+                        </property>
+                        <property name="title">IPv4 Method</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwEntryRow" id="resetIP4DNS">
+                        <property name="title">DNS (separate IP by comma, empty for automatic)</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwEntryRow" id="resetIP4Gateway">
+                        <property name="title">Gateway</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwPreferencesGroup" id="resetIP4AddressGroup">
+                    <property name="margin-top">10</property>
+                    <property name="title">Addresses</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwPreferencesGroup" id="resetIP4RoutesGroup">
+                    <property name="header-suffix">
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label">Automatic</property>
+                            <property name="margin-end">5</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch">
+                            <property name="valign">center</property>
+                          </object>
+                        </child>
                       </object>
                     </property>
-                    <property name="title">IPv4 Method</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwEntryRow" id="resetIP4DNS">
-                    <property name="title">DNS (separate IP by comma, empty for automatic)</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwEntryRow" id="resetIP4Gateway">
-                    <property name="title">Gateway</property>
+                    <property name="margin-top">10</property>
+                    <property name="title">Routes</property>
                   </object>
                 </child>
               </object>
             </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="label">IPv4</property>
+              </object>
+            </child>
             <child>
-              <object class="AdwPreferencesGroup" id="resetIP4AddressGroup">
-                <property name="margin-top">10</property>
-                <property name="title">Addresses</property>
-              </object>
-            </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="resetIP4RoutesGroup">
-                <property name="header-suffix">
-                  <object class="GtkBox">
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="GtkLabel">
-                        <property name="label">Automatic</property>
-                        <property name="margin-end">5</property>
+                      <object class="AdwComboRow" id="resetIP6Method">
+                        <property name="model">
+                          <object class="GtkStringList">
+                            <items>
+                              <item>Automatic</item>
+                              <item>Automatic (DHCP)</item>
+                              <item>Manual</item>
+                              <item>Link-Local Only</item>
+                              <item>Shared to other computers</item>
+                              <item>Disabled</item>
+                            </items>
+                          </object>
+                        </property>
+                        <property name="title">IPv6 Method</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSwitch">
-                        <property name="valign">center</property>
+                      <object class="AdwEntryRow" id="resetIP6DNS">
+                        <property name="title">DNS (separate IP by comma, empty for automatic)</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwEntryRow" id="resetIP6Gateway">
+                        <property name="title">Gateway</property>
                       </object>
                     </child>
                   </object>
-                </property>
-                <property name="margin-top">10</property>
-                <property name="title">Routes</property>
+                </child>
+                <child>
+                  <object class="AdwPreferencesGroup" id="resetIP6AddressGroup">
+                    <property name="margin-top">10</property>
+                    <property name="title">Addresses</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwPreferencesGroup" id="resetIP6RoutesGroup">
+                    <property name="header-suffix">
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label">Automatic</property>
+                            <property name="margin-end">5</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch">
+                            <property name="valign">center</property>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                    <property name="margin-top">10</property>
+                    <property name="title">Routes</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="label">IPv6</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="AdwPreferencesGroup">
+                    <child>
+                      <object class="AdwComboRow">
+                        <property name="model">
+                          <object class="GtkStringList">
+                            <items>
+                              <item>None</item>
+                              <item>Enhanced Open</item>
+                              <item>WEP 40/128-bit Key (Hex or ASCII)</item>
+                              <item>WEP 128-bit Passphrase</item>
+                              <item>LEAP</item>
+                              <item>Dynamic WEP (802.1X)</item>
+                              <item>WPA &amp; WPA2 Personal</item>
+                              <item>WPA &amp; WPA2 Enterprise</item>
+                              <item>WPA3 Personal</item>
+                            </items>
+                          </object>
+                        </property>
+                        <property name="title">Security</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwEntryRow">
+                        <property name="title">Username</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwPasswordEntryRow">
+                        <property name="title">Password</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="label">Security</property>
               </object>
             </child>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="label">IPv4</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="AdwPreferencesGroup">
-                <child>
-                  <object class="AdwComboRow" id="resetIP6Method">
-                    <property name="model">
-                      <object class="GtkStringList">
-                        <items>
-                          <item>Automatic</item>
-                          <item>Automatic (DHCP)</item>
-                          <item>Manual</item>
-                          <item>Link-Local Only</item>
-                          <item>Shared to other computers</item>
-                          <item>Disabled</item>
-                        </items>
-                      </object>
-                    </property>
-                    <property name="title">IPv6 Method</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwEntryRow" id="resetIP6DNS">
-                    <property name="title">DNS (separate IP by comma, empty for automatic)</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwEntryRow" id="resetIP6Gateway">
-                    <property name="title">Gateway</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="resetIP6AddressGroup">
-                <property name="margin-top">10</property>
-                <property name="title">Addresses</property>
-              </object>
-            </child>
-            <child>
-              <object class="AdwPreferencesGroup" id="resetIP6RoutesGroup">
-                <property name="header-suffix">
-                  <object class="GtkBox">
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">Automatic</property>
-                        <property name="margin-end">5</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch">
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-                <property name="margin-top">10</property>
-                <property name="title">Routes</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="label">IPv6</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="AdwPreferencesGroup">
-                <child>
-                  <object class="AdwComboRow">
-                    <property name="model">
-                      <object class="GtkStringList">
-                        <items>
-                          <item>None</item>
-                          <item>Enhanced Open</item>
-                          <item>WEP 40/128-bit Key (Hex or ASCII)</item>
-                          <item>WEP 128-bit Passphrase</item>
-                          <item>LEAP</item>
-                          <item>Dynamic WEP (802.1X)</item>
-                          <item>WPA &amp; WPA2 Personal</item>
-                          <item>WPA &amp; WPA2 Enterprise</item>
-                          <item>WPA3 Personal</item>
-                        </items>
-                      </object>
-                    </property>
-                    <property name="title">Security</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwEntryRow">
-                    <property name="title">Username</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="AdwPasswordEntryRow">
-                    <property name="title">Password</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel">
-            <property name="label">Security</property>
+          <object class="GtkButton" id="wifiOptionsApplyButton">
+            <property name="halign">end</property>
+            <property name="label">Apply</property>
+            <property name="margin-top">10</property>
           </object>
         </child>
       </object>