diff --git a/src/elements/public/ExperimentalAddToCartBuilder/ExperimentalAddToCartBuilder.ts b/src/elements/public/ExperimentalAddToCartBuilder/ExperimentalAddToCartBuilder.ts
index 4c745e1f..dc7f7309 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/ExperimentalAddToCartBuilder.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/ExperimentalAddToCartBuilder.ts
@@ -58,6 +58,18 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
 
   private readonly __signingSeparator = `--${Date.now()}${(Math.random() * 100000).toFixed(0)}--`;
 
+  private readonly __emptyOptions = [
+    { label: 'option_false', value: 'false' },
+    { label: 'option_true', value: 'true' },
+    { label: 'option_reset', value: 'reset' },
+  ];
+
+  private readonly __cartOptions = [
+    { label: 'option_add', value: 'add' },
+    { label: 'option_checkout', value: 'checkout' },
+    { label: 'option_redirect', value: 'redirect' },
+  ];
+
   private readonly __signAsync = debounce(async (html: string, encodeHelper: string) => {
     if (html === this.__previousUnsignedCode && this.__previousSignedCode) return;
 
@@ -107,8 +119,6 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
     const store = this.__storeLoader?.data;
 
     return html`
-      ${this.renderHeader()}
-
       <div class="grid gap-m items-start sm-grid-cols-2 md-grid-cols-3 h-full overflow-auto">
         <foxy-internal-summary-control layout="section" class="space-y-s" infer="items">
           ${this.form.items?.map((product, index) => {
@@ -116,16 +126,12 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
               <foxy-internal-summary-control
                 layout="details"
                 label=${ifDefined(product.name.trim() || void 0)}
-                infer="item"
+                infer="item-group"
                 ?open=${ifDefined(this.__openState[index])}
                 @toggle=${(evt: CustomEvent) => {
                   const details = evt.currentTarget as InternalSummaryControl;
-                  if (details.open) {
-                    this.__openState = this.__openState.map((_, i) => i === index);
-                  } else {
-                    this.__openState[index] = details.open;
-                    this.__openState = [...this.__openState];
-                  }
+                  this.__openState[index] = details.open;
+                  this.__openState = [...this.__openState];
                 }}
               >
                 <foxy-internal-experimental-add-to-cart-builder-item-control
@@ -133,7 +139,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
                   currency-code=${ifDefined(this.__resolvedCurrencyCode ?? void 0)}
                   store=${ifDefined(storeUrl)}
                   index=${index}
-                  infer=""
+                  infer="item"
                   .defaultItemCategory=${this.__defaultItemCategory}
                   @remove=${() => {
                     const newProducts = this.form.items?.filter((_, i) => i !== index);
@@ -239,69 +245,71 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
                 </foxy-internal-summary-control>
 
                 <foxy-internal-summary-control infer="link">
-                  <div
-                    class="flex items-center leading-s min-w-0 relative"
-                    style="gap: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px)"
-                  >
-                    <foxy-i18n infer="" key="direct_link"></foxy-i18n>
-
-                    <a
-                      target="_blank"
-                      style="max-width: 30rem"
-                      href=${addToCartCode.linkHref}
-                      class=${classMap({
-                        'font-medium truncate ml-auto min-w-0 rounded-s': true,
-                        'transition-all filter': true,
-                        'hover-underline': true,
-                        'focus-outline-none focus-ring-2 focus-ring-primary-50': true,
-                        'blur-sm': this.__signingState !== 'idle',
-                      })}
-                    >
-                      ${addToCartCode.linkHref}
-                    </a>
-
-                    <div
-                      style="top: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px); right: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px)"
-                      class=${classMap({
-                        'absolute right-0 bg-base rounded-s transition-opacity': true,
-                        'opacity-0 pointer-events-none': this.__signingState !== 'busy',
-                      })}
-                    >
-                      <div class="bg-contrast-10 rounded-s">
-                        <foxy-spinner
-                          infer="spinner"
-                          state=${this.__signingState === 'fail' ? 'error' : 'busy'}
-                          class="-mx-xs"
-                          style="transform: scale(0.8)"
+                  ${addToCartCode.linkHref
+                    ? html`
+                        <div
+                          class="flex items-center leading-s min-w-0 relative"
+                          style="gap: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px)"
                         >
-                        </foxy-spinner>
-                      </div>
-                    </div>
-
-                    <foxy-copy-to-clipboard
-                      infer="copy-to-clipboard"
-                      text=${addToCartCode.linkHref}
-                      class=${classMap({
-                        'flex-shrink-0 text-m transition-opacity': true,
-                        'opacity-0 pointer-events-none': this.__signingState === 'busy',
-                      })}
-                    >
-                    </foxy-copy-to-clipboard>
-                  </div>
+                          <foxy-i18n infer="" key="direct_link"></foxy-i18n>
+                          <a
+                            target="_blank"
+                            style="max-width: 30rem"
+                            href=${addToCartCode.linkHref}
+                            class=${classMap({
+                              'font-medium truncate ml-auto min-w-0 rounded-s': true,
+                              'transition-all filter': true,
+                              'hover-underline': true,
+                              'focus-outline-none focus-ring-2 focus-ring-primary-50': true,
+                              'blur-sm': this.__signingState !== 'idle',
+                            })}
+                          >
+                            ${addToCartCode.linkHref}
+                          </a>
+                          <div
+                            style="top: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px); right: calc(0.625em + (var(--lumo-border-radius) / 4) - 1px)"
+                            class=${classMap({
+                              'absolute right-0 bg-base rounded-s transition-opacity': true,
+                              'opacity-0 pointer-events-none': this.__signingState !== 'busy',
+                            })}
+                          >
+                            <div class="bg-contrast-10 rounded-s">
+                              <foxy-spinner
+                                infer="spinner"
+                                state=${this.__signingState === 'fail' ? 'error' : 'busy'}
+                                class="-mx-xs"
+                                style="transform: scale(0.8)"
+                              >
+                              </foxy-spinner>
+                            </div>
+                          </div>
+                          <foxy-copy-to-clipboard
+                            infer="copy-to-clipboard"
+                            text=${addToCartCode.linkHref}
+                            class=${classMap({
+                              'flex-shrink-0 text-m transition-opacity': true,
+                              'opacity-0 pointer-events-none': this.__signingState === 'busy',
+                            })}
+                          >
+                          </foxy-copy-to-clipboard>
+                        </div>
+                      `
+                    : html`
+                        <p class="text-disabled">
+                          <foxy-i18n infer="" key="unavailable"></foxy-i18n>
+                        </p>
+                      `}
                 </foxy-internal-summary-control>
               `
             : html`
                 <foxy-internal-summary-control infer="preview">
                   <div class="flex items-center justify-center p-xl">
-                    <foxy-spinner infer="unavailable" state="empty"></foxy-spinner>
+                    <foxy-spinner infer="unavailable"></foxy-spinner>
                   </div>
                 </foxy-internal-summary-control>
               `}
 
-          <foxy-internal-summary-control infer="cart-settings-group-one">
-            <foxy-internal-text-control layout="summary-item" infer="coupon">
-            </foxy-internal-text-control>
-
+          <foxy-internal-summary-control infer="cart-settings">
             <foxy-internal-resource-picker-control
               layout="summary-item"
               first=${ifDefined(this.__storeLoader?.data?._links['fx:template_sets'].href)}
@@ -313,32 +321,27 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
             <foxy-internal-select-control
               layout="summary-item"
               infer="empty"
-              .options=${[
-                { label: 'option_false', value: 'false' },
-                { label: 'option_true', value: 'true' },
-                { label: 'option_reset', value: 'reset' },
-              ]}
+              .options=${this.__emptyOptions}
             >
             </foxy-internal-select-control>
 
-            <foxy-internal-switch-control
-              false-alias="add"
-              true-alias="checkout"
+            <foxy-internal-select-control
               layout="summary-item"
               infer="cart"
+              .options=${this.__cartOptions}
             >
-            </foxy-internal-switch-control>
-          </foxy-internal-summary-control>
+            </foxy-internal-select-control>
 
-          ${this.form.cart !== 'checkout'
-            ? html`
-                <foxy-internal-summary-control infer="cart-settings-group-two">
+            ${this.form.cart === 'redirect'
+              ? html`
                   <foxy-internal-text-control layout="summary-item" infer="redirect">
                   </foxy-internal-text-control>
-                </foxy-internal-summary-control>
-              `
-            : ''}
-          ${super.renderBody()}
+                `
+              : ''}
+
+            <foxy-internal-text-control layout="summary-item" infer="coupon">
+            </foxy-internal-text-control>
+          </foxy-internal-summary-control>
         </div>
       </div>
 
@@ -363,7 +366,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
       <foxy-nucleon
         class="hidden"
         infer=""
-        href=${ifDefined(this.localeCodes)}
+        href=${ifDefined(this.localeCodes ?? void 0)}
         id="localeCodesHelperLoader"
         @update=${() => this.requestUpdate()}
       >
@@ -392,7 +395,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
           <foxy-nucleon
             class="hidden"
             infer=""
-            href=${ifDefined(product.item_category_uri)}
+            href=${ifDefined(product.item_category_uri ?? void 0)}
             id="itemCategoryLoaderProduct${index}"
             @update=${() => this.requestUpdate()}
           >
@@ -403,7 +406,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
               <foxy-nucleon
                 class="hidden"
                 infer=""
-                href=${ifDefined(option.item_category_uri)}
+                href=${ifDefined(option.item_category_uri ?? void 0)}
                 id="itemCategoryLoaderProduct${index}Option${i}"
                 @update=${() => this.requestUpdate()}
               >
@@ -419,7 +422,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
     super.updated(changes);
 
     if (this.in('idle') && !this.form.items?.length) {
-      this.edit({ items: [{ name: '', price: 0, custom_options: [] }] });
+      this.edit({ items: [{ name: '', price: 0, sub_frequency: '1m', custom_options: [] }] });
       this.__openState = [true];
     }
 
@@ -429,7 +432,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
   }
 
   submit(): void {
-    // Do nothing – in this version of the element, this form is not meant to be submitted.
+    // Do nothing – this form is not meant to be submitted.
   }
 
   private get __defaultTemplateSetHref() {
@@ -515,6 +518,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
 
     if (!this.defaultDomain || !templateSet || !store || !currencyCode || !cartUrl) return '';
 
+    let hasAtLeastOneFieldset = false;
     let output = `<form action="${encode(cartUrl)}" method="post" target="_blank">`;
     let level = 1;
 
@@ -526,8 +530,10 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
     };
 
     if (templateSet.code !== 'DEFAULT') addHiddenInput('template_set', templateSet.code);
