diff --git a/TalentBlazor.ServiceInterface/TalentBlazor.ServiceInterface.csproj b/TalentBlazor.ServiceInterface/TalentBlazor.ServiceInterface.csproj
index 137fa2b..7a18510 100644
--- a/TalentBlazor.ServiceInterface/TalentBlazor.ServiceInterface.csproj
+++ b/TalentBlazor.ServiceInterface/TalentBlazor.ServiceInterface.csproj
@@ -12,11 +12,11 @@
         <PackageReference Include="ServiceStack.Server" Version="6.*" />
     </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack.OrmLite\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
-        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack.Server\ServiceStack.Server.csproj" />
-        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack\ServiceStack.csproj" />
-    </ItemGroup>
+<!--    <ItemGroup>-->
+<!--        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack.OrmLite\src\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />-->
+<!--        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack.Server\ServiceStack.Server.csproj" />-->
+<!--        <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack\ServiceStack.csproj" />-->
+<!--    </ItemGroup>-->
 
     <ItemGroup>
         <ProjectReference Include="..\TalentBlazor.ServiceModel\TalentBlazor.ServiceModel.csproj" />
diff --git a/TalentBlazor.Tests/TalentBlazor.Tests.csproj b/TalentBlazor.Tests/TalentBlazor.Tests.csproj
index 7a620ee..08fc056 100644
--- a/TalentBlazor.Tests/TalentBlazor.Tests.csproj
+++ b/TalentBlazor.Tests/TalentBlazor.Tests.csproj
@@ -22,6 +22,7 @@
 
 <!--  <ItemGroup>-->
 <!--    <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack\ServiceStack.csproj" />-->
+<!--    <ProjectReference Include="..\..\..\ServiceStack\ServiceStack\ServiceStack\src\ServiceStack.Kestrel\ServiceStack.Kestrel.csproj" />-->
 <!--  </ItemGroup>-->
 
 </Project>
diff --git a/TalentBlazor/Components/Pages/Talent/JobEdit.razor b/TalentBlazor/Components/Pages/Talent/JobEdit.razor
index fc4dcf9..76f49d2 100644
--- a/TalentBlazor/Components/Pages/Talent/JobEdit.razor
+++ b/TalentBlazor/Components/Pages/Talent/JobEdit.razor
@@ -1,7 +1,9 @@
 @inherits AppComponentBase
 @inject NavigationManager navigationManager;
+@using ServiceStack.Blazor.Components.Tailwind
 @layout MainLayout
 @page "/jobs/{JobId:int}/edit"
+@rendermode RenderMode.InteractiveServer
 
 <SetHeader>
     <div class="flex-1 min-w-0">
@@ -36,12 +38,7 @@
 
 <main class="space-y-8 divide-y divide-gray-200">
     <div class="space-y-8 divide-y divide-gray-200">
-        @if (appMetadata != null)
-        {
-            <CascadingValue Value="appMetadata">
-                <AutoQueryForm TResponse="Job" T="UpdateJob" Request="request" OnSave="Save" OnDone="Done" OnCancel="OnCancel"></AutoQueryForm>
-            </CascadingValue>
-        }
+        <AutoEditForm ApiType="typeof(UpdateJob)" Edit="job" FormStyle="FormStyle.Card" Model="Job" Save="Save" Done="OnCancel" />
     </div>
 </main>
 
@@ -56,16 +53,12 @@
     UpdateJob request = new();
     Job? job;
 
-    async Task Save(UpdateJob req)
-    {
-        //request = req;
-    }
-
-    async Task Done(Job response)
+    async Task Save(Job model)
     {
+        await RefreshData();
         navigationManager.NavigateTo("/jobs/" + JobId + "/applications");
     }
-
+    
     async Task OnCancel()
     {
         navigationManager.NavigateTo("/jobs/" + JobId + "/applications");