diff --git a/OnnxStack.UI/App.xaml.cs b/OnnxStack.UI/App.xaml.cs
index b28d2065..deb02714 100644
--- a/OnnxStack.UI/App.xaml.cs
+++ b/OnnxStack.UI/App.xaml.cs
@@ -41,7 +41,7 @@ public App()
             builder.Services.AddTransient<UpdateUpscaleModelDialog>();
             builder.Services.AddSingleton<IModelFactory, ModelFactory>();
             builder.Services.AddSingleton<IDialogService, DialogService>();
-
+            builder.Services.AddSingleton<IDeviceService, DeviceService>();
             // Build App
             _applicationHost = builder.Build();
         }
diff --git a/OnnxStack.UI/Dialogs/UpdateModelDialog.xaml b/OnnxStack.UI/Dialogs/UpdateModelDialog.xaml
index 793dfda4..1ba41ecf 100644
--- a/OnnxStack.UI/Dialogs/UpdateModelDialog.xaml
+++ b/OnnxStack.UI/Dialogs/UpdateModelDialog.xaml
@@ -7,6 +7,8 @@
         xmlns:userControls="clr-namespace:OnnxStack.UI.UserControls"
         mc:Ignorable="d"
         Name="UI"
+        MinWidth="1200"
+        MaxWidth="1200"
         Icon="/Images/Icon.png"
         SizeToContent="WidthAndHeight"
         WindowStartupLocation="CenterOwner" 
@@ -27,16 +29,16 @@
 
                         <UniformGrid Columns="3" Margin="0,5,0,0">
 
-                            <StackPanel Margin="0,0,4,0">
+                            <StackPanel>
                                 <TextBlock Text="Pipeline" />
                                 <ComboBox ItemsSource="{Binding Source={StaticResource DiffuserPipelineType}}" SelectedItem="{Binding UpdateModelSet.PipelineType}" />
                             </StackPanel>
 
-                            <StackPanel Margin="0,0,4,0">
+                            <StackPanel Margin="4,0">
                                 <TextBlock Text="Model Type" />
                                 <ComboBox ItemsSource="{Binding Source={StaticResource ModelType}}" SelectedItem="{Binding UpdateModelSet.ModelType}" />
                             </StackPanel>
-                            <StackPanel Margin="0,0,4,0">
+                            <StackPanel >
                                 <TextBlock Text="Sample Size" />
                                 <TextBox Text="{Binding UpdateModelSet.SampleSize}" />
                             </StackPanel>
@@ -53,40 +55,35 @@
                 </GroupBox>
 
                 <GroupBox Header="Performance" Margin="5,0" >
-                    <UniformGrid Columns="2" Margin="5">
-
-                        <StackPanel Margin="0,0,4,0">
-                            <TextBlock Text="Execution Provider" />
-                            <ComboBox ItemsSource="{Binding UISettings.SupportedExecutionProviders}" SelectedItem="{Binding UpdateModelSet.ExecutionProvider}" />
+                    <StackPanel Margin="5">
+                        <StackPanel  Margin="0,0,4,0">
+                            <TextBlock Text="Device" />
+                            <userControls:DevicePickerControl 
+                                UISettings="{Binding UISettings}"
+                                DeviceId="{Binding UpdateModelSet.DeviceId, Mode=TwoWay}"
+                                ExecutionProvider="{Binding UpdateModelSet.ExecutionProvider, Mode=TwoWay}" />
                         </StackPanel>
-                        <TextBlock />
-                        <StackPanel Margin="0,0,4,0">
+                        <StackPanel Margin="0,4,0,0">
                             <TextBlock Text="Mode" />
                             <ComboBox ItemsSource="{Binding Source={StaticResource ExecutionModeType}}" SelectedItem="{Binding UpdateModelSet.ExecutionMode}" />
                         </StackPanel>
