diff --git a/BlazorWebAssemblyXrefGenerator/App.razor b/BlazorWebAssemblyXrefGenerator/App.razor
index 6fd3ed1b..99cb6d82 100644
--- a/BlazorWebAssemblyXrefGenerator/App.razor
+++ b/BlazorWebAssemblyXrefGenerator/App.razor
@@ -1,12 +1,16 @@
-<Router AppAssembly="@typeof(App).Assembly">
+<Router AppAssembly="@typeof(App).Assembly">
     <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <RouteView RouteData="@routeData" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
     <NotFound>
         <PageTitle>Not found</PageTitle>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p role="alert">Sorry, there's nothing at this address.</p>
-        </LayoutView>
+        <div class="page">
+            <main>
+                <article class="content px-4">
+                    <p role="alert">Sorry, there's nothing at this address.</p>
+                </article>
+            </main>
+        </div>
     </NotFound>
 </Router>
diff --git a/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor b/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor
deleted file mode 100644
index b6fe62e0..00000000
--- a/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor
+++ /dev/null
@@ -1,12 +0,0 @@
-@inherits LayoutComponentBase
-<div class="page">
-    <main>
-        <div class="top-row px-4">
-            <b>Xref Generator</b>
-        </div>
-
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
diff --git a/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor.css b/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor.css
deleted file mode 100644
index ecf25e5b..00000000
--- a/BlazorWebAssemblyXrefGenerator/Layout/MainLayout.razor.css
+++ /dev/null
@@ -1,77 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-        text-decoration: none;
-    }
-
-    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
-        text-decoration: underline;
-    }
-
-    .top-row ::deep a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .top-row.auth ::deep a:first-child {
-        flex: 1;
-        text-align: right;
-        width: 0;
-    }
-
-    .top-row, article {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
diff --git a/BlazorWebAssemblyXrefGenerator/Pages/Home.razor b/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
index 0087d066..dd81c462 100644
--- a/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
+++ b/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
@@ -3,51 +3,69 @@
 @using System.Text.RegularExpressions
 @inject IHttpClientFactory ClientFactory
 
-<EditForm Model="Model" OnSubmit="GetSearchResults" FormName="SearchForm">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Search</h3>
-        </div>
-        <div class="panel-body">
-            <div class="form-group">
-                <p>Provide a namespace, class, member, or <code>/dotnet/api/...</code> relative link.</p>
-                <InputText id="searchText" @bind-Value="Model!.SearchText" aria-label="Search Text" onfocus="this.value=''" />
-            </div>
-            <div class="form-group">
-                <button type="submit" class="btn btn-primary">Search</button>
-                <button type="button" class="btn btn-secondary" onclick="document.getElementById('searchText').value=''">Clear</button>
-            </div>
-        </div>
-    </div>
-</EditForm>
-
-@if (SearchResultItems?.Results?.Count() > 0)
-{
-    <ol style="margin-top:20px">
-        @foreach (var result in SearchResultItems.Results.Select((x, i) => new { Data = x, Index = i }))
-        {
-            <li style="margin-bottom:5px">
-                <div style="font-size:1.4em;color:green;font-weight:bold">@result.Data.DisplayName</div>
-                <div><b>Item Type:</b> @result.Data.ItemType</div>
-                <div style="width:90%"><b>Description:</b> @result.Data.Description</div>
-                <div><input id="m@(result.Index)0" value="<xref:@result.Data.Link>"></div>
-                <div><input id="m@(result.Index)1" value="<xref:@result.Data.Link?displayProperty=fullName>"></div>
-                <div><input id="m@(result.Index)2" value="<xref:@result.Data.Link?displayProperty=nameWithType>"></div>
-                <div><input id="m@(result.Index)3" value="[LINK_TEXT](xref:@result.Data.Link)"></div>
-                <div><input id="m@(result.Index)4" value="xref:@result.Data.Link"></div>
-                <div>
-                    <button type="button" class="btn btn-primary" onclick=@($"copyToClipboard('m{result.Index}0')")>Copy</button>
-                    <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}1')")>Copy (Full Name)</button>
-                    <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}2')")>Copy (Name with Type)</button>
-                    <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}3')")>Copy (Custom Link Text)</button>
-                    <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}4')")>Copy (Member Only)</button>
+<div class="page">
+    <main>
+        <article class="content px-4">
+            <EditForm Model="Model" OnSubmit="GetSearchResults" FormName="SearchForm">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">Search</h3>
+                        <span style="float:right">
+                            <InputSelect @bind-Value="dotNetVersion">
+                                <option>aspnetcore-9.0</option>
+                                <option>aspnetcore-8.0</option>
+                                <option>aspnetcore-7.0</option>
+                                <option>aspnetcore-6.0</option>
+                                <option>aspnetcore-5.0</option>
+                                <option>aspnetcore-3.1</option>
+                            </InputSelect>
+                        </span>
+                    </div>
+                    <div class="panel-body">
+                        <div class="form-group">
+                            <p>Provide a namespace, class, member, or <code>/dotnet/api/...</code> relative link.</p>
+                            <InputText id="searchText" @bind-Value="Model!.SearchText" aria-label="Search Text" onfocus="this.value=''" />
+                        </div>
+                        <div class="form-group">
+                            <button type="submit" class="btn btn-primary">Search</button>
+                            <button type="button" class="btn btn-secondary" onclick="document.getElementById('searchText').value=''">Clear</button>
+                        </div>
+                    </div>
                 </div>
