diff --git a/src/Ursa/Controls/Banner.cs b/src/Ursa/Controls/Banner/Banner.cs
similarity index 89%
rename from src/Ursa/Controls/Banner.cs
rename to src/Ursa/Controls/Banner/Banner.cs
index 2049e12..abdf373 100644
--- a/src/Ursa/Controls/Banner.cs
+++ b/src/Ursa/Controls/Banner/Banner.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Metadata;
+using Irihi.Avalonia.Shared.Helpers;
 
 namespace Ursa.Controls;
 
@@ -57,16 +58,9 @@ public class Banner: HeaderedContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (_closeButton != null)
-        {
-            _closeButton.Click -= OnCloseClick;
-        }
+        Button.ClickEvent.RemoveHandler(OnCloseClick, _closeButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        if (_closeButton != null)
-        {
-            _closeButton.Click += OnCloseClick;
-        }
-        
+        Button.ClickEvent.AddHandler(OnCloseClick, _closeButton);
     }
 
     private void OnCloseClick(object sender, RoutedEventArgs args)
diff --git a/src/Ursa/Controls/NavMenu/NavMenuItem.cs b/src/Ursa/Controls/NavMenu/NavMenuItem.cs
index df64986..eed50bf 100644
--- a/src/Ursa/Controls/NavMenu/NavMenuItem.cs
+++ b/src/Ursa/Controls/NavMenu/NavMenuItem.cs
@@ -10,6 +10,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
+using Irihi.Avalonia.Shared.Common;
 using Irihi.Avalonia.Shared.Helpers;
 
 namespace Ursa.Controls;
@@ -146,7 +147,7 @@ public class NavMenuItem: HeaderedItemsControl
         IsHighlightedProperty.AffectsPseudoClass<NavMenuItem>(PC_Highlighted);
         IsHorizontalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_HorizontalCollapsed);
         IsVerticalCollapsedProperty.AffectsPseudoClass<NavMenuItem>(PC_VerticalCollapsed);
-        IsSelectedProperty.AffectsPseudoClass<NavMenuItem>(":selected", IsSelectedChangedEvent);
+        IsSelectedProperty.AffectsPseudoClass<NavMenuItem>(PseudoClassName.PC_Selected, IsSelectedChangedEvent);
         IsHorizontalCollapsedProperty.Changed.AddClassHandler<NavMenuItem, bool>((item, args) =>
             item.OnIsHorizontalCollapsedChanged(args));
     }
diff --git a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
index 8f87b30..02234bf 100644
--- a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
@@ -20,7 +20,7 @@ public abstract class OverlayFeedbackElement: ContentControl
     
     static OverlayFeedbackElement()
     {
-        DataContextProperty.Changed.AddClassHandler<CustomDialogControl, object?>((o, e) => o.OnDataContextChange(e));
+        DataContextProperty.Changed.AddClassHandler<OverlayFeedbackElement, object?>((o, e) => o.OnDataContextChange(e));
         ClosedEvent.AddClassHandler<OverlayFeedbackElement>((o,e)=>o.OnClosed(e));
     }