diff --git a/AIDevGallery/Controls/ModelPicker/ModelOrApiPicker.xaml b/AIDevGallery/Controls/ModelPicker/ModelOrApiPicker.xaml
index 2f601e71..6b6fdcf8 100644
--- a/AIDevGallery/Controls/ModelPicker/ModelOrApiPicker.xaml
+++ b/AIDevGallery/Controls/ModelPicker/ModelOrApiPicker.xaml
@@ -195,7 +195,7 @@
                     Style="{StaticResource AccentButtonStyle}">
                     <StackPanel Orientation="Vertical" Spacing="4">
                         <FontIcon FontSize="14" Glyph="&#xE72A;" />
-                        <TextBlock Text="Run sample" />
+                        <TextBlock Text="Select model" />
                     </StackPanel>
                 </Button>
             </Grid>
diff --git a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
index 837cefe0..a201b1fc 100644
--- a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
+++ b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml
@@ -224,82 +224,93 @@
                         </DropDownButton.Flyout>
                     </DropDownButton>
                 </Grid>
-                <ItemsRepeater
+                <ItemsView
+                    x:Name="DownloadableModelSelectionItemsView"
                     Grid.Row="2"
                     IsTabStop="False"
-                    ItemsSource="{x:Bind DownloadableModels, Mode=OneWay}">
-                    <ItemsRepeater.Layout>
+                    ItemsSource="{x:Bind DownloadableModels, Mode=OneWay}"
+                    SelectionChanged="DownloadableModelSelectionItemsView_SelectionChanged"
+                    SelectionMode="Single">
+                    <ItemsView.Layout>
                         <StackLayout Spacing="4" />
-                    </ItemsRepeater.Layout>
-                    <ItemsRepeater.ItemTemplate>
+                    </ItemsView.Layout>
+                    <ItemsView.ItemTemplate>
                         <DataTemplate x:DataType="vm:DownloadableModel">
-                            <toolkit:SettingsCard
-                                MinHeight="48"
-                                Padding="20,8,16,6"
-                                Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
-                                Description="{x:Bind utils:AppUtils.FileSizeToString(ModelDetails.Size)}"
+                            <ItemContainer
+                                CornerRadius="{StaticResource ControlCornerRadius}"
                                 GotFocus="ItemContainer_GotFocus"
                                 PointerEntered="ItemContainer_PointerEntered"
                                 Tag="{x:Bind}">
-                                <toolkit:SettingsCard.Resources>
-                                    <Thickness x:Key="SettingsCardHeaderIconMargin">0,0,14,0</Thickness>
-                                    <x:Double x:Key="SettingsCardWrapThreshold">286</x:Double>
-                                    <x:Double x:Key="SettingsCardHeaderIconMaxSize">18</x:Double>
-                                </toolkit:SettingsCard.Resources>
-                                <toolkit:SettingsCard.Header>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock
-                                            MaxWidth="268"
-                                            VerticalAlignment="Center"
-                                            Text="{x:Bind ModelDetails.Name}"
-                                            TextTrimming="CharacterEllipsis"
-                                            ToolTipService.ToolTip="{x:Bind ModelDetails.Name}" />
-                                        <ItemsRepeater
-                                            Grid.Column="1"
-                                            Margin="4,0,0,0"
-                                            ItemsSource="{x:Bind ModelDetails.HardwareAccelerators}">
-                                            <ItemsRepeater.Layout>
-                                                <StackLayout Orientation="Horizontal" Spacing="4" />
-                                            </ItemsRepeater.Layout>
-                                            <ItemsRepeater.ItemTemplate>
-                                                <DataTemplate x:DataType="models:HardwareAccelerator">
-                                                    <Button
+                                <ItemContainer.Resources>
+                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent" />
+                                    <SolidColorBrush x:Key="ItemContainerSelectedPointerOverBackground" Color="Transparent" />
+                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent" />
+                                </ItemContainer.Resources>
+                                <toolkit:SettingsCard
+                                    MinHeight="48"
+                                    Padding="20,8,16,6"
+                                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                                    Description="{x:Bind utils:AppUtils.FileSizeToString(ModelDetails.Size)}">
+                                    <toolkit:SettingsCard.Resources>
+                                        <Thickness x:Key="SettingsCardHeaderIconMargin">0,0,14,0</Thickness>
+                                        <x:Double x:Key="SettingsCardWrapThreshold">286</x:Double>
+                                        <x:Double x:Key="SettingsCardHeaderIconMaxSize">18</x:Double>
+                                    </toolkit:SettingsCard.Resources>
+                                    <toolkit:SettingsCard.Header>
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock
+                                                MaxWidth="268"
+                                                VerticalAlignment="Center"
+                                                Text="{x:Bind ModelDetails.Name}"
+                                                TextTrimming="CharacterEllipsis"
+                                                ToolTipService.ToolTip="{x:Bind ModelDetails.Name}" />
+                                            <ItemsRepeater
+                                                Grid.Column="1"
+                                                Margin="4,0,0,0"
+                                                ItemsSource="{x:Bind ModelDetails.HardwareAccelerators}">
+                                                <ItemsRepeater.Layout>
+                                                    <StackLayout Orientation="Horizontal" Spacing="4" />
+                                                </ItemsRepeater.Layout>
+                                                <ItemsRepeater.ItemTemplate>
+                                                    <DataTemplate x:DataType="models:HardwareAccelerator">
+                                                        <Button
                                                         VerticalAlignment="Center"
                                                         AutomationProperties.Name="More info"
                                                         Content="{x:Bind utils:AppUtils.GetHardwareAcceleratorString((models:HardwareAccelerator))}"
                                                         Style="{StaticResource TertiaryButtonStyle}"
