diff --git a/src/designer/elsa-workflows-studio/src/components.d.ts b/src/designer/elsa-workflows-studio/src/components.d.ts
index 8a66f5acc..e7b95eb19 100644
--- a/src/designer/elsa-workflows-studio/src/components.d.ts
+++ b/src/designer/elsa-workflows-studio/src/components.d.ts
@@ -210,15 +210,15 @@ export namespace Components {
         "workflowInstanceId": string;
         "workflowModel": WorkflowModel;
     }
+    interface ElsaWorkflowInstanceListScreen {
+        "history"?: RouterHistory;
+        "serverUrl": string;
+    }
     interface ElsaWorkflowInstanceViewerScreen {
         "getServerUrl": () => Promise<string>;
         "serverUrl": string;
         "workflowInstanceId": string;
     }
-    interface ElsaWorkflowInstancesListScreen {
-        "history"?: RouterHistory;
-        "serverUrl": string;
-    }
     interface ElsaWorkflowPublishButton {
         "publishing": boolean;
         "workflowDefinition": WorkflowDefinition;
@@ -448,18 +448,18 @@ declare global {
         prototype: HTMLElsaWorkflowInstanceJournalElement;
         new (): HTMLElsaWorkflowInstanceJournalElement;
     };
+    interface HTMLElsaWorkflowInstanceListScreenElement extends Components.ElsaWorkflowInstanceListScreen, HTMLStencilElement {
+    }
+    var HTMLElsaWorkflowInstanceListScreenElement: {
+        prototype: HTMLElsaWorkflowInstanceListScreenElement;
+        new (): HTMLElsaWorkflowInstanceListScreenElement;
+    };
     interface HTMLElsaWorkflowInstanceViewerScreenElement extends Components.ElsaWorkflowInstanceViewerScreen, HTMLStencilElement {
     }
     var HTMLElsaWorkflowInstanceViewerScreenElement: {
         prototype: HTMLElsaWorkflowInstanceViewerScreenElement;
         new (): HTMLElsaWorkflowInstanceViewerScreenElement;
     };
-    interface HTMLElsaWorkflowInstancesListScreenElement extends Components.ElsaWorkflowInstancesListScreen, HTMLStencilElement {
-    }
-    var HTMLElsaWorkflowInstancesListScreenElement: {
-        prototype: HTMLElsaWorkflowInstancesListScreenElement;
-        new (): HTMLElsaWorkflowInstancesListScreenElement;
-    };
     interface HTMLElsaWorkflowPublishButtonElement extends Components.ElsaWorkflowPublishButton, HTMLStencilElement {
     }
     var HTMLElsaWorkflowPublishButtonElement: {
@@ -515,8 +515,8 @@ declare global {
         "elsa-workflow-definition-editor-screen": HTMLElsaWorkflowDefinitionEditorScreenElement;
         "elsa-workflow-definitions-list-screen": HTMLElsaWorkflowDefinitionsListScreenElement;
         "elsa-workflow-instance-journal": HTMLElsaWorkflowInstanceJournalElement;
+        "elsa-workflow-instance-list-screen": HTMLElsaWorkflowInstanceListScreenElement;
         "elsa-workflow-instance-viewer-screen": HTMLElsaWorkflowInstanceViewerScreenElement;
-        "elsa-workflow-instances-list-screen": HTMLElsaWorkflowInstancesListScreenElement;
         "elsa-workflow-publish-button": HTMLElsaWorkflowPublishButtonElement;
         "elsa-workflow-registry-list-screen": HTMLElsaWorkflowRegistryListScreenElement;
         "elsa-workflow-settings-modal": HTMLElsaWorkflowSettingsModalElement;
@@ -714,14 +714,14 @@ declare namespace LocalJSX {
         "workflowInstanceId"?: string;
         "workflowModel"?: WorkflowModel;
     }
+    interface ElsaWorkflowInstanceListScreen {
+        "history"?: RouterHistory;
+        "serverUrl"?: string;
+    }
     interface ElsaWorkflowInstanceViewerScreen {
         "serverUrl"?: string;
         "workflowInstanceId"?: string;
     }
-    interface ElsaWorkflowInstancesListScreen {
-        "history"?: RouterHistory;
-        "serverUrl"?: string;
-    }
     interface ElsaWorkflowPublishButton {
         "onExportClicked"?: (event: CustomEvent<any>) => void;
         "onImportClicked"?: (event: CustomEvent<File>) => void;
@@ -774,8 +774,8 @@ declare namespace LocalJSX {
         "elsa-workflow-definition-editor-screen": ElsaWorkflowDefinitionEditorScreen;
         "elsa-workflow-definitions-list-screen": ElsaWorkflowDefinitionsListScreen;
         "elsa-workflow-instance-journal": ElsaWorkflowInstanceJournal;
+        "elsa-workflow-instance-list-screen": ElsaWorkflowInstanceListScreen;
         "elsa-workflow-instance-viewer-screen": ElsaWorkflowInstanceViewerScreen;
-        "elsa-workflow-instances-list-screen": ElsaWorkflowInstancesListScreen;
         "elsa-workflow-publish-button": ElsaWorkflowPublishButton;
         "elsa-workflow-registry-list-screen": ElsaWorkflowRegistryListScreen;
         "elsa-workflow-settings-modal": ElsaWorkflowSettingsModal;
@@ -821,8 +821,8 @@ declare module "@stencil/core" {
             "elsa-workflow-definition-editor-screen": LocalJSX.ElsaWorkflowDefinitionEditorScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowDefinitionEditorScreenElement>;
             "elsa-workflow-definitions-list-screen": LocalJSX.ElsaWorkflowDefinitionsListScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowDefinitionsListScreenElement>;
             "elsa-workflow-instance-journal": LocalJSX.ElsaWorkflowInstanceJournal & JSXBase.HTMLAttributes<HTMLElsaWorkflowInstanceJournalElement>;
+            "elsa-workflow-instance-list-screen": LocalJSX.ElsaWorkflowInstanceListScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowInstanceListScreenElement>;
             "elsa-workflow-instance-viewer-screen": LocalJSX.ElsaWorkflowInstanceViewerScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowInstanceViewerScreenElement>;
-            "elsa-workflow-instances-list-screen": LocalJSX.ElsaWorkflowInstancesListScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowInstancesListScreenElement>;
             "elsa-workflow-publish-button": LocalJSX.ElsaWorkflowPublishButton & JSXBase.HTMLAttributes<HTMLElsaWorkflowPublishButtonElement>;
             "elsa-workflow-registry-list-screen": LocalJSX.ElsaWorkflowRegistryListScreen & JSXBase.HTMLAttributes<HTMLElsaWorkflowRegistryListScreenElement>;
             "elsa-workflow-settings-modal": LocalJSX.ElsaWorkflowSettingsModal & JSXBase.HTMLAttributes<HTMLElsaWorkflowSettingsModalElement>;
diff --git a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-root/elsa-studio-root.tsx b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-root/elsa-studio-root.tsx
index ce06db7ce..a292bde6a 100644
--- a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-root/elsa-studio-root.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-root/elsa-studio-root.tsx
@@ -38,7 +38,7 @@ export class ElsaStudioRoot {
                     </stencil-route-link>
                     <stencil-route-link url="/workflow-registry" anchorClass="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium" activeClass="text-white bg-gray-900">Workflow Registry
                     </stencil-route-link>
-                    <stencil-route-link url="/custom-activities" class="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium">Custom Activities</stencil-route-link>
+                    {/*<stencil-route-link url="/custom-activities" class="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium">Custom Activities</stencil-route-link>*/}
                   </div>
                 </div>
               </div>
diff --git a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-workflow-instances-list/elsa-studio-workflow-instances-list.tsx b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-workflow-instances-list/elsa-studio-workflow-instances-list.tsx
index f797f9e84..4ab20f422 100644
--- a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-workflow-instances-list/elsa-studio-workflow-instances-list.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-workflow-instances-list/elsa-studio-workflow-instances-list.tsx
@@ -20,7 +20,7 @@ export class ElsaStudioWorkflowInstancesList {
           </div>
         </div>
 
-        <elsa-workflow-instances-list-screen history={this.history} serverUrl={this.serverUrl} />
+        <elsa-workflow-instance-list-screen history={this.history} serverUrl={this.serverUrl} />
       </div>
     );
   }
diff --git a/src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/elsa-workflow-instances-list-screen.tsx b/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-list/elsa-workflow-instance-list-screen/elsa-workflow-instance-list-screen.tsx
similarity index 99%
rename from src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/elsa-workflow-instances-list-screen.tsx
rename to src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-list/elsa-workflow-instance-list-screen/elsa-workflow-instance-list-screen.tsx
index bd36ec450..0c19119c0 100644
--- a/src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/elsa-workflow-instances-list-screen.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-list/elsa-workflow-instance-list-screen/elsa-workflow-instance-list-screen.tsx
@@ -8,10 +8,10 @@ import {DropdownButtonItem, DropdownButtonOrigin} from "../../../controls/elsa-d
 import {Map, parseQuery} from '../../../../utils/utils';
 
 @Component({
-    tag: 'elsa-workflow-instances-list-screen',
+    tag: 'elsa-workflow-instance-list-screen',
     shadow: false,
 })
-export class ElsaWorkflowInstancesListScreen {
+export class ElsaWorkflowInstanceListScreen {
     @Prop() history?: RouterHistory;
     @Prop() serverUrl: string;
     @State() workflowBlueprints: Array<WorkflowBlueprintSummary> = [];
diff --git a/src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/readme.md b/src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-list/elsa-workflow-instance-list-screen/readme.md
similarity index 100%
rename from src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/readme.md
rename to src/designer/elsa-workflows-studio/src/components/screens/workflow-instance-list/elsa-workflow-instance-list-screen/readme.md
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_ViewImports.cshtml b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_ViewImports.cshtml
index 268b532ca..ca9c771ea 100644
--- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_ViewImports.cshtml
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_ViewImports.cshtml
@@ -1,3 +1,2 @@
 @using Microsoft.Extensions.Configuration
-@namespace ElsaDashboard.Samples.AspNetCore.Monolith.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj
index 7de4c8ee2..d5e5f2883 100644
--- a/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj
+++ b/src/samples/persistence/Elsa.Samples.Persistence.EntityFramework/Elsa.Samples.Persistence.EntityFramework.csproj
@@ -15,11 +15,4 @@
       <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.EntityFramework\Elsa.Persistence.EntityFramework.MySql\Elsa.Persistence.EntityFramework.MySql.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
index 86a1142b0..0c322a200 100644
--- a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
+++ b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
@@ -1,8 +1,6 @@
 using Elsa.Activities.UserTask.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Sqlite;
-using Elsa.Persistence.EntityFramework.SqlServer;
-using Elsa.Persistence.YesSql;
 using Elsa.Samples.Server.Host.Activities;
 using Elsa.Server.Hangfire.Extensions;
 using Hangfire;
@@ -13,7 +11,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NodaTime;
 using NodaTime.Serialization.JsonNet;
-using Quartz;
 
 namespace Elsa.Samples.Server.Host
 {
@@ -100,7 +97,6 @@ namespace Elsa.Samples.Server.Host
             app
                 .UseCors()
                 .UseHttpActivities()
-                .UseCors()
                 .UseRouting()
                 .UseEndpoints(endpoints =>
                 {
diff --git a/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/Models.cs b/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/Models.cs
index 68e8e8d20..f0d98a4d1 100644
--- a/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/Models.cs
+++ b/src/server/Elsa.Server.Api/Endpoints/WorkflowRegistry/Models.cs
@@ -54,7 +54,6 @@ namespace Elsa.Server.Api.Endpoints.WorkflowRegistry
         public int Version { get; set; }
         public string? TenantId { get; set; }
         public bool IsSingleton { get; set; }
-        public bool IsEnabled { get; set; }
         public bool IsPublished { get; set; }
         public bool IsLatest { get; set; }
     }