diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0df053b51..88c026b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Changed the buttons to links (`<a>`) on the tools page
+
 ## 1.10.1 - 02.06.2021
 
 ### Fixed
diff --git a/apps/client/src/app/pages/admin/admin-page.component.ts b/apps/client/src/app/pages/admin/admin-page.component.ts
index 3cdb58877..f0b3e3d45 100644
--- a/apps/client/src/app/pages/admin/admin-page.component.ts
+++ b/apps/client/src/app/pages/admin/admin-page.component.ts
@@ -80,7 +80,10 @@ export class AdminPageComponent implements OnInit {
         addSuffix: true
       });
 
-      return distanceString === '0 seconds ago' ? 'just now' : distanceString;
+      return distanceString === 'in 0 seconds' ||
+        distanceString === '0 seconds ago'
+        ? 'just now'
+        : distanceString;
     }
 
     return '';
diff --git a/apps/client/src/app/pages/tools/tools-page.html b/apps/client/src/app/pages/tools/tools-page.html
index b37469329..13ddaa815 100644
--- a/apps/client/src/app/pages/tools/tools-page.html
+++ b/apps/client/src/app/pages/tools/tools-page.html
@@ -9,14 +9,14 @@
           portfolio.
         </p>
         <p class="text-right">
-          <button
+          <a
             color="primary"
             i18n
             mat-button
             [routerLink]="['/tools', 'analysis']"
           >
             Open Analysis →
-          </button>
+          </a>
         </p>
       </mat-card>
     </div>
@@ -28,14 +28,14 @@
           risks in your portfolio.
         </p>
         <p class="text-right">
-          <button
+          <a
             color="primary"
             i18n
             mat-button
             [routerLink]="['/tools', 'report']"
           >
             Open X-ray →
-          </button>
+          </a>
         </p>
       </mat-card>
     </div>