+                                                        Tapped="StopPropagatingHandler"
                                                         ToolTipService.ToolTip="More info">
-                                                        <Button.Flyout>
-                                                            <Flyout ShouldConstrainToRootBounds="False">
-                                                                <TextBlock
+                                                            <Button.Flyout>
+                                                                <Flyout ShouldConstrainToRootBounds="False">
+                                                                    <TextBlock
                                                                     MaxWidth="360"
                                                                     Text="{x:Bind utils:AppUtils.GetHardwareAcceleratorDescription((models:HardwareAccelerator))}"
                                                                     TextWrapping="Wrap" />
-                                                            </Flyout>
-                                                        </Button.Flyout>
-                                                    </Button>
-                                                </DataTemplate>
-                                            </ItemsRepeater.ItemTemplate>
-                                        </ItemsRepeater>
-                                    </Grid>
-                                </toolkit:SettingsCard.Header>
-                                <toolkit:SettingsCard.HeaderIcon>
-                                    <ImageIcon
+                                                                </Flyout>
+                                                            </Button.Flyout>
+                                                        </Button>
+                                                    </DataTemplate>
+                                                </ItemsRepeater.ItemTemplate>
+                                            </ItemsRepeater>
+                                        </Grid>
+                                    </toolkit:SettingsCard.Header>
+                                    <toolkit:SettingsCard.HeaderIcon>
+                                        <ImageIcon
                                         AutomationProperties.AccessibilityView="Control"
                                         AutomationProperties.Name="Model source icon"
                                         Source="{x:Bind ModelDetails.Icon}" />
-                                </toolkit:SettingsCard.HeaderIcon>
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Border
+                                    </toolkit:SettingsCard.HeaderIcon>
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <Border
                                         Width="28"
                                         Height="28"
                                         Margin="0,0,1,0"
                                         Padding="0">
-                                        <Button
+                                            <Button
                                             Width="28"
                                             Height="28"
                                             Padding="0"
@@ -310,24 +321,24 @@
                                             Style="{StaticResource SubtleButtonStyle}"
                                             ToolTipService.ToolTip="More options"
                                             Visibility="{x:Bind OptionsVisible, Mode=OneWay}">
-                                            <Button.Flyout>
-                                                <MenuFlyout Placement="Bottom">
-                                                    <MenuFlyoutItem
+                                                <Button.Flyout>
+                                                    <MenuFlyout Placement="Bottom">
+                                                        <MenuFlyoutItem
                                                         Click="ModelCard_Click"
                                                         Icon="{ui:FontIcon Glyph=&#xE8A5;}"
                                                         Tag="{x:Bind ModelDetails}"
                                                         Text="View model card" />
-                                                    <MenuFlyoutItem
+                                                        <MenuFlyoutItem
                                                         Click="ViewLicense_Click"
                                                         Icon="{ui:FontIcon Glyph=&#xE82D;}"
                                                         Tag="{x:Bind ModelDetails}"
                                                         Text="View model license" />
-                                                </MenuFlyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                    </Border>
-                                    <Grid>
-                                        <Button
+                                                    </MenuFlyout>
+                                                </Button.Flyout>
+                                            </Button>
+                                        </Border>
+                                        <Grid>
+                                            <Button
                                             Padding="4"
                                             VerticalAlignment="Center"
                                             AutomationProperties.HelpText="Download model"
