diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
index 205c42781..51e679adb 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
@@ -18,7 +18,6 @@
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
     <PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
-    <PackageReference Include="Blazored.Modal" Version="7.3.1" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11" />
     <PackageReference Include="BlazorMonaco" Version="3.2.0" />
   </ItemGroup>
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Layout/MainLayout.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Layout/MainLayout.razor
index d90544240..9881c25b6 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Layout/MainLayout.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Layout/MainLayout.razor
@@ -37,9 +37,26 @@
             </ul>
 
             <ul class="navbar-nav flex-row flex-wrap ms-md-auto">
+                <li class="nav-item col-6 col-lg-auto">
+                    <a class="nav-link py-2 px-0 px-lg-2" href="@Constants.LinkGithubTestTool" target="_blank" rel="noopener">
+                        <i class="bi bi-github"></i>
+                        <small class="d-lg-none ms-2">GitHub</small>
+                    </a>
+                </li>
+                <li class="nav-item py-2 py-lg-1 col-12 col-lg-auto">
+                    <div class="vr d-none d-lg-flex h-100 mx-lg-2"></div>
+                    <hr class="d-lg-none my-2 text-white-50">
+                </li>
                 <li class="nav-item dropdown">
                     <button class="nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center show" id="bd-theme" type="button" aria-expanded="true" data-bs-toggle="dropdown" data-bs-display="static" aria-label="Toggle theme (light)">
-                        <i class="bi bi-palette-fill"></i>
+                        @if (ThemeService.CurrentTheme.Equals("dark"))
+                        {
+                            <i class="bi bi-moon-stars-fill"></i>
+                        }
+                        else
+                        {
+                            <i class="bi bi-sun-fill"></i>
+                        }
                         <span class="d-lg-none ms-2" id="bd-theme-text">Toggle theme</span>
                     </button>
                     <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text" data-bs-popper="static">
@@ -61,12 +78,9 @@
         </div>
     </div>
 </nav>
-<div class="page flex-grow-1">
-    <main>
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
+
+<div class="container-fluid content d-flex flex-column flex-grow-1 px-3">
+    @Body
 </div>
 
 <footer class="footer text-muted p-3 mt-4">
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/ConfirmDialog.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/ConfirmDialog.razor
deleted file mode 100644
index d758a3f61..000000000
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/ConfirmDialog.razor
+++ /dev/null
@@ -1,28 +0,0 @@
-@inject IModalService ModalService
-
-<div class="simple-form" style="min-width: 400px">
-    <p>@Message</p>
-
-    <button type="button" class="btn btn-primary" @onclick="OnOkClicked">Ok</button>
-    <button type="button" class="btn btn-secondary" @onclick="OnCancelClicked">Cancel</button>
-</div>
-
-@code {
-    public const string PARAMETER_NAME_MESSAGE = "Message";
-
-
-    [Parameter] public string? Message { get; set; }
-
-    [CascadingParameter] BlazoredModalInstance BlazoredModal { get; set; } = default!;
-
-    async Task OnOkClicked()
-    {
-        await BlazoredModal.CloseAsync(ModalResult.Ok(string.Empty));
-    }
-
-
-    async Task OnCancelClicked()
-    {
-        await BlazoredModal.CloseAsync(ModalResult.Cancel());
-    }
-}
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor
new file mode 100644
index 000000000..a1140d54f
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor
@@ -0,0 +1,59 @@
+@using Amazon.Lambda.TestTool.Models
+
+<div class="modal fade" id="eventModal" tabindex="-1" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="d-flex align-items-center gap-2">
+                    <div><b>Request ID:</b> @_eventContainer?.AwsRequestId</div>
+                    <span class="badge @GetStatusBadgeStyle(_eventContainer?.EventStatus)">@_eventContainer?.EventStatus</span>
+                </div>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <nav class="navbar navbar-expand-md bd-navbar pt-0">
+                    <ul class="navbar-nav nav-underline nav-fill flex-row" id="eventsModalTab" role="tablist">
+                        <li class="nav-item" role="presentation">
+                            <button class="nav-link active" id="active-tab" data-bs-toggle="tab" data-bs-target="#request-tab-pane" type="button" role="tab" aria-controls="request-tab-pane" aria-selected="true" @onclick="ShowRequestTab">
+                                <i class="bi bi-file-earmark"></i>
+                                Request
+                            </button>
+                        </li>
+                        <li class="nav-item" role="presentation">
+                            <button class="nav-link" id="queued-tab" data-bs-toggle="tab" data-bs-target="#response-tab-pane" type="button" role="tab" aria-controls="response-tab-pane" aria-selected="false" @onclick="ShowResponseTab">
+                                <i class="bi bi-file-earmark-fill"></i>
+                                Response
+                            </button>
+                        </li>
+                    </ul>
+                </nav>
+                <div class="tab-content d-flex flex-column flex-grow-1 flex-fill" id="eventsModalTabContent">
+                    <div class="tab-pane fade flex-fill active show" id="request-tab-pane" role="tabpanel" aria-labelledby="request-tab" tabindex="0">
+                        <StandaloneCodeEditor Id="request-body" @ref="_requestEditor" ConstructionOptions="EditorConstructionOptions" CssClass="monaco-modal-editor rounded-4 overflow-hidden border"/>
+                    </div>
+                    <div class="tab-pane fade flex-fill flex-column gap-2" id="response-tab-pane" role="tabpanel" aria-labelledby="response-tab" tabindex="1">
+                        <div class="flex-grow-1">
+                            <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2 rounded-4 rounded-bottom-0 border border-bottom-0">
+                                <div class="d-flex flex-column gap-2">
+                                    <div><b>Last Updated:</b> @_eventContainer?.LastUpdated</div>
+                                    @if (_eventContainer?.EventStatus == EventContainer.Status.Failure)
+                                    {
+                                        <div><b>Error Type:</b> @_eventContainer?.ErrorType</div>
+                                    }
+                                </div>
+                            </div>
+                            @if (_eventContainer?.EventStatus == EventContainer.Status.Failure)
+                            {
+                                <StandaloneCodeEditor Id="response-error-body" @ref="_responseErrorEditor" ConstructionOptions="EditorConstructionOptions" CssClass="monaco-editor-container monaco-modal-editor rounded-4 rounded-top-0 border border-top-0 overflow-hidden"/>
+                            }
+                            else
+                            {
+                                <StandaloneCodeEditor Id="response-body" @ref="_responseEditor" ConstructionOptions="EditorConstructionOptions" CssClass="monaco-editor-container monaco-modal-editor rounded-4 rounded-top-0 border border-top-0 overflow-hidden"/>
+                            }
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor.cs
new file mode 100644
index 000000000..ca2687aaf
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/EventDialog.razor.cs
@@ -0,0 +1,66 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Amazon.Lambda.TestTool.Models;
+using Amazon.Lambda.TestTool.Services;
+using BlazorMonaco.Editor;
+using Microsoft.AspNetCore.Components;
+
+namespace Amazon.Lambda.TestTool.Components.Pages;
+
+public partial class EventDialog : ComponentBase
+{
+    [Inject] public required IThemeService ThemeService { get; set; }
+
+    private EventContainer? _eventContainer;
+    private StandaloneCodeEditor? _requestEditor;
+    private StandaloneCodeEditor? _responseErrorEditor;
+    private StandaloneCodeEditor? _responseEditor;
+
+    public void ShowDialog(EventContainer eventContainer)
+    {
+        _eventContainer = eventContainer;
+        _requestEditor?.SetValue(_eventContainer.EventJson);
+        _responseErrorEditor?.SetValue(_eventContainer.ErrorResponse);
+        _responseEditor?.SetValue(_eventContainer.Response);
+        StateHasChanged();
+    }
+
+    private void ShowRequestTab()
+    {
+        _requestEditor?.SetValue(_eventContainer?.EventJson);
+        StateHasChanged();
+    }
+
+    private void ShowResponseTab()
+    {
+        _responseErrorEditor?.SetValue(_eventContainer?.ErrorResponse);
+        _responseEditor?.SetValue(_eventContainer?.Response);
+        StateHasChanged();
+    }
+
+    private string GetStatusBadgeStyle(EventContainer.Status? status) => status switch
+    {
+        EventContainer.Status.Success => "text-bg-success",
+        EventContainer.Status.Failure => "text-bg-danger",
+        _ => "text-bg-secondary"
+    };
+
+    private StandaloneEditorConstructionOptions EditorConstructionOptions(StandaloneCodeEditor editor)
+    {
+        return new StandaloneEditorConstructionOptions
+        {
+            Language = "json",
+            GlyphMargin = false,
+            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
+            FontSize = 12,
+            AutomaticLayout = true,
+            ScrollBeyondLastLine = false,
+            ReadOnly = true,
+            Minimap = new EditorMinimapOptions
+            {
+                Enabled = false
+            }
+        };
+    }
+}
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
index 14491f35a..d1ab9ea3d 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
@@ -1,104 +1,133 @@
 @page "/"
 
