diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index 18d8b7d4..f31aa809 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -9,18 +9,16 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Files" Style="float: right; margin: 10px;" />
+    <ActionLink Action="Add" Text="Add Files" />
 
     <Pager Items="@Files">
         <Header>
-            <th>Name</th>
             <th>&nbsp;</th>
+            <th>Name</th>
         </Header>
         <Row>
+            <td><ConfirmationDialog Header="Delete File" Message="@("Are You Sure You Wish To Delete " + context + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" /></td>
             <td><a href="@(uri.Scheme + "://" + uri.Authority + "/" + PageState.Site.SiteRootPath + context)" target="_new">@context</a></td>
-            <td>
-                <button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteFile(context))>Delete</button>
-            </td>
         </Row>
     </Pager>
 }
@@ -40,7 +38,7 @@ else
         }
         catch (Exception ex)
         {
-            await logger.LogError("Error Loading Files {Error}", ex.Message);
+            await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
             AddModuleMessage("Error Loading Files", MessageType.Error);
         }
     }
@@ -51,13 +49,13 @@ else
         {
             await FileService.DeleteFileAsync(PageState.Site.SiteRootPath, filename);
             Files = await FileService.GetFilesAsync(PageState.Site.SiteRootPath);
-            await logger.LogInformation("File Deleted");
-            AddModuleMessage("File Deleted", MessageType.Success);
+            await logger.LogInformation("File Deleted {File}", filename);
+            AddModuleMessage("File " + filename + " Deleted", MessageType.Success);
         }
         catch (Exception ex)
         {
-            await logger.LogError("Error Deleting File {Error}", ex.Message);
-            AddModuleMessage("Error Deleting File", MessageType.Error);
+            await logger.LogError(ex, "Error Deleting File {File} {Error}", filename, ex.Message);
+            AddModuleMessage("Error Deleting File " + filename, MessageType.Error);
         }
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor b/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor
new file mode 100644
index 00000000..00e5cdd4
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/ConfirmationDialog.razor
@@ -0,0 +1,69 @@
+@namespace Oqtane.Modules.Controls
+@inherits ModuleBase
+
+@if (visible)
+{
+    <div class="app-admin-modal">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@Header</h5>
+                        <button type="button" class="close" @onclick="DisplayModal" aria-label="Close">&times;</button>
+                    </div>
+                    <div class="modal-body">
+                        <p>@Message</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="@Class" @onclick="Confirm">@Action</button>
+                        <button type="button" class="btn btn-secondary" @onclick="DisplayModal">Cancel</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+<button class="@Class" @onclick="DisplayModal">@Action</button>
+
+@code {
+    [Parameter]
+    public string Header { get; set; }
+
+    [Parameter]
+    public string Message { get; set; }
+
+    [Parameter]
+    public string Action { get; set; }
+
+    [Parameter]
+    public string Class { get; set; }
+
+    [Parameter]
+    public Action OnClick { get; set; }
+
+    bool visible = false;
+
+    protected override void OnParametersSet()
+    {
+        if (string.IsNullOrEmpty(Action))
+        {
+            Action = "Ok";
+        }
+        if (string.IsNullOrEmpty(Class))
+        {
+            Class = "btn btn-success";
+        }
+    }
+
+    private void DisplayModal()
+    {
+        visible = !visible;
+        StateHasChanged();
+    }
+
+    private void Confirm()
+    {
+        DisplayModal();
+        OnClick();
+    }
+}
diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
index 1579151d..dbd8b02b 100644
--- a/Oqtane.Client/Shared/Installer.razor
+++ b/Oqtane.Client/Shared/Installer.razor
@@ -128,14 +128,14 @@
     private string HostEmail = "";
     private string Message = "";
 
-    private string IntegratedSecurityDisplay = "display:none;";
-    private string LoadingDisplay = "display:none;";
+    private string IntegratedSecurityDisplay = "display: none;";
+    private string LoadingDisplay = "display: none;";
 
     private void SetIntegratedSecurity(ChangeEventArgs e)
     {
         if (Convert.ToBoolean(e.Value))
         {
-            IntegratedSecurityDisplay = "display:none;";
+            IntegratedSecurityDisplay = "display: none;";
         }
         else
         {
@@ -158,7 +158,7 @@
             else
             {
                 connectionstring = "Data Source=" + ServerName + ";Initial Catalog=" + DatabaseName + ";";
-                if (IntegratedSecurityDisplay == "display:none;")
+                if (IntegratedSecurityDisplay == "display: none;")
                 {
                     connectionstring += "Integrated Security=SSPI;";
                 }
@@ -193,7 +193,7 @@
             else
             {
                 Message = "<div class=\"alert alert-danger\" role=\"alert\">" + response.Message + "</div>";
-                LoadingDisplay = "display:none;";
+                LoadingDisplay = "display: none;";
             }
         }
         else
diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor
index 74f3a1e3..bce9ff44 100644
--- a/Oqtane.Client/Themes/AdminContainer.razor
+++ b/Oqtane.Client/Themes/AdminContainer.razor
@@ -3,14 +3,12 @@
 @inject NavigationManager NavigationManager
 
 <div class="app-admin-modal">
-    <div class="modal" style="display: block">
-        <div class="modal-dialog" role="document">
+    <div class="modal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title"><ModuleTitle /></h5>
-                    <button type="button" class="close" @onclick="CloseModal" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
+                    <button type="button" class="close" @onclick="CloseModal" aria-label="Close">&times;</button>
                 </div>
                 <div class="modal-body">
                     <ModuleInstance />
diff --git a/Oqtane.Client/wwwroot/css/app.css b/Oqtane.Client/wwwroot/css/app.css
index cd277822..2e5c6113 100644
--- a/Oqtane.Client/wwwroot/css/app.css
+++ b/Oqtane.Client/wwwroot/css/app.css
@@ -44,6 +44,7 @@ app {
     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 */
diff --git a/Oqtane.Server/wwwroot/Tenants/1/Sites/1/Softvision Pen.jpg b/Oqtane.Server/wwwroot/Tenants/1/Sites/1/Softvision Pen.jpg
deleted file mode 100644
index f184f2ad..00000000
Binary files a/Oqtane.Server/wwwroot/Tenants/1/Sites/1/Softvision Pen.jpg and /dev/null differ
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index d03ddd15..ff45a8b4 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -44,6 +44,7 @@ app {
     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 */
@@ -90,4 +91,4 @@ app {
     color: gray;
     height: 1px;
     background-color: gray;
-}
\ No newline at end of file
+}