diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index 2c502690..73cac84d 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject IFolderService FolderService
+@inject IFileService FileService
 @inject NavigationManager NavigationManager
 
 @if (_folders != null)
@@ -45,7 +46,7 @@
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     @if (!_isSystem && PageState.QueryString.ContainsKey("id"))
     {
-        <button type="button" class="btn btn-danger" @onclick="DeleteFolder">Delete</button>
+        <ActionDialog Header="Delete Folder" Message="@("Are You Sure You Wish To Delete This Folder?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" />
     }
     <br />
     <br />
@@ -193,13 +194,21 @@
             }
             if (!isparent)
             {
-                await FolderService.DeleteFolderAsync(_folderId);
-                await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-                NavigationManager.NavigateTo(NavigateUrl());
+                var files = await FileService.GetFilesAsync(_folderId);
+                if (files.Count == 0)
+                {
+                    await FolderService.DeleteFolderAsync(_folderId);
+                    await logger.LogInformation("Folder Deleted {Folder}", _folderId);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage("Folder Has Files And Cannot Be Deleted", MessageType.Warning);
+                }
             }
             else
             {
-                AddModuleMessage("Folder Has Child Folders And Cannot Be Deleted", MessageType.Warning);
+                AddModuleMessage("Folder Has Subfolders And Cannot Be Deleted", MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 9e73435b..f666441b 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -299,7 +299,7 @@
         Page page = null;
         try
         {
-            if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_layouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)))
+            if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_layouts.Count == 0 || _layouttype != "-"))
             {
                 page = new Page();
                 page.SiteId = PageState.Page.SiteId;
@@ -389,7 +389,7 @@
             }
             else
             {
-                AddModuleMessage("You Must Provide Page Name And Theme", MessageType.Warning);
+                AddModuleMessage("You Must Provide Page Name And Theme/Layout", MessageType.Warning);
             }
 
         }
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index e483465e..6b5e98ee 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -448,7 +448,7 @@
             }
             else
             {
-                AddModuleMessage("You Must Provide A Site Name, Alias, And Default Theme/Container", MessageType.Warning);
+                AddModuleMessage("You Must Provide A Site Name, Alias, And Default Theme/Layout/Container", MessageType.Warning);
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index b2b9414d..042e168b 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -402,7 +402,7 @@ else
         }
         else
         {
-            AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template", MessageType.Warning);
+            AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Layout/Container, And Site Template", MessageType.Warning);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 0182fe03..fc22605c 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -3,7 +3,7 @@
 
 @if (_visible)
 {
-    <div class="app-admin-modal">
+    <div class="app-actiondialog">
         <div class="modal" tabindex="-1" role="dialog">
             <div class="modal-dialog">
                 <div class="modal-content">
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 669e0ce4..97be40fa 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -33,7 +33,7 @@
         }
         else
         {
-            _paneadminborder = "container";
+            _paneadminborder = "";
             _panetitle = "";
         }
 
diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs
index b1bebcfd..52a0c9fb 100644
--- a/Oqtane.Server/Controllers/FolderController.cs
+++ b/Oqtane.Server/Controllers/FolderController.cs
@@ -214,6 +214,11 @@ namespace Oqtane.Controllers
         {
             if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))
             {
+                Models.Folder _folder = _folders.GetFolder(id, false);
+                if (Directory.Exists(GetFolderPath(_folder)))
+                {
+                    Directory.Delete(GetFolderPath(_folder));
+                }
                 _folders.DeleteFolder(id);
                 _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
             }
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 4c9ef493..ce87887d 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -52,6 +52,31 @@ app {
         width: 80%; /* Could be more or less, depending on screen size */
     }
 
+/* Action Dialog */
+.app-actiondialog .modal {
+    position: fixed; /* Stay in place */
+    z-index: 9999; /* Sit on top */
+    left: 0;
+    top: 0;
+    display: block;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+    background: rgba(0,0,0,0.3); /* Dim background */
+}
+
+.app-actiondialog .modal-dialog {
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    max-width: none; /* Override default of 500px */
+}
+
+.app-actiondialog .modal-content {
+    margin: 15% auto; /* 15% from the top and centered */
+    width: 40%; /* Could be more or less, depending on screen size */
+}
+
+/* Admin Pane */
 .app-pane-admin-border {
     width: 100%;
     border-width: 1px;