diff --git a/IMPLEMENTATION_CHECKLIST.md b/IMPLEMENTATION_CHECKLIST.md
index 6eaafe7..d541fac 100644
--- a/IMPLEMENTATION_CHECKLIST.md
+++ b/IMPLEMENTATION_CHECKLIST.md
@@ -245,8 +245,9 @@
   список колод; магазин и декбилдер подключены.
 - [x] Очередь: classic-ranked, опрос, отмена, тикет, переход в матч.
 - [x] Простой декбилдер: фильтры (клан, грейд, триггер) в оверлее,
-  сброс, статистика триггеров/грейдов, коллекция сеткой, текущая колода,
-  создание/редактирование/сохранение, лимиты 50/4/owned.
+  сброс, сортировка клан→ранг→имя, карточная сетка с количеством,
+  узкий список колод справа, редактор с вертикальным списком карт,
+  статистика по рангам и общему числу, добавление/удаление кликом.
 - [ ] Декбилдер: drag&drop, live-валидация, редкость/тип/арт, пресеты.
 - [x] Базовая коллекция: список, балансы, разбор в пыль с подтверждением;
   арты и «сколько в колодах» — дальше.
diff --git a/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs b/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs
index f8e33ab..54a781c 100644
--- a/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs
+++ b/client/Assets/Vanguard/Runtime/UI/DeckBuilderView.cs
@@ -12,8 +12,8 @@ using Vanguard.Meta;
 namespace Vanguard.UI
 {
     /// <summary>
-    /// Простой декбилдер: коллекция слева, текущая колода справа,
-    /// фильтры в оверлее, статистика по триггерам и грейдам.
+    /// Декбилдер в духе HS: коллекция в центре, узкая колонка колод/карт справа.
+    /// Список колод и редактор используют один и тот же блок коллекции.
     /// </summary>
     public sealed class DeckBuilderView
     {
@@ -21,13 +21,14 @@ namespace Vanguard.UI
         private readonly AuthService _auth;
         private readonly Action _onBack;
         private readonly Action<DeckDto> _onPlay;
-
         private readonly RectTransform _root;
+
         private readonly RectTransform _listView;
         private readonly RectTransform _editorView;
-        private RectTransform _listContent;
-        private RectTransform _collectionContent;
-        private RectTransform _deckContent;
+        private RectTransform _deckListContent;
+        private RectTransform _listCollectionContent;
+        private RectTransform _editorCollectionContent;
+        private RectTransform _deckCardContent;
         private InputField _nameInput;
         private Text _listStatus;
         private Text _editorStatus;
@@ -44,10 +45,12 @@ namespace Vanguard.UI
         private readonly List<CollectionItemDto> _collection = new List<CollectionItemDto>();
         private readonly Dictionary<string, CardCatalogItemDto> _catalog =
             new Dictionary<string, CardCatalogItemDto>(StringComparer.Ordinal);
-
         private readonly List<string> _cards = new List<string>();
-        private readonly Dictionary<string, Text> _collectionCountTexts =
+        private readonly Dictionary<string, Text> _listCountTexts =
             new Dictionary<string, Text>(StringComparer.Ordinal);
+        private readonly Dictionary<string, Text> _editorCountTexts =
+            new Dictionary<string, Text>(StringComparer.Ordinal);
+
         private DeckDto _editing;
         private string _filterClan = "Все";
         private string _filterTrigger = "Все";
@@ -68,11 +71,11 @@ namespace Vanguard.UI
             _onPlay = onPlay;
 
             _root = UiKit.CreatePanel(parent, "DeckBuilderScreen", new Color(0.018f, 0.03f, 0.06f, 0.97f));
-
             _listView = BuildListView();
             _editorView = BuildEditorView();
             _filterOverlay = BuildFilterOverlay();
             _confirmOverlay = BuildDeleteConfirm();
+
             _listView.gameObject.SetActive(false);
             _editorView.gameObject.SetActive(false);
             _filterOverlay.gameObject.SetActive(false);
@@ -98,35 +101,83 @@ namespace Vanguard.UI
         {
             var view = UiKit.CreatePanel(_root, "DeckList", new Color(0.018f, 0.03f, 0.06f, 0.97f));
 
-            var top = BuildTopBar(view, "Колоды", out _);
-            var create = UiKit.CreateButton(top, "Create", "Создать колоду", NewDeck, 19);
-            UiKit.SetPreferredHeight(create, 46f, 0f);
+            var top = BuildTopBar(view);
+            var back = UiKit.CreateButton(top, "Back", "← В лобби", () => _onBack(), 17);
+            SetFixedSize(back, 120f, 44f);
+
+            var title = UiKit.CreateText(top, "Title", "Колоды", 28, Color.white, TextAnchor.MiddleLeft);
+            title.fontStyle = FontStyle.Bold;
+            SetFixedSize(title, 150f, 44f);
+
+            _filterSummary = UiKit.CreateText(
+                top, "FilterSummary", "Все карты", 16,
+                new Color(0.60f, 0.68f, 0.84f), TextAnchor.MiddleLeft);
+            SetFlexible(_filterSummary, 1f, 44f);
+
+            var filters = UiKit.CreateButton(top, "Filters", "Фильтры", OpenFilters, 17);
+            SetFixedSize(filters, 110f, 44f);
+
+            var reset = UiKit.CreateButton(top, "ResetFilters", "Сброс", ResetFilters, 17);
+            SetFixedSize(reset, 90f, 44f);
+
+            var create = UiKit.CreateButton(top, "Create", "Создать колоду", NewDeck, 17);
+            SetFixedSize(create, 180f, 44f);
 
             var body = UiKit.CreatePanel(view, "Body", new Color(0f, 0f, 0f, 0f));
             body.anchorMin = Vector2.zero;
             body.anchorMax = Vector2.one;
-            body.offsetMin = new Vector2(44f, 30f);
-            body.offsetMax = new Vector2(-44f, -110f);
-            UiKit.AddVerticalLayout(body, 8, 10);
+            body.offsetMin = new Vector2(34f, 28f);
+            body.offsetMax = new Vector2(-34f, -108f);
+            UiKit.AddHorizontalLayout(body, 0, 14);
 
-            var hint = UiKit.CreateText(
-                body,
-                "Hint",
-                "Откройте колоду для редактирования или создайте новую. «В бой» ставит колоду в очередь.",
-                17,
-                new Color(0.60f, 0.68f, 0.84f),
-                TextAnchor.MiddleLeft);
-            UiKit.SetPreferredHeight(hint, 26f);
+            var collectionArea = UiKit.CreatePanel(
+                body, "CollectionArea", new Color(0.04f, 0.06f, 0.10f, 0.55f));
+            var collectionElement = collectionArea.gameObject.AddComponent<LayoutElement>();
+            collectionElement.flexibleWidth = 1f;
+            collectionElement.flexibleHeight = 1f;
+            collectionElement.minHeight = 300f;
+            UiKit.AddVerticalLayout(collectionArea, 8, 6);
 
-            var scroll = UiKit.CreateScrollView(body, "DeckListScroll", out _listContent, 8f);
-            var element = scroll.gameObject.AddComponent<LayoutElement>();
-            element.flexibleHeight = 1f;
-            element.minHeight = 200f;
+            var scroll = UiKit.CreateGridScrollView(
+                collectionArea,
+                "CollectionGrid",
+                new Vector2(174f, 238f),
+                new Vector2(10f, 10f),
+                out _listCollectionContent);
+            var scrollElement = scroll.gameObject.AddComponent<LayoutElement>();
+            scrollElement.flexibleHeight = 1f;
+            scrollElement.minHeight = 220f;
 
             _listStatus = UiKit.CreateText(
-                body, "Status", string.Empty, 18,
+                collectionArea, "Status", string.Empty, 16,
                 new Color(0.62f, 0.68f, 0.82f), TextAnchor.MiddleLeft);
-            UiKit.SetPreferredHeight(_listStatus, 34f);
+            UiKit.SetPreferredHeight(_listStatus, 32f);
+
+            var deckArea = UiKit.CreatePanel(
+                body, "DeckArea", new Color(0.04f, 0.06f, 0.10f, 0.85f));
+            var deckElement = deckArea.gameObject.AddComponent<LayoutElement>();
+            deckElement.preferredWidth = 300f;
+            deckElement.minWidth = 280f;
+            deckElement.flexibleWidth = 0f;
+            deckElement.flexibleHeight = 1f;
+            deckElement.minHeight = 300f;
+            UiKit.AddVerticalLayout(deckArea, 10, 6);
+
+            var deckTitle = UiKit.CreateText(
+                deckArea, "Title", "Мои колоды", 20, Color.white, TextAnchor.MiddleLeft);
+            deckTitle.fontStyle = FontStyle.Bold;
+            UiKit.SetPreferredHeight(deckTitle, 30f);
+
+            var deckScroll = UiKit.CreateScrollView(deckArea, "DeckListScroll", out _deckListContent, 8f);
+            var deckScrollElement = deckScroll.gameObject.AddComponent<LayoutElement>();
+            deckScrollElement.flexibleHeight = 1f;
+            deckScrollElement.minHeight = 200f;
+
+            var hint = UiKit.CreateText(
+                deckArea, "Hint", "Нажмите на колоду,\nчтобы открыть редактор.", 14,
+                new Color(0.58f, 0.66f, 0.80f), TextAnchor.MiddleLeft);
+            hint.horizontalOverflow = HorizontalWrapMode.Wrap;
+            UiKit.SetPreferredHeight(hint, 46f);
 
             return view;
         }
@@ -135,6 +186,95 @@ namespace Vanguard.UI
         {
             var view = UiKit.CreatePanel(_root, "DeckEditor", new Color(0.018f, 0.03f, 0.06f, 0.97f));
 
+            var top = BuildTopBar(view);
+            var back = UiKit.CreateButton(top, "Back", "← Колоды", BackToList, 17);
+            SetFixedSize(back, 120f, 44f);
+
+            _nameInput = UiKit.CreateInput(top, "Name", "Название колоды");
+            SetFlexible(_nameInput, 0.7f, 46f);
+
+            var filters = UiKit.CreateButton(top, "Filters", "Фильтры", OpenFilters, 17);
+            SetFixedSize(filters, 110f, 44f);
+
+            var reset = UiKit.CreateButton(top, "ResetFilters", "Сброс", ResetFilters, 17);
+            SetFixedSize(reset, 90f, 44f);
+
+            _stats = UiKit.CreateText(
+                top, "Stats", string.Empty, 15,
+                new Color(0.72f, 0.78f, 0.92f), TextAnchor.MiddleLeft);
+            _stats.horizontalOverflow = HorizontalWrapMode.Wrap;
+            SetFlexible(_stats, 1.4f, 50f);
+
+            var save = UiKit.CreateButton(top, "Save", "Сохранить", SaveDeck, 17);
+            SetFixedSize(save, 120f, 44f);
+
+            var duel = UiKit.CreateButton(top, "Duel", "В бой", PlayDeck, 17);
+            SetFixedSize(duel, 90f, 44f);
+
+            var delete = UiKit.CreateButton(top, "Delete", "Удалить", RequestDeleteCurrent, 17);
+            SetFixedSize(delete, 100f, 44f);
+
+            var body = UiKit.CreatePanel(view, "Body", new Color(0f, 0f, 0f, 0f));
+            body.anchorMin = Vector2.zero;
+            body.anchorMax = Vector2.one;
+            body.offsetMin = new Vector2(34f, 28f);
+            body.offsetMax = new Vector2(-34f, -108f);
+            UiKit.AddHorizontalLayout(body, 0, 14);
+
+            var collectionArea = UiKit.CreatePanel(
+                body, "CollectionArea", new Color(0.04f, 0.06f, 0.10f, 0.55f));
+            var collectionElement = collectionArea.gameObject.AddComponent<LayoutElement>();
+            collectionElement.flexibleWidth = 1f;
+            collectionElement.flexibleHeight = 1f;
+            collectionElement.minHeight = 300f;
+            UiKit.AddVerticalLayout(collectionArea, 8, 6);
+
+            var scroll = UiKit.CreateGridScrollView(
+                collectionArea,
+                "CollectionGrid",
+                new Vector2(174f, 238f),
+                new Vector2(10f, 10f),
+                out _editorCollectionContent);
+            var scrollElement = scroll.gameObject.AddComponent<LayoutElement>();
+            scrollElement.flexibleHeight = 1f;
+            scrollElement.minHeight = 220f;
+
+            _editorStatus = UiKit.CreateText(
+                collectionArea, "Status", string.Empty, 16,
+                new Color(0.62f, 0.68f, 0.82f), TextAnchor.MiddleLeft);
+            UiKit.SetPreferredHeight(_editorStatus, 32f);
+
+            var deckArea = UiKit.CreatePanel(
+                body, "DeckArea", new Color(0.04f, 0.06f, 0.10f, 0.85f));
+            var deckElement = deckArea.gameObject.AddComponent<LayoutElement>();
+            deckElement.preferredWidth = 300f;
+            deckElement.minWidth = 280f;
+            deckElement.flexibleWidth = 0f;
+            deckElement.flexibleHeight = 1f;
+            deckElement.minHeight = 300f;
+            UiKit.AddVerticalLayout(deckArea, 10, 6);
+
+            _deckCount = UiKit.CreateText(
+                deckArea, "DeckCount", "Колода: 0/50", 19, Color.white, TextAnchor.MiddleLeft);
+            _deckCount.fontStyle = FontStyle.Bold;
+            UiKit.SetPreferredHeight(_deckCount, 28f);
+
+            var deckScroll = UiKit.CreateScrollView(deckArea, "DeckCardScroll", out _deckCardContent, 6f);
+            var deckScrollElement = deckScroll.gameObject.AddComponent<LayoutElement>();
+            deckScrollElement.flexibleHeight = 1f;
+            deckScrollElement.minHeight = 200f;
+
+            var hint = UiKit.CreateText(
+                deckArea, "Hint", "Нажмите на карту,\nчтобы убрать одну копию.", 14,
+                new Color(0.58f, 0.66f, 0.80f), TextAnchor.MiddleLeft);
+            hint.horizontalOverflow = HorizontalWrapMode.Wrap;
+            UiKit.SetPreferredHeight(hint, 46f);
+
+            return view;
+        }
+
+        private RectTransform BuildTopBar(RectTransform view)
+        {
             var top = UiKit.CreatePanel(view, "TopBar", new Color(0.06f, 0.08f, 0.13f, 1f));
             top.anchorMin = new Vector2(0f, 1f);
             top.anchorMax = new Vector2(1f, 1f);
@@ -142,104 +282,12 @@ namespace Vanguard.UI
             top.anchoredPosition = Vector2.zero;
             top.sizeDelta = new Vector2(0f, 88f);
             UiKit.AddHorizontalLayout(top, 18, 12);
-
-            var back = UiKit.CreateButton(top, "Back", "← Колоды", BackToCards, 18);
-            UiKit.SetPreferredHeight(back, 44f, 0f);
-
-            var title = UiKit.CreateText(top, "Title", "Конструктор", 28, Color.white, TextAnchor.MiddleLeft);
-            title.fontStyle = FontStyle.Bold;
-            UiKit.SetPreferredHeight(title, 44f, 0f);
-
-            _nameInput = UiKit.CreateInput(top, "Name", "Название колоды");
-            UiKit.SetPreferredHeight(_nameInput, 46f);
-
-            var save = UiKit.CreateButton(top, "Save", "Сохранить", SaveDeck, 18);
-            UiKit.SetPreferredHeight(save, 44f, 0f);
-
-            var body = UiKit.CreatePanel(view, "Body", new Color(0f, 0f, 0f, 0f));
-            body.anchorMin = Vector2.zero;
-            body.anchorMax = Vector2.one;
-            body.offsetMin = new Vector2(34f, 30f);
-            body.offsetMax = new Vector2(-34f, -106f);
-            UiKit.AddHorizontalLayout(body, 0, 14);
-
-            var left = UiKit.CreatePanel(body, "CollectionArea", new Color(0.04f, 0.06f, 0.10f, 0.7f));
-            var leftElement = left.gameObject.AddComponent<LayoutElement>();
-            leftElement.flexibleWidth = 1f;
-            leftElement.flexibleHeight = 1f;
-            leftElement.minHeight = 300f;
-            UiKit.AddVerticalLayout(left, 10, 6);
-
-            var filterRow = UiKit.CreatePanel(left, "FilterRow", new Color(0f, 0f, 0f, 0f));
-            UiKit.SetPreferredHeight(filterRow, 48f);
-            UiKit.AddHorizontalLayout(filterRow, 0, 10);
-
-            var filters = UiKit.CreateButton(filterRow, "Filters", "Фильтры", OpenFilters, 18);
-            UiKit.SetPreferredHeight(filters, 44f, 0f);
-
-            var reset = UiKit.CreateButton(filterRow, "ResetFilters", "Сбросить фильтры", ResetFilters, 17);
-            UiKit.SetPreferredHeight(reset, 44f, 0f);
-
-            _filterSummary = UiKit.CreateText(
-                filterRow, "FilterSummary", "Фильтры: все", 16,
-                new Color(0.60f, 0.68f, 0.84f), TextAnchor.MiddleLeft);
-            UiKit.SetPreferredHeight(_filterSummary, 44f);
-
-            var statsPanel = UiKit.CreatePanel(left, "Stats", new Color(0.06f, 0.08f, 0.13f, 1f));
-            UiKit.SetPreferredHeight(statsPanel, 76f);
-            UiKit.AddVerticalLayout(statsPanel, 8, 2);
-
-            _stats = UiKit.CreateText(
-                statsPanel, "Text", string.Empty, 16,
-                new Color(0.72f, 0.78f, 0.92f), TextAnchor.MiddleLeft);
-            _stats.horizontalOverflow = HorizontalWrapMode.Wrap;
-            UiKit.SetPreferredHeight(_stats, 56f);
-
-            var gridScroll = UiKit.CreateGridScrollView(
-                left,
-                "CollectionGrid",
-                new Vector2(166f, 186f),
-                new Vector2(8f, 8f),
-                out _collectionContent);
-            var gridElement = gridScroll.gameObject.AddComponent<LayoutElement>();
-            gridElement.flexibleHeight = 1f;
-            gridElement.minHeight = 220f;
-
-            var right = UiKit.CreatePanel(body, "DeckArea", new Color(0.04f, 0.06f, 0.10f, 0.85f));
-            var rightElement = right.gameObject.AddComponent<LayoutElement>();
-            rightElement.preferredWidth = 430f;
-            rightElement.minWidth = 360f;
-            rightElement.flexibleWidth = 0f;
-            rightElement.flexibleHeight = 1f;
-            rightElement.minHeight = 300f;
-            UiKit.AddVerticalLayout(right, 10, 6);
-
-            _deckCount = UiKit.CreateText(
-                right, "DeckCount", "Колода: 0/50", 20, Color.white, TextAnchor.MiddleLeft);
-            _deckCount.fontStyle = FontStyle.Bold;
-            UiKit.SetPreferredHeight(_deckCount, 30f);
-
-            var deckScroll = UiKit.CreateHorizontalScrollView(
-                right, "DeckScroll", out _deckContent, 6f);
-            var deckElement = deckScroll.gameObject.AddComponent<LayoutElement>();
-            deckElement.flexibleHeight = 1f;
-            deckElement.minHeight = 220f;
-
-            var editorStatusPanel = UiKit.CreatePanel(right, "StatusPanel", new Color(0f, 0f, 0f, 0f));
-            UiKit.SetPreferredHeight(editorStatusPanel, 54f);
-            _editorStatus = UiKit.CreateText(
-                editorStatusPanel, "Status", string.Empty, 16,
-                new Color(0.62f, 0.68f, 0.82f), TextAnchor.UpperLeft);
-            _editorStatus.horizontalOverflow = HorizontalWrapMode.Wrap;
-            UiKit.SetPreferredHeight(_editorStatus, 50f);
-
-            return view;
+            return top;
         }
 
         private RectTransform BuildFilterOverlay()
         {
-            var overlay = UiKit.CreatePanel(
-                _editorView, "FilterOverlay", new Color(0f, 0f, 0f, 0.78f));
+            var overlay = UiKit.CreatePanel(_root, "FilterOverlay", new Color(0f, 0f, 0f, 0.78f));
 
             var card = UiKit.CreateCenteredCard(
                 overlay, "FilterCard", new Vector2(860f, 820f),
@@ -304,29 +352,6 @@ namespace Vanguard.UI
             return overlay;
         }
 
-        private void RequestDelete(DeckDto deck)
-        {
-            _pendingDelete = deck;
-            _confirmText.text = deck.Name + "\nКолода будет удалена без восстановления.";
-            _confirmOverlay.SetAsLastSibling();
-            _confirmOverlay.gameObject.SetActive(true);
-        }
-
-        private void CancelDelete()
-        {
-            _pendingDelete = null;
-            _confirmOverlay.gameObject.SetActive(false);
-        }
-
-        private void ConfirmDelete()
-        {
-            var deck = _pendingDelete;
-            _confirmOverlay.gameObject.SetActive(false);
-            _pendingDelete = null;
-            if (deck != null)
-                DeleteDeck(deck);
-        }
-
         private void AddFilterSection(Transform parent, string title, string[] labels, Action<string> onSelected)
         {
             var caption = UiKit.CreateText(
@@ -355,25 +380,6 @@ namespace Vanguard.UI
             UiKit.SetPreferredHeight(button, 40f);
         }
 
-        private RectTransform BuildTopBar(RectTransform view, string titleText, out Text title)
-        {
-            var top = UiKit.CreatePanel(view, "TopBar", new Color(0.06f, 0.08f, 0.13f, 1f));
-            top.anchorMin = new Vector2(0f, 1f);
-            top.anchorMax = new Vector2(1f, 1f);
-            top.pivot = new Vector2(0.5f, 1f);
-            top.anchoredPosition = Vector2.zero;
-            top.sizeDelta = new Vector2(0f, 88f);
-            UiKit.AddHorizontalLayout(top, 18, 12);
-
-            var back = UiKit.CreateButton(top, "Back", "← В лобби", () => _onBack(), 18);
-            UiKit.SetPreferredHeight(back, 44f, 0f);
-
-            title = UiKit.CreateText(top, "Title", titleText, 30, Color.white, TextAnchor.MiddleLeft);
-            title.fontStyle = FontStyle.Bold;
-            UiKit.SetPreferredHeight(title, 46f);
-            return top;
-        }
-
         private async Task LoadAsync()
         {
             if (_loading)
@@ -382,7 +388,7 @@ namespace Vanguard.UI
             _loading = true;
             _listStatus.text = "Загружаем коллекцию и колоды…";
             _listStatus.color = new Color(0.62f, 0.68f, 0.82f);
-            ClearChildren(_listContent);
+            ClearChildren(_deckListContent);
 
             try
             {
@@ -399,13 +405,14 @@ namespace Vanguard.UI
                 foreach (var item in catalog)
                     _catalog[item.PrintingId] = item;
                 RebuildClanFilters();
+
                 _decks.Clear();
                 _decks.AddRange(decks);
-
                 BuildDeckList();
+                RebuildCollectionGrids();
                 _listStatus.text = _decks.Count == 0
                     ? "Колод пока нет. Создайте первую."
-                    : "Колод: " + _decks.Count + ".";
+                    : "Карт в коллекции: " + _collection.Count + ".";
             }
             catch (ApiException exception)
             {
@@ -426,50 +433,39 @@ namespace Vanguard.UI
 
         private void BuildDeckList()
         {
-            ClearChildren(_listContent);
+            ClearChildren(_deckListContent);
+
             if (_decks.Count == 0)
+            {
+                var empty = UiKit.CreateText(
+                    _deckListContent, "Empty", "Нет колод", 16,
+                    new Color(0.58f, 0.66f, 0.80f));
+                UiKit.SetPreferredHeight(empty, 90f);
                 return;
+            }
 
             foreach (var deck in _decks)
             {
                 var row = UiKit.CreatePanel(
-                    _listContent, "Deck_" + deck.Id, new Color(0.07f, 0.09f, 0.14f, 1f));
+                    _deckListContent, "DeckRow_" + deck.Id, new Color(0.08f, 0.11f, 0.17f, 1f));
                 var rowElement = row.gameObject.AddComponent<LayoutElement>();
-                rowElement.preferredHeight = 82f;
-                UiKit.AddHorizontalLayout(row, 14, 10);
+                rowElement.preferredHeight = 76f;
+                UiKit.AddVerticalLayout(row, 10, 2);
+
+                var button = row.gameObject.AddComponent<Button>();
+                button.targetGraphic = row.GetComponent<Image>();
+                button.onClick.AddListener(() => OpenDeck(deck));
 
                 var name = UiKit.CreateText(
-                    row, "Name", deck.Name, 21, Color.white, TextAnchor.MiddleLeft);
+                    row, "Name", deck.Name, 17, Color.white, TextAnchor.MiddleLeft);
                 name.fontStyle = FontStyle.Bold;
-                var nameElement = name.gameObject.AddComponent<LayoutElement>();
-                nameElement.flexibleWidth = 1f;
-                nameElement.preferredHeight = 40f;
+                name.horizontalOverflow = HorizontalWrapMode.Wrap;
+                UiKit.SetPreferredHeight(name, 30f);
 
-                var info = UiKit.CreateText(
-                    row, "Info", deck.Cards.Count + " карт · " + deck.Format, 16,
-                    new Color(0.60f, 0.68f, 0.84f), TextAnchor.MiddleLeft);
-                var infoElement = info.gameObject.AddComponent<LayoutElement>();
-                infoElement.preferredWidth = 190f;
-                infoElement.preferredHeight = 36f;
-                infoElement.flexibleWidth = 0f;
-
-                var edit = UiKit.CreateButton(row, "Edit", "Открыть", () => OpenDeck(deck), 17);
-                var editElement = edit.gameObject.AddComponent<LayoutElement>();
-                editElement.preferredWidth = 120f;
-                editElement.preferredHeight = 44f;
-                editElement.flexibleWidth = 0f;
-
-                var play = UiKit.CreateButton(row, "Play", "В бой", () => _onPlay(deck), 17);
-                var playElement = play.gameObject.AddComponent<LayoutElement>();
-                playElement.preferredWidth = 100f;
-                playElement.preferredHeight = 44f;
-                playElement.flexibleWidth = 0f;
-
-                var delete = UiKit.CreateButton(row, "Delete", "Удалить", () => RequestDelete(deck), 16);
-                var deleteElement = delete.gameObject.AddComponent<LayoutElement>();
-                deleteElement.preferredWidth = 105f;
-                deleteElement.preferredHeight = 44f;
-                deleteElement.flexibleWidth = 0f;
+                var count = UiKit.CreateText(
+                    row, "Count", deck.Cards.Count + "/50 · " + deck.Format, 13,
+                    new Color(0.62f, 0.70f, 0.84f), TextAnchor.MiddleLeft);
+                UiKit.SetPreferredHeight(count, 20f);
             }
         }
 
@@ -494,102 +490,148 @@ namespace Vanguard.UI
         {
             _listView.gameObject.SetActive(false);
             _editorView.gameObject.SetActive(true);
-            _nameInput.text = _editing?.Name ?? "Новая колода";
-            _deckCount.text = "Колода: " + _cards.Count + "/50";
+            _filterOverlay.gameObject.SetActive(false);
             _editorStatus.text = string.Empty;
             RebuildEditor();
         }
 
-        private void BackToCards()
+        private void BackToList()
         {
             _filterOverlay.gameObject.SetActive(false);
-            _confirmOverlay.gameObject.SetActive(false);
             _editorView.gameObject.SetActive(false);
             _listView.gameObject.SetActive(true);
-            BuildDeckList();
+            RefreshAllCounts();
+        }
+
+        private void ShowList()
+        {
+            _editorView.gameObject.SetActive(false);
+            _filterOverlay.gameObject.SetActive(false);
+            _confirmOverlay.gameObject.SetActive(false);
+            _listView.gameObject.SetActive(true);
         }
 
         private void RebuildEditor()
         {
             UpdateStats();
-            RebuildDeck();
-            RebuildCollection();
-            _deckCount.text = "Колода: " + _cards.Count + "/50";
+            RebuildDeckCards();
+            RebuildEditorCollection();
+            RefreshAllCounts();
         }
 
-        private void RebuildCollection()
+        private void RebuildCollectionGrids()
         {
-            ClearChildren(_collectionContent);
-            _collectionCountTexts.Clear();
-            if (_catalog.Count == 0)
-                return;
-
-            foreach (var item in _collection.OrderBy(item => GradeOf(item)).ThenBy(item => item.NameEn, StringComparer.Ordinal))
-            {
-                if (!_catalog.TryGetValue(item.PrintingId, out var meta))
-                    continue;
-
-                if (_filterGrade >= 0 && meta.Grade != _filterGrade)
-                    continue;
-                if (_filterTrigger != "Все" && meta.Trigger != _filterTrigger)
-                    continue;
-                if (_filterClan != "Все" && meta.Clan != _filterClan)
-                    continue;
-
-                AddCollectionCell(item, meta);
-            }
+            RebuildListCollection();
+            RebuildEditorCollection();
         }
 
-        private void AddCollectionCell(CollectionItemDto item, CardCatalogItemDto meta)
+        private void RebuildListCollection()
+        {
+            BuildCollectionGrid(_listCollectionContent, _listCountTexts, showDeckCount: false, onAdd: null);
+        }
+
+        private void RebuildEditorCollection()
+        {
+            BuildCollectionGrid(_editorCollectionContent, _editorCountTexts, showDeckCount: true, onAdd: AddCard);
+        }
+
+        private void BuildCollectionGrid(
+            RectTransform content,
+            Dictionary<string, Text> countTexts,
+            bool showDeckCount,
+            Action<CollectionItemDto> onAdd)
+        {
+            ClearChildren(content);
+            countTexts.Clear();
+
+            var items = _collection
+                .Select(item => new { Item = item, Meta = MetaOf(item) })
+                .Where(pair => pair.Meta != null && MatchesFilter(pair.Meta))
+                .OrderBy(pair => pair.Meta.Clan, StringComparer.Ordinal)
+                .ThenBy(pair => pair.Meta.Grade)
+                .ThenBy(pair => pair.Meta.NameEn, StringComparer.Ordinal);
+
+            foreach (var pair in items)
+                AddCollectionCell(content, pair.Item, pair.Meta, countTexts, showDeckCount, onAdd);
+        }
+
+        private void AddCollectionCell(
+            RectTransform content,
+            CollectionItemDto item,
+            CardCatalogItemDto meta,
+            Dictionary<string, Text> countTexts,
+            bool showDeckCount,
+            Action<CollectionItemDto> onAdd)
         {
             var cell = UiKit.CreatePanel(
-                _collectionContent, "Owned_" + item.PrintingId, new Color(0.08f, 0.11f, 0.17f, 1f));
-            var button = cell.gameObject.AddComponent<Button>();
-            var image = cell.GetComponent<Image>();
-            button.targetGraphic = image;
-            button.onClick.AddListener(() => AddCard(item));
-
+                content, "Owned_" + item.PrintingId, new Color(0.08f, 0.11f, 0.17f, 1f));
             UiKit.AddVerticalLayout(cell, 6, 2);
 
+            if (onAdd != null)
+            {
+                var button = cell.gameObject.AddComponent<Button>();
+                button.targetGraphic = cell.GetComponent<Image>();
+                button.onClick.AddListener(() => onAdd(item));
+            }
+
+            var art = UiKit.CreatePanel(cell, "Art", ClanColor(meta.Clan));
+            UiKit.SetPreferredHeight(art, 112f);
+
+            var artName = UiKit.CreateText(
+                art, "ArtName", meta.NameEn, 12,
+                new Color(1f, 1f, 1f, 0.9f), TextAnchor.MiddleCenter);
+            UiKit.Stretch(artName.rectTransform);
+            artName.rectTransform.offsetMin = new Vector2(6f, 8f);
+            artName.rectTransform.offsetMax = new Vector2(-6f, -6f);
+            artName.horizontalOverflow = HorizontalWrapMode.Wrap;
+
+            var grade = UiKit.CreateText(
+                art, "Grade", "G" + meta.Grade, 14, Color.white, TextAnchor.MiddleCenter);
+            grade.fontStyle = FontStyle.Bold;
+            var gradeRect = grade.rectTransform;
+            gradeRect.anchorMin = new Vector2(1f, 1f);
+            gradeRect.anchorMax = new Vector2(1f, 1f);
+            gradeRect.pivot = new Vector2(1f, 1f);
+            gradeRect.anchoredPosition = new Vector2(-5f, -5f);
+            gradeRect.sizeDelta = new Vector2(34f, 22f);
+
+            var trigger = UiKit.CreateText(
+                art, "Trigger", TriggerShort(meta.Trigger), 13, Color.white, TextAnchor.MiddleCenter);
+            var triggerRect = trigger.rectTransform;
+            triggerRect.anchorMin = new Vector2(0f, 0f);
+            triggerRect.anchorMax = new Vector2(0f, 0f);
+            triggerRect.pivot = new Vector2(0f, 0f);
+            triggerRect.anchoredPosition = new Vector2(5f, 5f);
+            triggerRect.sizeDelta = new Vector2(34f, 20f);
+
             var name = UiKit.CreateText(
-                cell, "Name", item.NameEn, 14, Color.white, TextAnchor.UpperLeft);
+                cell, "Name", meta.NameEn, 13, Color.white, TextAnchor.UpperLeft);
             name.fontStyle = FontStyle.Bold;
             name.horizontalOverflow = HorizontalWrapMode.Wrap;
-            UiKit.SetPreferredHeight(name, 34f);
+            UiKit.SetPreferredHeight(name, 32f);
 
-            var printing = UiKit.CreateText(
-                cell, "Printing", item.PrintingId, 11,
-                new Color(0.56f, 0.64f, 0.78f), TextAnchor.MiddleLeft);
-            UiKit.SetPreferredHeight(printing, 16f);
-
-            var info = UiKit.CreateText(
-                cell, "Info", "G" + meta.Grade + " · " + meta.Trigger + " · " + meta.Clan,
-                12,
-                new Color(0.66f, 0.74f, 0.90f),
-                TextAnchor.MiddleLeft);
-            info.horizontalOverflow = HorizontalWrapMode.Wrap;
-            UiKit.SetPreferredHeight(info, 30f);
+            var metaLine = UiKit.CreateText(
+                cell, "Meta", meta.Clan + " · " + meta.Rarity, 11,
+                new Color(0.58f, 0.66f, 0.80f), TextAnchor.MiddleLeft);
+            UiKit.SetPreferredHeight(metaLine, 16f);
 
             var counts = UiKit.CreateText(
-                cell,
-                "Counts",
-                meta.Rarity + " · есть " + item.Count + " · в колоде " + UsedByName(item.NameId),
-                12,
-                new Color(0.56f, 0.64f, 0.78f),
-                TextAnchor.MiddleLeft);
-            UiKit.SetPreferredHeight(counts, 16f);
-            _collectionCountTexts[item.PrintingId] = counts;
+                cell, "Counts", CountText(item, showDeckCount), 13,
+                new Color(0.98f, 0.82f, 0.42f), TextAnchor.MiddleLeft);
+            UiKit.SetPreferredHeight(counts, 20f);
+            countTexts[item.PrintingId] = counts;
         }
 
-        private void RebuildDeck()
+        private void RebuildDeckCards()
         {
-            ClearChildren(_deckContent);
+            ClearChildren(_deckCardContent);
+
             if (_cards.Count == 0)
             {
                 var empty = UiKit.CreateText(
-                    _deckContent, "Empty", "Колода пуста", 16,
-                    new Color(0.62f, 0.68f, 0.82f));
-                UiKit.SetPreferredHeight(empty, 120f);
+                    _deckCardContent, "Empty", "Колода пуста", 15,
+                    new Color(0.58f, 0.66f, 0.80f));
+                UiKit.SetPreferredHeight(empty, 90f);
                 return;
             }
 
@@ -597,67 +639,74 @@ namespace Vanguard.UI
             {
                 var printingId = group.Key;
                 var count = group.Count();
-                var name = _catalog.TryGetValue(printingId, out var meta)
-                    ? meta.NameEn
-                    : printingId;
+                var meta = _catalog.TryGetValue(printingId, out var found) ? found : null;
+                var name = meta != null ? meta.NameEn : printingId;
 
-                var cell = UiKit.CreatePanel(
-                    _deckContent, "Deck_" + printingId, new Color(0.09f, 0.12f, 0.20f, 1f));
-                var element = cell.gameObject.AddComponent<LayoutElement>();
-                element.preferredWidth = 142f;
-                element.preferredHeight = 190f;
-                element.flexibleWidth = 0f;
-                UiKit.AddVerticalLayout(cell, 6, 2);
+                var row = UiKit.CreatePanel(
+                    _deckCardContent, "DeckCard_" + printingId, new Color(0.08f, 0.11f, 0.17f, 1f));
+                var rowElement = row.gameObject.AddComponent<LayoutElement>();
+                rowElement.preferredHeight = 64f;
+                UiKit.AddHorizontalLayout(row, 6, 6);
+
+                var button = row.gameObject.AddComponent<Button>();
+                button.targetGraphic = row.GetComponent<Image>();
+                button.onClick.AddListener(() => RemoveCard(printingId));
+
+                var art = UiKit.CreatePanel(
+                    row, "Art", ClanColor(meta != null ? meta.Clan : "None"));
+                SetFixedSize(art, 36f, 50f);
+
+                var artText = UiKit.CreateText(
+                    art, "ArtText", meta != null ? "G" + meta.Grade : "?", 13,
+                    Color.white, TextAnchor.MiddleCenter);
+                UiKit.Stretch(artText.rectTransform);
+
+                var texts = UiKit.CreatePanel(row, "Texts", new Color(0f, 0f, 0f, 0f));
+                var textsElement = texts.gameObject.AddComponent<LayoutElement>();
+                textsElement.flexibleWidth = 1f;
+                textsElement.preferredHeight = 52f;
+                UiKit.AddVerticalLayout(texts, 2, 0);
 
                 var nameText = UiKit.CreateText(
-                    cell, "Name", name, 13, Color.white, TextAnchor.UpperLeft);
+                    texts, "Name", name, 13, Color.white, TextAnchor.MiddleLeft);
                 nameText.horizontalOverflow = HorizontalWrapMode.Wrap;
-                UiKit.SetPreferredHeight(nameText, 38f);
-
-                var idText = UiKit.CreateText(
-                    cell, "Printing", printingId, 10,
-                    new Color(0.56f, 0.64f, 0.78f));
-                UiKit.SetPreferredHeight(idText, 16f);
+                UiKit.SetPreferredHeight(nameText, 30f);
 
                 var info = UiKit.CreateText(
-                    cell,
-                    "Info",
-                    "×" + count + (meta != null ? " · G" + meta.Grade + " · " + meta.Trigger : string.Empty),
+                    texts, "Info",
+                    "×" + count + (meta != null ? " · " + TriggerShort(meta.Trigger) : string.Empty),
                     12,
-                    new Color(0.70f, 0.78f, 0.94f));
-                UiKit.SetPreferredHeight(info, 22f);
-
-                var remove = UiKit.CreateButton(
-                    cell, "Remove", "−", () => RemoveCard(printingId), 20);
-                UiKit.SetPreferredHeight(remove, 38f);
+                    new Color(0.62f, 0.70f, 0.84f),
+                    TextAnchor.MiddleLeft);
+                UiKit.SetPreferredHeight(info, 18f);
             }
         }
 
         private void AddCard(CollectionItemDto item)
         {
-            if (!_catalog.TryGetValue(item.PrintingId, out var meta))
+            if (!_catalog.TryGetValue(item.PrintingId, out _))
                 return;
 
             if (_cards.Count >= 50)
             {
-                SetEditorStatus("В колоде уже 50 карт.");
+                SetEditorStatus("В колоде уже 50 карт.", true);
                 return;
             }
 
             if (UsedByName(item.NameId) >= 4)
             {
-                SetEditorStatus("Не больше 4 копий одной карты.");
+                SetEditorStatus("Не больше 4 копий одной карты.", true);
                 return;
             }
 
             if (_cards.Count(card => card == item.PrintingId) >= item.Count)
             {
-                SetEditorStatus("В коллекции больше нет свободных копий.");
+                SetEditorStatus("В коллекции больше нет свободных копий.", true);
                 return;
             }
 
             _cards.Add(item.PrintingId);
-            SetEditorStatus(string.Empty);
+            SetEditorStatus(string.Empty, false);
             RefreshAfterDeckChange();
         }
 
