diff --git a/src/app.rs b/src/app.rs
index aee4cf2..f419a78 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -13,12 +13,12 @@ live_design! {
     use link::shaders::*;
     use link::widgets::*;
 
-    import crate::shared::styles::*;
-    import crate::home::home_screen::HomeScreen;
-    import crate::profile::my_profile_screen::MyProfileScreen;
-    import crate::verification_modal::VerificationModal;
-    import crate::login::login_screen::LoginScreen;
-    import crate::shared::popup_list::PopupList;
+    use crate::shared::styles::*;
+    use crate::home::home_screen::HomeScreen;
+    use crate::profile::my_profile_screen::MyProfileScreen;
+    use crate::verification_modal::VerificationModal;
+    use crate::login::login_screen::LoginScreen;
+    use crate::shared::popup_list::PopupList;
     
     ICON_CHAT = dep("crate://self/resources/icons/chat.svg")
     ICON_CONTACTS = dep("crate://self/resources/icons/contacts.svg")
diff --git a/src/shared/popup_list.rs b/src/shared/popup_list.rs
index 6b4e9a4..077b2ea 100644
--- a/src/shared/popup_list.rs
+++ b/src/shared/popup_list.rs
@@ -7,9 +7,9 @@ pub fn enqueue_popup_notification(update: String) {
 }
 
 live_design! {
-    import makepad_widgets::base::*;
-    import makepad_widgets::theme_desktop_dark::*;
-    import makepad_draw::shader::std::*;
+    use link::theme::*;
+    use link::shaders::*;
+    use link::widgets::*;
     ICO_CLOSE = dep("crate://self/resources/icons/close.svg")
 
     PopupDialog = <RoundedView> {
@@ -61,7 +61,7 @@ live_design! {
         icon_walk: {width: 12, height: 12}
     }
 
-    PopupList = {{PopupList}} {
+    pub PopupList = {{PopupList}} {
         width: Fit
         height: Fit
         flow: Down