threading fixes

Hyperbar.Windows/Views/CommandView.xaml

@@ -2,8 +2,9 @@
 <UserControl
     x:Class="Hyperbar.Windows.CommandView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ItemsControl ItemTemplateSelector="{Binding TemplateFactory}" ItemsSource="{Binding}">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:windows="using:Hyperbar.Windows">
+    <ItemsControl ItemTemplateSelector="{Binding Mode=TwoWay, Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />

Hyperbar.Windows/Views/CommandViewModel.cs

@@ -6,8 +6,9 @@ public partial class CommandViewModel :
     ITemplatedViewModel
 {
     public CommandViewModel(ITemplateFactory templateFactory, 
-        IServiceFactory serviceFactory, 
-        IEnumerable<IWidgetViewModel> items) : base(serviceFactory, items)
+        IServiceFactory serviceFactory,
+        IMediator mediator,
+        IEnumerable<IWidgetViewModel> items) : base(serviceFactory, mediator, items)
     {
         TemplateFactory = templateFactory;
     }

Hyperbar.Windows/Views/WidgetView.xaml

@@ -2,8 +2,9 @@
 <UserControl
     x:Class="Hyperbar.Windows.WidgetView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ItemsControl ItemTemplateSelector="{Binding TemplateFactory}" ItemsSource="{Binding}">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:windows="using:Hyperbar.Windows">
+    <ItemsControl ItemTemplateSelector="{Binding Mode=TwoWay, Converter={windows:DataTemplateConverter}}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" Spacing="8" />