-    if (this.form.empty) addHiddenInput('empty', this.form.empty);
+    if (this.form.empty && this.form.empty !== 'false') addHiddenInput('empty', this.form.empty);
     if (this.form.cart === 'checkout') addHiddenInput('cart', 'checkout');
+    if (this.form.redirect) addHiddenInput('redirect', this.form.redirect);
+    if (this.form.coupon) addHiddenInput('coupon', this.form.coupon);
 
     const items = this.form.items ?? [];
     const hasMoreThanOneProduct = items.length > 1;
@@ -537,39 +543,47 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
       const itemCategory = itemCategoryLoader?.data;
       const product = items[productIndex];
 
-      if (!product.name || !product.price) return '';
       if (product.item_category_uri && !itemCategory) return '';
 
-      const hasConfigurableQuantity = product.quantity_min !== product.quantity_max;
-      const hasConfigurablePrice = product.price_configurable;
-      const hasConfigurableOptions = product.custom_options.some(
+      const resolvedMinQty = Math.max(1, product.quantity_min ?? 1);
+      const resolvedMaxQty = Math.max(resolvedMinQty, product.quantity_max ?? Infinity);
+      const varyQty =
+        resolvedMinQty !== resolvedMaxQty &&
+        product.expires_format !== 'minutes' &&
+        !product.hide_quantity;
+
+      const varyPrice = product.price_configurable;
+      const varyptions = product.custom_options.some(
         (v, i, a) => v.value_configurable || a.findIndex(vv => vv.name === v.name) !== i
       );
 
-      const useFieldset =
-        hasMoreThanOneProduct &&
-        (hasConfigurablePrice || hasConfigurableQuantity || hasConfigurableOptions);
+      const resolvedName =
+        product.name.trim() || this.t('items.item-group.item.basics-group.name.placeholder');
+
+      const needsFieldset =
+        hasAtLeastOneFieldset || (hasMoreThanOneProduct && (varyPrice || varyQty || varyptions));
 
-      if (useFieldset) {
+      if (needsFieldset) {
+        hasAtLeastOneFieldset = true;
         output += `${newline()}<fieldset>`;
         level++;
-        output += `${newline()}<legend>${encode(product.name)}</legend>`;
+        output += `${newline()}<legend>${encode(resolvedName)}</legend>`;
       }
 
       const prefix = productIndex === 0 ? '' : `${productIndex + 1}:`;
-      addHiddenInput(`${prefix}name`, product.name);
+      addHiddenInput(`${prefix}name`, resolvedName);
       const price = `${product.price}${currencyCode}`;
 
       if (product.price_configurable) {
-        const encodedPrice = encode(price);
+        const encodedNoCurrencyPrice = encode(product.price.toFixed(2));
         output += `${newline()}<label>`;
         level++;
         output += `${newline()}<span>${encode(this.t('preview.price_label'))}</span>`;
 
         if (store.use_cart_validation) {
-          output += `${newline()}<input required name="${prefix}price" value="--OPEN--" data-replace="${encodedPrice}">`;
+          output += `${newline()}<input required name="${prefix}price" value="--OPEN--" data-replace="${encodedNoCurrencyPrice}">`;
         } else {
-          output += `${newline()}<input required name="${prefix}price" value="${encodedPrice}">`;
+          output += `${newline()}<input required name="${prefix}price" value="${encodedNoCurrencyPrice}">`;
         }
 
         level--;
@@ -614,7 +628,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
               const day = date.getDate().toString().padStart(2, '0');
               addHiddenInput(`${prefix}sub_enddate`, `${year}${month}${day}`);
             } else {
-              addHiddenInput(`${prefix}sub_enddate`, product.sub_enddate);
+              addHiddenInput(`${prefix}sub_enddate`, String(product.sub_enddate));
             }
           }
         }
@@ -629,16 +643,13 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
 
       if (product.expires_value) {
         if (product.expires_format === 'timestamp') {
-          addHiddenInput(`${prefix}expires`, (product.expires_value / 1000).toFixed(0));
+          addHiddenInput(`${prefix}expires`, product.expires_value.toFixed(0));
         } else {
           addHiddenInput(`${prefix}expires`, product.expires_value.toFixed(0));
         }
       }
 
-      const resolvedMinQty = Math.max(1, product.quantity_min ?? 1);
-      const resolvedMaxQty = Math.max(resolvedMinQty, product.quantity_max ?? Infinity);
-
-      if (resolvedMinQty !== resolvedMaxQty && product.expires_format !== 'minutes') {
+      if (varyQty) {
         output += `${newline()}<label>`;
         level++;
         output += `${newline()}<span>${encode(this.t('preview.quantity_label'))}</span>`;
@@ -662,8 +673,8 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
         if (resolvedMinQty !== 1) {
           addHiddenInput(`${prefix}quantity_min`, resolvedMinQty.toFixed(0));
         }
-        if (resolvedMinQty !== Infinity) {
-          addHiddenInput(`${prefix}quantity_max`, resolvedMinQty.toFixed(0));
+        if (resolvedMaxQty !== Infinity) {
+          addHiddenInput(`${prefix}quantity_max`, resolvedMaxQty.toFixed(0));
         }
       }
 
@@ -743,7 +754,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
         }
       }
 
