diff --git a/R/app_ui.R b/R/app_ui.R
index cdc2a6a..00a38e2 100644
--- a/R/app_ui.R
+++ b/R/app_ui.R
@@ -14,7 +14,6 @@ app_ui <- function(request) {
       icon = bsicons::bs_icon("graph-up"),
 
       bslib::card(
-        fill = FALSE,
         bslib::card_header(
           class = "bg-warning",
           bsicons::bs_icon("exclamation-triangle"),
@@ -23,27 +22,17 @@ app_ui <- function(request) {
         "This app is in development and its output has not been verified.",
         "The information presented here should not be relied on as fact."
       ),
-
+      mod_show_strategy_text_ui("mod_show_strategy_text"),
+      mod_plot_rates_ui("mod_plot_rates"),
       bslib::layout_columns(
-        col_widths = c(3, 9),
-        fill = FALSE,
-        fillable = FALSE,
-        mod_show_strategy_text_ui("mod_show_strategy_text"),
-        bslib::layout_column_wrap(
-          width = 1,
-          gap = "0.8rem",
-          mod_plot_rates_ui("mod_plot_rates"),
-          bslib::layout_column_wrap(
-            width = 1 / 2,
-            mod_table_procedures_ui("mod_table_procedures"),
-            mod_table_diagnoses_ui("mod_table_diagnoses")
-          ),
-          bslib::layout_column_wrap(
-            width = 1 / 2,
-            mod_plot_age_sex_pyramid_ui("mod_plot_age_sex_pyramid"),
-            mod_plot_nee_ui("mod_plot_nee")
-          ),
-        )
+        col_widths = c(6, 6),
+        mod_table_diagnoses_ui("mod_table_diagnoses"),
+        mod_table_procedures_ui("mod_table_procedures")
+      ),
+      bslib::layout_columns(
+        col_widths = c(6, 6),
+        mod_plot_age_sex_pyramid_ui("mod_plot_age_sex_pyramid"),
+        mod_plot_nee_ui("mod_plot_nee")
       )
     ),
 
diff --git a/R/mod_plot_rates.R b/R/mod_plot_rates.R
index 2336963..c3d9f7b 100644
--- a/R/mod_plot_rates.R
+++ b/R/mod_plot_rates.R
@@ -6,8 +6,6 @@ mod_plot_rates_ui <- function(id) {
   # Rates plots share a y-axis, so don't wrap
   bslib::layout_columns(
     col_widths = c(5, 5, 2),
-    fill = FALSE,
-    fillable = FALSE,
     mod_plot_rates_trend_ui(ns("mod_plot_rates_trend")),
     mod_plot_rates_funnel_ui(ns("mod_plot_rates_funnel")),
     mod_plot_rates_box_ui(ns("mod_plot_rates_box"))