diff --git a/src/drive_mount_row/imp.rs b/src/drive_mount_row/imp.rs
index 4646559..7d4d159 100644
--- a/src/drive_mount_row/imp.rs
+++ b/src/drive_mount_row/imp.rs
@@ -4,7 +4,7 @@ use adw::{prelude::*, subclass::prelude::*, *};
 use glib::{clone, subclass::Signal, Properties};
 use gtk::{glib, Orientation::Horizontal};
 
-use crate::partitioning_page::FstabEntry;
+use crate::{build_ui::{FstabEntry}};
 
 // ANCHOR: custom_button
 // Object holding the state
diff --git a/src/drive_mount_row/mod.rs b/src/drive_mount_row/mod.rs
index 089fe18..d31dec1 100644
--- a/src/drive_mount_row/mod.rs
+++ b/src/drive_mount_row/mod.rs
@@ -3,8 +3,7 @@ mod imp;
 use glib::Object;
 use gtk::glib;
 
-use crate::partitioning_page::create_parition_struct;
-use crate::partitioning_page::FstabEntry;
+use crate::{build_ui::{FstabEntry}, partitioning_page::create_parition_struct};
 
 glib::wrapper! {
     pub struct DriveMountRow(ObjectSubclass<imp::DriveMountRow>)
diff --git a/src/keyboard_page/mod.rs b/src/keyboard_page/mod.rs
index f81c622..6b119fa 100644
--- a/src/keyboard_page/mod.rs
+++ b/src/keyboard_page/mod.rs
@@ -63,6 +63,7 @@ pub fn keyboard_page(
     keyboard_test_entry_boxed_list.add_css_class("round-border-only-bottom");
 
     let current_keymap = "us";
+    let current_keymap_variant: Option<String> = None;
 
     let xkbinfo = gnome_desktop::XkbInfo::new();
 
@@ -147,7 +148,7 @@ pub fn keyboard_page(
                 }
             }
         ));
-        if current_keymap == keymap_clone1.name {
+        if current_keymap == keymap_clone1.name && current_keymap_variant == keymap_clone1.variant {
             keymap_checkbutton.set_active(true);
         }
     }