diff --git a/dp_creator_ii/app/analysis_panel.py b/dp_creator_ii/app/analysis_panel.py
index 48ea19c..b172e96 100644
--- a/dp_creator_ii/app/analysis_panel.py
+++ b/dp_creator_ii/app/analysis_panel.py
@@ -18,8 +18,11 @@ def analysis_ui():
             "the number of bins for the histogram, "
             "and its relative share of the privacy budget."
         ),
-        ui.output_ui("columns_checkbox_group_tooltip_ui"),
-        ui.input_checkbox_group("columns_checkbox_group", None, []),
+        ui.input_checkbox_group(
+            "columns_checkbox_group",
+            ["Columns", ui.output_ui("columns_checkbox_group_tooltip_ui")],
+            [],
+        ),
         ui.output_ui("columns_ui"),
         ui.markdown(
             "What is your privacy budget for this release? "
diff --git a/dp_creator_ii/app/components/column_module.py b/dp_creator_ii/app/components/column_module.py
index 719a1ff..d5e2499 100644
--- a/dp_creator_ii/app/components/column_module.py
+++ b/dp_creator_ii/app/components/column_module.py
@@ -16,17 +16,18 @@ def column_ui():  # pragma: no cover
     width = "10em"  # Just wide enough so the text isn't trucated.
     return ui.layout_columns(
         [
-            # The default values on these inputs
+            # The initial values on these inputs
             # should be overridden by the reactive.effect.
-            ui.output_ui("bounds_tooltip_ui"),
-            ui.input_numeric("lower", "Lower", 0, width=width),
+            ui.input_numeric(
+                "lower", ["Lower", ui.output_ui("bounds_tooltip_ui")], 0, width=width
+            ),
             ui.input_numeric("upper", "Upper", 0, width=width),
-            ui.output_ui("bins_tooltip_ui"),
-            ui.input_numeric("bins", "Bins", 0, width=width),
-            ui.output_ui("weight_tooltip_ui"),
+            ui.input_numeric(
+                "bins", ["Bins", ui.output_ui("bins_tooltip_ui")], 0, width=width
+            ),
             ui.input_select(
                 "weight",
-                "Weight",
+                ["Weight", ui.output_ui("weight_tooltip_ui")],
                 choices={
                     1: "Less accurate",
                     default_weight: "Default",