diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
index 905f8006..28192be0 100644
--- a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
+++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
 @inject IStringLocalizer<SqlServerConfig> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
     <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
@@ -38,6 +39,15 @@
         </div>
     </div>
 }
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="encryption" HelpText="Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment." ResourceKey="Encryption">Encryption:</Label>
+    <div class="col-sm-9">
+        <select id="encryption" class="form-select custom-select" @bind="@_encryption">
+            <option value="true">@SharedLocalizer["True"]</option>
+            <option value="false">@SharedLocalizer["False"]</option>
+        </select>
+    </div>
+</div>
 
 @code {
     private string _server = String.Empty;
@@ -45,6 +55,7 @@
     private string _security = "integrated";
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _encryption = "false";
 
     public string GetConnectionString()
     {
@@ -61,15 +72,9 @@
         }
         else
         {
-            if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
-            {
-                connectionString += $"User ID={_uid};Password={_pwd};";
-            }
-            else
-            {
-                connectionString = String.Empty;
-            }
+            connectionString += $"User ID={_uid};Password={_pwd};";
         }
+		connectionString += $"Encrypt={_encryption};";
 
         return connectionString;
     }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index 0b772dae..9238574a 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -11,13 +11,14 @@
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
             <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+            <td><button type="button" class="btn btn-secondary" @onclick="@(async () => Browse(context))">@Localizer["Browse"]</button></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
         </Row>
     </Pager>
@@ -42,4 +43,8 @@
             AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error);
         }
     }
+    protected string Browse(Page page)
+    {
+        return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+    }
 }
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index 1584fd6e..d36e7f9a 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -35,6 +35,9 @@
     [Parameter]
     public string Style { get; set; }
 
+    [Parameter]
+    public string DateTimeFormat { get; set; } = "MMM dd yyyy HH:mm:ss";
+
     protected override void OnParametersSet()
     {
         _text = string.Empty;
@@ -49,7 +52,7 @@
 
             if (CreatedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{CreatedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
@@ -66,7 +69,7 @@
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
@@ -83,7 +86,7 @@
 
             if (DeletedOn != null)
             {
-                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
+                _text += $" {Localizer["On"]} <b>{DeletedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";
diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
index b37a6487..0f4ca4ac 100644
--- a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
+++ b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx
@@ -153,4 +153,10 @@
   <data name="Integrated" xml:space="preserve">
     <value>Integrated</value>
   </data>
+  <data name="Encryption,Text" xml:space="preserve">
+    <value>Encryption:</value>
+  </data>
+  <data name="Encryption.HelpText" xml:space="preserve">
+    <value>Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx
index 9d1d643a..a05c2e9b 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx
@@ -129,4 +129,7 @@
   <data name="DeletePage.Header" xml:space="preserve">
     <value>Delete Page</value>
   </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index dee13803..3404baa2 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -297,4 +297,7 @@
   <data name="Runtime.Text" xml:space="preserve">
     <value>Runtime: </value>
   </data>
+  <data name="Browse" xml:space="preserve">
+    <value>Browse</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
index e62bc207..9ca3599e 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
@@ -1,7 +1,7 @@
-@namespace Oqtane.Themes.BlazorTheme
+@namespace Oqtane.Themes.BlazorTheme
 @inherits ContainerBase
 <div class="container">
-    <div class="row px-4">
+    <div class="row p-4">
         <div class="d-flex flex-nowrap">
             <ModuleActions /><h2><ModuleTitle /></h2>
         </div>
diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index d770cc1b..bc60e72f 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -1,23 +1,26 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ThemeBase
 
+
 <div class="breadcrumbs">
     <Breadcrumbs />
 </div>
 
-<div class="sidebar">
-    <nav class="navbar">
-        <Logo /><Menu Orientation="Vertical" />
-    </nav>
-</div>
-
-<div class="main">
-    <div class="top-row px-4">
-        <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+<div class="row flex-xl-nowrap gx-0">
+    <div class="sidebar">
+        <nav class="navbar">
+            <Logo /><Menu Orientation="Vertical" />
+        </nav>
     </div>
-    <div class="container">
-        <div class="row px-4">
-            <Pane Name="@PaneNames.Admin" />
+
+    <div class="main g-0">
+        <div class="top-row px-4">
+            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+        </div>
+        <div class="container">
+            <div class="row px-4">
+                <Pane Name="@PaneNames.Admin" />
+            </div>
         </div>
     </div>
 </div>
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index e2da14d8..2b01178a 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0-rc.2.21480.10" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0-rc.2.21480.10" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0-preview2.21264.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0-preview3.21293.2" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.2.21480.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-rc.2.21480.5">
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index a73e6b33..668d7fd3 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -124,6 +124,7 @@
 @media (min-width: 768px) {
     app {
         flex-direction: row;
+        display: block;
     }
 
     .app-logo {
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index 9aa12ba7..b944a691 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -20,10 +20,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="bunit.web" Version="1.0.0-beta-10" />
-    <PackageReference Include="bunit.xunit" Version="1.0.0-beta-10" />
-    <PackageReference Include="xunit.core" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="bunit.web" Version="1.3.35-preview" />
+    <PackageReference Include="bunit.xunit" Version="1.0.0-preview-02" />
+    <PackageReference Include="xunit.core" Version="2.4.2-pre.12" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>