diff --git a/unity-client/Assets/Editor/CreateCollectionScene.cs b/unity-client/Assets/Editor/CreateCollectionScene.cs
index 6a47744..c77e0ba 100644
--- a/unity-client/Assets/Editor/CreateCollectionScene.cs
+++ b/unity-client/Assets/Editor/CreateCollectionScene.cs
@@ -169,7 +169,7 @@ public static class CreateCollectionScene
         SetField(ctrl, "searchInput",         searchInput.GetComponent<TMP_InputField>());
         SetField(ctrl, "sortDropdown",        sortDd.GetComponent<TMP_Dropdown>());
         SetField(ctrl, "searchButton",        searchBtn.GetComponent<Button>());
-        SetField(ctrl, "filterToggleButton",  filterToggle.GetComponent<Button>());
+        SetField(ctrl, "filterToggleButton",  filterToggleBtn.GetComponent<Button>());
         SetField(ctrl, "filterPanel",         filterPanel);
         SetField(ctrl, "colorFilterDropdown",  colorDd.GetComponent<TMP_Dropdown>());
         SetField(ctrl, "typeFilterDropdown",   typeDd.GetComponent<TMP_Dropdown>());
@@ -178,15 +178,15 @@ public static class CreateCollectionScene
         SetField(ctrl, "ownedFilterDropdown",  ownedDd.GetComponent<TMP_Dropdown>());
         SetField(ctrl, "applyFilterButton",   applyBtn.GetComponent<Button>());
         SetField(ctrl, "clearFilterButton",   clearBtn.GetComponent<Button>());
-        SetField(ctrl, "cardGridParent",      gridContent.transform);
+        SetField(ctrl, "cardGridParent",      content.transform);
         SetField(ctrl, "cardPrefab",          null); // assign in Inspector
-        SetField(ctrl, "gridScrollRect",      gridScroll.GetComponent<ScrollRect>());
+        SetField(ctrl, "gridScrollRect",      scrollGo.GetComponent<ScrollRect>());
         SetField(ctrl, "loadMoreButton",      loadMoreBtn.GetComponent<Button>());
-        SetField(ctrl, "pageInfoText",        pageInfo.GetComponent<TMP_Text>());
+        SetField(ctrl, "pageInfoText",        pageInfoText.GetComponent<TMP_Text>());
         SetField(ctrl, "loadingSpinner",      spinner);
         SetField(ctrl, "detailPanel",         detailPanel);
-        SetField(ctrl, "detailCardFront",     detailFront.GetComponent<Image>());
-        SetField(ctrl, "detailCardBack",      detailBack.GetComponent<Image>());
+        SetField(ctrl, "detailCardFront",     detailCardFront.GetComponent<Image>());
+        SetField(ctrl, "detailCardBack",      detailCardBack.GetComponent<Image>());
         SetField(ctrl, "detailCardName",      detailName.GetComponent<TMP_Text>());
         SetField(ctrl, "detailManaCost",      detailMana.GetComponent<TMP_Text>());
         SetField(ctrl, "detailType",          detailType.GetComponent<TMP_Text>());
diff --git a/unity-client/Assets/Editor/CreateDeckBuilderScene.cs b/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
index 895a1fe..73c3187 100644
--- a/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
+++ b/unity-client/Assets/Editor/CreateDeckBuilderScene.cs
@@ -170,6 +170,49 @@ public static class CreateDeckBuilderScene
 
     // -- Helpers --
 
+    /// <summary>
+    /// Creates a Viewport + Content hierarchy inside the given scroll GameObject,
+    /// wires up the ScrollRect, and returns the Content RectTransform.
+    /// </summary>
+    static RectTransform CreateScrollContent(GameObject scrollGo, out ScrollRect scrollRect)
+    {
+        scrollRect = scrollGo.GetComponent<ScrollRect>();
+        if (scrollRect == null)
+            scrollRect = scrollGo.AddComponent<ScrollRect>();
+
+        // Viewport
+        var viewport = new GameObject("Viewport");
+        viewport.transform.SetParent(scrollGo.transform, false);
+        viewport.AddComponent<RectMask2D>();
+        var vpRect = viewport.GetComponent<RectTransform>();
+        vpRect.anchorMin = Vector2.zero;
+        vpRect.anchorMax = Vector2.one;
+        vpRect.offsetMin = Vector2.zero;
+        vpRect.offsetMax = Vector2.zero;
+
+        // Content
+        var content = new GameObject("Content");
+        content.transform.SetParent(viewport.transform, false);
+        var contentRect = content.AddComponent<RectTransform>();
+        contentRect.anchorMin = new Vector2(0f, 1f);
+        contentRect.anchorMax = new Vector2(1f, 1f);
+        contentRect.pivot     = new Vector2(0.5f, 1f);
+        contentRect.offsetMin = Vector2.zero;
+        contentRect.offsetMax = Vector2.zero;
+        content.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
+        var vlg = content.AddComponent<VerticalLayoutGroup>();
+        vlg.spacing = 4;
+        vlg.padding = new RectOffset(4, 4, 4, 4);
+        vlg.childForceExpandWidth  = true;
+        vlg.childForceExpandHeight = false;
+
+        scrollRect.viewport  = vpRect;
+        scrollRect.content   = contentRect;
+        scrollRect.horizontal = false;
+
+        return contentRect;
+    }
+
     static void SetField(object target, string fieldName, object value)
     {
         var field = target.GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);