@@ -342,19 +353,20 @@
                                             ToolTipService.ToolTip="Download model"
                                             Visibility="{x:Bind CanDownload, Mode=OneWay}" />
 
-                                        <ProgressRing
+                                            <ProgressRing
                                             Width="24"
                                             Height="24"
                                             Background="{ThemeResource ControlStrongStrokeColorDisabledBrush}"
                                             IsIndeterminate="False"
                                             Visibility="{x:Bind vm:DownloadableModel.BoolToVisibilityInverse(CanDownload), Mode=OneWay}"
                                             Value="{x:Bind Progress, Mode=OneWay}" />
-                                    </Grid>
-                                </StackPanel>
-                            </toolkit:SettingsCard>
+                                        </Grid>
+                                    </StackPanel>
+                                </toolkit:SettingsCard>
+                            </ItemContainer>
                         </DataTemplate>
-                    </ItemsRepeater.ItemTemplate>
-                </ItemsRepeater>
+                    </ItemsView.ItemTemplate>
+                </ItemsView>
             </Grid>
         </ScrollViewer>
         <mpControls:AddHFModelView
diff --git a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml.cs b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml.cs
index 85b83754..f355bb31 100644
--- a/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml.cs
+++ b/AIDevGallery/Controls/ModelPicker/ModelPickerViews/OnnxPickerView.xaml.cs
@@ -131,6 +131,11 @@ private void ResetAndLoadModelList()
                 }
             }
         }
+
+        if (Selected != null)
+        {
+            SelectModel(Selected);
+        }
     }
 
     private void CacheStore_ModelsChanged(ModelCacheStore sender)
@@ -143,6 +148,16 @@ private void ModelSelectionItemsView_SelectionChanged(ItemsView sender, ItemsVie
         if (sender.SelectedItem is AvailableModel model)
         {
             OnSelectedModelChanged(this, model.ModelDetails);
+            DispatcherQueue.TryEnqueue(() => DownloadableModelSelectionItemsView.DeselectAll());
+        }
+    }
+
+    private void DownloadableModelSelectionItemsView_SelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
+    {
+        if (sender.SelectedItem is DownloadableModel model)
+        {
+            OnSelectedModelChanged(this, model.GetModelDetails());
+            DispatcherQueue.TryEnqueue(() => ModelSelectionItemsView.DeselectAll());
         }
     }
 
@@ -159,6 +174,16 @@ public override void SelectModel(ModelDetails? modelDetails)
             {
                 DispatcherQueue.TryEnqueue(() => ModelSelectionItemsView.DeselectAll());
             }
