diff --git a/src/app.rs b/src/app.rs
index 5f44fdee..cf4cb6bb 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -267,42 +267,6 @@ pub struct App {
     ui: WidgetRef,
 }
 
-
-/*
-        // shared
-        crate::shared::styles::live_design(cx);
-        crate::shared::helpers::live_design(cx);
-        crate::shared::header::live_design(cx);
-        crate::shared::search_bar::live_design(cx);
-        crate::shared::popup_menu::live_design(cx);
-        crate::shared::dropdown_menu::live_design(cx);
-        crate::shared::clickable_view::live_design(cx);
-        crate::shared::avatar::live_design(cx);
-        crate::shared::text_or_image::live_design(cx);
-        crate::shared::html_or_plaintext::live_design(cx);
-
-        // home - chats
-        crate::home::home_screen::live_design(cx);
-        crate::home::rooms_list::live_design(cx);
-        crate::home::room_screen::live_design(cx);
-
-        // contacts
-        crate::contacts::contacts_screen::live_design(cx);
-        crate::contacts::contacts_group::live_design(cx);
-        crate::contacts::contacts_list::live_design(cx);
-        crate::contacts::add_contact_screen::live_design(cx);
-
-        // discover
-        crate::discover::discover_screen::live_design(cx);
-        crate::discover::moment_list::live_design(cx);
-        crate::discover::moments_screen::live_design(cx);
-
-        // profile
-        crate::profile::profile_screen::live_design(cx);
-        crate::profile::my_profile_screen::live_design(cx);
-
-*/
-
 impl LiveRegister for App {
     fn live_register(cx: &mut Cx) {
         // Order matters here, as some widget definitions depend on others.
diff --git a/src/profile/user_profile.rs b/src/profile/user_profile.rs
index 62d2cb7c..9b2ecdd6 100644
--- a/src/profile/user_profile.rs
+++ b/src/profile/user_profile.rs
@@ -30,7 +30,7 @@ live_design! {
     //
     // Customized button widget, based on the RoundedView shaders with some modifications
     // which is a better fit with our application UI design
-    MoxinButton = <Button> {
+    UserProfileActionButton = <Button> {
         width: Fit,
         height: Fit,
         spacing: 10,
@@ -219,7 +219,7 @@ live_design! {
             padding: {left: 25, bottom: 50 }
 
 
-            direct_message_button = <MoxinButton> {
+            direct_message_button = <UserProfileActionButton> {
                 draw_icon: {
                     svg_file: (ICON_DOUBLE_CHAT)
                 }
@@ -227,7 +227,7 @@ live_design! {
                 text: "Direct Message"
             }
 
-            copy_link_to_user_button = <MoxinButton> {
+            copy_link_to_user_button = <UserProfileActionButton> {
                 draw_icon: {
                     svg_file: (ICON_COPY)
                 }
@@ -235,7 +235,7 @@ live_design! {
                 text: "Copy Link to User"
             }
 
-            jump_to_read_receipt_button = <MoxinButton> {
+            jump_to_read_receipt_button = <UserProfileActionButton> {
                 draw_icon: {
                     svg_file: (ICON_JUMP)
                 }
@@ -243,7 +243,7 @@ live_design! {
                 text: "Jump to Read Receipt"
             }
 
-            block_user_button = <MoxinButton> {
+            block_user_button = <UserProfileActionButton> {
                 draw_icon: {
                     svg_file: (ICON_BLOCK_USER)
                     color: (COLOR_DANGER_RED),
@@ -289,7 +289,7 @@ live_design! {
             user_profile_view = <UserProfileView> { }
 
             // The "X" close button on the top left
-            close_button = <MoxinButton> {
+            close_button = <UserProfileActionButton> {
                 width: Fit,
                 height: Fit,
                 align: {x: 0.0, y: 0.0},