-@using Amazon.Lambda.TestTool.Services
 @using Amazon.Lambda.TestTool.Models
-@using Amazon.Lambda.TestTool.SampleRequests;
-@using Amazon.Lambda.TestTool.Services.IO
-@using Microsoft.AspNetCore.Http;
-
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IRuntimeApiDataStoreManager DataStoreManager
-@inject IDirectoryManager DirectoryManager
-@inject IThemeService ThemeService
-@inject IJSRuntime JsRuntime
+@using Amazon.Lambda.TestTool.SampleRequests
+@using Amazon.Lambda.TestTool.Services
 
 <PageTitle>Lambda Function Tester</PageTitle>
 
-<h3>Lambda Function Tester</h3>
+<div class="d-flex align-items-center mb-2">
+    <h3 class="me-auto">Lambda Function Tester</h3>
+    <div class="form-floating @(_availableLambdaFunctions.Count <= 1 ? "d-none" : "")" style="min-width: 300px;">
+        <select class="form-select" id="selectedFunctionName" @bind="SelectedFunctionName">
+            @foreach (var functionName in _availableLambdaFunctions)
+            {
+                if (functionName.Equals(LambdaRuntimeApi.DefaultFunctionName))
+                {
+                    <option value="@functionName">Default Lambda</option>
+                }
+                else
+                {
+                    <option value="@functionName">@functionName</option>
+                }
+            }
+        </select>
+        <label for="sample-requests">Lambda Functions</label>
+    </div>
+</div>
 
 <div class="alert alert-secondary" role="alert">
     For Lambda functions written as executable assemblies, i.e. custom runtimes functions and top level statement functions, this page can be used for testing the functions locally.
-    Set the <b>AWS_LAMBDA_RUNTIME_API</b> environment variable to <b>@HttpContextAccessor?.HttpContext?.Request?.Host</b> while debugging executable assembly
+    Set the <b>AWS_LAMBDA_RUNTIME_API</b> environment variable to <b>@HttpContextAccessor.HttpContext?.Request.Host</b> while debugging executable assembly
     Lambda function. More information can be found in the <a href="/documentation">documentation</a>.
 </div>
 