-                        <StackPanel Margin="0,0,4,0">
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="DeviceId" />
-                                <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                            </DockPanel>
-                            <TextBox Text="{Binding UpdateModelSet.DeviceId}" />
-                        </StackPanel>
-                        <StackPanel Margin="0,0,4,0">
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
-                                <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                            </DockPanel>
-                            <TextBox Text="{Binding UpdateModelSet.InterOpNumThreads}" />
-                        </StackPanel>
-
-                        <StackPanel>
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="IntraOp Threads" />
-                                <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                            </DockPanel>
-                            <TextBox Text="{Binding UpdateModelSet.IntraOpNumThreads}" />
-                        </StackPanel>
-                    </UniformGrid>
+                        <UniformGrid Columns="2" Margin="0,4,0,0">
+                            <StackPanel Margin="0,0,2,0">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
+                                    <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                </DockPanel>
+                                <TextBox Text="{Binding UpdateModelSet.InterOpNumThreads}" />
+                            </StackPanel>
+                            <StackPanel Margin="2,0,0,0">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Left" Text="IntraOp Threads" />
+                                    <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                </DockPanel>
+                                <TextBox Text="{Binding UpdateModelSet.IntraOpNumThreads}" />
+                            </StackPanel>
+                        </UniformGrid>
+                    </StackPanel>
                 </GroupBox>
 
                 <GroupBox Header="Advanced Settings" >
@@ -148,22 +145,20 @@
                                         </DockPanel>
 
                                         <!--Override Defaults-->
-                                        <UniformGrid Grid.Column="0" Columns="5" Visibility="{Binding IsOverrideEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,5,0,10">
+                                        <UniformGrid Grid.Column="0" Columns="4" Visibility="{Binding IsOverrideEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,5,0,10">
                                             <StackPanel Margin="0,0,4,0">