@@ -673,64 +722,53 @@ namespace Vanguard.UI
         private void RefreshAfterDeckChange()
         {
             UpdateStats();
-            RebuildDeck();
-            RefreshCollectionCounts();
-            _deckCount.text = "Колода: " + _cards.Count + "/50";
+            RebuildDeckCards();
+            RefreshAllCounts();
         }
 
-        private void RefreshCollectionCounts()
+        private void RefreshAllCounts()
         {
-            foreach (var pair in _collectionCountTexts)
+            RefreshCounts(_listCountTexts, showDeckCount: false);
+            RefreshCounts(_editorCountTexts, showDeckCount: true);
+        }
+
+        private void RefreshCounts(Dictionary<string, Text> countTexts, bool showDeckCount)
+        {
+            foreach (var pair in countTexts)
             {
                 var item = _collection.Find(candidate => candidate.PrintingId == pair.Key);
-                if (item == null || !_catalog.TryGetValue(pair.Key, out var meta))
+                if (item == null)
                     continue;
 
-                pair.Value.text = meta.Rarity + " · есть " + item.Count
-                    + " · в колоде " + UsedByName(item.NameId);
+                pair.Value.text = CountText(item, showDeckCount);
             }
         }
 
+        private string CountText(CollectionItemDto item, bool showDeckCount)
+        {
+            var text = "×" + item.Count;
+            if (showDeckCount)
+                text += " · в колоде " + UsedByName(item.NameId);
+            return text;
+        }
+
         private void UpdateStats()
         {
-            var triggers = new Dictionary<string, int>(StringComparer.Ordinal)
-            {
-                ["—"] = 0, ["K"] = 0, ["D"] = 0, ["S"] = 0, ["H"] = 0,
-            };
             var grades = new int[4];
-
             foreach (var printingId in _cards)
             {
-                if (!_catalog.TryGetValue(printingId, out var meta))
-                    continue;
-
-                if (meta.Grade >= 0 && meta.Grade < grades.Length)
-                    grades[meta.Grade]++;
-
-                var key = meta.Trigger switch
+                if (_catalog.TryGetValue(printingId, out var meta)
+                    && meta.Grade >= 0 && meta.Grade < grades.Length)
                 {
-                    "Critical" => "K",
-                    "Draw" => "D",
-                    "Stand" => "S",
-                    "Heal" => "H",
-                    _ => "—",
-                };
-                triggers[key]++;
+                    grades[meta.Grade]++;
+                }
             }
 
