diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index d92e0994..1c5f5783 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -28,7 +28,7 @@
     </table>
     <Pager Items="@_files">
         <Header>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Modified</th>
             <th>Type</th>
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index f15c50df..6ba8c69b 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -15,14 +15,14 @@ else
 
     <Pager Items="@_jobs">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Status</th>
             <th>Frequency</th>
             <th>Next Execution</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 730c6d13..3fcb0fb5 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -49,7 +49,7 @@ else
     {
         <Pager Items="@_logs">
             <Header>
-                <th>&nbsp;</th>
+                <th style="width: 1px;">&nbsp;</th>
                 <th>Date</th>
                 <th>Level</th>
                 <th>Feature</th>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 4d13338e..72dde55c 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -16,7 +16,7 @@
                     <Header>
                         <th>Name</th>
                         <th>Version</th>
-                        <th></th>
+                        <th style="width: 1px"></th>
                     </Header>
                     <Row>
                         <td>@context.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 88590d5e..fab64a64 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -14,11 +14,11 @@ else
 
     <Pager Items="@_moduleDefinitions">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
             <th>Version</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index b53f3811..02d1d14c 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -9,8 +9,8 @@
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index e3cefdaa..36df1731 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -12,8 +12,8 @@ else
 
     <Pager Items="@_profiles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index d3955307..220f5ffe 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -16,8 +16,8 @@
         {
             <Pager Items="@_pages">
                 <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
                     <th>Name</th>
                     <th>Deleted By</th>
                     <th>Deleted On</th>
@@ -42,8 +42,8 @@
         {
             <Pager Items="@_modules">
                 <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
+                    <th style="width: 1px;">&nbsp;</th>
                     <th>Page</th>
                     <th>Module</th>
                     <th>Deleted By</th>
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 881a9348..a41998d4 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -12,9 +12,9 @@ else
 
     <Pager Items="@_roles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index d8b79632..8d82492d 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -14,8 +14,8 @@ else
 
     <Pager Items="@_sites">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
index ead272dc..1ce7c686 100644
--- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor
@@ -11,8 +11,8 @@ else
 {
     <Pager Items="@tenants">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 327a7d3a..bc280dff 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -16,7 +16,7 @@
                     <Header>
                         <th>Name</th>
                         <th>Version</th>
-                        <th></th>
+                        <th style="width: 1px;"></th>
                     </Header>
                     <Row>
                         <td>@context.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index d2e6b2e9..f3945afb 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -15,10 +15,10 @@ else
 
     <Pager Items="@_themes">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Version</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th scope="col">Name</th>
+            <th scope="col">Version</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
@@ -37,6 +37,7 @@ else
                     <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>Upgrade</button>
                     }
             </td>
+            <td></td>
         </Row>
     </Pager>
 }
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 82ff8309..0c40987a 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -32,7 +32,7 @@ else
                         <label for="Name" class="control-label">Password: </label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@password" />
+                        <input type="password" class="form-control" @bind="@password" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
@@ -40,7 +40,7 @@ else
                         <label for="Name" class="control-label">Confirm Password: </label>
                     </td>
                     <td>
-                        <input type="password" class="form-control" @bind="@confirm" />
+                        <input type="password" class="form-control" @bind="@confirm" autocomplete="new-password" />
                     </td>
                 </tr>
                 <tr>
@@ -111,8 +111,8 @@ else
             {
                 <Pager Items="@notifications">
                     <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
                         <th>From</th>
                         <th>Subject</th>
                         <th>Received</th>
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 32dde145..5621001f 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -33,7 +33,7 @@
                 <td>
                     <input class="form-control" @bind="@subject" readonly />
                 </td>
-}
+            }
             @if (title == "To")
             {
                 <td>
@@ -51,7 +51,7 @@
                     <input class="form-control" @bind="@createdon" readonly />
                 </td>
             </tr>
-}
+        }
         @if (title == "From")
         {
             <tr>
@@ -62,7 +62,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" readonly />
                 </td>
             </tr>
-}
+        }
         @if (title == "To")
         {
             <tr>
@@ -73,7 +73,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
-}
+        }
     </table>
 
 
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 4abc278a..682e2d3b 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -20,9 +20,9 @@ else
 
     <Pager Items="@userroles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
             <th>Name</th>
         </Header>
         <Row>
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 90954bbe..951f0502 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -10,10 +10,10 @@
     <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
-                <th>Role</th>
+                <th scope="col">Role</th>
                 @foreach (PermissionString permission in _permissions)
                 {
-                    <th style="text-align: center;">@permission.PermissionName</th>
+                    <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
                 }
             </tr>
             @foreach (Role role in _roles)
@@ -36,10 +36,10 @@
         <table class="table" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
-                    <th>User</th>
+                    <th scope="col">User</th>
                     @foreach (PermissionString permission in _permissions)
                     {
-                        <th style="text-align: center;">@permission.PermissionName</th>
+                <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
                     }
                 </tr>
             </thead>
@@ -48,11 +48,11 @@
                 {
                     string userid = "[" + user.UserId.ToString() + "]";
                     <tr>
-                        <td>@user.DisplayName</td>
+                        <td >@user.DisplayName</td>
                         @foreach (PermissionString permission in _permissions)
                         {
                             var p = permission;
-                            <td style="text-align: center;">
+                            <td style="text-align: center; width: 1px;">
                                 <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
                             </td>
                         }
@@ -64,9 +64,10 @@
     <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>
-                <td><input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" /></td>
-                <td style="text-align: left;"><button type="button" class="btn btn-primary" @onclick="AddUser">Add</button></td>
+                <td class="input-group">
+                    <input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" />
+                    <button type="button" class="btn btn-primary" @onclick="AddUser">Add</button>
+                </td>
             </tr>
         </tbody>
     </table>
diff --git a/Oqtane.Server/Properties/launchSettings.json b/Oqtane.Server/Properties/launchSettings.json
index fcddfc65..d33ad7b2 100644
--- a/Oqtane.Server/Properties/launchSettings.json
+++ b/Oqtane.Server/Properties/launchSettings.json
@@ -26,4 +26,4 @@
       "applicationUrl": "http://localhost:44357/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index cad2785c..0ab499f0 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -2,7 +2,7 @@
   "ConnectionStrings": {
     "DefaultConnection": ""
   },
-  "Runtime" : "Server",
+  "Runtime": "Server",
   "Installation": {
     "DefaultAlias": "",
     "HostPassword": "",
@@ -12,4 +12,4 @@
     "DefaultLayout": "",
     "DefaultContainer": ""
   }
-}
+}
\ No newline at end of file