diff --git a/src/app/administration/api-token/api-keys.component.html b/src/app/administration/api-token/api-keys.component.html
index c97e22e4..ccfac534 100644
--- a/src/app/administration/api-token/api-keys.component.html
+++ b/src/app/administration/api-token/api-keys.component.html
@@ -21,11 +21,8 @@ <h6 class="card-header bg-transparent">API Keys <span class="inline-controller">
                   </thead>
                   <tbody>
                   <tr *ngIf="apiKeys.length === 0">
-                    <td></td>
-                    <td></td>
-                    <td class="text-muted">No api tokens...</td>
-                    <td></td>
-                    <td></td>
+                    <td colspan="5" class="text-muted text-center">Nothing here yet! Add your first api token.</td>
+
                   </tr>
                   <tr *ngFor="let _ of apiKeys">
                     <td>
diff --git a/src/app/administration/projects/administration.component.html b/src/app/administration/projects/administration.component.html
index a8fd9f05..a3cc5538 100644
--- a/src/app/administration/projects/administration.component.html
+++ b/src/app/administration/projects/administration.component.html
@@ -22,11 +22,7 @@ <h6 class="card-header bg-transparent">Projects <span class="inline-controller">
                   </thead>
                   <tbody>
                   <tr *ngIf="projects.length === 0">
-                    <td></td>
-                    <td></td>
-                    <td class="text-muted">No data...</td>
-                    <td></td>
-                    <td></td>
+                    <td colspan="5" class="text-muted text-center">Nothing here yet! Add your first project.</td>
                   </tr>
                   <tr *ngFor="let _ of projects">
                     <td class="project-name">
diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index 56061c94..64bdc1ca 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -81,7 +81,7 @@ <h6 class="card-header bg-transparent">Recent Test Runs</h6>
                   </thead>
                   <tbody>
                     <tr *ngIf="!latestItems || latestItems.length === 0">
-                      <td colspan="4" class="text-muted no-data">No Data...</td>
+                      <td colspan="5" class="text-muted no-data">Nothing here yet! Upload some test reports. <span><a href="https://jtlreporter.site/docs/guides/manual-data-upload">Show me how!</a></span></td>
                     </tr>
                     <tr *ngFor="let _ of latestItems" (click)="open(_.projectName, _.name, _.id)">
                       <td class="ellipsis">
diff --git a/src/app/project/project.component.html b/src/app/project/project.component.html
index f8d184ef..e96f490a 100644
--- a/src/app/project/project.component.html
+++ b/src/app/project/project.component.html
@@ -77,7 +77,10 @@ <h6 class="card-header bg-transparent">Scenarios</h6>
                   </tr>
                 </thead>
                 <tbody>
-                  <tr *ngFor="let _ of mf.data" (click)="open(_.name)">
+                <tr *ngIf="filteredScenarios.length === 0">
+                  <td colspan="5" class="text-muted text-center">Nothing here yet! Add your first scenario.</td>
+                </tr>
+                <tr *ngFor="let _ of mf.data" (click)="open(_.name)">
                     <td>{{_.name}}</td>
                     <td>{{_.data[0].startDate | date:'d. L. yyyy H:mm'}}</td>
                   </tr>
diff --git a/src/app/scenario/external-notification/external-notification.component.html b/src/app/scenario/external-notification/external-notification.component.html
index 8c71ce0a..1b225cad 100644
--- a/src/app/scenario/external-notification/external-notification.component.html
+++ b/src/app/scenario/external-notification/external-notification.component.html
@@ -29,11 +29,8 @@ <h5 class="modal-title" id="modal-basic-title">External notifications</h5>
             </thead>
             <tbody *ngIf="notifications.length === 0">
             <tr>
-              <td></td>
-              <td>
-                <div class="empty-table">No data found.</div>
-              </td>
-              <td></td>
+              <td colspan="4" class="text-muted text-center">Nothing here yet! Add your first notification.</td>
+
             </tr>
             </tbody>
             <tbody *ngIf="notifications.length > 0">
diff --git a/src/app/scenario/scenario.component.html b/src/app/scenario/scenario.component.html
index 167bd550..2d1c5751 100644
--- a/src/app/scenario/scenario.component.html
+++ b/src/app/scenario/scenario.component.html
@@ -76,15 +76,7 @@ <h6 class="card-header bg-transparent">Test Runs
                     </thead>
                     <tbody *ngIf="items.data.length === 0">
                       <tr>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td>
-                          <div class="empty-table">No test runs were uploaded yet.</div>
-                        </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td colspan="8" class="text-muted text-center">Nothing here yet! Please upload some test reports.</td>
                       </tr>
                     </tbody>
                     <tbody *ngIf="items.data.length > 0">
diff --git a/src/app/scenario/share-token/scenario-share-token.component.html b/src/app/scenario/share-token/scenario-share-token.component.html
index afa0c859..c4cb4dd5 100644
--- a/src/app/scenario/share-token/scenario-share-token.component.html
+++ b/src/app/scenario/share-token/scenario-share-token.component.html
@@ -26,11 +26,7 @@ <h5 class="modal-title" id="modal-basic-title">Share Scenario</h5>
             </thead>
             <tbody *ngIf="scenarioShareTokens.length === 0">
             <tr>
-              <td></td>
-              <td>
-                <div class="empty-table">No links created yet.</div>
-              </td>
-              <td></td>
+              <td colspan="4" class="text-muted text-center">Nothing here yet! Add your first share token.</td>
             </tr>
             </tbody>
             <tbody *ngIf="scenarioShareTokens.length > 0">