diff --git a/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
deleted file mode 100644
index d0938833..00000000
--- a/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@{ 
-    Layout = "/Areas/Identity/Pages/_Layout.cshtml";
-}
-
-<h2>Manage your account</h2>
-
-<div>
-    <h4>Change your account settings</h4>
-    <hr />
-    <div class="row">
-        <div class="col-md-3">
-            <partial name="_ManageNav" />
-        </div>
-        <div class="col-md-10">
-            @RenderBody()
-        </div>
-    </div>
-</div>
-
-@section Scripts {
-    @RenderSection("Scripts", required: false)
-}
diff --git a/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
deleted file mode 100644
index 70eaec46..00000000
--- a/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-@inject SignInManager<ApplicationUser> SignInManager
-@{
-    var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
-}
-<ul class="nav nav-pills nav-stacked">
-    <li class="@ManageNavPages.IndexNavClass(ViewContext)"><a asp-page="./Index">Profile</a></li>
-    <li class="@ManageNavPages.ChangePasswordNavClass(ViewContext)"><a id="change-password" asp-page="./ChangePassword">Password</a></li>
-    @if (hasExternalLogins)
-    {
-        <li class="@ManageNavPages.ExternalLoginsNavClass(ViewContext)"><a id="external-login" asp-page="./ExternalLogins">External logins</a></li>
-    }
-    <li class="@ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)"><a asp-page="./TwoFactorAuthentication">Two-factor authentication</a></li>
-    <li class="@ManageNavPages.PersonalDataNavClass(ViewContext)"><a asp-page="./PersonalData">Personal data</a></li>
-</ul>
diff --git a/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml b/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml
new file mode 100644
index 00000000..36b23c14
--- /dev/null
+++ b/src/CmsEngine.Ui/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "/Views/Shared/Cms/_Layout.cshtml";
+}
diff --git a/src/CmsEngine.Ui/Program.cs b/src/CmsEngine.Ui/Program.cs
index c16cdd16..0879e3c9 100644
--- a/src/CmsEngine.Ui/Program.cs
+++ b/src/CmsEngine.Ui/Program.cs
@@ -18,7 +18,7 @@
 // https://dotnetplaybook.com/custom-local-domain-using-https-kestrel-asp-net-core/
 if (builder.Environment.IsDevelopment())
 {
-    var certificatePassword = builder.Configuration.GetSection("Kestrel:Certificates:Password").Value;
+    var certificatePassword = builder.Configuration["CertPassword"];
 
     Log.Debug("Dev environment: Using Kestrel with port 5001");
     builder.WebHost.ConfigureKestrel(options =>
diff --git a/src/CmsEngine.Ui/Views/Shared/Cms/_Layout.cshtml b/src/CmsEngine.Ui/Views/Shared/Cms/_Layout.cshtml
index 69c45ac8..53e740b1 100644
--- a/src/CmsEngine.Ui/Views/Shared/Cms/_Layout.cshtml
+++ b/src/CmsEngine.Ui/Views/Shared/Cms/_Layout.cshtml
@@ -46,7 +46,7 @@
 
         <ul class="nav navbar-nav d-md-down-none">
             <li class="nav-item px-3">
-                <a class="nav-link" href="#">Dashboard</a>
+                <a class="nav-link" asp-area="Cms" asp-controller="Home" asp-action="Index">Dashboard</a>
             </li>
             <li class="nav-item px-3">
                 <a class="nav-link" href="#">Users</a>
@@ -101,7 +101,7 @@
             <nav class="sidebar-nav">
                 <ul class="nav">
                     <li class="nav-item">
-                        <a class="nav-link" asp-area="Cms" asp-controller="Home" asp-action="Index"><i class="fa fa-tachometer"></i> Dashboard <span class="badge badge-primary">NEW</span></a>
+                        <a class="nav-link" asp-area="Cms" asp-controller="Home" asp-action="Index"><i class="fa fa-tachometer-alt"></i> Dashboard</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" asp-area="Cms" asp-controller="Post" asp-action="Index"><i class="far fa-file-alt"></i> Posts</a>