-            </li>
-        }
-    </ol>
-}
+            </EditForm>
 
-@message
+            @if (SearchResultItems?.Results?.Count() > 0)
+            {
+                <ol style="margin-top:20px">
+                    @foreach (var result in SearchResultItems.Results.Select((x, i) => new { Data = x, Index = i }))
+                    {
+                        <li style="margin-bottom:5px">
+                            <div style="font-size:1.4em;color:green;font-weight:bold">@result.Data.DisplayName</div>
+                            <div><b>Item Type:</b> @result.Data.ItemType</div>
+                            <div style="width:90%"><b>Description:</b> @result.Data.Description</div>
+                            <div><input id="m@(result.Index)0" value="<xref:@result.Data.Link>"></div>
+                            <div><input id="m@(result.Index)1" value="<xref:@result.Data.Link?displayProperty=fullName>"></div>
+                            <div><input id="m@(result.Index)2" value="<xref:@result.Data.Link?displayProperty=nameWithType>"></div>
+                            <div><input id="m@(result.Index)3" value="[LINK_TEXT](xref:@result.Data.Link)"></div>
+                            <div><input id="m@(result.Index)4" value="xref:@result.Data.Link"></div>
+                            <div>
+                                <button type="button" class="btn btn-primary" onclick=@($"copyToClipboard('m{result.Index}0')")>Copy</button>
+                                <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}1')")>Copy (Full Name)</button>
+                                <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}2')")>Copy (Name with Type)</button>
+                                <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}3')")>Copy (Custom Link Text)</button>
+                                <button type="button" class="btn btn-secondary" onclick=@($"copyToClipboard('m{result.Index}4')")>Copy (Member Only)</button>
+                            </div>
+                        </li>
+                    }
+                </ol>
+            }
+
+            <div style="margin-top:20px">
+                @message
+            </div>
+        </article>
+    </main>
+</div>
 
 @code {
     [SupplyParameterFromForm]
@@ -55,6 +73,7 @@
 
     private SearchResults? SearchResultItems { get; set; }
     public string? message;
+    private string? dotNetVersion;
 
     protected override void OnInitialized() => Model ??= new();
 
@@ -68,33 +87,37 @@
             return;
         }
 
-        SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?api-version=0.2&search={Model.SearchText}");
+        try
+        {
+            SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?api-version=0.2&search={Model.SearchText}");
+        }
+        catch (HttpRequestException ex)
+        {
+            if (ex.StatusCode == HttpStatusCode.BadRequest)
+            {
+                message = "Bad Request! No results returned.";
+            }
+
+            return;
+        }
 
         if (SearchResultItems?.Results != null)
         {
             foreach (var result in SearchResultItems.Results)
             {
                 var client = ClientFactory.CreateClient();
-
-                var urlEncodedRequestUrl = WebUtility.UrlEncode($"https://learn.microsoft.com/en-us{result.Url}?view=aspnetcore-9.0");
+                var urlEncodedRequestUrl = WebUtility.UrlEncode($"https://learn.microsoft.com/en-us{result.Url}?view={dotNetVersion}");
                 var request = new HttpRequestMessage(HttpMethod.Get, $"https://corsproxy.io/?{urlEncodedRequestUrl}");
-
                 var apiBrowserPage = await client.SendAsync(request);
-
                 var metaTag = new Regex("<meta name=\"ms.assetid\" content=\"(.+?)\" />");
                 var match = metaTag.Match(await apiBrowserPage.Content.ReadAsStringAsync()).Groups[1].Value;
-
                 result.Link = match.Replace("*", "%2A").Replace("`", "%60");
             }
         }
         else
         {
-            message = "Request failed.";
+            message = "No results returned.";
         }
-
-        Model.SearchText = string.Empty;
-
-        //StateHasChanged();
     }
 
     public class FormModel
diff --git a/BlazorWebAssemblyXrefGenerator/_Imports.razor b/BlazorWebAssemblyXrefGenerator/_Imports.razor
index 44390593..9b19bb09 100644
--- a/BlazorWebAssemblyXrefGenerator/_Imports.razor
+++ b/BlazorWebAssemblyXrefGenerator/_Imports.razor
@@ -7,4 +7,3 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using BlazorWebAssemblyXrefGenerator
-@using BlazorWebAssemblyXrefGenerator.Layout