-            _stats.text = "Триггеры:  — " + triggers["—"] + " · K " + triggers["K"]
-                + " · D " + triggers["D"] + " · S " + triggers["S"] + " · H " + triggers["H"]
-                + "\nGrade: 0 — " + grades[0] + " · 1 — " + grades[1]
-                + " · 2 — " + grades[2] + " · 3 — " + grades[3];
+            _stats.text = "Всего: " + _cards.Count + "/50   G0 " + grades[0]
+                + " · G1 " + grades[1] + " · G2 " + grades[2] + " · G3 " + grades[3];
+            _deckCount.text = "Колода: " + _cards.Count + "/50";
         }
 
-        private int UsedByName(string nameId) =>
-            _cards.Count(printingId =>
-                _catalog.TryGetValue(printingId, out var meta) && meta.NameId == nameId);
-
-        private int GradeOf(CollectionItemDto item) =>
-            _catalog.TryGetValue(item.PrintingId, out var meta) ? meta.Grade : int.MaxValue;
-
         private void OpenFilters()
         {
             _filterOverlay.SetAsLastSibling();
@@ -745,22 +783,19 @@ namespace Vanguard.UI
         private void OnGradeFilter(string value)
         {
             _filterGrade = value == "Все" ? -1 : int.Parse(value);
-            UpdateFilterSummary();
-            RebuildCollection();
+            OnFiltersChanged();
         }
 
         private void OnTriggerFilter(string value)
         {
             _filterTrigger = value;
-            UpdateFilterSummary();
-            RebuildCollection();
+            OnFiltersChanged();
         }
 
         private void OnClanFilter(string value)
         {
             _filterClan = value;
-            UpdateFilterSummary();
-            RebuildCollection();
+            OnFiltersChanged();
         }
 
         private void ResetFilters()
@@ -768,16 +803,20 @@ namespace Vanguard.UI
             _filterGrade = -1;
             _filterTrigger = "Все";
             _filterClan = "Все";
+            OnFiltersChanged();
+        }
+
+        private void OnFiltersChanged()
+        {
             UpdateFilterSummary();
-            RebuildCollection();
+            RebuildCollectionGrids();
         }
 
         private void UpdateFilterSummary()
         {
-            _filterSummary.text = "Фильтры: "
-                + (_filterClan == "Все" ? "клан все" : "клан " + _filterClan)
-                + " · " + (_filterTrigger == "Все" ? "триггер все" : _filterTrigger)
-                + " · " + (_filterGrade < 0 ? "grade все" : "grade " + _filterGrade);
+            _filterSummary.text = (_filterClan == "Все" ? "Клан: все" : "Клан: " + _filterClan)
+                + " · " + (_filterTrigger == "Все" ? "Триггер: все" : "Триггер: " + _filterTrigger)
+                + " · " + (_filterGrade < 0 ? "Ранг: все" : "Ранг: " + _filterGrade);
         }
 
         private async void SaveDeck()
