diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index c19ba94a..d7bc822c 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -32,10 +32,8 @@
             </td>
         </tr>
         <tr>
-            <td>
-                <label  class="control-label">Permissions: </label>
-            </td>
-            <td>
+            <td colspan="2" align="center">
+                <label class="control-label">Permissions: </label>
                 <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
             </td>
         </tr>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 64b28fc1..fb6c723e 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -13,10 +13,8 @@
         </td>
     </tr>
     <tr>
-        <td>
-            <label  class="control-label">Permissions: </label>
-        </td>
-        <td>
+        <td colspan="2" align="center">
+            <label class="control-label">Permissions: </label>
             <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames=PermissionNames.Utilize Permissions="@_permissions" @ref="_permissionGrid" />
         </td>
     </tr>
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index 560fa398..3f27530c 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -54,10 +54,8 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td>
+                                <td colspan="2" align="center">
                                     <label for="Name" class="control-label">Permissions: </label>
-                                </td>
-                                <td>
                                     <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
                                 </td>
                             </tr>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 077dfd73..fc0644a3 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -133,10 +133,8 @@
             </td>
         </tr>
         <tr>
-            <td>
+            <td colspan="2" align="center">
                 <label for="Name" class="control-label">Permissions: </label>
-            </td>
-            <td>
                 <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
             </td>
         </tr>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index b91f8b6d..91a57188 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -151,11 +151,9 @@
             </td>
         </tr>
         <tr>
-            <td>
+            <td colspan="2" align="center">
                 <label for="Name" class="control-label">Permissions: </label>
-            </td>
-            <td>
-                <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                 <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
             </td>
         </tr>
     </table>
diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index 65f346c5..29c248cf 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -6,26 +6,26 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="_name" Class="control-label" HelpText="Name Of The Role">Name: </Label>
+            <Label For="name" HelpText="Name Of The Role">Name:</Label>
         </td>
         <td>
-            <input id="_name" class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <Label For="_description" Class="control-label" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description: </Label>
+            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
         </td>
         <td>
-            <textarea id="_description" class="form-control" @bind="@_description" rows="5"></textarea>
+            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <Label For="_isautoassigned" Class="control-label" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned? </Label>
+            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
         </td>
         <td>
-            <select id="_isautoassigned" class="form-control" @bind="@_isautoassigned">
+            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
                 <option value="True">Yes</option>
                 <option value="False">No</option>
             </select>
diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
index acea8de2..9b341e7e 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
@@ -6,26 +6,26 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="_name" Class="control-label" HelpText="Name Of The Role">Name: </Label>
+            <Label For="name" HelpText="Name Of The Role">Name:</Label>
         </td>
         <td>
-            <input id="_name" class="form-control" @bind="@_name" />
+            <input id="name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <Label For="_description" Class="control-label" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description: </Label>
+            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
         </td>
         <td>
-            <textarea id="_description" class="form-control" @bind="@_description" rows="5"></textarea>
+            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <Label For="_isautoassigned" Class="control-label" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned? </Label>
+            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
         </td>
         <td>
-            <select id="_isautoassigned" class="form-control" @bind="@_isautoassigned">
+            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
                 <option value="True">Yes</option>
                 <option value="False">No</option>
             </select>
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 5e253a9d..974bd31c 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -6,7 +6,7 @@
 @if (_permissions != null)
 {
     <br />
-    <table class="table">
+    <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <th>Role</th>
@@ -32,7 +32,7 @@
     </table>
     @if (_users.Count != 0)
     {
-        <table class="table">
+        <table class="table" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
                     <th>User</th>
@@ -60,7 +60,7 @@
             </tbody>
         </table>
     }
-    <table class="table">
+    <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
                 <td style="text-align: right;"><label for="Username" class="control-label">User: </label></td>
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index eb7aeaa8..257429e5 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -408,7 +408,7 @@
     private void ShowControlPanel()
     {
         _message = "";
-        _display = "width: 25%; minwidth:300px";
+        _display = "width: 25%; min-width: 375px;";
         StateHasChanged();
     }
 
diff --git a/Oqtane.Client/wwwroot/css/app.css b/Oqtane.Client/wwwroot/css/app.css
index 2f2f61c8..c28214d4 100644
--- a/Oqtane.Client/wwwroot/css/app.css
+++ b/Oqtane.Client/wwwroot/css/app.css
@@ -59,7 +59,6 @@ app {
 
 .app-admin-modal .modal-content {
     margin: 5% auto; /* 5% from the top and centered */
-    padding: 20px;
     width: 80%; /* Could be more or less, depending on screen size */
 }
 
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index b524b6bd..45d61327 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -55,7 +55,7 @@ namespace Oqtane.SiteTemplates
                             new Permission(PermissionNames.Edit, Constants.AdminRole, true)
                         }),
                         Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> built from the ground up using modern .NET Core technology. It leverages the revolutionary new Blazor component model to create a <b>fully dynamic</b> web development experience which can be executed on a client or server. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
-                        "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img src=\"oqtane.png\"></a><br /><br /><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a><br /><br /></p>" +
+                        "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
                         "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is a single-page app framework that lets you build interactive web applications using C# instead of JavaScript. Client-side Blazor relies on WebAssembly, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Server-side Blazor uses SignalR to host your application on a web server and provide a responsive and robust debugging experience. Blazor applications works in all modern web browsers, including mobile browsers.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">ASP.NET Core 3</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 99f6e73e..f1c79deb 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -59,7 +59,6 @@ app {
 
     .app-admin-modal .modal-content {
         margin: 5% auto; /* 5% from the top and centered */
-        padding: 20px;
         width: 80%; /* Could be more or less, depending on screen size */
     }