diff --git a/resources/automagic_dashboards/table/GenericTable.yaml b/resources/automagic_dashboards/table/GenericTable.yaml
index 39d5627b3ca21c2fc651a2335dc3ccdea187324a..42223337a53e1c9fd5d435741f0c82a2065da23b 100644
--- a/resources/automagic_dashboards/table/GenericTable.yaml
+++ b/resources/automagic_dashboards/table/GenericTable.yaml
@@ -62,7 +62,7 @@ filters:
       score: 80
 groups:
 - Overview:
-    title: Overview
+    title: Summary
 - Singletons:
     title: These are the same for all your [[this]]
 - ByTime:
@@ -80,32 +80,36 @@ dashboard_filters:
 - Country
 - State
 cards:
-# Overview
-  - Rowcount:
-      title: Total [[GenericTable]]
-      visualization: scalar
+# General
+  - NumberDistribution:
+      title: How [[GenericTable]] are distributed across [[GenericNumber]]
+      dimensions:
+        - GenericNumber:
+            aggregation: default
       metrics: Count
-      score: 100
-      group: Overview
-      width: 5
-      height: 3
-  - RowcountLast30Days:
-      title: New [[GenericTable]] in the last 30 days
-      visualization: scalar
+      visualization: bar
+      score: 90
+      group: General
+  - CountByCategoryMedium:
+      title: "[[GenericTable]] per [[GenericCategoryMedium]]"
+      dimensions: GenericCategoryMedium
       metrics: Count
-      score: 100
-      filters: Last30Days
-      group: Overview
-      width: 5
-      height: 3
-  - DistinctFKCounts:
-      title: Distinct [[FK]]
-      visualization: scalar
-      metrics: CountDistinctFKs
-      score: 100
-      group: Overview
-      width: 5
-      height: 3
+      visualization: row
+      score: 80
+      height: 8
+      group: General
+      order_by:
+        - Count: descending
+  - CountByCategoryLarge:
+      title: "[[GenericTable]] per [[GenericCategoryLarge]]"
+      dimensions: GenericCategoryLarge
+      metrics: Count
+      visualization: table
+      height: 8
+      score: 70
+      group: General
+      order_by:
+        - Count: descending
 # Geographical
   - CountByCountry:
       title: "[[GenericTable]] per country"
@@ -117,6 +121,7 @@ cards:
           map.type: region
           map.region: world_countries
       group: Geographical
+      height: 6
   - CountByState:
       title: "[[GenericTable]] per state"
       metrics: Count
@@ -127,6 +132,7 @@ cards:
           map.type: region
           map.region: us_states
       group: Geographical
+      height: 6
   - CountByCoords:
       title: "[[GenericTable]] by coordinates"
       metrics: Count
@@ -138,36 +144,7 @@ cards:
       visualization: map
       score: 80
       group: Geographical
-# General
-  - NumberDistribution:
-      title: How [[GenericTable]] are distributed across [[GenericNumber]]
-      dimensions:
-        - GenericNumber:
-            aggregation: default
-      metrics: Count
-      visualization: bar
-      score: 90
-      group: General
-  - CountByCategoryMedium:
-      title: "[[GenericTable]] per [[GenericCategoryMedium]]"
-      dimensions: GenericCategoryMedium
-      metrics: Count
-      visualization: row
-      score: 80
-      height: 8
-      group: General
-      order_by:
-        - Count: descending
-  - CountByCategoryLarge:
-      title: "[[GenericTable]] per [[GenericCategoryLarge]]"
-      dimensions: GenericCategoryLarge
-      metrics: Count
-      visualization: table
-      height: 8
-      score: 70
-      group: General
-      order_by:
-        - Count: descending
+      height: 6
 # By Time
   - CountByJoinDate:
       title: "[[GenericTable]] that have joined over time"
@@ -367,4 +344,23 @@ cards:
       height: 3
       width: 3
       group: Singletons
-      x_label: ""
+# Overview
+  - Rowcount:
+      title: Total [[GenericTable]]
+      visualization: scalar
+      metrics: Count
+      score: 100
+      group: Overview
+  - RowcountLast30Days:
+      title: New [[GenericTable]] in the last 30 days
+      visualization: scalar
+      metrics: Count
+      score: 100
+      filters: Last30Days
+      group: Overview
+  - DistinctFKCounts:
+      title: Distinct [[FK]]
+      visualization: scalar
+      metrics: CountDistinctFKs
+      score: 100
+      group: Overview
diff --git a/resources/automagic_dashboards/table/GoogleAnalyticsTable.yaml b/resources/automagic_dashboards/table/GoogleAnalyticsTable.yaml
index 6bb05ab5532b68ef9f8e106a34ccd95d86310442..fce432a60015e2c1ef156616662926d8feebd29b 100644
--- a/resources/automagic_dashboards/table/GoogleAnalyticsTable.yaml
+++ b/resources/automagic_dashboards/table/GoogleAnalyticsTable.yaml
@@ -37,26 +37,24 @@ dimensions:
   - Source:
       field_type: ga:source
 groups:
+- Overview:
+    title: Summary
 - SessionsBreakdown:
-    title: Sessions overview
+    title: Sessions in the last 30 days
 cards:
   - SessionsOverTime:
-      title: Sessions per day
-      description: Total sessions over time
-      metrics: Sessions
+      title: Sessions and unique users per day, last 30 days
+      description: How many total sessions vs. how many individual users you had each day in the last 30 days.
+      metrics:
+        - Sessions
+        - 1DayActiveUsers
       dimensions: Day
       filters: Last30Days
       visualization: line
       score: 100
       width: 18
-  - 1DayDAUOverTime:
-      title: Daily active users
-      description: The number of unique users per day
-      metrics: 1DayActiveUsers
-      dimensions: Day
-      filters: Last30Days
-      visualization: line
-      score: 85
+      height: 7
+      group: Overview
   # I don't know if I can do this, but I'd like to have a multi-metric card here
   # made up of two scalars, new user sessions and returning user sessions, so that
   # it's displayed as a bar chart.
diff --git a/resources/automagic_dashboards/table/UserTable.yaml b/resources/automagic_dashboards/table/UserTable.yaml
index ce6c486c551dce8dc9b372a4a0c7ac12605f4b97..c736e7984d7b892afa859e6bfb2aee9f8caa6d17 100644
--- a/resources/automagic_dashboards/table/UserTable.yaml
+++ b/resources/automagic_dashboards/table/UserTable.yaml
@@ -81,6 +81,8 @@ cards:
       metrics: Count
       score: 100
       group: Overview
+      width: 18
+      height: 7
 # Geographical
   - CountByCountry:
       title: Count of users per country