@@ -786,7 +825,7 @@ namespace Vanguard.UI
                 return;
 
             _busy = true;
-            SetEditorStatus("Сохраняем…");
+            SetEditorStatus("Сохраняем…", false);
             try
             {
                 await _auth.EnsureAccessAsync();
@@ -803,21 +842,21 @@ namespace Vanguard.UI
                 _cards.AddRange(result.Cards);
                 _nameInput.text = result.Name;
                 UpsertDeck(result);
-                SetEditorStatus("Сохранено: " + result.Cards.Count + " карт.");
-                _deckCount.text = "Колода: " + _cards.Count + "/50";
+                BuildDeckList();
                 RebuildEditor();
+                SetEditorStatus("Сохранено: " + result.Cards.Count + " карт.", false);
             }
             catch (ApiException exception)
             {
                 var details = exception.Violations.Count > 0
                     ? "\n" + string.Join("\n", exception.Violations.Take(3).Select(v => v.Message))
                     : string.Empty;
-                SetEditorStatus(exception.Message + details);
+                SetEditorStatus(exception.Message + details, true);
             }
             catch (Exception exception)
             {
                 Debug.LogException(exception);
-                SetEditorStatus("Не удалось сохранить колоду.");
+                SetEditorStatus("Не удалось сохранить колоду.", true);
             }
             finally
             {
@@ -825,13 +864,26 @@ namespace Vanguard.UI
             }
         }
 
