diff --git a/npm/ng-packs/packages/tenant-management/ng-package.json b/npm/ng-packs/packages/tenant-management/ng-package.json
index e506119f69..07fbab773b 100644
--- a/npm/ng-packs/packages/tenant-management/ng-package.json
+++ b/npm/ng-packs/packages/tenant-management/ng-package.json
@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "whitelistedNonPeerDependencies": ["@abp/ng.theme.shared"]
+  "whitelistedNonPeerDependencies": ["@abp/ng.theme.shared", "@abp/ng.feature-management"]
 }
diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json
index 73347fccd4..0e415b4e80 100644
--- a/npm/ng-packs/packages/tenant-management/package.json
+++ b/npm/ng-packs/packages/tenant-management/package.json
@@ -2,7 +2,8 @@
   "name": "@abp/ng.tenant-management",
   "version": "0.8.3",
   "dependencies": {
-    "@abp/ng.theme.shared": "^0.8.3"
+    "@abp/ng.theme.shared": "^0.8.3",
+    "@abp/ng.feature-management": "^0.8.4"
   },
   "publishConfig": {
     "access": "public"
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
index 00d209e02a..0680b43f9c 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
@@ -1,26 +1 @@
-<abp-layout>
-  <ul class="navbar-nav mr-auto">
-    <li class="nav-item">
-      <a class="nav-link" href="/">
-        {{ '::Menu:Home' | abpLocalization }}
-      </a>
-    </li>
-  </ul>
-
-  <span id="main-navbar-tools">
-    <span>
-      <div class="dropdown d-inline" ngbDropdown>
-        <a class="btn btn-link dropdown-toggle" role="button" data-toggle="dropdown" ngbDropdownToggle>
-          English
-        </a>
-
-        <div class="dropdown-menu" ngbDropdownMenu>
-          <a class="dropdown-item">Čeština</a>
-          <a class="dropdown-item">Português</a>
-          <a class="dropdown-item">Türkçe</a>
-          <a class="dropdown-item">简体中文</a>
-        </div>
-      </div>
-    </span>
-  </span>
-</abp-layout>
+<router-outlet></router-outlet>
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
index e3e4d2db07..7a97b307fa 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
@@ -8,6 +8,4 @@ import { eLayoutType } from '@abp/ng.core';
 export class AccountLayoutComponent {
   // required for dynamic component
   static type = eLayoutType.account;
-
-  isCollapsed: boolean = false;
 }
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
index 77e6f2a8e4..efc65f7598 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
@@ -9,6 +9,5 @@ import { eLayoutType } from '@abp/ng.core';
   `,
 })
 export class EmptyLayoutComponent {
-  // required for dynamic component
   static type = eLayoutType.empty;
 }