-                                                <TextBlock Text="Provider" />
-                                                <ComboBox ItemsSource="{Binding UISettings.SupportedExecutionProviders, ElementName=UI}" SelectedItem="{Binding ExecutionProvider}" />
+                                                <TextBlock Text="Device" />
+                                                <userControls:DevicePickerControl 
+                                                    UISettings="{Binding UISettings, ElementName=UI}"
+                                                    DeviceId="{Binding DeviceId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                    ExecutionProvider="{Binding ExecutionProvider, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                             </StackPanel>
+
                                             <StackPanel Margin="0,0,4,0">
                                                 <TextBlock Text="Mode" />
                                                 <ComboBox ItemsSource="{Binding Source={StaticResource ExecutionModeType}}" SelectedItem="{Binding ExecutionMode}" />
                                             </StackPanel>
-                                            <StackPanel Margin="0,0,4,0">
-                                                <DockPanel>
-                                                    <TextBlock DockPanel.Dock="Left" Text="DeviceId" />
-                                                    <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                                                </DockPanel>
-                                                <TextBox Text="{Binding DeviceId, TargetNullValue=''}" />
-                                            </StackPanel>
+
                                             <StackPanel Margin="0,0,4,0">
                                                 <DockPanel>
                                                     <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
diff --git a/OnnxStack.UI/Dialogs/UpdateUpscaleModelDialog.xaml b/OnnxStack.UI/Dialogs/UpdateUpscaleModelDialog.xaml
index 66103af6..9db538e0 100644
--- a/OnnxStack.UI/Dialogs/UpdateUpscaleModelDialog.xaml
+++ b/OnnxStack.UI/Dialogs/UpdateUpscaleModelDialog.xaml
@@ -74,22 +74,20 @@
             <GroupBox Header="Performance" Margin="5,10,5,0" >
                 <UniformGrid Columns="2" Margin="5">
 
-                    <StackPanel Margin="0,0,4,0">
-                        <TextBlock Text="Execution Provider" />
-                        <ComboBox ItemsSource="{Binding UISettings.SupportedExecutionProviders}" SelectedItem="{Binding UpdateModelSet.ExecutionProvider}" />
+                    <StackPanel  Margin="0,0,4,0">
+                        <TextBlock Text="Device" />
+                        <userControls:DevicePickerControl 
+                             UISettings="{Binding UISettings}"
+                             DeviceId="{Binding UpdateModelSet.DeviceId, Mode=TwoWay}"
+                             ExecutionProvider="{Binding UpdateModelSet.ExecutionProvider, Mode=TwoWay}" />
                     </StackPanel>
+
                     <TextBlock />
                     <StackPanel Margin="0,0,4,0">
                         <TextBlock Text="Mode" />
                         <ComboBox ItemsSource="{Binding Source={StaticResource ExecutionModeType}}" SelectedItem="{Binding UpdateModelSet.ExecutionMode}" />
                     </StackPanel>
-                    <StackPanel>
-                        <DockPanel>
-                            <TextBlock DockPanel.Dock="Left" Text="DeviceId" />
-                            <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                        </DockPanel>
-                        <TextBox Text="{Binding UpdateModelSet.DeviceId}" />
-                    </StackPanel>
+   
                     <StackPanel Margin="0,0,4,0">
                         <DockPanel>
                             <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
diff --git a/OnnxStack.UI/Models/DeviceInfo.cs b/OnnxStack.UI/Models/DeviceInfo.cs
new file mode 100644
index 00000000..b1a0515c
--- /dev/null
+++ b/OnnxStack.UI/Models/DeviceInfo.cs
@@ -0,0 +1,16 @@
+namespace OnnxStack.UI.Models
+{
+    public class DeviceInfo
+    {
+        public DeviceInfo(string name, int deviceId, int vram)
+        {
+            Name = name;
+            DeviceId = deviceId;
+            VRAM = vram;
+        }
+
+        public string Name { get; set; }
+        public int DeviceId { get; set; }
+        public int VRAM { get; set; }
+    }
+}
diff --git a/OnnxStack.UI/Models/OnnxStackUIConfig.cs b/OnnxStack.UI/Models/OnnxStackUIConfig.cs
index 49fac02a..f297a278 100644
--- a/OnnxStack.UI/Models/OnnxStackUIConfig.cs
+++ b/OnnxStack.UI/Models/OnnxStackUIConfig.cs
@@ -14,28 +14,27 @@ public class OnnxStackUIConfig : IConfigSection
         public int DefaultIntraOpNumThreads { get; set; }
         public ExecutionMode DefaultExecutionMode { get; set; }
         public ExecutionProvider DefaultExecutionProvider { get; set; }
-        public IEnumerable<ExecutionProvider> SupportedExecutionProviders => GetSupportedExecutionProviders();
+        public ExecutionProvider SupportedExecutionProvider => GetSupportedExecutionProvider();
         public ObservableCollection<UpscaleModelSetViewModel> UpscaleModelSets { get; set; } = new ObservableCollection<UpscaleModelSetViewModel>();
         public ObservableCollection<StableDiffusionModelSetViewModel> StableDiffusionModelSets { get; set; } = new ObservableCollection<StableDiffusionModelSetViewModel>();
 
 
-        public IEnumerable<ExecutionProvider> GetSupportedExecutionProviders()
+        public ExecutionProvider GetSupportedExecutionProvider()
         {
 #if DEBUG_CUDA || RELEASE_CUDA
-            yield return ExecutionProvider.Cuda;
+            return ExecutionProvider.Cuda;
 #elif DEBUG_TENSORRT || RELEASE_TENSORRT
-            yield return ExecutionProvider.TensorRT;
+            return ExecutionProvider.TensorRT;
 #else
-            yield return ExecutionProvider.DirectML;
+            return ExecutionProvider.DirectML;
 #endif
-            yield return ExecutionProvider.Cpu;
         }
 
         public void Initialize()
         {
-            DefaultExecutionProvider = SupportedExecutionProviders.Contains(DefaultExecutionProvider)
+            DefaultExecutionProvider = DefaultExecutionProvider == SupportedExecutionProvider || DefaultExecutionProvider == ExecutionProvider.Cpu
                 ? DefaultExecutionProvider
-                : SupportedExecutionProviders.First();
+                : SupportedExecutionProvider;
         }
 
     }