-        private void UpsertDeck(DeckDto deck)
+        private void PlayDeck()
         {
-            var index = _decks.FindIndex(item => item.Id == deck.Id);
-            if (index >= 0)
-                _decks[index] = deck;
-            else
-                _decks.Add(deck);
+            if (_editing == null)
+            {
+                SetEditorStatus("Сначала сохраните колоду.", true);
+                return;
+            }
+
+            _onPlay(_editing);
+        }
+
+        private void RequestDeleteCurrent()
+        {
+            if (_editing == null)
+            {
+                SetEditorStatus("Сначала сохраните колоду.", true);
+                return;
+            }
+
+            RequestDelete(_editing);
         }
 
         private async void DeleteDeck(DeckDto deck)
@@ -844,7 +896,11 @@ namespace Vanguard.UI
             {
                 await _meta.DeleteDeckAsync(deck.Id);
                 _decks.RemoveAll(item => item.Id == deck.Id);
+                if (_editing != null && _editing.Id == deck.Id)
+                    _editing = null;
                 BuildDeckList();
+                if (_editorView.gameObject.activeSelf)
+                    BackToList();
                 _listStatus.text = "Колода удалена.";
             }
             catch (ApiException exception)
@@ -862,27 +918,120 @@ namespace Vanguard.UI
             }
         }
 
