diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index ae1f3d9b..25d8e4fb 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -63,10 +63,18 @@
     </tr>
     <tr>
         <td>
-            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
+            <Label For="retention" HelpText="Number of log entries to retain for this job">Retention Log (Items): </Label>
         </td>
         <td>
-            <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
+            <input id="retention" class="form-control" @bind="@_retentionHistory" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="next" HelpText="Next execution for this job.">Next Execution: </Label>
+        </td>
+        <td>
+            <input id="next" class="form-control" @bind="@_nextExecution" />
         </td>
     </tr>
 </table>
@@ -83,6 +91,7 @@
     private string _startDate = string.Empty;
     private string _endDate = string.Empty;
     private string _retentionHistory = string.Empty;
+    private string _nextExecution = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -102,6 +111,7 @@
                 _startDate = (job.StartDate != null) ? job.StartDate.ToString() : string.Empty;
                 _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
                 _retentionHistory = job.RetentionHistory.ToString();
+                _nextExecution = job.NextExecution.ToString();
             }
         }
         catch (Exception ex)
@@ -140,6 +150,15 @@
                 job.EndDate = DateTime.Parse(_endDate);
             }
 
+            if (_nextExecution == string.Empty)
+            {
+                job.NextExecution = null;
+            }
+            else
+            {
+                job.NextExecution = DateTime.Parse(_nextExecution);
+            }
+            
             job.RetentionHistory = int.Parse(_retentionHistory);
 
             try
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 9d4e4611..e483465e 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -7,7 +7,7 @@
 @inject IThemeService  ThemeService
 @inject ISettingService  SettingService
 
-@if (_themes != null)
+@if (_initialized)
 {
     <table class="table table-borderless">
         <tr>
@@ -211,6 +211,7 @@
 }
 
 @code {
+    private bool _initialized = false;
     private List<Theme> _themeList;
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _layouts = new List<ThemeControl>();
@@ -318,6 +319,8 @@
                 _deletedby = site.DeletedBy;
                 _deletedon = site.DeletedOn;
                 _isdeleted = site.IsDeleted.ToString();
+
+                _initialized = true;
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index 00e3d9f9..43599e98 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -6,7 +6,7 @@
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
 
-@if (_themes != null)
+@if (_initialized)
 {
     <table class="table table-borderless">
         <tr>
@@ -106,6 +106,7 @@
 }
 
 @code {
+    private bool _initialized = false;
     private List<Theme> _themeList;
     private List<ThemeControl> _themes = new List<ThemeControl>();
     private List<ThemeControl> _layouts = new List<ThemeControl>();
@@ -163,6 +164,8 @@
                 _deletedby = site.DeletedBy;
                 _deletedon = site.DeletedOn;
                 _isdeleted = site.IsDeleted.ToString();
+
+                _initialized = true;
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 1273f784..5a164309 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -19,7 +19,7 @@
     {
         _moduleState = Module; // passed in from Pane component
         string container = _moduleState.ContainerType;
-        if (PageState.ModuleId != -1 && PageState.Action != "" && _moduleState.UseAdminContainer)
+        if (PageState.ModuleId != -1 && _moduleState.UseAdminContainer)
         {
             container = Constants.DefaultAdminContainer;
         }
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index bf51e4ee..669e0ce4 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -39,12 +39,12 @@
 
         DynamicComponent = builder =>
         {
-            if (PageState.ModuleId != -1 && PageState.Action != "")
+            if (PageState.ModuleId != -1 && PageState.Action != Constants.DefaultAction)
             {
                 if (Name.ToLower() == Constants.AdminPane.ToLower())
                 {
                     Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
-                    if (module != null)
+                    if (module != null && !module.IsDeleted)
                     {
                         var typename = module.ModuleType;
                         // check for core module actions component
@@ -104,7 +104,7 @@
                 if (PageState.ModuleId != -1)
                 {
                     Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
-                    if (module != null && module.Pane.ToLower() == Name.ToLower())
+                    if (module != null && module.Pane.ToLower() == Name.ToLower() && !module.IsDeleted)
                     {
                         // check if user is authorized to view module
                         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))