diff --git a/web/src/pages/admin-overview/AdminOverviewPage.ts b/web/src/pages/admin-overview/AdminOverviewPage.ts
index 72ba1aa98..f629d2181 100644
--- a/web/src/pages/admin-overview/AdminOverviewPage.ts
+++ b/web/src/pages/admin-overview/AdminOverviewPage.ts
@@ -10,12 +10,12 @@ import "./cards/BackupStatusCard";
 import "./cards/VersionStatusCard";
 import "./cards/WorkerStatusCard";
 
-import "./graphs/FlowStatusCard";
-import "./graphs/LDAPSyncStatusCard";
-import "./graphs/OutpostStatusCard";
-import "./graphs/UserCountStatusCard";
-import "./graphs/GroupCountStatusCard";
-import "./graphs/PolicyStatusCard";
+import "./charts/FlowStatusChart";
+import "./charts/LDAPSyncStatusChart";
+import "./charts/OutpostStatusChart";
+import "./charts/UserCountStatusChart";
+import "./charts/GroupCountStatusChart";
+import "./charts/PolicyStatusChart";
 
 import PFPage from "@patternfly/patternfly/components/Page/page.css";
 import PFContent from "@patternfly/patternfly/components/Content/content.css";
@@ -39,7 +39,7 @@ export class AdminOverviewPage extends LitElement {
                 height: 35em;
             }
             .card-container {
-                height: 10em;
+                max-height: 10em;
             }
         `];
     }
@@ -54,34 +54,34 @@ export class AdminOverviewPage extends LitElement {
         <section class="pf-c-page__main-section">
             <div class="pf-l-grid pf-m-gutter">
                 <!-- row 1 -->
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="pf-icon pf-icon-infrastructure" header=${t`Policies`} headerLink="#/policy/policies">
-                        <ak-admin-status-card-policy></ak-admin-status-card-policy>
+                        <ak-admin-status-chart-policy></ak-admin-status-chart-policy>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="pf-icon pf-icon-server" header=${t`Flows`} headerLink="#/flow/flows">
-                        <ak-admin-status-card-flow></ak-admin-status-card-flow>
+                        <ak-admin-status-chart-flow></ak-admin-status-chart-flow>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="fa fa-sync-alt" header=${t`Outpost status`} headerLink="#/outpost/outposts">
-                        <ak-admin-status-card-outpost></ak-admin-status-card-outpost>
+                        <ak-admin-status-chart-outpost></ak-admin-status-chart-outpost>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="fa fa-sync-alt" header=${t`Users`} headerLink="#/identity/users">
-                        <ak-admin-status-card-user-count></ak-admin-status-card-user-count>
+                        <ak-admin-status-chart-user-count></ak-admin-status-chart-user-count>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="fa fa-sync-alt" header=${t`Groups`} headerLink="#/identity/groups">
-                        <ak-admin-status-card-group-count></ak-admin-status-card-group-count>
+                        <ak-admin-status-chart-group-count></ak-admin-status-chart-group-count>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-xl2 graph-container">
+                <div class="pf-l-grid__item pf-m-6-col pf-m-4-col-on-xl pf-m-2-col-on-2xl graph-container">
                     <ak-aggregate-card icon="fa fa-sync-alt" header=${t`LDAP Sync status`} headerLink="#/core/sources">
-                        <ak-admin-status-card-ldap-sync></ak-admin-status-card-ldap-sync>
+                        <ak-admin-status-chart-ldap-sync></ak-admin-status-chart-ldap-sync>
                     </ak-aggregate-card>
                 </div>
                 <div class="pf-l-grid__item pf-m-12-col row-divider">
@@ -104,12 +104,12 @@ export class AdminOverviewPage extends LitElement {
                     <hr>
                 </div>
                 <!-- row 3 -->
-                <div class="pf-l-grid__item pf-m-12-col pf-m-6-col-on-xl pf-m-9-col-on-xl2 big-graph-container">
+                <div class="pf-l-grid__item pf-m-12-col pf-m-6-col-on-xl pf-m-8-col-on-2xl big-graph-container">
                     <ak-aggregate-card icon="pf-icon pf-icon-server" header=${t`Logins over the last 24 hours`}>
                         <ak-charts-admin-login></ak-charts-admin-login>
                     </ak-aggregate-card>
                 </div>
-                <div class="pf-l-grid__item pf-m-12-col pf-m-6-col-on-xl pf-m-3-col-on-xl2 big-graph-container">
+                <div class="pf-l-grid__item pf-m-12-col pf-m-6-col-on-xl pf-m-4-col-on-2xl big-graph-container">
                     <ak-aggregate-card icon="pf-icon pf-icon-server" header=${t`Apps with most usage`}>
                         <ak-top-applications-table></ak-top-applications-table>
                     </ak-aggregate-card>
diff --git a/web/src/pages/admin-overview/graphs/FlowStatusCard.ts b/web/src/pages/admin-overview/charts/FlowStatusChart.ts
similarity index 93%
rename from web/src/pages/admin-overview/graphs/FlowStatusCard.ts
rename to web/src/pages/admin-overview/charts/FlowStatusChart.ts
index 8eb474da5..483664279 100644
--- a/web/src/pages/admin-overview/graphs/FlowStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/FlowStatusChart.ts
@@ -11,8 +11,8 @@ interface FlowMetrics {
     cached: number;
 }
 
-@customElement("ak-admin-status-card-flow")
-export class PolicyStatusCard extends AKChart<FlowMetrics> {
+@customElement("ak-admin-status-chart-flow")
+export class PolicyStatusChart extends AKChart<FlowMetrics> {
 
     getChartType(): string {
         return "doughnut";
diff --git a/web/src/pages/admin-overview/graphs/GroupCountStatusCard.ts b/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts
similarity index 93%
rename from web/src/pages/admin-overview/graphs/GroupCountStatusCard.ts
rename to web/src/pages/admin-overview/charts/GroupCountStatusChart.ts
index 77964e975..9755ebc4b 100644
--- a/web/src/pages/admin-overview/graphs/GroupCountStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/GroupCountStatusChart.ts
@@ -10,8 +10,8 @@ interface GroupMetrics {
     superusers: number;
 }
 
-@customElement("ak-admin-status-card-group-count")
-export class GroupCountStatusCard extends AKChart<GroupMetrics> {
+@customElement("ak-admin-status-chart-group-count")
+export class GroupCountStatusChart extends AKChart<GroupMetrics> {
 
     getChartType(): string {
         return "doughnut";
diff --git a/web/src/pages/admin-overview/graphs/LDAPSyncStatusCard.ts b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
similarity index 95%
rename from web/src/pages/admin-overview/graphs/LDAPSyncStatusCard.ts
rename to web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
index 712eedf4c..934f937ef 100644
--- a/web/src/pages/admin-overview/graphs/LDAPSyncStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/LDAPSyncStatusChart.ts
@@ -12,8 +12,8 @@ interface LDAPSyncStats {
     unsynced: number;
 }
 
-@customElement("ak-admin-status-card-ldap-sync")
-export class LDAPSyncStatusCard extends AKChart<LDAPSyncStats> {
+@customElement("ak-admin-status-chart-ldap-sync")
+export class LDAPSyncStatusChart extends AKChart<LDAPSyncStats> {
 
     getChartType(): string {
         return "doughnut";
diff --git a/web/src/pages/admin-overview/graphs/OutpostStatusCard.ts b/web/src/pages/admin-overview/charts/OutpostStatusChart.ts
similarity index 95%
rename from web/src/pages/admin-overview/graphs/OutpostStatusCard.ts
rename to web/src/pages/admin-overview/charts/OutpostStatusChart.ts
index 572775c64..073f68654 100644
--- a/web/src/pages/admin-overview/graphs/OutpostStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/OutpostStatusChart.ts
@@ -12,8 +12,8 @@ interface OutpostStats {
     unhealthy: number;
 }
 
-@customElement("ak-admin-status-card-outpost")
-export class OutpostStatusCard extends AKChart<OutpostStats> {
+@customElement("ak-admin-status-chart-outpost")
+export class OutpostStatusChart extends AKChart<OutpostStats> {
 
     getChartType(): string {
         return "doughnut";
diff --git a/web/src/pages/admin-overview/graphs/PolicyStatusCard.ts b/web/src/pages/admin-overview/charts/PolicyStatusChart.ts
similarity index 94%
rename from web/src/pages/admin-overview/graphs/PolicyStatusCard.ts
rename to web/src/pages/admin-overview/charts/PolicyStatusChart.ts
index 0952d4e04..6d859e19a 100644
--- a/web/src/pages/admin-overview/graphs/PolicyStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/PolicyStatusChart.ts
@@ -12,8 +12,8 @@ interface PolicyMetrics {
     unbound: number;
 }
 
-@customElement("ak-admin-status-card-policy")
-export class PolicyStatusCard extends AKChart<PolicyMetrics> {
+@customElement("ak-admin-status-chart-policy")
+export class PolicyStatusChart extends AKChart<PolicyMetrics> {
 
     getChartType(): string {
         return "doughnut";
diff --git a/web/src/pages/admin-overview/graphs/UserCountStatusCard.ts b/web/src/pages/admin-overview/charts/UserCountStatusChart.ts
similarity index 93%
rename from web/src/pages/admin-overview/graphs/UserCountStatusCard.ts
rename to web/src/pages/admin-overview/charts/UserCountStatusChart.ts
index c88bc95f6..e2f1264d5 100644
--- a/web/src/pages/admin-overview/graphs/UserCountStatusCard.ts
+++ b/web/src/pages/admin-overview/charts/UserCountStatusChart.ts
@@ -10,8 +10,8 @@ interface UserMetrics {
     superusers: number;
 }
 
-@customElement("ak-admin-status-card-user-count")
-export class UserCountStatusCard extends AKChart<UserMetrics> {
+@customElement("ak-admin-status-chart-user-count")
+export class UserCountStatusChart extends AKChart<UserMetrics> {
 
     getChartType(): string {
         return "doughnut";