-        private void SetEditorStatus(string text)
+        private void RequestDelete(DeckDto deck)
         {
+            _pendingDelete = deck;
+            _confirmText.text = deck.Name + "\nКолода будет удалена без восстановления.";
+            _confirmOverlay.SetAsLastSibling();
+            _confirmOverlay.gameObject.SetActive(true);
+        }
+
+        private void CancelDelete()
+        {
+            _pendingDelete = null;
+            _confirmOverlay.gameObject.SetActive(false);
+        }
+
+        private void ConfirmDelete()
+        {
+            var deck = _pendingDelete;
+            _confirmOverlay.gameObject.SetActive(false);
+            _pendingDelete = null;
+            if (deck != null)
+                DeleteDeck(deck);
+        }
+
+        private void SetEditorStatus(string text, bool error)
+        {
+            if (_editorStatus == null)
+                return;
+
             _editorStatus.text = text;
-            _editorStatus.color = text.StartsWith("Не удалось", StringComparison.Ordinal)
-                || text.Contains("Не больше") || text.Contains("В колоде уже") || text.Contains("больше нет")
+            _editorStatus.color = error
                 ? new Color(1f, 0.55f, 0.45f)
                 : new Color(0.62f, 0.68f, 0.82f);
         }
 
-        private void ShowList()
+        private void UpsertDeck(DeckDto deck)
         {
-            _editorView.gameObject.SetActive(false);
-            _filterOverlay.gameObject.SetActive(false);
-            _confirmOverlay.gameObject.SetActive(false);
-            _listView.gameObject.SetActive(true);
+            var index = _decks.FindIndex(item => item.Id == deck.Id);
+            if (index >= 0)
+                _decks[index] = deck;
+            else
+                _decks.Add(deck);
+        }
+
+        private CardCatalogItemDto MetaOf(CollectionItemDto item) =>
+            _catalog.TryGetValue(item.PrintingId, out var meta) ? meta : null;
+
+        private bool MatchesFilter(CardCatalogItemDto meta)
+        {
+            if (_filterGrade >= 0 && meta.Grade != _filterGrade)
+                return false;
+            if (_filterTrigger != "Все" && meta.Trigger != _filterTrigger)
+                return false;
+            if (_filterClan != "Все" && meta.Clan != _filterClan)
+                return false;
+            return true;
+        }
+
+        private int UsedByName(string nameId) =>
+            _cards.Count(printingId =>
+                _catalog.TryGetValue(printingId, out var meta) && meta.NameId == nameId);
+
+        private static string TriggerShort(string trigger) => trigger switch
+        {
+            "Critical" => "K",
+            "Draw" => "D",
+            "Stand" => "S",
+            "Heal" => "H",
+            _ => "—",
+        };
+
+        private static Color ClanColor(string clan) => clan switch
+        {
+            "RoyalPaladin" => new Color(0.22f, 0.42f, 0.78f),
+            "OracleThinkTank" => new Color(0.72f, 0.58f, 0.22f),
+            "Kagero" => new Color(0.66f, 0.18f, 0.18f),
+            "Nubatama" => new Color(0.38f, 0.22f, 0.62f),
+            "Tachikaze" => new Color(0.22f, 0.56f, 0.34f),
+            "NovaGrappler" => new Color(0.78f, 0.40f, 0.16f),
+            "SpikeBrothers" => new Color(0.52f, 0.34f, 0.20f),
+            "DarkIrregulars" => new Color(0.28f, 0.20f, 0.36f),
+            "Granblue" => new Color(0.16f, 0.46f, 0.54f),
+            "Megacolony" => new Color(0.40f, 0.48f, 0.18f),
+            _ => new Color(0.25f, 0.30f, 0.40f),
+        };
+
+        private static void SetFixedSize(Component component, float width, float height)
+        {
+            var element = component.gameObject.GetComponent<LayoutElement>()
+                ?? component.gameObject.AddComponent<LayoutElement>();
+            element.preferredWidth = width;
+            element.preferredHeight = height;
+            element.flexibleWidth = 0f;
+            element.flexibleHeight = 0f;
+        }
+
+        private static void SetFlexible(Component component, float widthWeight, float height)
+        {
+            var element = component.gameObject.GetComponent<LayoutElement>()
+                ?? component.gameObject.AddComponent<LayoutElement>();
+            element.preferredHeight = height;
+            element.flexibleWidth = widthWeight;
+            element.flexibleHeight = 0f;
         }
 
         private static void ClearChildren(Transform parent)
         {
             for (var i = parent.childCount - 1; i >= 0; i--)
-                UnityEngine.Object.Destroy(parent.GetChild(i).gameObject);
+            {
+                var child = parent.GetChild(i).gameObject;
+                if (Application.isPlaying)
+                    UnityEngine.Object.Destroy(child);
+                else
+                    UnityEngine.Object.DestroyImmediate(child);
+            }
         }
     }
 }
