diff --git a/ClientHub/Pages/AwaitingDisposition.razor b/ClientHub/Pages/AwaitingDisposition.razor
index 81dbbaa..50524df 100644
--- a/ClientHub/Pages/AwaitingDisposition.razor
+++ b/ClientHub/Pages/AwaitingDisposition.razor
@@ -1,4 +1,5 @@
-@page "/AwaitingDisposition"
+@page "/"
+@page "/AwaitingDisposition"
 
 @using Microsoft.AspNetCore.Components.Web
 @using MudBlazor
diff --git a/ClientHub/Pages/Index.razor b/ClientHub/Pages/Index.razor
index 7ed5b84..9129765 100644
--- a/ClientHub/Pages/Index.razor
+++ b/ClientHub/Pages/Index.razor
@@ -1,11 +1,7 @@
-@page "/"
+@page "/Index"
 
 @using Microsoft.AspNetCore.Components.Web
 
 @namespace OI.Metrology.ClientHub.Pages
 
 <PageTitle>Index</PageTitle>
-
-<h4>Run Information</h4>
-
-Welcome to your new app.
diff --git a/ClientHub/Pages/RunHeaders.razor b/ClientHub/Pages/RunHeaders.razor
index 3bd1873..103d3a6 100644
--- a/ClientHub/Pages/RunHeaders.razor
+++ b/ClientHub/Pages/RunHeaders.razor
@@ -1,6 +1,7 @@
 @page "/RunHeaders"
 
 @using Microsoft.AspNetCore.Components.Web
+@using MudBlazor
 
 @namespace OI.Metrology.ClientHub.Pages
 
@@ -28,4 +29,13 @@
             <table id="FieldsGrid"></table>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>
+
+<div class="row" style="margin-top: 10px; margin-bottom: 20px;">
+    <div class="col-xs-1">
+        <MudButton Variant="Variant.Filled" Color="Color.Info" id="OpenButton">Open</MudButton>
+    </div>
+    <div class="col-xs-1">
+        <MudButton Variant="Variant.Filled" Color="Color.Primary" id="RefreshButton">Refresh</MudButton>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ClientHub/Pages/RunInfo.razor b/ClientHub/Pages/RunInfo.razor
index 8f7e0ec..a4202be 100644
--- a/ClientHub/Pages/RunInfo.razor
+++ b/ClientHub/Pages/RunInfo.razor
@@ -1,4 +1,5 @@
 @page "/RunInfo/{Model?}"
+@page "/RunInfo/{ToolTypeId:int?}/{HeaderId:int?}"
 
 @using Microsoft.AspNetCore.Components.Web
 @using MudBlazor
diff --git a/ClientHub/Pages/RunInfo.razor.cs b/ClientHub/Pages/RunInfo.razor.cs
index ee35280..c40d545 100644
--- a/ClientHub/Pages/RunInfo.razor.cs
+++ b/ClientHub/Pages/RunInfo.razor.cs
@@ -6,6 +6,8 @@ namespace OI.Metrology.ClientHub.Pages;
 public partial class RunInfo
 {
 
+    [Parameter] public int? HeaderId { get; set; }
+    [Parameter] public int? ToolTypeId { get; set; }
     [Parameter] public Metrology.Shared.ViewModels.RunInfo? Model { get; set; }
 
     [Inject] protected IJSRuntime? JSRuntime { get; set; }
@@ -19,9 +21,9 @@ public partial class RunInfo
                 throw new NullReferenceException(nameof(JSRuntime));
             if (AppSettings is null)
                 throw new NullReferenceException(nameof(AppSettings));
-            int initialToolTypeID = Model is not null ? Model.ToolTypeID : 0;
-            int initialHeaderId = Model is not null ? Model.HeaderID : 0;
+            int initialHeaderId = Model is not null ? Model.HeaderID : HeaderId is not null ? HeaderId.Value : 0;
             string initialHeaderAttachmentId = Model is not null ? Model.HeaderAttachmentID.ToString() : string.Empty;
+            int initialToolTypeID = Model is not null ? Model.ToolTypeID : ToolTypeId is not null ? ToolTypeId.Value : 1;
             return JSRuntime.InvokeVoidAsync("initRunInfo", AppSettings.ApiUrl, initialToolTypeID, initialHeaderId, initialHeaderAttachmentId).AsTask();
         }
         return Task.CompletedTask;
diff --git a/ClientHub/wwwroot/site.js b/ClientHub/wwwroot/site.js
index 7784521..98c3849 100644
--- a/ClientHub/wwwroot/site.js
+++ b/ClientHub/wwwroot/site.js
@@ -22,7 +22,7 @@ function loadRunInfoAwaitingDisposition() {
   var data = $("#grid").igGrid("findRecordByKey", row.id);
   if (data == null)
     return;
-  var targetURL = "RunInfo?tooltypeid=" + data.ToolTypeID + "&headerid=" + data.ID;
+  var targetURL = "RunInfo/" + data.ToolTypeID + "/" + data.ID;
   window.location.href = targetURL;
 }
 
@@ -161,6 +161,17 @@ function headerSelectionChangedRunHeaders(evt, ui) {
   });
 }
 
+function loadRunInfoRunHeaders() {
+  var row = $("#HeaderGrid").igGrid("selectedRow");
+  if (row == null)
+    return;
+  var data = $("#HeaderGrid").igGrid("findRecordByKey", row.id);
+  if (data == null)
+    return;
+  var targetURL = "RunInfo/" + data.ToolTypeID + "/" + data.ID;
+  window.location.href = targetURL;
+}
+
 function initRunHeaders(apiUrl) {
   _apiUrl = apiUrl;
   // $("#ToolType").igCombo({
@@ -177,6 +188,11 @@ function initRunHeaders(apiUrl) {
   //   selectionChanged: loadHeaderGridRunHeaders,
   // });
   loadHeaderGridRunHeaders();
+  $("#RefreshButton").click(function () {
+    $("#HeaderGrid").igGrid("dataBind");
+  });
+  $("#OpenButton").click(loadRunInfoRunHeaders);
+  $("#HeaderGrid").on("dblclick", "tr", loadRunInfoRunHeaders);
 }
 
 function loadHeaderGridRunInfo() {