diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
index 553cf2f98..f1946a9be 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
@@ -155,6 +155,64 @@
       padding: 0 12px;
       color: #454647; }
 
+.components-panel__body .collection-carousel-view-modes {
+  display: flex;
+  margin: 12px 0 24px 0; }
+  .components-panel__body .collection-carousel-view-modes button {
+    background: transparent;
+    border: 1px solid #cbcbcb;
+    border-radius: 5px;
+    padding: 2px;
+    margin: 0;
+    width: calc(50% - 6px);
+    flex-shrink: 0;
+    cursor: pointer;
+    transition: border ease 0.5s, opacity ease 0.5; }
+    .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid {
+      margin-right: 6px; }
+      .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div {
+        display: grid;
+        grid-template-columns: 33% 33% 33%;
+        grid-template-rows: 50% 50%;
+        grid-column-gap: 2px;
+        grid-row-gap: 2px;
+        width: 60px;
+        height: 40px;
+        margin: 4px auto 8px auto; }
+        .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div > div:first-of-type {
+          grid-column-start: 1;
+          grid-column-end: span 2;
+          grid-row-start: 1;
+          grid-row-end: span 2;
+          width: 41px;
+          height: 42px; }
+        .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div > div {
+          width: 20px;
+          height: 20px;
+          background: #555758;
+          transition: background-color ease 0.5s; }
+    .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-thumbnail {
+      margin-left: 6px; }
+      .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-thumbnail div {
+        display: block;
+        height: 40px;
+        width: 40px;
+        background: #555758;
+        margin: 4px auto 8px auto;
+        transition: background-color ease 0.5s; }
+    .components-panel__body .collection-carousel-view-modes button label {
+      font-size: 0.75rem;
+      color: #555758; }
+    .components-panel__body .collection-carousel-view-modes button.is-active {
+      border: 2px solid #298596; }
+      .components-panel__body .collection-carousel-view-modes button.is-active.collection-carousel-view-mode-thumbnail div, .components-panel__body .collection-carousel-view-modes button.is-active.collection-carousel-view-mode-grid div > div {
+        background-color: #298596; }
+    .components-panel__body .collection-carousel-view-modes button:hover {
+      opacity: 0.9;
+      border-width: 2px; }
+      .components-panel__body .collection-carousel-view-modes button:hover button {
+        background: #f2f2f2; }
+
 .wp-block-tainacan-carousel-collections-list {
   margin: 2rem 0px; }
   .wp-block-tainacan-carousel-collections-list .spinner-container {
@@ -286,10 +344,11 @@
     .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item {
       position: relative;
       display: block;
-      margin: 16px;
+      margin: 16px 32px 16px 0px;
       width: calc(16.666% - 32px);
       min-width: calc(16.666% - 32px); }
       .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item.collection-list-item-grid {
+        margin: 16px;
         width: calc(25% - 16px);
         min-width: calc(25% - 16px); }
       .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item a {
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
index 0aa07143b..c9cae75d8 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAEA,kCAAmC;EAC/B,KAAK,EAAE,iBAAiB;;AAE5B,cAAe;EACX,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,KAAK;EACV,IAAI,EAAE,KAAK;EACX,KAAK,EAAE,iBAAiB;EACxB,UAAU,EAAE,OAAO;EAEnB,gBAAE;IACE,SAAS,EAAE,mBAAmB;IAC9B,MAAM,EAAE,kBAAkB;IAC1B,IAAI,EAAE,OAAO;IAEb,oBAAI;MACA,GAAG,EAAE,GAAG;MACR,YAAY,EAAE,OAAO;MACrB,QAAQ,EAAE,QAAQ;MAClB,IAAI,EAAE,OAAO;;AAIzB,mCAAoC;EAChC,SAAS,EAAE,mBAAmB;EAC9B,UAAU,EAAE,IAAI;EAChB,IAAI,EAAE,OAAO;EAEb,uCAAI;IACA,YAAY,EAAE,IAAI;IAClB,GAAG,EAAE,GAAG;IACR,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,OAAO;;AAKrB,wBAAyB;EACrB,KAAK,EAAE,GAAG;EAEV,0CAA2C;IAH/C,wBAAyB;MAGyB,KAAK,EAAE,GAAG;EACxD,yCAA0C;IAJ9C,wBAAyB;MAIuB,KAAK,EAAE,IAAI;EAGvD,sCAAgB;IACZ,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IAEZ,6CAAO;MACH,KAAK,EAAE,iBAAiB;MACxB,MAAM,EAAE,kBAAkB;MAC1B,WAAW,EAAE,KAAK;IAGtB,yDAAmB;MACf,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,iBAAiB;MACxB,WAAW,EAAE,gBAAgB;MAC7B,OAAO,EAAE,wBAAwB;MACjC,UAAU,EAAE,iBAAiB;EAKrC,2CAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;IACd,+DAAoB;MAAE,MAAM,EAAE,GAAG;EAGrC,0EAAkD;IAC9C,aAAa,EAAE,CAAC;EAGpB,2BAAG;IACC,MAAM,EAAE,WAAW;EAGvB,2CAAmB;IACf,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,IAAI;IAEnB,oEAAyB;MACrB,KAAK,EAAE,GAAG;MAEV,0CAA2C;QAH/C,oEAAyB;UAGyB,KAAK,EAAE,GAAG;MACxD,iFAAe;QACX,WAAW,EAAE,CAAC;MAElB,oGAAgC;QAC5B,SAAS,EAAE,IAAI;MAEnB,yGAAqC;QACjC,WAAW,EAAE,GAAG;QAChB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,MAAM;MAEtB,yGAAqC;QACjC,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,IAAI;EAKxB,gDAAwB;IACpB,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,OAAO;EAGxB;4EACkD;IAC9C,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,IAAI;IACb,qBAAqB,EAAE,wBAAwB;IAC/C,QAAQ,EAAE,GAAG;IACb,eAAe,EAAE,YAAY;IAC7B,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,MAAM;IAElB;uGAAyB;MACrB,QAAQ,EAAE,MAAM;IAGpB;;;gHACkC;MAC9B,OAAO,EAAE,IAAI;MACb,eAAe,EAAE,UAAU;MAE3B;;;sHAAI;QACA,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,IAAI;MAEtB;;;wHAAM;QACF,WAAW,EAAE,MAAM;QACnB,aAAa,EAAE,QAAQ;QACvB,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,GAAG;QAEd,yCAA0C;UAP9C;;;4HAAM;YAO0C,SAAS,EAAE,GAAG;EAItE,gDAAwB;IACpB,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,MAAM;IAEvB,kDAAE;MACE,KAAK,EAAE,OAAO;MACd,YAAY,EAAE,IAAI;MAClB,UAAU,EAAE,GAAG;EAGvB,2CAAmB;IACf,UAAU,EAAE,iBAAiB;IAC7B,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,aAAa;IAC9B,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,OAAO;IAEf,6CAAE;MACE,OAAO,EAAE,MAAM;MACf,KAAK,EAAE,OAAO;;ACtL1B,4CAA6C;EACzC,MAAM,EAAE,QAAQ;EAGhB,+DAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;AAIlB,qCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,kCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,gCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,6BAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;EAErB,sDAAU;IACN,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,OAAO;IAEnB,iBAAiB,EAAE,qCAAqC;IACxD,cAAc,EAAE,qCAAqC;IACrD,YAAY,EAAE,qCAAqC;IACnD,SAAS,EAAE,qCAAqC;EAIpD,+DAAmB;IACf,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,iBAAiB;IACxB,IAAI,EAAE,KAAK;IAEX,iFAAkB;MACd,MAAM,EAAE,MAAM;MAEd;sGACa;QACT,KAAK,EAAE,KAAK;QACZ,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,IAAI;QACrB,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,MAAM;MAEvB,yFAAM;QACF,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;MAEhB,yFAAQ;QACJ,eAAe,EAAE,IAAI;MAKrB,2HAAE;QACE,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,KAAK;MAElB,gJAAuB;QACnB,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,WAAW;QAClC,kBAAkB,EAAE,OAAO;QAC3B,KAAK,EAAE,IAAI;QAEX,kKAAkB;UACd,iBAAiB,EAAE,CAAC;UACpB,eAAe,EAAE,MAAM;UACvB,cAAc,EAAE,CAAC;UACjB,YAAY,EAAE,MAAM;QAGxB,oJAAI;UACA,KAAK,EAAE,IAAI;UACX,MAAM,EAAE,IAAI;UACZ,OAAO,EAAE,GAAG;UACZ,aAAa,EAAE,GAAG;EAOtC,6DAAiB;IACb,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,QAAQ;EAIpB,kIAAyC;IACrC,GAAG,EAAE,gBAAgB;IACrB,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,MAAM;IAEd,0IAAI;MACA,IAAI,EAAE,OAAO;EAKrB;iEACmB;IACf,QAAQ,EAAE,QAAQ;IAElB;6EAAY;MACR,UAAU,EAAE,KAAK;MACjB,UAAU,EAAE,KAAK;IAGrB;;uGACsC;MAClC,OAAO,EAAE,IAAI;IAEjB;uGAAsC;MAClC,IAAI,EAAE,IAAI;MACV,KAAK,EAAE,IAAI;MACX,MAAM,EAAE,gBAAgB;IAE5B;wGAAuC;MACnC,KAAK,EAAE,IAAI;MACX,IAAI,EAAE,IAAI;IAEd;wGAAuC;MACnC,MAAM,EAAE,gBAAgB;EAGhC,qEAAyB;IACrB,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,MAAM;IAEd,6FAAwB;MACpB,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,KAAK;MACd,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,oBAAoB;MAC3B,SAAS,EAAE,oBAAoB;MAE/B,uHAA4B;QACxB,KAAK,EAAE,gBAAgB;QACvB,SAAS,EAAE,gBAAgB;MAG/B,+FAAE;QACE,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,MAAM;MAGvB,iGAAI;QACA,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,GAAG;QACZ,aAAa,EAAE,MAAM;MAGzB,qGAAU;QACN,KAAK,EAAE,OAAO;QACd,eAAe,EAAE,IAAI;MAGzB,oGAAO;QACH,QAAQ,EAAE,mBAAmB;QAC7B,gBAAgB,EAAE,yBAAyB;QAC3C,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,GAAG;QACZ,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,GAAG;QACR,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE,GAAG;MAGhB,0GAAe;QACX,UAAU,EAAE,OAAO;QACnB,gBAAgB,EAAE,gBAAiC;QACnD,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,iBAAiB;QACzB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,wCAAwC;MAExD,gHAAqB;QACjB,gBAAgB,EAAE,gBAAiC;QACnD,MAAM,EAAE,4BAA4B;MAIxC,oHAAuB;QACnB,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,WAAW;QAClC,kBAAkB,EAAE,OAAO;QAE3B,sIAAkB;UACd,iBAAiB,EAAE,CAAC;UACpB,eAAe,EAAE,MAAM;UACvB,cAAc,EAAE,CAAC;UACjB,YAAY,EAAE,MAAM;QAGxB,wHAAI;UACA,OAAO,EAAE,GAAG;UACZ,aAAa,EAAE,GAAG;EAKlC,0CAA2C;IAEvC,6FAAiD;MAC7C,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,0CAA2C;IAEvC,6FAAiD;MAC7C,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,0CAA2C;IAEvC,wFAA4C;MACxC,KAAK,EAAE,oBAAoB;MAC3B,SAAS,EAAE,oBAAoB;EAGvC,yCAA0C;IAEtC,6FAAiD;MAC7C,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,yCAA0C;IAEtC,6FAAiD;MAC7C,KAAK,EAAE,iBAAiB;MACxB,SAAS,EAAE,iBAAiB",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-carousel-collections-list.css"
diff --git a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
index ab9ca983d..b5724fa3b 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
@@ -1,5 +1,86 @@
 @import '../../gutenberg-blocks-style.scss';
 
+.components-panel__body .collection-carousel-view-modes {
+    display: flex;
+    margin: 12px 0 24px 0;
+
+    button {
+        background: transparent;
+        border: 1px solid #cbcbcb;
+        border-radius: 5px;
+        padding: 2px;
+        margin: 0;
+        width: calc(50% - 6px);
+        flex-shrink: 0;
+        cursor: pointer;
+        transition: border ease 0.5s, opacity ease 0.5;
+
+        &.collection-carousel-view-mode-grid {
+            margin-right: 6px;
+            div {
+                display: grid;
+                grid-template-columns: 33% 33% 33%;
+                grid-template-rows: 50% 50%;
+                grid-column-gap: 2px;
+                grid-row-gap: 2px;
+                width: 60px;
+                height: 40px;
+                margin: 4px auto 8px auto;
+
+                &>div:first-of-type {
+                    grid-column-start: 1;
+                    grid-column-end: span 2;
+                    grid-row-start: 1;
+                    grid-row-end: span 2;
+                    width: 41px;
+                    height: 42px;
+                }
+
+                &>div { 
+                    width: 20px;
+                    height: 20px;
+                    background: #555758;
+                    transition: background-color ease 0.5s; 
+                }
+            }
+        }
+        &.collection-carousel-view-mode-thumbnail {
+            margin-left: 6px;
+
+            div {
+                display: block;
+                height: 40px;
+                width: 40px;
+                background: #555758;
+                margin: 4px auto 8px auto;
+                transition: background-color ease 0.5s;
+            }
+        }
+
+        label {
+            font-size: 0.75rem;
+            color: #555758;
+        }
+
+        &.is-active {
+            border: 2px solid #298596;
+            
+            &.collection-carousel-view-mode-thumbnail div,
+            &.collection-carousel-view-mode-grid div>div {
+                background-color: #298596;
+            }    
+        }
+        &:hover {
+            opacity: 0.9;
+            border-width: 2px;
+            button {
+                background: #f2f2f2;
+            }
+        }
+
+    }
+}
+
 .wp-block-tainacan-carousel-collections-list {
     margin: 2rem 0px;
 
@@ -162,11 +243,12 @@
         li.collection-list-item {
             position: relative;
             display: block;
-            margin: 16px;
+            margin: 16px 32px 16px 0px;
             width: calc(16.666% - 32px); 
             min-width: calc(16.666% - 32px);
 
             &.collection-list-item-grid {
+                margin: 16px;
                 width: calc(25% - 16px); 
                 min-width: calc(25% - 16px);
             }
diff --git a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
index e5665ae51..cfd440a78 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
@@ -291,7 +291,7 @@ registerBlockType('tainacan/carousel-collections-list', {
                                 initialOpen={ true }
                             >
                             <div>
-                                <ToggleControl
+                                {/* <ToggleControl
                                             label={__('Show collection\'s thumbnail', 'tainacan')}
                                             help={ !showCollectionThumbnail ? __('Toggle to show items grid instead of collection\'s thumbnail', 'tainacan') : __('Do not show collection\'s thumbnail instead of items grid', 'tainacan')}
                                             checked={ showCollectionThumbnail ? showCollectionThumbnail : false }
@@ -301,7 +301,35 @@ registerBlockType('tainacan/carousel-collections-list', {
                                                     setContent();
                                                 } 
                                             }
-                                        />
+                                        /> */}
+                                <div className="collection-carousel-view-modes">
+                                    <button
+                                            onClick={ () => {
+                                                    showCollectionThumbnail = false;
+                                                    setAttributes({ showCollectionThumbnail: showCollectionThumbnail });
+                                                    setContent();    
+                                                }
+                                            }
+                                            className={'collection-carousel-view-mode-grid' + (showCollectionThumbnail ? '' : ' is-active')}>
+                                        <div>
+                                            <div />
+                                        <div />
+                                        <div />
+                                        </div>
+                                        <label>{ __('Items\'s grid', 'tainacan') }</label>
+                                    </button>
+                                    <button
+                                            onClick={ () => {
+                                                    showCollectionThumbnail = true;
+                                                    setAttributes({ showCollectionThumbnail: showCollectionThumbnail });
+                                                    setContent();    
+                                                }
+                                            }
+                                            className={'collection-carousel-view-mode-thumbnail' + (showCollectionThumbnail ? ' is-active' : '')}>
+                                        <div />
+                                        <label>{ __('Thumbnail', 'tainacan') }</label>
+                                    </button>
+                                </div>
                                 <ToggleControl
                                         label={__('Hide name', 'tainacan')}
                                         help={ !hideName ? __('Toggle to hide collection\'s name', 'tainacan') : __('Do not hide collection\'s name', 'tainacan')}