diff --git a/client/README.md b/client/README.md
index cccbfaa..d467ab5 100644
--- a/client/README.md
+++ b/client/README.md
@@ -50,8 +50,9 @@ http://localhost:5080
 - Восстановление сессии по refresh-токену при старте.
 - Онбординг: две триал-деки из `/api/store`, выбор одной, 50 карт и 5 токенов.
 - Коллекция: список карт, балансы, разбор в пыль с подтверждением.
-- Колоды: список, удаление, создание/редактирование в декбилдере;
-  фильтры (клан/грейд/триггер), статистика, текущая колода.
+- Колоды: список справа, создание/редактирование в декбилдере;
+  сортировка коллекции клан→ранг→имя, фильтры, статистика по рангам,
+  добавление/удаление карт кликом.
 - Магазин в Lobby: бустер за Gold/токен, показ 5 карт, покупка второй
   триал-деки.
 - История матчей: список результатов, награды, MMR; просмотр реплея по
diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md
index af471db..86b748c 100644
--- a/docs/HANDOFF.md
+++ b/docs/HANDOFF.md
@@ -710,10 +710,14 @@ DeckBuilder / Battle; Boot и общие сервисы остаются пер
   `clan`, `rarity`, `isSentinel`, `isParallel`, `basePrintingId`.
   Клиент объединяет каталог с коллекцией по `printingId`; правила для
   фильтров/статистики не дублируются в клиенте.
