diff --git a/apps/api/src/app/user/interfaces/user.interface.ts b/apps/api/src/app/user/interfaces/user.interface.ts
index 48f49c820..7c9b132e3 100644
--- a/apps/api/src/app/user/interfaces/user.interface.ts
+++ b/apps/api/src/app/user/interfaces/user.interface.ts
@@ -10,7 +10,7 @@ export interface User {
   settings: UserSettings;
   subscription: {
     expiresAt: Date;
-    type: 'Diamond';
+    type: 'Trial';
   };
 }
 
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 971b42007..f586bd4a3 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -46,7 +46,7 @@ export class UserService {
       },
       subscription: {
         expiresAt: resetHours(add(new Date(), { days: 7 })),
-        type: 'Diamond'
+        type: 'Trial'
       }
     };
   }
diff --git a/apps/client/src/app/app.component.html b/apps/client/src/app/app.component.html
index 2272723e7..2321a456d 100644
--- a/apps/client/src/app/app.component.html
+++ b/apps/client/src/app/app.component.html
@@ -26,7 +26,10 @@
 
 <footer class="footer d-flex justify-content-center position-absolute w-100">
   <div class="container text-center">
-    <div>Ghostfolio {{ version }}</div>
+    <div>
+      © {{ currentYear }} <a href="https://ghostfol.io">Ghostfolio</a>
+      {{ version }}
+    </div>
     <div class="py-2 text-muted">
       <small i18n
         >The risk of loss in trading can be substantial. It is not advisable to
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 3cebc907e..ba85746b9 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -27,6 +27,7 @@ import { TokenStorageService } from './services/token-storage.service';
 export class AppComponent implements OnDestroy, OnInit {
   public canCreateAccount: boolean;
   public currentRoute: string;
+  public currentYear = new Date().getFullYear();
   public isLoggedIn = false;
   public lastDataGathering: string;
   public user: User;
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index d402fa9fe..fb54d9577 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -147,9 +147,8 @@
         i18n
         mat-menu-item
         [ngClass]="{ 'font-weight-bold': currentRoute === 'account' }"
-        ><span>Account</span
-        ><ion-icon class="ml-1 text-muted" name="diamond-outline"></ion-icon
-      ></a>
+        >Account</a
+      >
       <a
         *ngIf="canAccessAdminAccessControl"
         class="d-block d-sm-none"
@@ -198,6 +197,12 @@
       [color]="currentRoute === 'about' ? 'primary' : null"
       >About</a
     >
+    <a
+      class="d-none d-sm-block mx-1"
+      href="https://github.com/ghostfolio/ghostfolio"
+      mat-flat-button
+      >GitHub</a
+    >
     <button i18n mat-flat-button (click)="openLoginDialog()">Sign in</button>
   </ng-container>
 </mat-toolbar>
diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.html
index aa8d7ed18..114c310e8 100644
--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@@ -5,33 +5,54 @@
       <mat-card class="mb-3">
         <mat-card-content>
           <p>
-            Ghostfolio is a side project by
+            <strong>Ghostfolio</strong> ({{ version }}) is open source software
+            which empowers busy folks to have a sharp look of their financial
+            assets and to make solid, data-driven investment decisions by
+            evaluating automated static portfolio analysis rules. The project
+            has been initiated by
             <a href="https://dotsilver.ch">Thomas Kaul</a>.
-          </p>
-          <p>
-            This is <strong>Ghostfolio {{ version }}</strong>
             <ng-container *ngIf="lastPublish">
-              and was last published on {{ lastPublish }}</ng-container
-            >.
+              This instance has been last published on {{ lastPublish
+              }}</ng-container
+            >
           </p>
           <p>
             If you encounter a bug or would like to suggest an improvement or a
-            new feature, please send an e-mail to
-            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or tweet to
-            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>.
+            new feature, please open an issue at
+            <a href="https://github.com/ghostfolio/ghostfolio">GitHub</a>, tweet
+            to <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> or
+            send an e-mail to
+            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
           </p>
           <p class="text-center">
             <a
+              class="mx-2"
+              href="https://github.com/ghostfolio/ghostfolio"
+              mat-icon-button
+              title="Find Ghostfolio on GitHub"
+            >
+              <ion-icon name="logo-github" size="large"></ion-icon>
+            </a>
+            <a
+              class="mx-2"
               href="https://twitter.com/ghostfolio_"
               mat-icon-button
               title="Follow Ghostfolio on Twitter"
             >
               <ion-icon name="logo-twitter" size="large"></ion-icon>
             </a>
+            <a
+              class="mx-2"
+              href="mailto:hi@ghostfol.io"
+              mat-icon-button
+              title="Send an e-mail"
+            >
+              <ion-icon name="mail" size="large"></ion-icon>
+            </a>
           </p>
           <div class="d-flex justify-content-center">
             <div
-              class="independent-and-bootstrapped-logo"
+              class="independent-and-bootstrapped-logo mb-2"
               title="Ghostfolio is an independent & bootstrapped business"
             ></div>
           </div>
@@ -46,11 +67,8 @@
       <div class="row">
         <div class="col-xs-12 col-md-6">
           <mat-card class="mb-3">
-            <h4 i18n>Basic</h4>
-            <p>
-              The starting point for tracking your goals and adopting your
-              personal investment strategy.
-            </p>
+            <h4 i18n>Open Source</h4>
+            <p>Host your <strong>Ghostfolio</strong> instance by yourself.</p>
             <ul class="list-unstyled mb-3">
               <li class="align-items-center d-flex mb-1">
                 <ion-icon
@@ -73,7 +91,13 @@
                 ></ion-icon>
                 <span>Unlimited Transactions</span>
               </li>
-              <li class="d-none d-sm-block mb-1">&#8203;</li>
+              <li class="align-items-center d-flex mb-1">
+                <ion-icon
+                  class="mr-1 text-muted"
+                  name="checkmark-circle-outline"
+                ></ion-icon>
+                <span>Advanced Insights</span>
+              </li>
             </ul>
             <p class="h5 text-right">
               <span>Free</span>
@@ -83,7 +107,7 @@
         <div class="col-xs-12 col-md-6">
           <mat-card
             class="mb-3"
-            [ngClass]="{ 'active': user?.subscription?.type === 'Diamond' }"
+            [ngClass]="{ 'active': user?.subscription?.type === 'Trial' }"
           >
             <h4 class="align-items-center d-flex" i18n>
               Diamond
@@ -92,10 +116,7 @@
                 name="diamond-outline"
               ></ion-icon>
             </h4>
-            <p>
-              Get a bird's-eye view of your financial assets for making
-              sustainable investment decisions.
-            </p>
+            <p>Get a managed <strong>Ghostfolio</strong> cloud offering.</p>
             <ul class="list-unstyled mb-3">
               <li class="align-items-center d-flex mb-1">
                 <ion-icon
@@ -129,8 +150,8 @@
             <p class="h5 text-right">
               <span class="font-weight-normal"
                 >{{ user?.settings.baseCurrency || baseCurrency }}
-                <strong>3.99</strong>
-                <del class="ml-1 text-muted">4.99</del> / Month</span
+                <strong>2.99</strong>
+                <del class="ml-1 text-muted">3.99</del> / Month</span
               >
             </p>
           </mat-card>
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/account/account-page.html
index a38251f74..ffd2f73e9 100644
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@@ -19,11 +19,7 @@
             <div class="w-50" i18n>Membership</div>
             <div class="w-50">
               <div class="align-items-center d-flex mb-1">
-                <span>{{ user?.subscription?.type }}</span>
-                <ion-icon
-                  class="ml-1 text-muted"
-                  name="diamond-outline"
-                ></ion-icon>
+                {{ user?.subscription?.type }}
               </div>
               <div>
                 Valid until {{ user.subscription.expiresAt | date:
diff --git a/apps/client/src/app/pages/analysis/analysis-page.html b/apps/client/src/app/pages/analysis/analysis-page.html
index 8ba41b374..77f9b249c 100644
--- a/apps/client/src/app/pages/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/analysis/analysis-page.html
@@ -168,10 +168,9 @@
     <div class="col-lg">
       <mat-card class="mb-3">
         <mat-card-header>
-          <mat-card-title class="align-items-center d-flex"
-            ><span i18n>Investment</span
-            ><ion-icon class="ml-1 text-muted" name="diamond-outline"></ion-icon
-          ></mat-card-title>
+          <mat-card-title class="align-items-center d-flex" i18n
+            >Investment</mat-card-title
+          >
         </mat-card-header>
         <mat-card-content>
           <!--<gf-positions-chart
diff --git a/apps/client/src/app/pages/login/login-page.html b/apps/client/src/app/pages/login/login-page.html
index 81768ab19..840306c9b 100644
--- a/apps/client/src/app/pages/login/login-page.html
+++ b/apps/client/src/app/pages/login/login-page.html
@@ -4,7 +4,7 @@
       class="align-items-center d-flex flex-column justify-content-center mb-4 w-100"
     >
       <gf-logo size="large"></gf-logo>
-      <p class="lead m-0">Privacy-first Portfolio Tracker</p>
+      <p class="lead m-0">Open Source Portfolio Tracker</p>
     </div>
   </div>
 
diff --git a/apps/client/src/app/pages/report/report-page.html b/apps/client/src/app/pages/report/report-page.html
index 76b7689bb..57e29a545 100644
--- a/apps/client/src/app/pages/report/report-page.html
+++ b/apps/client/src/app/pages/report/report-page.html
@@ -1,9 +1,8 @@
 <div class="container">
   <div class="row">
     <div class="col">
-      <h3 class="align-items-center d-flex justify-content-center mb-3">
-        <span i18n>X-ray</span
-        ><ion-icon class="ml-2 text-muted" name="diamond-outline"></ion-icon>
+      <h3 class="align-items-center d-flex justify-content-center mb-3" i18n>
+        X-ray
       </h3>
       <p class="mb-4" i18n>
         Ghostfolio X-ray uses static analysis to identify potential issues and