diff --git a/OnnxStack.UI/OnnxStack.Adapter.dll b/OnnxStack.UI/OnnxStack.Adapter.dll
new file mode 100644
index 00000000..ed0e899f
Binary files /dev/null and b/OnnxStack.UI/OnnxStack.Adapter.dll differ
diff --git a/OnnxStack.UI/OnnxStack.UI.csproj b/OnnxStack.UI/OnnxStack.UI.csproj
index 1998c6d9..7e43cd12 100644
--- a/OnnxStack.UI/OnnxStack.UI.csproj
+++ b/OnnxStack.UI/OnnxStack.UI.csproj
@@ -10,6 +10,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <Configurations>Debug;Release;Debug-Cuda;Debug-TensorRT;Release-Cuda;Release-TensorRT</Configurations>
     <Platforms>x64</Platforms>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Cuda|x64'">
@@ -39,7 +40,6 @@
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
-    <None Include="..\OnnxStack.Adapter\x64\Debug\OnnxStack.Adapter.dll" Link="OnnxStack.Adapter.dll" />
     <Resource Include="Fonts\fa-brands-400.ttf" />
     <Resource Include="Fonts\fa-duotone-900.ttf" />
     <Resource Include="Fonts\fa-light-300.ttf" />
@@ -69,4 +69,10 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="OnnxStack.Adapter.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/OnnxStack.UI/Services/DeviceService.cs b/OnnxStack.UI/Services/DeviceService.cs
new file mode 100644
index 00000000..7ed606e2
--- /dev/null
+++ b/OnnxStack.UI/Services/DeviceService.cs
@@ -0,0 +1,113 @@
+using Microsoft.Extensions.Logging;
+using OnnxStack.UI.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace OnnxStack.UI.Services
+{
+    public class DeviceService : IDeviceService
+    {
+        private readonly ILogger<DeviceService> _logger;
+        private IReadOnlyList<DeviceInfo> _devices;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceService"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public DeviceService(ILogger<DeviceService> logger)
+        {
+            _logger = logger;
+            _devices = GetDevices();
+        }
+
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
+        public IReadOnlyList<DeviceInfo> Devices => _devices;
+
+
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
+        /// <returns></returns>
+        private IReadOnlyList<DeviceInfo> GetDevices()
+        {
+            _logger.LogInformation("[GetDevices] - Query Devices...");
+            var devices = new List<DeviceInfo> { new DeviceInfo("CPU", 0, 0) };
+
+            try
+            {
+                var adapters = new AdapterInfo[10];
+                AdapterInterop.GetAdapters(adapters);
+                devices.AddRange(adapters
+                    .Where(x => x.DedicatedVideoMemory > 0)
+                    .Select(GetDeviceInfo)
+                    .ToList());
+                devices.ForEach(x => _logger.LogInformation($"[GetDevices] - Found Device: {x.Name}, DeviceId: {x.DeviceId}"));
+            }
+            catch (Exception ex)
+            {
+                devices.Add(new DeviceInfo("GPU0", 0, 0));
+                devices.Add(new DeviceInfo("GPU1", 1, 0));
+                _logger.LogError($"[GetDevices] - Failed to query devices, {ex.Message}");
+            }
+
+            _logger.LogInformation($"[GetDevices] - Query devices complete, Devices Found: {devices.Count}");
+            return devices;
+        }
+
+
+        /// <summary>
+        /// Gets the device information.
+        /// </summary>
+        /// <param name="adapter">The adapter.</param>
+        /// <returns></returns>
+        private static DeviceInfo GetDeviceInfo(AdapterInfo adapter)
+        {
+            string description;
+            unsafe
+            {
+                description = new string(adapter.Description);
+            }
+            var deviceId = (int)adapter.Id;
+            var vram = (int)(adapter.DedicatedVideoMemory / 1024 / 1024);
+            return new DeviceInfo(description, deviceId, vram);
+        }
+    }
+
+    public static partial class AdapterInterop
+    {
+        [LibraryImport("OnnxStack.Adapter.dll")]
+        [UnmanagedCallConv(CallConvs = new Type[] { typeof(CallConvCdecl) })]
+        public static partial int GetAdapter([MarshalAs(UnmanagedType.Bool)] bool preferHighPerformance);
+
+        [LibraryImport("OnnxStack.Adapter.dll")]
+        [UnmanagedCallConv(CallConvs = new Type[] { typeof(CallConvCdecl) })]
+        public static partial void GetAdapters(AdapterInfo[] adapterArray);
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct AdapterInfo
+    {
+        public uint Id;
+        public uint VendorId;
+        public uint DeviceId;
+        public uint SubSysId;
+        public uint Revision;
+        public ulong DedicatedVideoMemory;
+        public ulong DedicatedSystemMemory;
+        public ulong SharedSystemMemory;
+        public Luid AdapterLuid;
+        public fixed char Description[128];
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Luid
+    {
+        public uint LowPart;
+        public int HighPart;
+    }
+}
diff --git a/OnnxStack.UI/Services/IDeviceService.cs b/OnnxStack.UI/Services/IDeviceService.cs
new file mode 100644
index 00000000..aa2928c7
--- /dev/null
+++ b/OnnxStack.UI/Services/IDeviceService.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using OnnxStack.UI.Models;
+
+namespace OnnxStack.UI.Services
+{
+    public interface IDeviceService
+    {
+        IReadOnlyList<DeviceInfo> Devices { get; }
+    }
+}
\ No newline at end of file
diff --git a/OnnxStack.UI/UserControls/DevicePickerControl.xaml b/OnnxStack.UI/UserControls/DevicePickerControl.xaml
new file mode 100644
index 00000000..425f9c7a
--- /dev/null
+++ b/OnnxStack.UI/UserControls/DevicePickerControl.xaml
@@ -0,0 +1,30 @@
+<UserControl x:Class="OnnxStack.UI.UserControls.DevicePickerControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" Name="UI">
+    <DockPanel DataContext="{Binding ElementName=UI}">
+        <ComboBox ItemsSource="{Binding Devices}" SelectedItem="{Binding SelectedDevice}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Name}" />
+                        <TextBlock Text="{Binding UISettings.SupportedExecutionProvider, ElementName=UI, StringFormat={}({0})}" Margin="6,1,0,0" FontSize="10" Opacity=".7" FontStyle="Italic" >
+                            <TextBlock.Style>
+                                <Style TargetType="{x:Type TextBlock}">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Name}" Value="CPU">
+                                            <Setter Property="Visibility" Value="Collapsed" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+    </DockPanel>
+</UserControl>
diff --git a/OnnxStack.UI/UserControls/DevicePickerControl.xaml.cs b/OnnxStack.UI/UserControls/DevicePickerControl.xaml.cs
new file mode 100644
index 00000000..ec3d48a9
--- /dev/null
+++ b/OnnxStack.UI/UserControls/DevicePickerControl.xaml.cs
@@ -0,0 +1,139 @@
+using OnnxStack.Core.Config;
+using OnnxStack.UI.Models;
+using OnnxStack.UI.Services;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace OnnxStack.UI.UserControls
+{
+    /// <summary>
+    /// Interaction logic for DevicePickerControl.xaml
+    /// </summary>
+    public partial class DevicePickerControl : UserControl, INotifyPropertyChanged
+    {
+        private readonly IDeviceService _deviceService;
+        private DeviceInfo _selectedDevice;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DevicePickerControl"/> class.
+        /// </summary>
+        public DevicePickerControl()
+        {
+            if (!DesignerProperties.GetIsInDesignMode(this))
+                _deviceService = App.GetService<IDeviceService>();
+
+            InitializeComponent();
+        }
+
+        public static readonly DependencyProperty UISettingsProperty =
+             DependencyProperty.Register("UISettings", typeof(OnnxStackUIConfig), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+             {
+                 if (c is DevicePickerControl control)
+                     control.OnSettingsChanged();
+             }));
+
+        public static readonly DependencyProperty ExecutionProviderProperty =
+            DependencyProperty.Register("ExecutionProvider", typeof(ExecutionProvider?), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+            {
+                if (c is DevicePickerControl control)
+                    control.OnSettingsChanged();
+            }));
+
+        public static readonly DependencyProperty DeviceIdProperty =
+            DependencyProperty.Register("DeviceId", typeof(int?), typeof(DevicePickerControl), new PropertyMetadata((c, e) =>
+            {
+                if (c is DevicePickerControl control)
+                    control.OnSettingsChanged();
+            }));
+
+
+        /// <summary>
+        /// Gets or sets the UI settings.
+        /// </summary>
+        public OnnxStackUIConfig UISettings
+        {
+            get { return (OnnxStackUIConfig)GetValue(UISettingsProperty); }
+            set { SetValue(UISettingsProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the ExecutionProvider.
+        /// </summary>
+        public ExecutionProvider? ExecutionProvider
+        {
+            get { return (ExecutionProvider?)GetValue(ExecutionProviderProperty); }
+            set { SetValue(ExecutionProviderProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the DeviceId.
+        /// </summary>
+        public int? DeviceId
+        {
+            get { return (int?)GetValue(DeviceIdProperty); }
+            set { SetValue(DeviceIdProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the devices.
+        /// </summary>
+        public IReadOnlyList<DeviceInfo> Devices => _deviceService.Devices;
+
+
+        /// <summary>
+        /// Gets or sets the selected device.
+        /// </summary>
+        public DeviceInfo SelectedDevice
+        {
+            get { return _selectedDevice; }
+            set { _selectedDevice = value; OnSelectedDeviceChanged(); }
+        }
+
+
+        /// <summary>
+        /// Called when UISettings changed.
+        /// </summary>
+        private void OnSettingsChanged()
+        {
+            SelectedDevice = ExecutionProvider == Core.Config.ExecutionProvider.Cpu
+               ? Devices.FirstOrDefault()
+               : Devices.FirstOrDefault(x => x.Name != "CPU" && x.DeviceId == DeviceId);
+        }
+
+
+        /// <summary>
+        /// Called when SelectedDevice changed.
+        /// </summary>
+        private void OnSelectedDeviceChanged()
+        {
+            if (_selectedDevice is null)
+                return;
+
+            if (_selectedDevice.Name == "CPU")
+            {
+                DeviceId = 0;
+                ExecutionProvider = Core.Config.ExecutionProvider.Cpu;
+            }
+            else
+            {
+                DeviceId = _selectedDevice.DeviceId;
+                ExecutionProvider = UISettings.SupportedExecutionProvider;
+            }
+
+            NotifyPropertyChanged(nameof(SelectedDevice));
+        }
+
+        #region INotifyPropertyChanged
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void NotifyPropertyChanged([CallerMemberName] string property = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+        }
+        #endregion
+    }
+}
diff --git a/OnnxStack.UI/Views/SettingsView.xaml b/OnnxStack.UI/Views/SettingsView.xaml
index 0136eb5b..5e63be16 100644
--- a/OnnxStack.UI/Views/SettingsView.xaml
+++ b/OnnxStack.UI/Views/SettingsView.xaml
@@ -37,35 +37,40 @@
 
                 <GroupBox Header="Execution Defaults"  MinWidth="200" Margin="10,0,0,0">
                     <StackPanel Margin="5">
-                        <StackPanel Margin="0,10,0,0">
-                            <TextBlock Text="Provider" />
-                            <ComboBox ItemsSource="{Binding UISettings.SupportedExecutionProviders}" SelectedItem="{Binding UISettings.DefaultExecutionProvider}" />
-                        </StackPanel>
-                        <StackPanel Margin="0,5,0,0">
-                            <TextBlock Text="Mode" />
-                            <ComboBox ItemsSource="{Binding Source={StaticResource ExecutionModeType}}" SelectedItem="{Binding UISettings.DefaultExecutionMode}" />
-                        </StackPanel>
                         <StackPanel Margin="0,5,0,0">
                             <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="DeviceId" />
+                                <TextBlock DockPanel.Dock="Left" Text="Device" />
                                 <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                             </DockPanel>
-                            <TextBox Text="{Binding UISettings.DefaultDeviceId}" />
+                            <userControls:DevicePickerControl 
+                                  UISettings="{Binding UISettings}"
+                                  DeviceId="{Binding UISettings.DefaultDeviceId, Mode=TwoWay}"
+                                  ExecutionProvider="{Binding UISettings.DefaultExecutionProvider, Mode=TwoWay}" /> 
                         </StackPanel>
+          
                         <StackPanel Margin="0,5,0,0">
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
-                                <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                            </DockPanel>
-                            <TextBox Text="{Binding UISettings.DefaultInterOpNumThreads}" />
-                        </StackPanel>
-                        <StackPanel Margin="0,5,0,0">
-                            <DockPanel>
-                                <TextBlock DockPanel.Dock="Left" Text="IntraOp Threads" />
-                                <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                            </DockPanel>
-                            <TextBox Text="{Binding UISettings.DefaultIntraOpNumThreads}" />
+                            <TextBlock Text="Mode" />
+                            <ComboBox ItemsSource="{Binding Source={StaticResource ExecutionModeType}}" SelectedItem="{Binding UISettings.DefaultExecutionMode}" />
                         </StackPanel>
+
+                        <UniformGrid Columns="2" Margin="0,5,0,0">
+                            <StackPanel Margin="0,0,2,0">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Left" Text="InterOp Threads" />
+                                    <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                </DockPanel>
+                                <TextBox Text="{Binding UISettings.DefaultInterOpNumThreads}" />
+                            </StackPanel>
+                            <StackPanel Margin="2,0,0,0">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Left" Text="IntraOp Threads" />
+                                    <TextBlock Text="(0=auto)" FontSize="9" FontStyle="Italic" Margin="6,0,6,0" Opacity="0.5" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                </DockPanel>
+                                <TextBox Text="{Binding UISettings.DefaultIntraOpNumThreads}" />
+                            </StackPanel>
+                        </UniformGrid>
+     
+
                         <StackPanel Margin="0,10,0,0">
                             <Button Content="Save Changes" Height="30" Command="{Binding SaveCommand}" />
                         </StackPanel>
diff --git a/OnnxStack.UI/Views/SettingsView.xaml.cs b/OnnxStack.UI/Views/SettingsView.xaml.cs
index 10183b05..bd109aa7 100644
--- a/OnnxStack.UI/Views/SettingsView.xaml.cs
+++ b/OnnxStack.UI/Views/SettingsView.xaml.cs
@@ -5,6 +5,7 @@
 using OnnxStack.UI.Models;
 using OnnxStack.UI.Services;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -21,6 +22,7 @@ public partial class SettingsView : UserControl, INavigatable, INotifyPropertyCh
     {
         private readonly ILogger<SettingsView> _logger;
         private readonly IDialogService _dialogService;
+        private readonly IDeviceService _deviceService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SettingsView"/> class.
@@ -31,6 +33,8 @@ public SettingsView()
             {
                 _logger = App.GetService<ILogger<SettingsView>>();
                 _dialogService = App.GetService<IDialogService>();
+                _deviceService = App.GetService<IDeviceService>();
+             
             }
 
             SaveCommand = new AsyncRelayCommand(SaveConfigurationFile);
@@ -232,7 +236,6 @@ private async Task RemoveUpscaleModel()
 
 
 
-
         #region INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;