-<div class="row h-100">
-    <div class="col-lg-6 gap-2 d-flex flex-column mt-1 mb-3">
-        <div class="form-group d-flex">
-            <h4>Queue Event</h4>
-            <button class="btn btn-primary btn-sm ms-auto rounded-pill px-4 fw-bold d-flex align-items-center gap-1" @onclick="OnAddEventClick">
-                <i class="bi bi-play-fill"></i>
-                Invoke
-            </button>
+@if (DataStore == null)
+{
+    <div class="d-flex justify-content-center flex-grow-1 align-items-center">
+        <div class="d-flex flex-column align-items-center gap-4">
+            <i class="bi bi-journal-text" style="font-size: 96px;"></i>
+            <span class="text-muted" style="font-size: 1.25rem;">Looks like you haven't registered any Lambda functions...</span>
         </div>
-        <div class="form-floating">
-            <select class="form-select" id="sample-requests" @bind="SelectedSampleRequestName">
-                <option value="@NoSampleSelectedId">Select a request</option>
-                @if (@SampleRequests.ContainsKey(SampleRequestManager.SavedRequestGroup))
-                {
-                    <optgroup id="saved-select-request-group" label="@SampleRequestManager.SavedRequestGroup">
-                        @foreach (var request in SampleRequests[SampleRequestManager.SavedRequestGroup])
-                        {
-                            <option value="@request.Filename">@request.Name</option>
-                        }
-                    </optgroup>
-                }
-                @foreach (var group in SampleRequests.Keys)
-                {
-                    @if (!string.Equals(group, SampleRequestManager.SavedRequestGroup))
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-lg-6 gap-2 d-flex flex-column mt-1 mb-3">
+            <div class="form-group d-flex">
+                <h4>Queue Event</h4>
+                <button class="btn btn-primary btn-sm ms-auto rounded-pill px-4 fw-bold d-flex align-items-center gap-1" @onclick="OnAddEventClick">
+                    <i class="bi bi-play-fill"></i>
+                    Invoke
+                </button>
+            </div>
+            <div class="form-floating">
+                <select class="form-select" id="sample-requests" @bind="SelectedSampleRequestName">
+                    <option value="@NoSampleSelectedId">Select a request</option>
+                    @if (@SampleRequests.ContainsKey(SampleRequestManager.SavedRequestGroup))
                     {
-                        <optgroup label="@group">
-                            @foreach (var request in SampleRequests[group])
+                        <optgroup id="saved-select-request-group" label="@SampleRequestManager.SavedRequestGroup">
+                            @foreach (var request in SampleRequests[SampleRequestManager.SavedRequestGroup])
                             {
                                 <option value="@request.Filename">@request.Name</option>
                             }
                         </optgroup>
                     }
-                }
-            </select>
-            <label for="sample-requests">Example Requests</label>
-        </div>
-        <div class="mt-1 flex-grow-1 flex-fill">
-            <label class="form-label" for="function-payload">Function Input</label>
-            <StandaloneCodeEditor Id="function-payload" @ref="_editor" ConstructionOptions="EditorConstructionOptions" CssClass="rounded-4 overflow-hidden border"/>
+                    @foreach (var group in SampleRequests.Keys)
+                    {
+                        @if (!string.Equals(group, SampleRequestManager.SavedRequestGroup))
+                        {
+                            <optgroup label="@group">
+                                @foreach (var request in SampleRequests[group])
+                                {
+                                    <option value="@request.Filename">@request.Name</option>
+                                }
+                            </optgroup>
+                        }
+                    }
+                </select>
+                <label for="sample-requests">Example Requests</label>
+            </div>
+            <div class="mt-1 flex-grow-1 flex-fill">
+                <label class="form-label" for="function-payload">Function Input</label>
+                <StandaloneCodeEditor Id="function-payload" @ref="_editor" ConstructionOptions="EditorConstructionOptions" CssClass="rounded-4 overflow-hidden border"/>
+            </div>
         </div>
-    </div>
-    <div class="col-lg-6 d-flex flex-column">
-        <nav class="navbar navbar-expand-md bd-navbar pt-0">
-            <ul class="navbar-nav nav-underline nav-fill flex-row" id="eventsTab" role="tablist">
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link active" id="active-tab" data-bs-toggle="tab" data-bs-target="#active-tab-pane" type="button" role="tab" aria-controls="home-tab-pane" aria-selected="true">Active Event</button>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link" id="queued-tab" data-bs-toggle="tab" data-bs-target="#queued-tab-pane" type="button" role="tab" aria-controls="queued-tab-pane" aria-selected="false">Queued Events</button>
-                </li>
-                <li class="nav-item" role="presentation">
-                    <button class="nav-link" id="executed-tab" data-bs-toggle="tab" data-bs-target="#executed-tab-pane" type="button" role="tab" aria-controls="executed-tab-pane" aria-selected="false">Executed Events</button>
-                </li>
-            </ul>
-        </nav>
-        <div class="tab-content d-flex flex-column flex-grow-1 flex-fill" id="eventsTabContent">
-            <div class="tab-pane fade flex-fill active show" id="active-tab-pane" role="tabpanel" aria-labelledby="active-tab" tabindex="0">
-                @if (DataStore.ActiveEvent == null)
-                {
-                    <div class="d-flex justify-content-center flex-grow-1 align-self-center my-5">
-                        <div class="d-flex flex-column align-items-center gap-4">
-                            <i class="bi bi-journal-text" style="font-size: 96px;"></i>
-                            <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have an active event...</span>
+        <div class="col-lg-6 d-flex flex-column">
+            <nav class="navbar navbar-expand-md bd-navbar pt-0 justify-content-center">
+                <ul class="navbar-nav nav-underline nav-fill flex-row" id="eventsTab" role="tablist">
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link active" id="active-tab" data-bs-toggle="tab" data-bs-target="#active-tab-pane" type="button" role="tab" aria-controls="home-tab-pane" aria-selected="true">
+                            <i class="bi bi-person-walking"></i>
+                            Active Event
+                        </button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="queued-tab" data-bs-toggle="tab" data-bs-target="#queued-tab-pane" type="button" role="tab" aria-controls="queued-tab-pane" aria-selected="false">
+                            <i class="bi bi-hourglass-split"></i>
+                            Queued <span class="badge text-bg-secondary rounded-5">@_queuedEventsCount</span>
+                        </button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="executed-tab" data-bs-toggle="tab" data-bs-target="#executed-tab-pane" type="button" role="tab" aria-controls="executed-tab-pane" aria-selected="false">
+                            <i class="bi bi-clock-history"></i>
+                            History <span class="badge text-bg-secondary rounded-5">@_pastEventsCount</span>
+                        </button>
+                    </li>
+                </ul>
+            </nav>
+            <div class="tab-content d-flex flex-column flex-grow-1 flex-fill" id="eventsTabContent">
+                <div class="tab-pane fade flex-grow-1 flex-fill flex-column active show" id="active-tab-pane" role="tabpanel" aria-labelledby="active-tab" tabindex="0">
+                    @if (DataStore?.ActiveEvent == null)
+                    {
+                        <div class="d-flex justify-content-center flex-grow-1 align-items-center my-5">
+                            <div class="d-flex flex-column align-items-center gap-4">
+                                <i class="bi bi-journal-text" style="font-size: 96px;"></i>
+                                <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have an active event...</span>
+                            </div>
                         </div>
-                    </div>
-                }
-                else
-                {
-                    <div class="flex-grow-1">
-                        <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2">
+                    }
+                    else
+                    {
+                        <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2 rounded-4 rounded-bottom-0 border border-bottom-0">
                             <div class="d-flex flex-column gap-2">
                                 <div class="d-flex align-items-center gap-2">
                                     <div><b>Request ID:</b> @DataStore.ActiveEvent.AwsRequestId</div>
                                     <span class="badge @GetStatusBadgeStyle(DataStore.ActiveEvent.EventStatus)">@DataStore.ActiveEvent.EventStatus</span>
                                 </div>
                                 <div><b>Last Updated:</b> @DataStore.ActiveEvent.LastUpdated</div>
-                                <div><b>Event JSON:</b> <span class="event-value"><span class="fake-link" @onclick="() => ShowEventJson(DataStore.ActiveEvent)">@CreateSnippet(DataStore.ActiveEvent.EventJson)</span></span></div>
+                                <div><b>Event JSON:</b> <span class="event-value"><span class="fake-link" @onclick="() => ShowEvent(DataStore.ActiveEvent)">@CreateSnippet(DataStore.ActiveEvent.EventJson)</span></span></div>
                                 @if (DataStore.ActiveEvent.EventStatus == EventContainer.Status.Failure)
                                 {
                                     <div><b>Error Type:</b> @DataStore.ActiveEvent.ErrorType</div>
@@ -111,338 +140,111 @@
                         </div>
                         @if (DataStore.ActiveEvent.EventStatus == EventContainer.Status.Failure)
                         {
-                            <p class="mt-2">
-                                <b class="px-2">Error Response</b>
-                                <StandaloneCodeEditor Id="activeEditorError" @ref="_activeEditorError" ConstructionOptions="ActiveErrorEditorConstructionOptions" CssClass="rounded-4 overflow-hidden border"/>
-                            </p>
+                            <StandaloneCodeEditor Id="activeEditorError" @ref="_activeEditorError" ConstructionOptions="ActiveErrorEditorConstructionOptions" CssClass="overflow-hidden rounded-4 rounded-top-0 border border-top-0"/>
                         }
                         else
                         {
-                            <p class="mt-2">
-                                <b class="px-2">Response</b>
-                                <StandaloneCodeEditor Id="activeEditor" @ref="_activeEditor" ConstructionOptions="ActiveEditorConstructionOptions" CssClass="rounded-4 overflow-hidden border"/>
-                            </p>
+                            <StandaloneCodeEditor Id="activeEditor" @ref="_activeEditor" ConstructionOptions="ActiveEditorConstructionOptions" CssClass="overflow-hidden rounded-4 rounded-top-0 border border-top-0"/>
                         }
-                    </div>
-                }
-            </div>
-            <div class="tab-pane fade flex-fill flex-column gap-2" id="queued-tab-pane" role="tabpanel" aria-labelledby="queued-tab" tabindex="1">
-                @if (!DataStore.QueuedEvents.Any())
-                {
-                    <div class="d-flex justify-content-center flex-grow-1 align-items-center my-5">
-                        <div class="d-flex flex-column align-items-center gap-4">
-                            <i class="bi bi-journal-text" style="font-size: 96px;"></i>
-                            <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have any queued events...</span>
-                        </div>
-                    </div>
-                }
-                else
-                {
-                    <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2">
-                        <button class="btn btn-secondary btn-sm rounded-pill ms-auto d-flex align-items-center gap-1 px-2" @onclick="OnClearQueued">
-                            <i class="bi bi-x-lg"></i>
-                            Clear
-                        </button>
-                    </div>
-                    <div class="col-xs-5 event-list">
-                        @foreach (var evnt in @DataStore.QueuedEvents)
-                        {
-                            <div class="alert alert-secondary d-flex gap-2 p-0" role="alert">
-                                <div class="d-flex flex-column gap-2 p-3">
-                                    <div><b>Request ID:</b> @evnt.AwsRequestId</div>
-                                    <div><b>Last Updated:</b> @evnt.LastUpdated</div>
-                                    <div><b>Event JSON:</b> <span class="event-value"><span class="fake-link" @onclick="() => ShowEventJson(evnt)">@CreateSnippet(evnt.EventJson)</span></span></div>
-                                </div>
-                                <div class="ms-auto p-1">
-                                    <button class="btn btn-sm" style="cursor: pointer" @onclick="() => OnDeleteEvent(evnt.AwsRequestId)">
-                                        <i class="bi bi-x-lg"></i>
-                                    </button>
-                                </div>
+                    }
+                </div>
+                <div class="tab-pane fade flex-fill flex-column gap-2" id="queued-tab-pane" role="tabpanel" aria-labelledby="queued-tab" tabindex="1">
+                    @if (!DataStore?.QueuedEvents.Any() ?? true)
+                    {
+                        <div class="d-flex justify-content-center flex-grow-1 align-items-center my-5">
+                            <div class="d-flex flex-column align-items-center gap-4">
+                                <i class="bi bi-journal-text" style="font-size: 96px;"></i>
+                                <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have any queued events...</span>
                             </div>
-                        }
-                    </div>
-                }
-            </div>
-            <div class="tab-pane fade flex-fill flex-column gap-2" id="executed-tab-pane" role="tabpanel" aria-labelledby="executed-tab" tabindex="2">
-                @if (!DataStore.ExecutedEvents.Any())
-                {
-                    <div class="d-flex justify-content-center flex-grow-1 align-items-center my-5">
-                        <div class="d-flex flex-column align-items-center gap-4">
-                            <i class="bi bi-journal-text" style="font-size: 96px;"></i>
-                            <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have any executed events...</span>
                         </div>
-                    </div>
-                }
-                else
-                {
-                    <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2">
-                        <button class="btn btn-secondary btn-sm rounded-pill ms-auto d-flex align-items-center gap-1 px-2" @onclick="OnClearExecuted">
-                            <i class="bi bi-x-lg"></i>
-                            Clear
-                        </button>
-                    </div>
-                    <div class="col-xs-5 event-list">
-                        @foreach (var evnt in @DataStore.ExecutedEvents.OrderByDescending(x => x.LastUpdated))
-                        {
-                            <div class="event-list-item">
+                    }
+                    else
+                    {
+                        <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2 rounded">
+                            <button class="btn btn-secondary btn-sm rounded-pill ms-auto d-flex align-items-center gap-1 px-2" @onclick="OnClearQueued">
+                                <i class="bi bi-x-lg"></i>
+                                Clear
+                            </button>
+                        </div>
+                        <div class="col-xs-5 event-list">
+                            @foreach (var evnt in DataStore?.QueuedEvents ?? new List<EventContainer>())
+                            {
                                 <div class="alert alert-secondary d-flex gap-2 p-0" role="alert">
                                     <div class="d-flex flex-column gap-2 p-3">
-                                        <div class="d-flex align-items-center gap-2">
-                                            <div><b>Request ID:</b> @evnt.AwsRequestId</div>
-                                            <span class="badge @GetStatusBadgeStyle(evnt.EventStatus)">@evnt.EventStatus</span>
-                                        </div>
+                                        <div><b>Request ID:</b> @evnt.AwsRequestId</div>
                                         <div><b>Last Updated:</b> @evnt.LastUpdated</div>
-                                        <div><b>Event JSON:</b> <span class="event-value"><span class="fake-link" @onclick="() => ShowEventJson(evnt)">@CreateSnippet(evnt.EventJson)</span></span></div>
-                                        @if (evnt.EventStatus == EventContainer.Status.Success)
-                                        {
-                                            <div><b>Response:</b> <span class="fake-link" @onclick="() => ShowResponse(evnt)">@CreateSnippet(evnt.Response)</span></div>
-                                        }
-                                        else if (evnt.EventStatus == EventContainer.Status.Failure)
-                                        {
-                                            <div><b>Error Type:</b> @evnt.ErrorType</div>
-                                            <div><b>Error Response:</b> <span class="fake-link" @onclick="() => ShowError(evnt)">@CreateSnippet(evnt.ErrorResponse)</span></div>
-                                        }
+                                        <div><b>Event JSON:</b> <span class="event-value"><span class="fake-link" @onclick="() => ShowEvent(evnt)">@CreateSnippet(evnt.EventJson)</span></span></div>
                                     </div>
                                     <div class="ms-auto p-1">
-                                        <button class="btn btn-sm" style="cursor: pointer" @onclick="() => OnRequeue(evnt.AwsRequestId)">
-                                            <i class="bi bi-arrow-clockwise"></i>
-                                        </button>
                                         <button class="btn btn-sm" style="cursor: pointer" @onclick="() => OnDeleteEvent(evnt.AwsRequestId)">
                                             <i class="bi bi-x-lg"></i>
                                         </button>
                                     </div>
                                 </div>
+                            }
+                        </div>
+                    }
+                </div>
+                <div class="tab-pane fade flex-fill flex-column gap-2" id="executed-tab-pane" role="tabpanel" aria-labelledby="executed-tab" tabindex="2">
+                    @if (!DataStore?.ExecutedEvents.Any() ?? true)
+                    {
+                        <div class="d-flex justify-content-center flex-grow-1 align-items-center my-5">
+                            <div class="d-flex flex-column align-items-center gap-4">
+                                <i class="bi bi-journal-text" style="font-size: 96px;"></i>
+                                <span class="text-muted" style="font-size: 1.25rem;">Looks like you don't have any past events...</span>
                             </div>
-                        }
-                    </div>
-                }
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="d-flex bg-body-tertiary p-2 align-items-start gap-2 rounded">
+                            <button class="btn btn-secondary btn-sm rounded-pill ms-auto d-flex align-items-center gap-1 px-2" @onclick="OnClearExecuted">
+                                <i class="bi bi-x-lg"></i>
+                                Clear
+                            </button>
+                        </div>
+                        <div class="col-xs-5 event-list">
+                            @foreach (var evnt in (DataStore?.ExecutedEvents ?? new List<EventContainer>()).OrderByDescending(x => x.LastUpdated))
+                            {
+                                <div class="event-list-item">
+                                    <div class="alert alert-secondary d-flex gap-2 p-0" role="alert">
+                                        <div class="d-flex flex-column gap-2 p-3">
+                                            <div class="d-flex align-items-center gap-2">
+                                                <div><b>Request ID:</b> @evnt.AwsRequestId</div>
+                                                <span class="badge @GetStatusBadgeStyle(evnt.EventStatus)">@evnt.EventStatus</span>
+                                            </div>
+                                            <div><b>Last Updated:</b> @evnt.LastUpdated</div>
+                                            <div><b>Request:</b> <span class="event-value"><span class="fake-link">@CreateSnippet(evnt.EventJson)</span></span></div>
+                                            @if (evnt.EventStatus == EventContainer.Status.Success)
+                                            {
+                                                <div><b>Response:</b> <span class="fake-link">@CreateSnippet(evnt.Response)</span></div>
+                                            }
+                                            else if (evnt.EventStatus == EventContainer.Status.Failure)
+                                            {
+                                                <div><b>Error Type:</b> @evnt.ErrorType</div>
+                                                <div><b>Error Response:</b> <span class="fake-link">@CreateSnippet(evnt.ErrorResponse)</span></div>
+                                            }
+                                        </div>
+                                        <div class="ms-auto p-1">
+                                            <button type="button" data-bs-toggle="modal" data-bs-target="#eventModal" class="btn btn-sm shadow-none" style="cursor: pointer" @onclick="() => ShowEvent(evnt)">
+                                                <i class="bi bi-arrows-angle-expand"></i>
+                                            </button>
+                                            <button class="btn btn-sm shadow-none" style="cursor: pointer" @onclick="() => OnRequeue(evnt.AwsRequestId)">
+                                                <i class="bi bi-arrow-clockwise"></i>
+                                            </button>
+                                            <button class="btn btn-sm shadow-none" style="cursor: pointer" @onclick="() => OnDeleteEvent(evnt.AwsRequestId)">
+                                                <i class="bi bi-x-lg"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
             </div>
         </div>
     </div>
-</div>
-
-
-
-
-@code {
-    private StandaloneCodeEditor _editor = null!;
-    private StandaloneCodeEditor _activeEditor = null!;
-    private StandaloneCodeEditor _activeEditorError = null!;
-
-    [CascadingParameter] public IModalService Modal { get; set; } = default!;
-
-    private const string NoSampleSelectedId = "void-select-request";
-
-    private IDictionary<string, IList<LambdaRequest>> SampleRequests { get; set; } = new Dictionary<string, IList<LambdaRequest>>();
-
-    private IRuntimeApiDataStore DataStore => DataStoreManager.GetLambdaRuntimeDataStore(LambdaRuntimeApi.DefaultFunctionName);
-
-    string? _selectedSampleRequestName;
-    string? SelectedSampleRequestName
-    {
-        get => _selectedSampleRequestName;
-        set
-        {
-            if (SampleRequestManager == null)
-                return;
-
-            _selectedSampleRequestName = value;
-            if (string.IsNullOrEmpty(_selectedSampleRequestName) ||
-                string.Equals(value, NoSampleSelectedId))
-            {
-                _editor.SetValue(string.Empty);
-            }
-            else
-            {
-                _editor.SetValue(SampleRequestManager.GetRequest(_selectedSampleRequestName));
-            }
-
-            StateHasChanged();
-        }
-    }
-
-    SampleRequestManager? SampleRequestManager { get; set; }
-
-    protected override void OnInitialized()
-    {
-        ThemeService.OnThemeChanged += HandleThemeChanged;
-        DataStore.StateChange += DataStoreOnStateChange;
-        SampleRequestManager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());
-        SampleRequests = SampleRequestManager.GetSampleRequests();
-    }
-
-    private void HandleThemeChanged()
-    {
-        if (ThemeService.CurrentTheme.Equals("dark"))
-        {
-            BlazorMonaco.Editor.Global.SetTheme(JsRuntime, "vs-dark");
-        }
-        else
-        {
-            BlazorMonaco.Editor.Global.SetTheme(JsRuntime, "vs");
-        }
-        InvokeAsync(StateHasChanged);
-    }
-
-    public void Dispose()
-    {
-        ThemeService.OnThemeChanged -= HandleThemeChanged; // Unsubscribe to avoid memory leaks
-    }
-
-    private void DataStoreOnStateChange(object? sender, EventArgs e)
-    {
-        InvokeAsync(() =>
-        {
-            this.StateHasChanged();
-            if (_activeEditor != null)
-                _activeEditor.SetValue(DataStore.ActiveEvent?.Response);
-            if (_activeEditorError != null)
-                _activeEditorError.SetValue(DataStore.ActiveEvent?.ErrorResponse);
-        });
-    }
-
-    async Task OnAddEventClick()
-    {
-        var editorValue = await _editor.GetValue();
-        DataStore.QueueEvent(editorValue, false);
-        await _editor.SetValue(string.Empty);
-        SelectedSampleRequestName = NoSampleSelectedId;
-        StateHasChanged();
-    }
-
-    void OnClearQueued()
-    {
-        DataStore.ClearQueued();
-        StateHasChanged();
-    }
-
-    void OnClearExecuted()
-    {
-        DataStore.ClearExecuted();
-        StateHasChanged();
-    }
-
-    void OnRequeue(string awsRequestId)
-    {
-        EventContainer? evnt = null;
-        if (string.Equals(DataStore.ActiveEvent?.AwsRequestId, awsRequestId))
-        {
-            evnt = DataStore.ActiveEvent;
-        }
-        else
-        {
-            evnt = DataStore.ExecutedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
-        }
-
-        if (evnt == null)
-            return;
-
-        DataStore.QueueEvent(evnt.EventJson, false);
-        StateHasChanged();
-    }
-
-    void OnDeleteEvent(string awsRequestId)
-    {
-        DataStore.DeleteEvent(awsRequestId);
-        StateHasChanged();
-    }
-
-    string GetStatusBadgeStyle(EventContainer.Status status) => status switch
-    {
-        EventContainer.Status.Success => "text-bg-success",
-        EventContainer.Status.Failure => "text-bg-danger",
-        _ => "text-bg-secondary"
-    };
-
-    string CreateSnippet(string? fullString)
-    {
-        const int maxLength = 50;
-        string trim;
-        if (fullString == null || fullString.Length < maxLength)
-        {
-            trim = fullString ?? string.Empty;
-        }
-        else
-        {
-            trim = fullString.Substring(0, maxLength);
-        }
-
-        return trim;
-    }
-
-    void ShowEventJson(EventContainer evnt)
-    {
-        ShowExpandedText("Event JSON", evnt.EventJson);
-    }
-
-    void ShowResponse(EventContainer evnt)
-    {
-        ShowExpandedText("Response", evnt.Response ?? string.Empty);
-    }
-
-    void ShowError(EventContainer evnt)
-    {
-        ShowExpandedText("Error Response", evnt.ErrorResponse ?? string.Empty);
-    }
-
-    void ShowExpandedText(string title, string text)
-    {
-        var parameters = new ModalParameters();
-        parameters.Add(ExpandedTextDialog.PARAMETER_NAME_FULL_TEXT, text);
-        Modal.Show<ExpandedTextDialog>(title, parameters);
-    }
-
-    private StandaloneEditorConstructionOptions EditorConstructionOptions(StandaloneCodeEditor editor)
-    {
-        return new StandaloneEditorConstructionOptions
-        {
-            Language = "json",
-            GlyphMargin = false,
-            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
-            AutomaticLayout = true,
-            ScrollBeyondLastLine = false,
-            Minimap = new EditorMinimapOptions
-            {
-                Enabled = false
-            }
-        };
-    }
-
-    private StandaloneEditorConstructionOptions ActiveEditorConstructionOptions(StandaloneCodeEditor editor)
-    {
-        return new StandaloneEditorConstructionOptions
-        {
-            Language = "json",
-            GlyphMargin = false,
-            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
-            Value = DataStore.ActiveEvent?.Response,
-            FontSize = 12,
-            AutomaticLayout = true,
-            ScrollBeyondLastLine = false,
-            ReadOnly = true,
-            Minimap = new EditorMinimapOptions
-            {
-                Enabled = false
-            }
-        };
-    }
-
-    private StandaloneEditorConstructionOptions ActiveErrorEditorConstructionOptions(StandaloneCodeEditor editor)
-    {
-        return new StandaloneEditorConstructionOptions
-        {
-            Language = "json",
-            GlyphMargin = false,
-            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
-            Value = DataStore.ActiveEvent?.ErrorResponse,
-            FontSize = 12,
-            AutomaticLayout = true,
-            ScrollBeyondLastLine = false,
-            ReadOnly = true,
-            Minimap = new EditorMinimapOptions
-            {
-                Enabled = false
-            }
-        };
-    }
 }
+
+<EventDialog @ref="_eventDialog"/>
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor.cs
new file mode 100644
index 000000000..4334e6505
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor.cs
@@ -0,0 +1,277 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+using Microsoft.AspNetCore.Components;
+using Amazon.Lambda.TestTool.Services;
+using Amazon.Lambda.TestTool.Models;
+using Amazon.Lambda.TestTool.SampleRequests;
+using Amazon.Lambda.TestTool.Services.IO;
+using BlazorMonaco.Editor;
+using Microsoft.JSInterop;
+
+namespace Amazon.Lambda.TestTool.Components.Pages;
+
+public partial class Home : ComponentBase, IDisposable
+{
+    [Inject] public required IHttpContextAccessor HttpContextAccessor { get; set; }
+    [Inject] public required IRuntimeApiDataStoreManager DataStoreManager { get; set; }
+    [Inject] public required IDirectoryManager DirectoryManager { get; set; }
+    [Inject] public required IThemeService ThemeService { get; set; }
+    [Inject] public required IJSRuntime JsRuntime { get; set; }
+
+    private StandaloneCodeEditor? _editor;
+    private StandaloneCodeEditor? _activeEditor;
+    private StandaloneCodeEditor? _activeEditorError;
+
+    private EventDialog? _eventDialog;
+
+    private int _queuedEventsCount;
+    private int _pastEventsCount;
+
+    private const string NoSampleSelectedId = "void-select-request";
+
+    private IDictionary<string, IList<LambdaRequest>> SampleRequests { get; set; } = new Dictionary<string, IList<LambdaRequest>>();
+
+    private IRuntimeApiDataStore? DataStore { get; set; }
+
+    string? _selectedFunctionName;
+
+    string? SelectedFunctionName
+    {
+        get => _selectedFunctionName;
+        set
+        {
+            if (string.IsNullOrEmpty(value))
+                return;
+            _selectedFunctionName = value;
+            if (DataStore != null)
+                DataStore.StateChange -= DataStoreOnStateChange;
+            DataStore = DataStoreManager.GetLambdaRuntimeDataStore(_selectedFunctionName);
+            DataStore.StateChange += DataStoreOnStateChange;
+
+
+            if (_activeEditor != null && !string.IsNullOrEmpty(DataStore?.ActiveEvent?.Response))
+                _activeEditor.SetValue(DataStore.ActiveEvent.Response);
+            if (_activeEditorError != null && !string.IsNullOrEmpty(DataStore?.ActiveEvent?.ErrorResponse))
+                _activeEditorError.SetValue(DataStore.ActiveEvent?.ErrorResponse);
+
+            StateHasChanged();
+        }
+    }
+    List<string> _availableLambdaFunctions = new();
+    string? _selectedSampleRequestName;
+    string? SelectedSampleRequestName
+    {
+        get => _selectedSampleRequestName;
+        set
+        {
+            if (SampleRequestManager == null)
+                return;
+
+            _selectedSampleRequestName = value;
+            if (string.IsNullOrEmpty(_selectedSampleRequestName) ||
+                string.Equals(value, NoSampleSelectedId))
+            {
+                _editor?.SetValue(string.Empty);
+            }
+            else
+            {
+                _editor?.SetValue(SampleRequestManager.GetRequest(_selectedSampleRequestName));
+            }
+
+            StateHasChanged();
+        }
+    }
+
+    SampleRequestManager? SampleRequestManager { get; set; }
+
+    protected override void OnInitialized()
+    {
+        DataStore = DataStoreManager.GetLambdaRuntimeDataStore(LambdaRuntimeApi.DefaultFunctionName);
+        _availableLambdaFunctions = DataStoreManager.GetListOfFunctionNames().ToList();
+        if (_availableLambdaFunctions.Count > 0)
+            SelectedFunctionName = _availableLambdaFunctions.First();
+        ThemeService.OnThemeChanged += HandleThemeChanged;
+        DataStoreManager.StateChange += DataStoreManagerOnStateChange;
+        SampleRequestManager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());
+        SampleRequests = SampleRequestManager.GetSampleRequests();
+        _queuedEventsCount = DataStore?.QueuedEvents.Count ?? 0;
+        _pastEventsCount = DataStore?.ExecutedEvents.Count ?? 0;
+
+    }
+
+    private void HandleThemeChanged()
+    {
+        if (ThemeService.CurrentTheme.Equals("dark"))
+        {
+            Global.SetTheme(JsRuntime, "vs-dark");
+        }
+        else
+        {
+            Global.SetTheme(JsRuntime, "vs");
+        }
+        InvokeAsync(StateHasChanged);
+    }
+
+    public void Dispose()
+    {
+        ThemeService.OnThemeChanged -= HandleThemeChanged;
+    }
+
+    private void DataStoreOnStateChange(object? sender, EventArgs e)
+    {
+        InvokeAsync(() =>
+        {
+            _queuedEventsCount = DataStore?.QueuedEvents.Count ?? 0;
+            _pastEventsCount = DataStore?.ExecutedEvents.Count ?? 0;
+            StateHasChanged();
+            if (_activeEditor != null)
+                _activeEditor.SetValue(DataStore?.ActiveEvent?.Response);
+            if (_activeEditorError != null)
+                _activeEditorError.SetValue(DataStore?.ActiveEvent?.ErrorResponse);
+        });
+    }
+
+    private void DataStoreManagerOnStateChange(object? sender, EventArgs e)
+    {
+        InvokeAsync(() =>
+        {
+            _availableLambdaFunctions = DataStoreManager.GetListOfFunctionNames().ToList();
+            SelectedFunctionName = _availableLambdaFunctions.FirstOrDefault();
+            StateHasChanged();
+        });
+    }
+
+    async Task OnAddEventClick()
+    {
+        if (_editor is null ||
+            DataStore is null)
+            return;
+        var editorValue = await _editor.GetValue();
+        DataStore.QueueEvent(editorValue, false);
+        await _editor.SetValue(string.Empty);
+        SelectedSampleRequestName = NoSampleSelectedId;
+        StateHasChanged();
+    }
+
+    void OnClearQueued()
+    {
+        DataStore?.ClearQueued();
+        StateHasChanged();
+    }
+
+    void OnClearExecuted()
+    {
+        DataStore?.ClearExecuted();
+        StateHasChanged();
+    }
+
+    void OnRequeue(string awsRequestId)
+    {
+        if (DataStore is null)
+            return;
+        EventContainer? evnt;
+        if (string.Equals(DataStore.ActiveEvent?.AwsRequestId, awsRequestId))
+        {
+            evnt = DataStore.ActiveEvent;
+        }
+        else
+        {
+            evnt = DataStore.ExecutedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
+        }
+
+        if (evnt == null)
+            return;
+
+        DataStore.QueueEvent(evnt.EventJson, false);
+        StateHasChanged();
+    }
+
+    void OnDeleteEvent(string awsRequestId)
+    {
+        DataStore?.DeleteEvent(awsRequestId);
+        StateHasChanged();
+    }
+
+    string GetStatusBadgeStyle(EventContainer.Status status) => status switch
+    {
+        EventContainer.Status.Success => "text-bg-success",
+        EventContainer.Status.Failure => "text-bg-danger",
+        _ => "text-bg-secondary"
+    };
+
+    string CreateSnippet(string? fullString)
+    {
+        const int maxLength = 50;
+        string trim;
+        if (fullString == null || fullString.Length < maxLength)
+        {
+            trim = fullString ?? string.Empty;
+        }
+        else
+        {
+            trim = fullString.Substring(0, maxLength);
+        }
+
+        return trim;
+    }
+
+    void ShowEvent(EventContainer evnt)
+    {
+        _eventDialog?.ShowDialog(evnt);
+    }
+
+    private StandaloneEditorConstructionOptions EditorConstructionOptions(StandaloneCodeEditor editor)
+    {
+        return new StandaloneEditorConstructionOptions
+        {
+            Language = "json",
+            GlyphMargin = false,
+            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
+            AutomaticLayout = true,
+            ScrollBeyondLastLine = false,
+            Minimap = new EditorMinimapOptions
+            {
+                Enabled = false
+            }
+        };
+    }
+
+    private StandaloneEditorConstructionOptions ActiveEditorConstructionOptions(StandaloneCodeEditor editor)
+    {
+        return new StandaloneEditorConstructionOptions
+        {
+            Language = "json",
+            GlyphMargin = false,
+            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
+            Value = DataStore?.ActiveEvent?.Response,
+            FontSize = 12,
+            AutomaticLayout = true,
+            ScrollBeyondLastLine = false,
+            ReadOnly = true,
+            Minimap = new EditorMinimapOptions
+            {
+                Enabled = false
+            }
+        };
+    }
+
+    private StandaloneEditorConstructionOptions ActiveErrorEditorConstructionOptions(StandaloneCodeEditor editor)
+    {
+        return new StandaloneEditorConstructionOptions
+        {
+            Language = "json",
+            GlyphMargin = false,
+            Theme = ThemeService.CurrentTheme.Equals("dark") ? "vs-dark" : "vs",
+            Value = DataStore?.ActiveEvent?.ErrorResponse,
+            FontSize = 12,
+            AutomaticLayout = true,
+            ScrollBeyondLastLine = false,
+            ReadOnly = true,
+            Minimap = new EditorMinimapOptions
+            {
+                Enabled = false
+            }
+        };
+    }
+}
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor
deleted file mode 100644
index 9cabab373..000000000
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor
+++ /dev/null
@@ -1,45 +0,0 @@
-@using Amazon.Lambda.TestTool.Commands
-@using Amazon.Lambda.TestTool.SampleRequests;
-@using Amazon.Lambda.TestTool.Services
-@using Amazon.Lambda.TestTool.Services.IO
-@inject IModalService ModalService
-@inject IDirectoryManager DirectoryManager
-
-<div class="simple-form" style="min-width: 400px">
-    <div class="form-group" for="save-request-name">
-        <label class="control-label">Enter a request name: </label>
-        <input id="save-request-name" type="text" class="form-control" @bind="SaveRequestName" />
-    </div>
-    <button type="button" class="btn btn-primary" @onclick="OnSaveChangesClicked">Save</button>
-    <button type="button" class="btn btn-secondary" @onclick="OnCancelClicked">Cancel</button>
-</div>
-
-
-@code {
-
-    public const string PARAMETER_NAME_REQUEST_BODY = "RequestBody";
-
-    [Parameter] public string? SaveRequestName { get; set; }
-
-    [CascadingParameter] BlazoredModalInstance BlazoredModal { get; set; } = default!;
-    [CascadingParameter] ModalParameters? Parameters { get; set; }
-
-    async Task OnSaveChangesClicked()
-    {
-        if (Parameters == null || SaveRequestName == null)
-            return;
-
-        var requestBody = Parameters.Get<string>(PARAMETER_NAME_REQUEST_BODY);
-
-        var manager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());
-        var systemName = manager.SaveRequest(SaveRequestName, requestBody);
-
-        await BlazoredModal.CloseAsync(ModalResult.Ok(systemName));
-    }
-
-
-    async Task OnCancelClicked()
-    {
-        await BlazoredModal.CloseAsync(ModalResult.Cancel());
-    }
-}
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Routes.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Routes.razor
index dda069022..f756e19df 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Routes.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Routes.razor
@@ -1,8 +1,6 @@
-<CascadingBlazoredModal>
-    <Router AppAssembly="typeof(Program).Assembly">
-        <Found Context="routeData">
-            <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
-            <FocusOnNavigate RouteData="routeData" Selector="h1" />
-        </Found>
-    </Router>
-</CascadingBlazoredModal>
\ No newline at end of file
+<Router AppAssembly="typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+</Router>
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/_Imports.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/_Imports.razor
index d47a57025..ebc8b7495 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/_Imports.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/_Imports.razor
@@ -9,9 +9,6 @@
 @using Amazon.Lambda.TestTool
 @using Amazon.Lambda.TestTool.Components
 
-@using Blazored.Modal
-@using Blazored.Modal.Services
-
 @using BlazorMonaco
 @using BlazorMonaco.Editor
 @using BlazorMonaco.Languages
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
index cdd00ec39..75762bbca 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
@@ -5,7 +5,6 @@
 using Amazon.Lambda.TestTool.Components;
 using Amazon.Lambda.TestTool.Services;
 using Amazon.Lambda.TestTool.Services.IO;
-using Blazored.Modal;
 using Microsoft.Extensions.Options;
 
 namespace Amazon.Lambda.TestTool.Processes;
@@ -47,8 +46,6 @@ public static TestToolProcess Startup(RunCommandSettings settings, CancellationT
 
         builder.Services.AddHttpContextAccessor();
 
-        builder.Services.AddBlazoredModal();
-
         builder.Services.AddTransient<IPostConfigureOptions<StaticFileOptions>, ConfigureStaticFilesOptions>();
         builder.Services.AddSingleton<IDirectoryManager, DirectoryManager>();
 
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStoreManager.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStoreManager.cs
index c78377ecf..08d22ea35 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStoreManager.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStoreManager.cs
@@ -20,6 +20,12 @@ public interface IRuntimeApiDataStoreManager
     /// </summary>
     /// <returns></returns>
     string[] GetListOfFunctionNames();
+
+    /// <summary>
+    /// An event that some event or event collection has changed. This is used by the UI to
+    /// know when it should refresh.
+    /// </summary>
+    event EventHandler? StateChange;
 }
 
 /// <inheritdoc/>
@@ -27,10 +33,22 @@ internal class RuntimeApiDataStoreManager : IRuntimeApiDataStoreManager
 {
     private readonly ConcurrentDictionary<string, IRuntimeApiDataStore> _dataStores = new ConcurrentDictionary<string, IRuntimeApiDataStore>();
 
+    /// <inheritdoc/>
+    public event EventHandler? StateChange;
+
     /// <inheritdoc/>
     public IRuntimeApiDataStore GetLambdaRuntimeDataStore(string functionName)
     {
-        return _dataStores.GetOrAdd(functionName, name => new RuntimeApiDataStore());
+        if (_dataStores.ContainsKey(functionName))
+        {
+            return _dataStores[functionName];
+        }
+        else
+        {
+            _dataStores[functionName] = new RuntimeApiDataStore();
+            RaiseStateChanged();
+            return _dataStores[functionName];
+        }
     }
 
     /// <inheritdoc/>
@@ -38,4 +56,10 @@ public string[] GetListOfFunctionNames()
     {
         return _dataStores.Keys.ToArray();
     }
+
+    private void RaiseStateChanged()
+    {
+        var handler = StateChange;
+        handler?.Invoke(this, EventArgs.Empty);
+    }
 }
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/wwwroot/app.css b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/wwwroot/app.css
index f37ccf8cd..c17356e5c 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/wwwroot/app.css
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/wwwroot/app.css
@@ -54,6 +54,10 @@ h1:focus {
     height: 500px;
 }
 
+.monaco-modal-editor {
+    width: 466px;
+}
+
 .tab-pane.active {
     display: flex;
 }