-      if (useFieldset) {
+      if (needsFieldset) {
         level--;
         output += `${newline()}</fieldset>`;
       }
@@ -768,8 +779,12 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
     const url = new URL(cartUrl);
 
     if (templateSet.code !== 'DEFAULT') url.searchParams.set('template_set', templateSet.code);
-    if (this.form.empty) url.searchParams.set('empty', this.form.empty);
     if (this.form.cart === 'checkout') url.searchParams.set('cart', 'checkout');
+    if (this.form.redirect) url.searchParams.set('redirect', this.form.redirect);
+    if (this.form.coupon) url.searchParams.set('coupon', this.form.coupon);
+    if (this.form.empty && this.form.empty !== 'false') {
+      url.searchParams.set('empty', this.form.empty);
+    }
 
     for (let index = 0; index < (this.form.items?.length ?? 0); ++index) {
       const product = this.form.items![index];
@@ -777,6 +792,10 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
       const itemCategory = this.__getItemCategoryLoader(index)?.data;
 
       if (product.item_category_uri && !itemCategory) return '';
+      if (product.price_configurable) return '';
+      if (new Set(product.custom_options.map(v => v.name)).size < product.custom_options.length) {
+        return '';
+      }
 
       if (itemCategory && itemCategory.code !== 'DEFAULT') {
         url.searchParams.set(`${prefix}category`, itemCategory.code);
@@ -817,7 +836,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
               const day = date.getDate().toString().padStart(2, '0');
               url.searchParams.set(`${prefix}sub_enddate`, `${year}${month}${day}`);
             } else {
-              url.searchParams.set(`${prefix}sub_enddate`, product.sub_enddate);
+              url.searchParams.set(`${prefix}sub_enddate`, String(product.sub_enddate));
             }
           }
         }
@@ -832,7 +851,7 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
 
       if (product.expires_value) {
         if (product.expires_format === 'timestamp') {
-          url.searchParams.set(`${prefix}expires`, (product.expires_value / 1000).toFixed(0));
+          url.searchParams.set(`${prefix}expires`, product.expires_value.toFixed(0));
         } else {
           url.searchParams.set(`${prefix}expires`, product.expires_value.toFixed(0));
         }
@@ -856,11 +875,14 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
       if (product.width) url.searchParams.set(`${prefix}width`, product.width.toFixed(3));
       if (product.height) url.searchParams.set(`${prefix}height`, product.height.toFixed(3));
 
-      product.custom_options.forEach((option, optionIndex) => {
+      for (let optionIndex = 0; optionIndex < product.custom_options.length; ++optionIndex) {
+        const option = product.custom_options[optionIndex];
+        if (option.value_configurable) return '';
+
         const itemCategory = this.__getItemCategoryLoader(index, optionIndex)?.data;
         const modifiers = this.__getOptionModifiers(option, itemCategory ?? null, currencyCode);
         url.searchParams.set(`${prefix}${option.name}`, `${option.value ?? ''}${modifiers}`);
-      });
+      }
     }
 
     return url.toString();
@@ -872,21 +894,28 @@ export class ExperimentalAddToCartBuilder extends Base<Data> {
 
     const formHTML = this.__getAddToCartFormHTML();
     const linkHref = this.__getAddToCartLinkHref();
-    if (!formHTML || !linkHref) return null;
+    if (!formHTML && !linkHref) return null;
 
-    const linkHTML = `<a href="${encode(linkHref)}">Add to cart</a>`;
-    const unsignedCode = `${formHTML}${this.__signingSeparator}${linkHTML}`;
+    let unsignedCode: string;
+
+    if (linkHref) {
+      const linkHTML = `<a href="${encode(linkHref)}">Add to cart</a>`;
+      unsignedCode = `${formHTML}${this.__signingSeparator}${linkHTML}`;
+    } else {
+      unsignedCode = formHTML;
+    }
 
     if (unsignedCode === this.__previousUnsignedCode && this.__previousSignedCode) {
-      const signedCode = this.__previousSignedCode.split(this.__signingSeparator);
+      const [formHTML, linkHTML] = this.__previousSignedCode.split(this.__signingSeparator);
       return {
-        formHTML: signedCode[0],
-        linkHref: decode(signedCode[1].substring(9, signedCode[1].length - 17)),
+        linkHref: linkHTML ? decode(linkHTML.substring(9, linkHTML.length - 17)) : '',
+        formHTML,
       };
     }
 
     this.__previousUnsignedCode = unsignedCode;
     this.__previousSignedCode = '';
+
     if (store.use_cart_validation) this.__signAsync(unsignedCode, this.encodeHelper);
     return { formHTML, linkHref };
   }
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/index.ts b/src/elements/public/ExperimentalAddToCartBuilder/index.ts
index be8c76bb..b3d159d2 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/index.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/index.ts
@@ -1,9 +1,11 @@
 import '@vaadin/vaadin-button';
 
 import '../../internal/InternalResourcePickerControl/index';
+import '../../internal/InternalEditableListControl/index';
 import '../../internal/InternalSummaryControl/index';
 import '../../internal/InternalSwitchControl/index';
 import '../../internal/InternalSelectControl/index';
+import '../../internal/InternalTextControl/index';
 import '../../internal/InternalForm/index';
 
 import '../TemplateSetCard/index';
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/InternalExperimentalAddToCartBuilderCustomOptionCard.ts b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/InternalExperimentalAddToCartBuilderCustomOptionCard.ts
index 9e0b3c40..b29e4ef5 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/InternalExperimentalAddToCartBuilderCustomOptionCard.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/InternalExperimentalAddToCartBuilderCustomOptionCard.ts
@@ -8,8 +8,8 @@ export class InternalExperimentalAddToCartBuilderCustomOptionCard extends Intern
   renderBody(): TemplateResult {
     return html`
       <div class="flex justify-between items-center h-xs">
-        <span class="font-medium">${this.data?.name}</span>
-        <span class="text-secondary">${this.data?.value}</span>
+        <span class="font-medium">${this.data?.name}&ZeroWidthSpace;</span>
+        <span class="text-secondary">${this.data?.value}&ZeroWidthSpace;</span>
       </div>
     `;
   }
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/types.ts b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/types.ts
index 7d4df976..fbd2e0c2 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/types.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionCard/types.ts
@@ -4,7 +4,7 @@ import type { Graph, Resource } from '@foxy.io/sdk/core';
 interface ExperimentalAddToCartSnippetCustomOption extends Graph {
   curie: 'fx:experimental_add_to_cart_snippet_custom_option';
   links: { self: ExperimentalAddToCartSnippetCustomOption };
-  props: ExperimentalAddToCartSnippet['props']['items'][number]['custom_options'][number];
+  props: Required<ExperimentalAddToCartSnippet['props']>['items'][number]['custom_options'][number];
 }
 
 export type Data = Resource<ExperimentalAddToCartSnippetCustomOption>;
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/InternalExperimentalAddToCartBuilderCustomOptionForm.ts b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/InternalExperimentalAddToCartBuilderCustomOptionForm.ts
index 3f28d0d3..7cfdce75 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/InternalExperimentalAddToCartBuilderCustomOptionForm.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/InternalExperimentalAddToCartBuilderCustomOptionForm.ts
@@ -26,7 +26,7 @@ export class InternalExperimentalAddToCartBuilderCustomOptionForm extends Base<D
 
   defaultWeightUnit: string | null = null;
 
-  existingOptions: Data[] = [];
+  existingOptions: Omit<Data, '_links'>[] = [];
 
   itemCategories: string | null = null;
 
