diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts
index d08757c8b..a741970bc 100644
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@@ -53,57 +53,59 @@ const routes: Routes = [
       import('./pages/home/home-page.module').then((m) => m.HomePageModule)
   },
   {
-    path: 'pricing',
+    path: 'portfolio',
     loadChildren: () =>
-      import('./pages/pricing/pricing-page.module').then(
-        (m) => m.PricingPageModule
+      import('./pages/portfolio/portfolio-page.module').then(
+        (m) => m.PortfolioPageModule
       )
   },
   {
-    path: 'register',
+    path: 'portfolio/analysis',
     loadChildren: () =>
-      import('./pages/register/register-page.module').then(
-        (m) => m.RegisterPageModule
+      import('./pages/portfolio/analysis/analysis-page.module').then(
+        (m) => m.AnalysisPageModule
       )
   },
   {
-    path: 'resources',
+    path: 'portfolio/report',
     loadChildren: () =>
-      import('./pages/resources/resources-page.module').then(
-        (m) => m.ResourcesPageModule
+      import('./pages/portfolio/report/report-page.module').then(
+        (m) => m.ReportPageModule
       )
   },
   {
-    path: 'start',
+    path: 'portfolio/transactions',
     loadChildren: () =>
-      import('./pages/landing/landing-page.module').then(
-        (m) => m.LandingPageModule
+      import('./pages/portfolio/transactions/transactions-page.module').then(
+        (m) => m.TransactionsPageModule
       )
   },
   {
-    path: 'tools',
+    path: 'pricing',
     loadChildren: () =>
-      import('./pages/tools/tools-page.module').then((m) => m.ToolsPageModule)
+      import('./pages/pricing/pricing-page.module').then(
+        (m) => m.PricingPageModule
+      )
   },
   {
-    path: 'tools/analysis',
+    path: 'register',
     loadChildren: () =>
-      import('./pages/tools/analysis/analysis-page.module').then(
-        (m) => m.AnalysisPageModule
+      import('./pages/register/register-page.module').then(
+        (m) => m.RegisterPageModule
       )
   },
   {
-    path: 'tools/report',
+    path: 'resources',
     loadChildren: () =>
-      import('./pages/tools/report/report-page.module').then(
-        (m) => m.ReportPageModule
+      import('./pages/resources/resources-page.module').then(
+        (m) => m.ResourcesPageModule
       )
   },
   {
-    path: 'transactions',
+    path: 'start',
     loadChildren: () =>
-      import('./pages/transactions/transactions-page.module').then(
-        (m) => m.TransactionsPageModule
+      import('./pages/landing/landing-page.module').then(
+        (m) => m.LandingPageModule
       )
   },
   {
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 71e61464f..e6d3b5040 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -22,27 +22,22 @@
       i18n
       mat-flat-button
       [ngClass]="{
-        'font-weight-bold':
-          currentRoute === 'analysis' ||
-          currentRoute === 'report' ||
-          currentRoute === 'tools',
-        'text-decoration-underline':
-          currentRoute === 'analysis' ||
-          currentRoute === 'report' ||
-          currentRoute === 'tools'
+        'font-weight-bold': currentRoute === 'portfolio',
+        'text-decoration-underline': currentRoute === 'portfolio'
       }"
-      [routerLink]="['/tools']"
-      >Tools</a
+      [routerLink]="['/portfolio']"
+      >Portfolio</a
     >
     <a
+      *ngIf="user?.settings?.viewMode !== 'DEFAULT'"
       class="d-none d-sm-block mx-1"
       i18n
       mat-flat-button
       [ngClass]="{
-        'font-weight-bold': currentRoute === 'transactions',
-        'text-decoration-underline': currentRoute === 'transactions'
+        'font-weight-bold': currentRoute === 'portfolio',
+        'text-decoration-underline': currentRoute === 'portfolio'
       }"
-      [routerLink]="['/transactions']"
+      [routerLink]="['/portfolio', 'transactions']"
       >Transactions</a
     >
     <a
@@ -166,22 +161,20 @@
         i18n
         mat-menu-item
         [ngClass]="{
-          'font-weight-bold':
-            currentRoute === 'analysis' ||
-            currentRoute === 'report' ||
-            currentRoute === 'tools'
+          'font-weight-bold': currentRoute === 'portfolio'
         }"
-        [routerLink]="['/tools']"
-        >Tools</a
+        [routerLink]="['/portfolio']"
+        >Portfolio</a
       >
       <a
+        *ngIf="user?.settings?.viewMode !== 'DEFAULT'"
         class="d-block d-sm-none"
         i18n
         mat-menu-item
         [ngClass]="{
-          'font-weight-bold': currentRoute === 'transactions'
+          'font-weight-bold': currentRoute === 'portfolio'
         }"
-        [routerLink]="['/transactions']"
+        [routerLink]="['/portfolio', 'transactions']"
         >Transactions</a
       >
       <a
diff --git a/apps/client/src/app/components/no-transactions-info/no-transactions-info.component.html b/apps/client/src/app/components/no-transactions-info/no-transactions-info.component.html
index d06119dd4..a5bafc3b4 100644
--- a/apps/client/src/app/components/no-transactions-info/no-transactions-info.component.html
+++ b/apps/client/src/app/components/no-transactions-info/no-transactions-info.component.html
@@ -5,7 +5,7 @@
   <a
     class="align-items-center justify-content-center"
     color="primary"
-    [routerLink]="['/transactions']"
+    [routerLink]="['/portfolio', 'transactions']"
     mat-button
   >
     <span i18n>Time to add your first transaction.</span>
diff --git a/apps/client/src/app/pages/tools/analysis/analysis-page-routing.module.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page-routing.module.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/analysis/analysis-page-routing.module.ts
rename to apps/client/src/app/pages/portfolio/analysis/analysis-page-routing.module.ts
diff --git a/apps/client/src/app/pages/tools/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/analysis/analysis-page.component.ts
rename to apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
diff --git a/apps/client/src/app/pages/tools/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
similarity index 100%
rename from apps/client/src/app/pages/tools/analysis/analysis-page.html
rename to apps/client/src/app/pages/portfolio/analysis/analysis-page.html
diff --git a/apps/client/src/app/pages/tools/analysis/analysis-page.module.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.module.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/analysis/analysis-page.module.ts
rename to apps/client/src/app/pages/portfolio/analysis/analysis-page.module.ts
diff --git a/apps/client/src/app/pages/tools/analysis/analysis-page.scss b/apps/client/src/app/pages/portfolio/analysis/analysis-page.scss
similarity index 100%
rename from apps/client/src/app/pages/tools/analysis/analysis-page.scss
rename to apps/client/src/app/pages/portfolio/analysis/analysis-page.scss
diff --git a/apps/client/src/app/pages/tools/tools-page-routing.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts
similarity index 59%
rename from apps/client/src/app/pages/tools/tools-page-routing.module.ts
rename to apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts
index f3ab4b445..acd0cf95d 100644
--- a/apps/client/src/app/pages/tools/tools-page-routing.module.ts
+++ b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts
@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
-import { ToolsPageComponent } from './tools-page.component';
+import { PortfolioPageComponent } from './portfolio-page.component';
 
 const routes: Routes = [
-  { path: '', component: ToolsPageComponent, canActivate: [AuthGuard] }
+  { path: '', component: PortfolioPageComponent, canActivate: [AuthGuard] }
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class ToolsPageRoutingModule {}
+export class PortfolioPageRoutingModule {}
diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts
new file mode 100644
index 000000000..84b44117a
--- /dev/null
+++ b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts
@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'gf-portfolio-page',
+  templateUrl: './portfolio-page.html',
+  styleUrls: ['./portfolio-page.scss']
+})
+export class PortfolioPageComponent implements OnInit {
+  /**
+   * @constructor
+   */
+  public constructor() {}
+
+  /**
+   * Initializes the controller
+   */
+  public ngOnInit() {}
+}
diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.html b/apps/client/src/app/pages/portfolio/portfolio-page.html
new file mode 100644
index 000000000..1aca66097
--- /dev/null
+++ b/apps/client/src/app/pages/portfolio/portfolio-page.html
@@ -0,0 +1,74 @@
+<div class="container">
+  <h3 class="d-flex justify-content-center mb-3" i18n>Portfolio</h3>
+  <div class="row">
+    <div class="col-xs-12 col-md-6">
+      <mat-card class="mb-3">
+        <h4 i18n>Transactions</h4>
+        <p class="mb-0">Manage your transactions.</p>
+        <p class="text-right">
+          <a
+            color="primary"
+            i18n
+            mat-button
+            [routerLink]="['/portfolio', 'transactions']"
+          >
+            Open Transactions →
+          </a>
+        </p>
+      </mat-card>
+    </div>
+    <div class="col-xs-12 col-md-6">
+      <mat-card class="mb-3">
+        <h4 i18n>Allocations</h4>
+        <p class="mb-0">Check the allocations of your portfolio.</p>
+        <p class="text-right">
+          <a
+            color="primary"
+            i18n
+            mat-button
+            [routerLink]="['/portfolio', 'allocations']"
+          >
+            Open Allocations →
+          </a>
+        </p>
+      </mat-card>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-xs-12 col-md-6">
+      <mat-card class="mb-3">
+        <h4 i18n>Analysis</h4>
+        <p class="mb-0">Ghostfolio Analysis visualizes your portfolio.</p>
+        <p class="text-right">
+          <a
+            color="primary"
+            i18n
+            mat-button
+            [routerLink]="['/portfolio', 'analysis']"
+          >
+            Open Analysis →
+          </a>
+        </p>
+      </mat-card>
+    </div>
+    <div class="col-xs-12 col-md-6">
+      <mat-card class="mb-3">
+        <h4 i18n>X-ray</h4>
+        <p class="mb-0">
+          Ghostfolio X-ray uses static analysis to identify potential issues and
+          risks in your portfolio.
+        </p>
+        <p class="text-right">
+          <a
+            color="primary"
+            i18n
+            mat-button
+            [routerLink]="['/portfolio', 'report']"
+          >
+            Open X-ray →
+          </a>
+        </p>
+      </mat-card>
+    </div>
+  </div>
+</div>
diff --git a/apps/client/src/app/pages/tools/tools-page.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page.module.ts
similarity index 61%
rename from apps/client/src/app/pages/tools/tools-page.module.ts
rename to apps/client/src/app/pages/portfolio/portfolio-page.module.ts
index bd1fee692..e997b372c 100644
--- a/apps/client/src/app/pages/tools/tools-page.module.ts
+++ b/apps/client/src/app/pages/portfolio/portfolio-page.module.ts
@@ -4,20 +4,20 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { RouterModule } from '@angular/router';
 
-import { ToolsPageRoutingModule } from './tools-page-routing.module';
-import { ToolsPageComponent } from './tools-page.component';
+import { PortfolioPageRoutingModule } from './portfolio-page-routing.module';
+import { PortfolioPageComponent } from './portfolio-page.component';
 
 @NgModule({
-  declarations: [ToolsPageComponent],
+  declarations: [PortfolioPageComponent],
   exports: [],
   imports: [
     CommonModule,
     MatButtonModule,
     MatCardModule,
-    RouterModule,
-    ToolsPageRoutingModule
+    PortfolioPageRoutingModule,
+    RouterModule
   ],
   providers: [],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class ToolsPageModule {}
+export class PortfolioPageModule {}
diff --git a/apps/client/src/app/pages/tools/report/report-page.scss b/apps/client/src/app/pages/portfolio/portfolio-page.scss
similarity index 100%
rename from apps/client/src/app/pages/tools/report/report-page.scss
rename to apps/client/src/app/pages/portfolio/portfolio-page.scss
diff --git a/apps/client/src/app/pages/tools/report/report-page-routing.module.ts b/apps/client/src/app/pages/portfolio/report/report-page-routing.module.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/report/report-page-routing.module.ts
rename to apps/client/src/app/pages/portfolio/report/report-page-routing.module.ts
diff --git a/apps/client/src/app/pages/tools/report/report-page.component.ts b/apps/client/src/app/pages/portfolio/report/report-page.component.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/report/report-page.component.ts
rename to apps/client/src/app/pages/portfolio/report/report-page.component.ts
diff --git a/apps/client/src/app/pages/tools/report/report-page.html b/apps/client/src/app/pages/portfolio/report/report-page.html
similarity index 100%
rename from apps/client/src/app/pages/tools/report/report-page.html
rename to apps/client/src/app/pages/portfolio/report/report-page.html
diff --git a/apps/client/src/app/pages/tools/report/report-page.module.ts b/apps/client/src/app/pages/portfolio/report/report-page.module.ts
similarity index 100%
rename from apps/client/src/app/pages/tools/report/report-page.module.ts
rename to apps/client/src/app/pages/portfolio/report/report-page.module.ts
diff --git a/apps/client/src/app/pages/tools/tools-page.scss b/apps/client/src/app/pages/portfolio/report/report-page.scss
similarity index 100%
rename from apps/client/src/app/pages/tools/tools-page.scss
rename to apps/client/src/app/pages/portfolio/report/report-page.scss
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
similarity index 98%
rename from apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
rename to apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
index 9507f174e..a35e00152 100644
--- a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.component.ts
@@ -19,7 +19,7 @@ import {
   takeUntil
 } from 'rxjs/operators';
 
-import { DataService } from '../../../services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { CreateOrUpdateTransactionDialogParams } from './interfaces/interfaces';
 
 @Component({
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
similarity index 100%
rename from apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
rename to apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts
similarity index 100%
rename from apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts
rename to apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss
similarity index 100%
rename from apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss
rename to apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss
diff --git a/apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts
similarity index 100%
rename from apps/client/src/app/pages/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts
rename to apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts
diff --git a/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page-routing.module.ts
similarity index 100%
rename from apps/client/src/app/pages/transactions/transactions-page-routing.module.ts
rename to apps/client/src/app/pages/portfolio/transactions/transactions-page-routing.module.ts
diff --git a/apps/client/src/app/pages/transactions/transactions-page.component.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
similarity index 100%
rename from apps/client/src/app/pages/transactions/transactions-page.component.ts
rename to apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
diff --git a/apps/client/src/app/pages/transactions/transactions-page.html b/apps/client/src/app/pages/portfolio/transactions/transactions-page.html
similarity index 100%
rename from apps/client/src/app/pages/transactions/transactions-page.html
rename to apps/client/src/app/pages/portfolio/transactions/transactions-page.html
diff --git a/apps/client/src/app/pages/transactions/transactions-page.module.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts
similarity index 100%
rename from apps/client/src/app/pages/transactions/transactions-page.module.ts
rename to apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts
diff --git a/apps/client/src/app/pages/transactions/transactions-page.scss b/apps/client/src/app/pages/portfolio/transactions/transactions-page.scss
similarity index 100%
rename from apps/client/src/app/pages/transactions/transactions-page.scss
rename to apps/client/src/app/pages/portfolio/transactions/transactions-page.scss
diff --git a/apps/client/src/app/pages/tools/tools-page.component.ts b/apps/client/src/app/pages/tools/tools-page.component.ts
deleted file mode 100644
index aa0f0601f..000000000
--- a/apps/client/src/app/pages/tools/tools-page.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
-
-@Component({
-  selector: 'gf-tools-page',
-  templateUrl: './tools-page.html',
-  styleUrls: ['./tools-page.scss']
-})
-export class ToolsPageComponent implements OnInit {
-  private unsubscribeSubject = new Subject<void>();
-
-  /**
-   * @constructor
-   */
-  public constructor() {}
-
-  /**
-   * Initializes the controller
-   */
-  public ngOnInit() {}
-}
diff --git a/apps/client/src/app/pages/tools/tools-page.html b/apps/client/src/app/pages/tools/tools-page.html
deleted file mode 100644
index 13ddaa815..000000000
--- a/apps/client/src/app/pages/tools/tools-page.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="container">
-  <h3 class="d-flex justify-content-center mb-3" i18n>Tools</h3>
-  <div class="row">
-    <div class="col-xs-12 col-md-6">
-      <mat-card class="mb-3">
-        <h4 i18n>Analysis</h4>
-        <p class="mb-0">
-          Ghostfolio Analysis shows your positions and visualizes your
-          portfolio.
-        </p>
-        <p class="text-right">
-          <a
-            color="primary"
-            i18n
-            mat-button
-            [routerLink]="['/tools', 'analysis']"
-          >
-            Open Analysis →
-          </a>
-        </p>
-      </mat-card>
-    </div>
-    <div class="col-xs-12 col-md-6">
-      <mat-card class="mb-3">
-        <h4 i18n>X-ray</h4>
-        <p class="mb-0">
-          Ghostfolio X-ray uses static analysis to identify potential issues and
-          risks in your portfolio.
-        </p>
-        <p class="text-right">
-          <a
-            color="primary"
-            i18n
-            mat-button
-            [routerLink]="['/tools', 'report']"
-          >
-            Open X-ray →
-          </a>
-        </p>
-      </mat-card>
-    </div>
-  </div>
-</div>