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>