diff --git a/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerHandler.cs b/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerHandler.cs
index 0fcf96e..3a1d42c 100644
--- a/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerHandler.cs
+++ b/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerHandler.cs
@@ -22,8 +22,8 @@ public class MediaControllerHandler(IMediator mediator,
                         if (factory.Create(mediaController) is MediaControllerViewModel mediaControllerViewModel)
                         {
                             cache.Add(mediaController, mediaControllerViewModel);
-                            await mediator.PublishAsync(new Created<MediaControllerViewModel>(mediaControllerViewModel),
-                                cancellationToken);
+                            //await mediator.PublishAsync(new Created<MediaControllerViewModel>(mediaControllerViewModel),
+                            //    cancellationToken);
                         }
                     }
                 }
diff --git a/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerManager.cs b/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerManager.cs
index 2d464b7..92d9ef9 100644
--- a/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerManager.cs
+++ b/Hyperbar.Windows.MediaController/Lifecycles/MediaControllerManager.cs
@@ -29,7 +29,7 @@ public class MediaControllerManager(IMediator mediator,
     {
         if (factory.Create(session) is MediaController mediaController)
         {
-            await mediator.PublishAsync(new Created<MediaController>(mediaController));
+            //await mediator.PublishAsync(new Created<MediaController>(mediaController));
             cache.Add(new KeyValuePair<GlobalSystemMediaTransportControlsSession, MediaController>(session, mediaController));
         }
     }
diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs b/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
index a15eae4..b3efd67 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
@@ -25,8 +25,9 @@ public class PrimaryWidgetConfigurationHandler(IMediator mediator,
             {
                 if (factory.Create(item) is IWidgetComponentViewModel value)
                 {
-                    await mediator.PublishAsync(new Created<IWidgetComponentViewModel>(value),
-                        cancellationToken);
+                    await mediator.PublishAsync(Inserted<IWidgetComponentViewModel>
+                            .For<PrimaryWidgetViewModel>(item.Order, value),
+                                cancellationToken);
                 }
             }
         }
diff --git a/Hyperbar/Views/Created.cs b/Hyperbar/Views/Created.cs
index 2e8c597..718532e 100644
--- a/Hyperbar/Views/Created.cs
+++ b/Hyperbar/Views/Created.cs
@@ -1,5 +1,16 @@
 namespace Hyperbar;
 
-public record Created<TValue>(TValue Value) : INotification;
-
-public record Inserted<TValue>(int Index, TValue Value) : INotification;
\ No newline at end of file
+public record Created<TValue>(TValue Value, object Target) : INotification
+{
+    public static Created<TValue> For<TTarget>(TValue value)
+    {
+        return new Created<TValue>(value, typeof(TTarget).Name);
+    }
+}
+public record Inserted<TValue>(int Index, TValue Value, object Target) : INotification
+{
+    public static Inserted<TValue> For<TTarget>(int index, TValue value)
+    {
+        return new Inserted<TValue>(index, value, typeof(TTarget).Name);
+    }
+}
\ No newline at end of file
diff --git a/Hyperbar/Views/ObservableCollectionViewModel.cs b/Hyperbar/Views/ObservableCollectionViewModel.cs
index 62aaa57..0ddace7 100644
--- a/Hyperbar/Views/ObservableCollectionViewModel.cs
+++ b/Hyperbar/Views/ObservableCollectionViewModel.cs
@@ -11,6 +11,7 @@ public partial class ObservableCollectionViewModel<TItem> :
     IObservableCollectionViewModel<TItem>,
     INotificationHandler<Removed<TItem>>,
     INotificationHandler<Created<TItem>>,
+    INotificationHandler<Inserted<TItem>>,
     IDisposable
     where TItem :
     IDisposable
@@ -228,16 +229,33 @@ public partial class ObservableCollectionViewModel<TItem> :
     public ValueTask Handle(Created<TItem> notification,
         CancellationToken cancellationToken)
     {
-        if (notification.Value is not null)
+        if (notification.Target.Equals(GetType().Name))
         {
-            Add(notification.Value);
+            if (notification.Value is TItem item)
+            {
+                Add(item);
+            }
         }
 
         return ValueTask.CompletedTask;
     }
 
-    public int IndexOf(TItem item) => 
-        collection.IndexOf(item);
+    public ValueTask Handle(Inserted<TItem> notification,
+        CancellationToken cancellationToken)
+    {
+        if (notification.Target.Equals(GetType().Name))
+        {
+            if (notification.Value is TItem item)
+            {
+                Insert(notification.Index, item);
+            }
+        }
+
+        return ValueTask.CompletedTask;
+    }
+
+    public int IndexOf(TItem item) =>
+            collection.IndexOf(item);
 
     int IList.IndexOf(object? value) => 
         IsCompatibleObject(value) ?