+
+            var downloadableModel = DownloadableModels.FirstOrDefault(m => m.ModelDetails.Id == modelDetails.Id);
+            if (downloadableModel != null)
+            {
+                DispatcherQueue.TryEnqueue(() => DownloadableModelSelectionItemsView.Select(DownloadableModels.IndexOf(downloadableModel)));
+            }
+            else
+            {
+                DispatcherQueue.TryEnqueue(() => DownloadableModelSelectionItemsView.DeselectAll());
+            }
         }
         else
         {
diff --git a/AIDevGallery/Controls/SampleContainer.xaml b/AIDevGallery/Controls/SampleContainer.xaml
index 6883666f..c2879485 100644
--- a/AIDevGallery/Controls/SampleContainer.xaml
+++ b/AIDevGallery/Controls/SampleContainer.xaml
@@ -55,7 +55,7 @@
                     IsClosable="False"
                     IsIconVisible="False"
                     IsOpen="True"
-                    Message="To enable this sample, download the required models."
+                    Message="To enable this sample, use the modelpicker to download the required models."
                     Severity="Informational"
                     Visibility="Collapsed" />
                 <StackPanel
diff --git a/AIDevGallery/Controls/SampleContainer.xaml.cs b/AIDevGallery/Controls/SampleContainer.xaml.cs
index bb22843b..a3daef87 100644
--- a/AIDevGallery/Controls/SampleContainer.xaml.cs
+++ b/AIDevGallery/Controls/SampleContainer.xaml.cs
@@ -138,6 +138,7 @@ public async Task LoadSampleAsync(Sample? sample, List<ModelDetails>? models, Wi
         this.Visibility = Visibility.Visible;
         if (!LoadSampleMetadata(sample, models, winMlSampleOptions))
         {
+            VisualStateManager.GoToState(this, "SampleLoaded", true);
             return;
         }
 
@@ -439,6 +440,11 @@ private void UserControl_ActualThemeChanged(FrameworkElement sender, object args
         RenderCode();
     }
 
+    public void SetNoModelStatus()
+    {
+        VisualStateManager.GoToState(this, "Disabled", true);
+    }
+
     public void ShowCode()
     {
         RenderCodeTabs();
diff --git a/AIDevGallery/Helpers/SamplesHelper.cs b/AIDevGallery/Helpers/SamplesHelper.cs
index 41373856..b164e1a1 100644
--- a/AIDevGallery/Helpers/SamplesHelper.cs
+++ b/AIDevGallery/Helpers/SamplesHelper.cs
@@ -345,10 +345,12 @@ string GetValueOrNull(string? value, string ifNull)
             var realCachedModel = App.ModelCache.GetCachedModel(selectedModelDetails.Url);
             if (realCachedModel == null)
             {
-                return null;
+                cachedModel = new(selectedModelDetails.Id, "Need Download", selectedModelDetails.Url, selectedModelDetails.Size, selectedModelDetails.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
+            }
+            else
+            {
+                cachedModel = new(selectedModelDetails.Id, realCachedModel.Path, realCachedModel.Details.Url, realCachedModel.ModelSize, selectedModelDetails.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
             }
-
-            cachedModel = new(selectedModelDetails.Id, realCachedModel.Path, realCachedModel.Details.Url, realCachedModel.ModelSize, selectedModelDetails.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
         }
 
         var cachedSampleItem = App.FindSampleItemById(cachedModel.Id);
@@ -374,10 +376,12 @@ string GetValueOrNull(string? value, string ifNull)
                 var realCachedModel = App.ModelCache.GetCachedModel(selectedModelDetails2.Url);
                 if (realCachedModel == null)
                 {
-                    return null;
+                    cachedModel = new(selectedModelDetails2.Id, "Need Download", selectedModelDetails2.Url, selectedModelDetails2.Size, selectedModelDetails2.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
+                }
+                else
+                {
+                    cachedModel = new(selectedModelDetails2.Id, realCachedModel.Path, realCachedModel.Url, realCachedModel.ModelSize, selectedModelDetails2.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
                 }
-
-                cachedModel = new(selectedModelDetails2.Id, realCachedModel.Path, realCachedModel.Url, realCachedModel.ModelSize, selectedModelDetails2.HardwareAccelerators.FirstOrDefault(), winMlSampleOptions);
             }
 
             var model2Type = sample.Model2Types.Any(cachedSampleItem.Contains)
diff --git a/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml b/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml
index 6f604816..d20f5d8e 100644
--- a/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml
+++ b/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml
@@ -47,7 +47,40 @@
                 To="0"
                 Duration="0:0:0.1" />
         </animations:ImplicitAnimationSet>
-
+        <ContentDialog
+            x:Name="DownloadDialog"
+            Title="Download model"
+            DefaultButton="Primary"
+            IsPrimaryButtonEnabled="{Binding ElementName=AgreeCheckBox, Path=IsChecked}"
+            PrimaryButtonText="Download"
+            SecondaryButtonText="Cancel">
+            <ContentDialog.Content>
+                <StackPanel MinWidth="360">
+                    <InfoBar
+                        x:Name="WarningInfoBar"
+                        Title="Model is not recommended"
+                        Margin="0,0,0,16"
+                        IsClosable="False"
+                        IsOpen="False"
+                        Severity="Warning" />
+                    <TextBlock TextWrapping="Wrap">
+                        <Run Text="You are about to download" />
+                        <Run x:Name="ModelNameTxt" FontWeight="SemiBold" />
+                        <Run Text="from" />
+                        <Run x:Name="ModelSourceTxt" FontWeight="SemiBold" />
+                        <LineBreak />
+                        <LineBreak /><Run Text="License:" />
+                        <Hyperlink x:Name="ModelLicenseLink">
+                            <Run x:Name="ModelLicenseLabel" />
+                        </Hyperlink>
+                    </TextBlock>
+                    <CheckBox
+                        x:Name="AgreeCheckBox"
+                        Margin="0,16,0,0"
+                        Content="I have reviewed and agree with the license" />
+                </StackPanel>
+            </ContentDialog.Content>
+        </ContentDialog>
     </Page.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -156,8 +189,6 @@
                             </Grid>
                         </StackPanel>
                     </Button>
-                    <!--<ComboBox x:Name="DeviceEpSelectionDevicePolicyComboBox"
-                              Visibility="Collapsed"></ComboBox>-->
                     <Button
                         x:Name="WinMlModelOptionsButton"
                         Padding="0"
diff --git a/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml.cs b/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml.cs
index 3253e609..71e79ac4 100644
--- a/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml.cs
+++ b/AIDevGallery/Pages/Scenarios/ScenarioPage.xaml.cs
@@ -247,8 +247,20 @@ private async void HandleModelSelectionChanged(List<ModelDetails?> selectedModel
         }
         else
         {
+            var selectedModel = selectedModels.FirstOrDefault(m => m != null);
+            if (selectedModel != null && !App.ModelCache.IsModelCached(selectedModel.Url))
+            {
+                SampleContainer.SetNoModelStatus();
+            }
+
             SampleContainer.ShowFooter = false;
             LoadSample(viableSamples[0]);
+
+            if (selectedModel != null && !App.ModelCache.IsModelCached(selectedModel.Url))
+            {
+                CodeToggle.IsChecked = true;
+                HandleCodePane();
+            }
         }
     }
 
diff --git a/AIDevGallery/ProjectGenerator/Generator.cs b/AIDevGallery/ProjectGenerator/Generator.cs
index 926becac..e1a02b15 100644
--- a/AIDevGallery/ProjectGenerator/Generator.cs
+++ b/AIDevGallery/ProjectGenerator/Generator.cs
@@ -72,8 +72,14 @@ internal async Task<string> GenerateAsync(Sample sample, Dictionary<ModelType, E
 
         generatedProjectPath = outputPath;
 
-        var modelTypes = sample.Model1Types.Concat(sample.Model2Types ?? Enumerable.Empty<ModelType>())
-                .Where(models.ContainsKey);
+        if (models == null)
+        {
+            throw new ArgumentNullException(nameof(models), "Models dictionary cannot be null.");
+        }
+
+        var modelTypes = sample.Model1Types
+            .Concat(sample.Model2Types ?? Enumerable.Empty<ModelType>())
+            .Where(models.ContainsKey);
 
         if (copyModelLocally)
         {
@@ -380,29 +386,44 @@ internal static async Task AskGenerateAndOpenAsync(Sample sample, IEnumerable<Mo
 
         RadioButton? copyRadioButton = null;
 
-        var totalSize = cachedModels.Sum(cm => cm.Value.ModelSize);
-        if (totalSize != 0)
+        var radioButtons = new RadioButtons();
+        var cacheModel = cachedModels.FirstOrDefault();
+
+        if (cacheModel.Value.Path != "Need Download")
         {
-            var radioButtons = new RadioButtons();
             radioButtons.Items.Add(new RadioButton
             {
                 Content = "Reference model from model cache",
                 IsChecked = true
             });
+        }
+        else
+        {
+            radioButtons.Items.Add(new RadioButton
+            {
+                Content = "Reference model from cache. (The sample will not run because the model has not been downloaded)",
+                IsChecked = true
+            });
+        }
 
-            copyRadioButton = new RadioButton
+        if (cacheModel.Value.Path != "Need Download")
+        {
+            var totalSize = cachedModels.Sum(cm => cm.Value.ModelSize);
+            if (totalSize != 0)
             {
-                Content = new TextBlock()
+                copyRadioButton = new RadioButton
                 {
-                    Text = $"Copy model({AppUtils.FileSizeToString(totalSize)}) to project directory"
-                }
-            };
-
-            radioButtons.Items.Add(copyRadioButton);
-
-            contentStackPanel.Children.Add(radioButtons);
+                    Content = new TextBlock()
+                    {
+                        Text = $"Copy model({AppUtils.FileSizeToString(totalSize)}) to project directory"
+                    }
+                };
+                radioButtons.Items.Add(copyRadioButton);
+            }
         }
 
+        contentStackPanel.Children.Add(radioButtons);
+
         ContentDialog exportDialog = new ContentDialog()
         {
             Title = "Export Visual Studio project",
diff --git a/AIDevGallery/ViewModels/DownloadableModel.cs b/AIDevGallery/ViewModels/DownloadableModel.cs
index 316485ca..d77f3fcc 100644
--- a/AIDevGallery/ViewModels/DownloadableModel.cs
+++ b/AIDevGallery/ViewModels/DownloadableModel.cs
@@ -77,6 +77,11 @@ public DownloadableModel(ModelDownload download)
     {
     }
 
+    public ModelDetails GetModelDetails()
+    {
+        return ModelDetails;
+    }
+
     public void StartDownload()
     {
         ModelDownload ??= App.ModelDownloadQueue.AddModel(ModelDetails);