-- Новый `DeckBuilderView`: список колод → создание/редактирование.
-  В редакторе: фильтры в оверлее (grade/trigger/clan) и отдельный сброс,
-  статистика по триггерам и грейдам, коллекция сеткой, справа
-  горизонтальная зона текущей колоды, сохранение через POST/PUT.
+- Новый `DeckBuilderView` в духе HS:
+  - список: сверху фильтры/сброс/создание, в центре сетка коллекции
+    (изображение-заглушка, количество), справа узкий вертикальный список
+    колод; клик по колоде открывает редактор;
+  - редактор: вместо создания — статистика по грейдам и общему числу,
+    справа вертикальный список карт колоды; клик по карте коллекции
+    добавляет, клик по карте колоды убирает одну копию;
+  - сортировка коллекции: клан → ранг → имя.
 - Ограничения в UI: 50 карт, ≤4 по `nameId`, не больше owned-копий;
   серверная валидация остаётся источником истины.
 - `DeckBuilderSceneController` и `CollectionSceneController` теперь
@@ -721,4 +725,5 @@ DeckBuilder / Battle; Boot и общие сервисы остаются пер
 - `MetaService.GetCatalogAsync`, `UpdateDeckAsync`; `ApiClient.PutAsync`.
 - Проверки: серверные 131 + 44 на `ssh home`; Unity EditMode 2/2,
   `SCENE_SMOKE success=True active=Login`; live `GET /api/cards` — 124
-  принта.
+  принта; live UI-проба: загрузка 50 карт, создание колоды,
+  добавление и удаление карты.
diff --git a/docs/SESSION-STATE.md b/docs/SESSION-STATE.md
index 1f2f3f6..d0e37ba 100644
--- a/docs/SESSION-STATE.md
+++ b/docs/SESSION-STATE.md
@@ -39,13 +39,15 @@
 - Сервисы: `ApiClient`, `AuthService`, `MetaService`, `TokenStore`,
   `PlayerState`, `GameConnection`.
 - Работает: логин/регистрация/refresh, онбординг, коллекция с разбором,
-  простой декбилдер (коллекция + текущая колода, фильтры в оверлее,
-  статистика триггеров/грейдов, создание/редактирование/сохранение),
+  декбилдер в духе HS (список колод справа, карточная сетка коллекции,
+  фильтры в оверлее, сортировка клан→ранг→имя, редактор с вертикальным
+  списком карт колоды и статистикой по рангам/общему числу),
   магазин (бустер/триал-дека), история матчей и реплей, очередь,
   WebSocket-матч (snapshot, интенты, маллиган, сдача, `GameFinished`),
   таймер, результат.
 - Декбилдер: `DeckBuilderView`; каталог метаданных — `GET /api/cards`
   (grade, trigger, clan, rarity, printing), клиент объединяет с коллекцией.
+  Изображения карт пока заглушки-плашки по цвету клана.
 - Не готово: арты/модели/анимации, локализация RU/EN, настройки, DOTween.
 
 ## Запуск