@@ -34,17 +34,25 @@ export class InternalExperimentalAddToCartBuilderCustomOptionForm extends Base<D
 
   get readonlySelector(): BooleanSelector {
     const alwaysMatch = [super.readonlySelector.toString()];
-    if (this.data) alwaysMatch.unshift('basics-group');
+    if (this.href) alwaysMatch.unshift('basics-group');
     return new BooleanSelector(alwaysMatch.join(' ').trim());
   }
 
   get disabledSelector(): BooleanSelector {
     const alwaysMatch = [super.disabledSelector.toString()];
 
-    if (!this.data) {
-      if (this.existingOptions.some(o => o.name === this.form.name)) {
-        alwaysMatch.unshift('basics-group:value-configurable');
-      }
+    if (!this.href && this.existingOptions.some(o => o.name === this.form.name)) {
+      alwaysMatch.unshift('basics-group:value-configurable');
+    }
+
+    return new BooleanSelector(alwaysMatch.join(' ').trim());
+  }
+
+  get hiddenSelector(): BooleanSelector {
+    const alwaysMatch = [super.hiddenSelector.toString()];
+
+    if (this.form.value_configurable) {
+      alwaysMatch.unshift('price-group', 'weight-group', 'code-group', 'category-group');
     }
 
     return new BooleanSelector(alwaysMatch.join(' ').trim());
@@ -65,54 +73,50 @@ export class InternalExperimentalAddToCartBuilderCustomOptionForm extends Base<D
         <foxy-internal-switch-control infer="value-configurable"></foxy-internal-switch-control>
       </foxy-internal-summary-control>
 
-      ${this.form.value_configurable
-        ? ''
-        : html`
-            <foxy-internal-summary-control infer="price-group">
-              <foxy-internal-number-control
-                layout="summary-item"
-                suffix=${ifDefined(this.currencyCode ?? void 0)}
-                infer="price"
-              >
-              </foxy-internal-number-control>
-              <foxy-internal-switch-control infer="replace-price"></foxy-internal-switch-control>
-            </foxy-internal-summary-control>
-
-            <foxy-internal-summary-control infer="weight-group">
-              <foxy-internal-number-control
-                layout="summary-item"
-                suffix=${ifDefined(this.__resolvedDefaultWeightUnit ?? void 0)}
-                infer="weight"
-              >
-              </foxy-internal-number-control>
-              <foxy-internal-switch-control infer="replace-weight"></foxy-internal-switch-control>
-            </foxy-internal-summary-control>
-
-            <foxy-internal-summary-control infer="code-group">
-              <foxy-internal-text-control layout="summary-item" infer="code">
-              </foxy-internal-text-control>
-              <foxy-internal-switch-control infer="replace-code"></foxy-internal-switch-control>
-            </foxy-internal-summary-control>
-
-            <foxy-internal-summary-control infer="category-group">
-              <foxy-internal-resource-picker-control
-                layout="summary-item"
-                first=${ifDefined(this.itemCategories ?? undefined)}
-                infer="item-category-uri"
-                item="foxy-item-category-card"
-              >
-              </foxy-internal-resource-picker-control>
-            </foxy-internal-summary-control>
-
-            <foxy-nucleon
-              infer=""
-              class="hidden"
-              href=${ifDefined(this.form.item_category_uri ?? void 0)}
-              id="itemCategoryLoader"
-              @update=${() => this.requestUpdate()}
-            >
-            </foxy-nucleon>
-          `}
+      <foxy-internal-summary-control infer="price-group">
+        <foxy-internal-number-control
+          layout="summary-item"
+          suffix=${ifDefined(this.currencyCode ?? void 0)}
+          infer="price"
+        >
+        </foxy-internal-number-control>
+        <foxy-internal-switch-control infer="replace-price"></foxy-internal-switch-control>
+      </foxy-internal-summary-control>
+
+      <foxy-internal-summary-control infer="weight-group">
+        <foxy-internal-number-control
+          layout="summary-item"
+          suffix=${ifDefined(this.__resolvedDefaultWeightUnit ?? void 0)}
+          infer="weight"
+        >
+        </foxy-internal-number-control>
+        <foxy-internal-switch-control infer="replace-weight"></foxy-internal-switch-control>
+      </foxy-internal-summary-control>
+
+      <foxy-internal-summary-control infer="code-group">
+        <foxy-internal-text-control layout="summary-item" infer="code">
+        </foxy-internal-text-control>
+        <foxy-internal-switch-control infer="replace-code"></foxy-internal-switch-control>
+      </foxy-internal-summary-control>
+
+      <foxy-internal-summary-control infer="category-group">
+        <foxy-internal-resource-picker-control
+          layout="summary-item"
+          first=${ifDefined(this.itemCategories ?? undefined)}
+          infer="item-category-uri"
+          item="foxy-item-category-card"
+        >
+        </foxy-internal-resource-picker-control>
+      </foxy-internal-summary-control>
+
+      <foxy-nucleon
+        infer=""
+        class="hidden"
+        href=${ifDefined(this.form.item_category_uri ?? void 0)}
+        id="itemCategoryLoader"
+        @update=${() => this.requestUpdate()}
+      >
+      </foxy-nucleon>
     `;
   }
 
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/types.ts b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/types.ts
index 7d4df976..fbd2e0c2 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/types.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderCustomOptionForm/types.ts
@@ -4,7 +4,7 @@ import type { Graph, Resource } from '@foxy.io/sdk/core';
 interface ExperimentalAddToCartSnippetCustomOption extends Graph {
   curie: 'fx:experimental_add_to_cart_snippet_custom_option';
   links: { self: ExperimentalAddToCartSnippetCustomOption };
-  props: ExperimentalAddToCartSnippet['props']['items'][number]['custom_options'][number];
+  props: Required<ExperimentalAddToCartSnippet['props']>['items'][number]['custom_options'][number];
 }
 
 export type Data = Resource<ExperimentalAddToCartSnippetCustomOption>;
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderItemControl/InternalExperimentalAddToCartBuilderItemControl.ts b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderItemControl/InternalExperimentalAddToCartBuilderItemControl.ts
index 6929849d..08b7e163 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderItemControl/InternalExperimentalAddToCartBuilderItemControl.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/internal/InternalExperimentalAddToCartBuilderItemControl/InternalExperimentalAddToCartBuilderItemControl.ts
@@ -18,7 +18,6 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
       itemCategories: { attribute: 'item-categories' },
       currencyCode: { attribute: 'currency-code' },
       index: { type: Number },
-      store: {},
     };
   }
 
@@ -32,6 +31,7 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
 
   renderControl(): TemplateResult {
     const itemCategory = this.__resolvedItemCategory;
+    const itemDeliveryType = itemCategory?.item_delivery_type;
     const nucleon = this.nucleon as ExperimentalAddToCartBuilder | null;
     const index = this.index;
     const item = nucleon?.form.items?.[index];
@@ -89,25 +89,21 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
           </foxy-internal-text-control>
         </foxy-internal-summary-control>
 
-        <foxy-internal-summary-control infer="appearance-group">
-          <foxy-internal-text-control
-            property="items.${index}.image"
-            layout="summary-item"
-            infer="image"
-          >
-          </foxy-internal-text-control>
-
-          ${item?.image
-            ? html`
-                <foxy-internal-text-control
-                  property="items.${index}.url"
+        ${itemDeliveryType === 'notshipped' || itemDeliveryType === 'downloaded'
+          ? ''
+          : html`
+              <foxy-internal-summary-control infer="appearance-group">
+                <foxy-internal-number-control
+                  placeholder=${ifDefined(itemCategory?.default_weight)}
+                  property="items.${index}.weight"
                   layout="summary-item"
-                  infer="url"
+                  suffix=${ifDefined(itemCategory?.default_weight_unit)}
+                  infer="weight"
+                  min="0"
                 >
-                </foxy-internal-text-control>
-              `
-            : ''}
-        </foxy-internal-summary-control>
+                </foxy-internal-number-control>
+              </foxy-internal-summary-control>
+            `}
 
         <foxy-internal-summary-control infer="subscriptions-group">
           <foxy-internal-switch-control
@@ -238,6 +234,12 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
                 >
                 </foxy-internal-number-control>
               `}
+
+          <foxy-internal-switch-control
+            property="items.${index}.hide_quantity"
+            infer="hide-quantity"
+          >
+          </foxy-internal-switch-control>
         </foxy-internal-summary-control>
 
         <foxy-internal-summary-control infer="advanced-group" layout="details">
@@ -254,7 +256,7 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
                   infer="discount-builder"
                   .parsedValue=${{
                     details: item?.discount_details ?? '',
-                    type: item?.discount_type ?? 'discount_amount_percentage',
+                    type: item?.discount_type ?? 'amount_percentage',
                     name: item?.discount_name ?? '',
                   }}
                   @change=${(evt: CustomEvent) => {
@@ -265,6 +267,24 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
               `
             : ''}
 
+          <foxy-internal-text-control
+            property="items.${index}.image"
+            layout="summary-item"
+            infer="image"
+          >
+          </foxy-internal-text-control>
+
+          ${item?.image
+            ? html`
+                <foxy-internal-text-control
+                  property="items.${index}.url"
+                  layout="summary-item"
+                  infer="url"
+                >
+                </foxy-internal-text-control>
+              `
+            : ''}
+
           <foxy-internal-select-control
             property="items.${index}.expires_format"
             layout="summary-item"
@@ -298,43 +318,36 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
                 </foxy-internal-date-control>
               `
             : ''}
+          ${itemDeliveryType === 'notshipped' || itemDeliveryType === 'downloaded'
+            ? ''
+            : html`
+                <foxy-internal-number-control
+                  property="items.${index}.length"
+                  layout="summary-item"
+                  suffix=${ifDefined(itemCategory?.default_length_unit)}
+                  infer="length"
+                  min="0"
+                >
+                </foxy-internal-number-control>
 
-          <foxy-internal-number-control
-            placeholder=${ifDefined(itemCategory?.default_weight)}
-            property="items.${index}.weight"
-            layout="summary-item"
-            suffix=${ifDefined(itemCategory?.default_weight_unit)}
-            infer="weight"
-            min="0"
-          >
-          </foxy-internal-number-control>
-
-          <foxy-internal-number-control
-            property="items.${index}.length"
-            layout="summary-item"
-            suffix=${ifDefined(itemCategory?.default_length_unit)}
-            infer="length"
-            min="0"
-          >
-          </foxy-internal-number-control>
-
-          <foxy-internal-number-control
-            property="items.${index}.width"
-            layout="summary-item"
-            suffix=${ifDefined(itemCategory?.default_length_unit)}
-            infer="width"
-            min="0"
-          >
-          </foxy-internal-number-control>
+                <foxy-internal-number-control
+                  property="items.${index}.width"
+                  layout="summary-item"
+                  suffix=${ifDefined(itemCategory?.default_length_unit)}
+                  infer="width"
+                  min="0"
+                >
+                </foxy-internal-number-control>
 
-          <foxy-internal-number-control
-            property="items.${index}.height"
-            layout="summary-item"
-            suffix=${ifDefined(itemCategory?.default_length_unit)}
-            infer="height"
-            min="0"
-          >
-          </foxy-internal-number-control>
+                <foxy-internal-number-control
+                  property="items.${index}.height"
+                  layout="summary-item"
+                  suffix=${ifDefined(itemCategory?.default_length_unit)}
+                  infer="height"
+                  min="0"
+                >
+                </foxy-internal-number-control>
+              `}
         </foxy-internal-summary-control>
 
         <foxy-internal-async-list-control
@@ -352,7 +365,7 @@ export class InternalExperimentalAddToCartBuilderItemControl extends InternalCon
         >
         </foxy-internal-async-list-control>
 
-        ${nucleon?.form.items?.length === 1
+        ${(nucleon?.form.items?.length ?? 0) <= 1
           ? html``
           : html`
               <vaadin-button
diff --git a/src/elements/public/ExperimentalAddToCartBuilder/types.ts b/src/elements/public/ExperimentalAddToCartBuilder/types.ts
index f5c163c8..de4c97a5 100644
--- a/src/elements/public/ExperimentalAddToCartBuilder/types.ts
+++ b/src/elements/public/ExperimentalAddToCartBuilder/types.ts
@@ -13,7 +13,7 @@ export interface ExperimentalAddToCartSnippet extends Graph {
     redirect?: string;
     coupon?: string;
     empty?: 'false' | 'true' | 'reset';
-    cart?: 'add' | 'checkout';
+    cart?: 'add' | 'checkout' | 'redirect';
     items?: {
       name: string;
       item_category_uri?: string;
@@ -28,12 +28,13 @@ export interface ExperimentalAddToCartSnippet extends Graph {
       sub_startdate_format?: 'none' | 'yyyymmdd' | 'dd' | 'duration';
       sub_startdate?: string | number;
       sub_enddate_format?: 'none' | 'yyyymmdd' | 'duration';
-      sub_enddate?: string;
+      sub_enddate?: string | number;
       discount_details?: string;
       discount_type?: string;
       discount_name?: string;
       expires_format?: 'minutes' | 'timestamp' | 'none';
       expires_value?: number;
+      hide_quantity?: boolean;
       quantity?: number;
       quantity_max?: number;
       quantity_min?: number;
diff --git a/src/static/translations/experimental-add-to-cart-builder/en.json b/src/static/translations/experimental-add-to-cart-builder/en.json
index 6748e0f1..ec142022 100644
--- a/src/static/translations/experimental-add-to-cart-builder/en.json
+++ b/src/static/translations/experimental-add-to-cart-builder/en.json
@@ -1,461 +1,464 @@
 {
-  "header": {
-    "title": "New add-to-cart template",
-    "title_existing": "Add-to-cart template",
-    "subtitle": ""
-  },
   "items": {
     "label": "Items",
     "helper_text": "",
-    "item": {
+    "item-group": {
       "label": "New item",
       "helper_text": "",
-      "basics-group": {
-        "label": "",
-        "helper_text": "",
-        "name": {
-          "label": "Name",
-          "placeholder": "Required",
-          "helper_text": ""
-        },
-        "item-category-uri": {
-          "label": "Category",
+      "item": {
+        "basics-group": {
+          "label": "",
           "helper_text": "",
-          "placeholder": "DEFAULT",
-          "value": "{{ resource.name }}",
-          "dialog": {
-            "cancel": "Cancel",
-            "close": "Close",
-            "header": "Select an item category",
-            "selection": {
-              "label": "",
-              "helper_text": "",
-              "search": "Search",
-              "clear": "Clear",
-              "pagination": {
-                "search_button_text": "Search",
-                "first": "First",
-                "last": "Last",
-                "next": "Next",
-                "pagination": "{{from}}-{{to}} out of {{total}}",
-                "previous": "Previous",
-                "card": {
-                  "spinner": {
-                    "loading_busy": "Loading",
-                    "loading_empty": "No item categories found",
-                    "loading_error": "Unknown error"
+          "name": {
+            "label": "Name",
+            "placeholder": "New item",
+            "helper_text": ""
+          },
+          "item-category-uri": {
+            "label": "Category",
+            "helper_text": "",
+            "placeholder": "DEFAULT",
+            "value": "{{ resource.name }}",
+            "dialog": {
+              "cancel": "Cancel",
+              "close": "Close",
+              "header": "Select an item category",
+              "selection": {
+                "label": "",
+                "helper_text": "",
+                "search": "Search",
+                "clear": "Clear",
+                "pagination": {
+                  "search_button_text": "Search",
+                  "first": "First",
+                  "last": "Last",
+                  "next": "Next",
+                  "pagination": "{{from}}-{{to}} out of {{total}}",
+                  "previous": "Previous",
+                  "card": {
+                    "spinner": {
+                      "loading_busy": "Loading",
+                      "loading_empty": "No item categories found",
+                      "loading_error": "Unknown error"
+                    }
                   }
                 }
               }
-            }
-          },
-          "card": {
-            "spinner": {
-              "loading_busy": "Loading",
-              "loading_empty": "Not assigned – click to select",
-              "loading_error": "Unknown error"
+            },
+            "card": {
+              "spinner": {
+                "loading_busy": "Loading",
+                "loading_empty": "Not assigned – click to select",
+                "loading_error": "Unknown error"
+              }
             }
           }
-        }
-      },
-      "price-group": {
-        "label": "",
-        "helper_text": "",
-        "price": {
-          "label": "Price",
-          "placeholder": "0",
-          "helper_text": ""
-        },
-        "price-default": {
-          "label": "Default price",
-          "placeholder": "0",
-          "helper_text": ""
         },
-        "price-configurable": {
-          "label": "Allow custom amount",
-          "helper_text": "For donations or pay-what-you-want items.",
-          "checked": "Yes",
-          "unchecked": "No"
-        }
-      },
-      "code-group": {
-        "label": "",
-        "helper_text": "",
-        "code": {
-          "label": "SKU",
-          "placeholder": "Optional",
-          "helper_text": ""
-        },
-        "parent-code": {
-          "label": "Parent SKU",
-          "placeholder": "Optional",
-          "helper_text": "For child items in a bundle."
-        }
-      },
-      "appearance-group": {
-        "label": "",
-        "helper_text": "",
-        "image": {
-          "label": "Image URL",
-          "placeholder": "Optional",
-          "helper_text": ""
-        },
-        "url": {
-          "label": "Product URL",
-          "placeholder": "Optional",
-          "helper_text": ""
-        }
-      },
-      "subscriptions-group": {
-        "label": "",
-        "helper_text": "",
-        "sub-enabled": {
-          "label": "Enable subscription",
+        "price-group": {
+          "label": "",
           "helper_text": "",
-          "checked": "Yes",
-          "unchecked": "No"
-        },
-        "sub-frequency": {
-          "label": "Frequency",
-          "helper_text": "",
-          "placeholder": "0",
-          "select": "Select",
-          "times_a_month": "times/mo",
-          "day": "day",
-          "day_plural": "days",
-          "week": "week",
-          "week_plural": "weeks",
-          "month": "month",
-          "month_plural": "months",
-          "year": "year",
-          "year_plural": "years"
-        },
-        "sub-startdate-format": {
-          "label": "Start",
-          "helper_text": "",
-          "placeholder": "Select",
-          "option_none": "Immediately",
-          "option_yyyymmdd": "On a specific date",
-          "option_dd": "On a specific day of the month",
-          "option_duration": "After a period of time"
-        },
-        "sub-startdate-yyyymmdd": {
-          "label": "Start date",
-          "helper_text": "",
-          "display_value": "{{ value, date }}",
-          "placeholder": "Required"
-        },
-        "sub-startdate-dd": {
-          "label": "Start day of the month",
-          "helper_text": "",
-          "placeholder": "Required"
+          "price": {
+            "label": "Price",
+            "placeholder": "0",
+            "helper_text": ""
+          },
+          "price-default": {
+            "label": "Default price",
+            "placeholder": "0",
+            "helper_text": ""
+          },
+          "price-configurable": {
+            "label": "Allow custom amount",
+            "helper_text": "For donations or pay-what-you-want items.",
+            "checked": "Yes",
+            "unchecked": "No"
+          }
         },
-        "sub-startdate-duration": {
-          "label": "Start after",
+        "code-group": {
+          "label": "",
           "helper_text": "",
-          "placeholder": "0",
-          "select": "Select",
-          "day": "Day",
-          "day_plural": "Days",
-          "week": "Week",
-          "week_plural": "Weeks",
-          "month": "Month",
-          "month_plural": "Months",
-          "year": "Year",
-          "year_plural": "Years"
+          "code": {
+            "label": "SKU",
+            "placeholder": "Optional",
+            "helper_text": ""
+          },
+          "parent-code": {
+            "label": "Parent SKU",
+            "placeholder": "Optional",
+            "helper_text": "For child items in a bundle."
+          }
         },
-        "sub-enddate-format": {
-          "label": "End",
+        "appearance-group": {
+          "label": "",
           "helper_text": "",
-          "placeholder": "Select",
-          "option_none": "When cancelled",
-          "option_yyyymmdd": "On a specific date",
-          "option_duration": "After a period of time"
+          "weight": {
+            "label": "Weight",
+            "helper_text": "",
+            "placeholder": "0"
+          }
         },
-        "sub-enddate-yyyymmdd": {
-          "label": "End date",
+        "subscriptions-group": {
+          "label": "",
           "helper_text": "",
-          "display_value": "{{ value, date }}",
-          "placeholder": "Required"
+          "sub-enabled": {
+            "label": "Enable subscription",
+            "helper_text": "",
+            "checked": "Yes",
+            "unchecked": "No"
+          },
+          "sub-frequency": {
+            "label": "Frequency",
+            "helper_text": "",
+            "placeholder": "0",
+            "select": "Select",
+            "times_a_month": "times/mo",
+            "day": "day",
+            "day_plural": "days",
+            "week": "week",
+            "week_plural": "weeks",
+            "month": "month",
+            "month_plural": "months",
+            "year": "year",
+            "year_plural": "years"
+          },
+          "sub-startdate-format": {
+            "label": "Start",
+            "helper_text": "",
+            "placeholder": "Select",
+            "option_none": "Immediately",
+            "option_yyyymmdd": "On a specific date",
+            "option_dd": "On a specific day of the month",
+            "option_duration": "After a period of time"
+          },
+          "sub-startdate-yyyymmdd": {
+            "label": "Start date",
+            "helper_text": "",
+            "display_value": "{{ value, date }}",
+            "placeholder": "Required"
+          },
+          "sub-startdate-dd": {
+            "label": "Start day of the month",
+            "helper_text": "",
+            "placeholder": "Required"
+          },
+          "sub-startdate-duration": {
+            "label": "Start after",
+            "helper_text": "",
+            "placeholder": "0",
+            "select": "Select",
+            "day": "Day",
+            "day_plural": "Days",
+            "week": "Week",
+            "week_plural": "Weeks",
+            "month": "Month",
+            "month_plural": "Months",
+            "year": "Year",
+            "year_plural": "Years"
+          },
+          "sub-enddate-format": {
+            "label": "End",
+            "helper_text": "",
+            "placeholder": "Select",
+            "option_none": "When cancelled",
+            "option_yyyymmdd": "On a specific date",
+            "option_duration": "After a period of time"
+          },
+          "sub-enddate-yyyymmdd": {
+            "label": "End date",
+            "helper_text": "",
+            "display_value": "{{ value, date }}",
+            "placeholder": "Required"
+          },
+          "sub-enddate-duration": {
+            "label": "End after",
+            "helper_text": "",
+            "placeholder": "0",
+            "select": "Select",
+            "day": "Day",
+            "day_plural": "Days",
+            "week": "Week",
+            "week_plural": "Weeks",
+            "month": "Month",
+            "month_plural": "Months",
+            "year": "Year",
+            "year_plural": "Years"
+          }
         },
-        "sub-enddate-duration": {
-          "label": "End after",
-          "helper_text": "",
-          "placeholder": "0",
-          "select": "Select",
-          "day": "Day",
-          "day_plural": "Days",
-          "week": "Week",
-          "week_plural": "Weeks",
-          "month": "Month",
-          "month_plural": "Months",
-          "year": "Year",
-          "year_plural": "Years"
-        }
-      },
-      "quantity-group": {
-        "label": "Quantity",
-        "helper_text": "",
-        "quantity": {
+        "quantity-group": {
           "label": "Quantity",
-          "placeholder": "1",
-          "helper_text": ""
-        },
-        "quantity-min": {
-          "label": "Minimum quantity",
-          "placeholder": "1",
-          "helper_text": ""
-        },
-        "quantity-max": {
-          "label": "Maximum quantity",
-          "placeholder": "None",
-          "helper_text": ""
-        }
-      },
-      "advanced-group": {
-        "label": "Advanced",
-        "helper_text": "",
-        "discount-name": {
-          "label": "Discount",
-          "helper_text": "",
-          "placeholder": "None"
-        },
-        "discount-builder": {
-          "tier": "Tier",
-          "tier_by": "by",
-          "tier_if": "if",
-          "tier_allunits": "price of each item",
-          "tier_incremental": "price of additional items",
-          "tier_repeat": "price of next item",
-          "tier_single": "order total",
-          "tier_then": "then",
-          "quantity": "quantity",
-          "total": "total",
-          "reduce": "reduce",
-          "increase": "increase"
-        },
-        "expires-format": {
-          "label": "Expiration",
-          "helper_text": "",
-          "placeholder": "Select",
-          "option_none": "Doesn't expire",
-          "option_minutes": "After a number of minutes",
-          "option_timestamp": "On a specific date"
-        },
-        "expires-value-timestamp": {
-          "label": "Expiration date",
           "helper_text": "",
-          "display_value": "{{ value, date }}",
-          "placeholder": "Required"
-        },
-        "expires-value-minutes": {
-          "label": "Expires after",
-          "helper_text": "",
-          "placeholder": "0"
-        },
-        "width": {
-          "label": "Width",
-          "helper_text": "",
-          "placeholder": "0"
-        },
-        "height": {
-          "label": "Height",
-          "helper_text": "",
-          "placeholder": "0"
+          "quantity": {
+            "label": "Quantity",
+            "placeholder": "1",
+            "helper_text": ""
+          },
+          "quantity-min": {
+            "label": "Minimum quantity",
+            "placeholder": "1",
+            "helper_text": ""
+          },
+          "quantity-max": {
+            "label": "Maximum quantity",
+            "placeholder": "None",
+            "helper_text": ""
+          },
+          "hide-quantity": {
+            "label": "Hide quantity field in the form",
+            "helper_text": "",
+            "checked": "Yes",
+            "unchecked": "No"
+          }
         },
-        "length": {
-          "label": "Length",
+        "advanced-group": {
+          "label": "Advanced",
           "helper_text": "",
-          "placeholder": "0"
+          "discount-name": {
+            "label": "Discount",
+            "helper_text": "",
+            "placeholder": "None"
+          },
+          "discount-builder": {
+            "tier": "Tier",
+            "tier_by": "by",
+            "tier_if": "if",
+            "tier_allunits": "price of each item",
+            "tier_incremental": "price of additional items",
+            "tier_repeat": "price of next item",
+            "tier_single": "order total",
+            "tier_then": "then",
+            "quantity": "quantity",
+            "total": "total",
+            "reduce": "reduce",
+            "increase": "increase"
+          },
+          "expires-format": {
+            "label": "Expiration",
+            "helper_text": "",
+            "placeholder": "Select",
+            "option_none": "Doesn't expire",
+            "option_minutes": "After a number of minutes",
+            "option_timestamp": "On a specific date"
+          },
+          "expires-value-timestamp": {
+            "label": "Expiration date",
+            "helper_text": "",
+            "display_value": "{{ value, date }}",
+            "placeholder": "Required"
+          },
+          "expires-value-minutes": {
+            "label": "Expires after",
+            "helper_text": "",
+            "placeholder": "0"
+          },
+          "image": {
+            "label": "Image URL",
+            "placeholder": "Optional",
+            "helper_text": ""
+          },
+          "url": {
+            "label": "Product URL",
+            "placeholder": "Optional",
+            "helper_text": ""
+          },
+          "width": {
+            "label": "Width",
+            "helper_text": "",
+            "placeholder": "0"
+          },
+          "height": {
+            "label": "Height",
+            "helper_text": "",
+            "placeholder": "0"
+          },
+          "length": {
+            "label": "Length",
+            "helper_text": "",
+            "placeholder": "0"
+          }
         },
-        "weight": {
-          "label": "Weight",
-          "helper_text": "",
-          "placeholder": "0"
-        }
-      },
-      "custom-options": {
-        "label": "Custom options",
-        "delete_header": "Remove custom option?",
-        "delete_message": "Please confirm that you'd like to remove this custom option from the product.",
-        "delete_confirm": "Remove",
-        "delete_cancel": "Cancel",
-        "dialog": {
-          "header_create": "Add option",
-          "header_update": "Update option",
-          "close": "Close",
-          "save": "Save",
-          "cancel": "Cancel",
-          "undo_header": "Unsaved changes",
-          "undo_message": "Looks like you didn't save your changes! What would you like to do with them?",
-          "undo_cancel": "Review",
-          "undo_confirm": "Discard",
-          "internal-experimental-add-to-cart-builder-custom-option-form": {
-            "error": {
-              "option_exists": "Option with this name and value already exists.",
-              "option_exists_configurable": "Only one option with this name can exist when its value is configurable."
-            },
-            "basics-group": {
-              "label": "",
-              "helper_text": "",
-              "name": {
-                "label": "Name",
-                "placeholder": "Required",
-                "helper_text": ""
-              },
-              "value": {
-                "label": "Value",
-                "placeholder": "Required",
-                "helper_text": ""
-              },
-              "default-value": {
-                "label": "Default value",
-                "placeholder": "Optional",
-                "helper_text": ""
+        "custom-options": {
+          "label": "Custom options",
+          "delete_header": "Remove custom option?",
+          "delete_message": "Please confirm that you'd like to remove this custom option from the product.",
+          "delete_confirm": "Remove",
+          "delete_cancel": "Cancel",
+          "dialog": {
+            "header_create": "Add option",
+            "header_update": "Update option",
+            "close": "Close",
+            "save": "Save",
+            "cancel": "Cancel",
+            "undo_header": "Unsaved changes",
+            "undo_message": "Looks like you didn't save your changes! What would you like to do with them?",
+            "undo_cancel": "Review",
+            "undo_confirm": "Discard",
+            "internal-experimental-add-to-cart-builder-custom-option-form": {
+              "error": {
+                "option_exists": "Option with this name and value already exists.",
+                "option_exists_configurable": "Only one option with this name can exist when its value is configurable."
               },
-              "value-configurable": {
-                "label": "Let users enter a custom value",
+              "basics-group": {
+                "label": "",
                 "helper_text": "",
-                "checked": "Yes",
-                "unchecked": "No"
-              }
-            },
-            "price-group": {
-              "label": "",
-              "helper_text": "",
-              "price": {
-                "label": "Price modifier",
-                "placeholder": "0",
-                "helper_text": ""
+                "name": {
+                  "label": "Name",
+                  "placeholder": "Required",
+                  "helper_text": ""
+                },
+                "value": {
+                  "label": "Value",
+                  "placeholder": "Required",
+                  "helper_text": ""
+                },
+                "default-value": {
+                  "label": "Default value",
+                  "placeholder": "Optional",
+                  "helper_text": ""
+                },
+                "value-configurable": {
+                  "label": "Let users enter a custom value",
+                  "helper_text": "",
+                  "checked": "Yes",
+                  "unchecked": "No"
+                }
               },
-              "replace-price": {
-                "label": "Replace item price with this value",
+              "price-group": {
+                "label": "",
                 "helper_text": "",
-                "checked": "Yes",
-                "unchecked": "No"
-              }
-            },
-            "weight-group": {
-              "label": "",
-              "helper_text": "",
-              "weight": {
-                "label": "Weight modifier",
-                "placeholder": "0",
-                "helper_text": ""
+                "price": {
+                  "label": "Price modifier",
+                  "placeholder": "0",
+                  "helper_text": ""
+                },
+                "replace-price": {
+                  "label": "Replace item price with this value",
+                  "helper_text": "",
+                  "checked": "Yes",
+                  "unchecked": "No"
+                }
               },
-              "replace-weight": {
-                "label": "Replace item weight with this value",
+              "weight-group": {
+                "label": "",
                 "helper_text": "",
-                "checked": "Yes",
-                "unchecked": "No"
-              }
-            },
-            "code-group": {
-              "label": "",
-              "helper_text": "",
-              "code": {
-                "label": "Code modifier",
-                "placeholder": "None",
-                "helper_text": ""
+                "weight": {
+                  "label": "Weight modifier",
+                  "placeholder": "0",
+                  "helper_text": ""
+                },
+                "replace-weight": {
+                  "label": "Replace item weight with this value",
+                  "helper_text": "",
+                  "checked": "Yes",
+                  "unchecked": "No"
+                }
               },
-              "replace-code": {
-                "label": "Replace item code with this value",
+              "code-group": {
+                "label": "",
                 "helper_text": "",
-                "checked": "Yes",
-                "unchecked": "No"
-              }
-            },
-            "category-group": {
-              "label": "",
-              "helper_text": "",
-              "item-category-uri": {
-                "label": "Change item category to",
+                "code": {
+                  "label": "Code modifier",
+                  "placeholder": "None",
+                  "helper_text": ""
+                },
+                "replace-code": {
+                  "label": "Replace item code with this value",
+                  "helper_text": "",
+                  "checked": "Yes",
+                  "unchecked": "No"
+                }
+              },
+              "category-group": {
+                "label": "",
                 "helper_text": "",
-                "placeholder": "Don't change",
-                "value": "{{ resource.code }}",
-                "dialog": {
-                  "cancel": "Cancel",
-                  "close": "Close",
-                  "header": "Select an item category",
-                  "selection": {
-                    "label": "",
-                    "helper_text": "",
-                    "search": "Search",
-                    "clear": "Clear",
-                    "pagination": {
-                      "search_button_text": "Search",
-                      "first": "First",
-                      "last": "Last",
-                      "next": "Next",
-                      "pagination": "{{from}}-{{to}} out of {{total}}",
-                      "previous": "Previous",
-                      "card": {
-                        "spinner": {
-                          "loading_busy": "Loading",
-                          "loading_empty": "No item categories found",
-                          "loading_error": "Unknown error"
+                "item-category-uri": {
+                  "label": "Change item category to",
+                  "helper_text": "",
+                  "placeholder": "Don't change",
+                  "value": "{{ resource.code }}",
+                  "dialog": {
+                    "cancel": "Cancel",
+                    "close": "Close",
+                    "header": "Select an item category",
+                    "selection": {
+                      "label": "",
+                      "helper_text": "",
+                      "search": "Search",
+                      "clear": "Clear",
+                      "pagination": {
+                        "search_button_text": "Search",
+                        "first": "First",
+                        "last": "Last",
+                        "next": "Next",
+                        "pagination": "{{from}}-{{to}} out of {{total}}",
+                        "previous": "Previous",
+                        "card": {
+                          "spinner": {
+                            "loading_busy": "Loading",
+                            "loading_empty": "No item categories found",
+                            "loading_error": "Unknown error"
+                          }
                         }
                       }
                     }
-                  }
-                },
-                "card": {
-                  "spinner": {
-                    "loading_busy": "Loading",
-                    "loading_empty": "Not assigned – click to select",
-                    "loading_error": "Unknown error"
+                  },
+                  "card": {
+                    "spinner": {
+                      "loading_busy": "Loading",
+                      "loading_empty": "Not assigned – click to select",
+                      "loading_error": "Unknown error"
+                    }
                   }
                 }
+              },
+              "delete": {
+                "delete": "Delete",
+                "cancel": "Cancel",
+                "delete_prompt": "Are you sure you'd like to remove this custom option? You won't be able to bring it back."
+              },
+              "undo": {
+                "caption": "Undo"
+              },
+              "submit": {
+                "caption": "Save changes"
+              },
+              "create": {
+                "caption": "Create"
+              },
+              "spinner": {
+                "refresh": "Refresh",
+                "loading_busy": "Loading",
+                "loading_error": "Unknown error"
               }
-            },
-            "delete": {
-              "delete": "Delete",
-              "cancel": "Cancel",
-              "delete_prompt": "Are you sure you'd like to remove this custom option? You won't be able to bring it back."
-            },
-            "undo": {
-              "caption": "Undo"
-            },
-            "submit": {
-              "caption": "Save changes"
-            },
-            "create": {
-              "caption": "Create"
-            },
-            "spinner": {
-              "refresh": "Refresh",
-              "loading_busy": "Loading",
-              "loading_error": "Unknown error"
             }
+          },
+          "pagination": {
+            "card": {
+              "delete_button_text": "Delete",
+              "spinner": {
+                "loading_busy": "Loading",
+                "loading_empty": "No options",
+                "loading_error": "Unknown error"
+              }
+            },
+            "create_button_text": "Add option +",
+            "first": "First",
+            "last": "Last",
+            "next": "Next",
+            "pagination": "{{from}}-{{to}} out of {{total}}",
+            "previous": "Previous"
           }
         },
-        "pagination": {
-          "card": {
-            "delete_button_text": "Delete",
-            "spinner": {
-              "loading_busy": "Loading",
-              "loading_empty": "No options",
-              "loading_error": "Unknown error"
-            }
-          },
-          "create_button_text": "Add option +",
-          "first": "First",
-          "last": "Last",
-          "next": "Next",
-          "pagination": "{{from}}-{{to}} out of {{total}}",
-          "previous": "Previous"
+        "delete": {
+          "caption": "Remove from bundle"
         }
-      },
-      "delete": {
-        "caption": "Remove from bundle"
       }
     },
     "add-product": {
       "caption": "Add another item"
     }
   },
-  "cart-settings-group-one": {
-    "label": "Cart settings",
+  "cart-settings": {
+    "label": "Settings",
     "helper_text": "",
     "template-set-uri": {
       "label": "Template set",
@@ -490,7 +493,7 @@
       }
     },
     "empty": {
-      "label": "Before adding new items",
+      "label": "Before adding items",
       "helper_text": "",
       "placeholder": "Select",
       "option_false": "Do nothing",
@@ -498,10 +501,17 @@
       "option_reset": "Create a new cart"
     },
     "cart": {
-      "label": "Skip the cart and go straight to checkout",
+      "label": "After adding items",
       "helper_text": "",
-      "checked": "Yes",
-      "unchecked": "No"
+      "placeholder": "Select",
+      "option_add": "Do nothing",
+      "option_checkout": "Open checkout",
+      "option_redirect": "Redirect to a page"
+    },
+    "redirect": {
+      "label": "Redirect URL",
+      "placeholder": "Required",
+      "helper_text": ""
     },
     "coupon": {
       "label": "Coupon code",
@@ -509,20 +519,12 @@
       "placeholder": "Optional"
     }
   },
-  "cart-settings-group-two": {
-    "label": "",
-    "helper_text": "",
-    "redirect": {
-      "label": "Redirect URL",
-      "placeholder": "Optional",
-      "helper_text": "Instead of showing the cart, redirect the customer to this URL after adding item(s)."
-    }
-  },
   "link": {
     "label": "",
     "helper_text": "",
     "direct_link": "Direct link",
     "empty": "Modify the item parameters to see the add-to-cart link.",
+    "unavailable": "Direct link is not available when one or more items have configurable options.",
     "copy-to-clipboard": {
       "failed_to_copy": "Failed to copy",
       "click_to_copy": "Copy to clipboard",
@@ -540,7 +542,7 @@
     "shipto_label": "Ship to:",
     "submit_caption": "Add to cart",
     "unavailable": {
-      "loading_empty": "Add name and price to every item to see the preview and the add-to-cart code."
+      "loading_busy": "Loading preview..."
     },
     "spinner": {
       "loading_busy": "Signing",
@@ -552,26 +554,5 @@
       "copying": "Copying...",
       "done": "Copied to clipboard"
     }
-  },
-  "timestamps": {
-    "date_created": "Created on",
-    "date_modified": "Last updated on",
-    "date": "{{value, date}}"
-  },
-  "delete": {
-    "delete": "Delete",
-    "cancel": "Cancel",
-    "delete_prompt": "This action is irreversible. Are you sure you want to delete this add-to-cart template?"
-  },
-  "submit": {
-    "caption": "Save changes"
-  },
-  "create": {
-    "caption": "Save as new template"
-  },
-  "spinner": {
-    "refresh": "Refresh",
-    "loading_busy": "Loading",
-    "loading_error": "Unknown error"
   }
 }
\ No newline at end of file