diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index eda2d6d28..a349375b8 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -1414,15 +1414,29 @@ exports[`Storyshots Generics / Filter default 1`] = `
           data-shrink="false"
         />
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id Hook-input-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id Hook-input-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -2568,15 +2582,29 @@ exports[`Storyshots Generics / PhoneField default 1`] = `
             data-shrink="true"
           />
           <div
-            class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+            class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
           >
+            <fieldset
+              aria-hidden="true"
+              class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+              style="padding-left:8px"
+            >
+              <legend
+                class="MuiPrivateNotchedOutline-legend-id"
+                style="width:143px"
+              >
+                <span>
+                  ​
+                </span>
+              </legend>
+            </fieldset>
             <div
               class="MuiSelect-root-id"
             >
               <div
                 aria-haspopup="true"
                 aria-pressed="false"
-                class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+                class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
                 id="select-phone_prefix"
                 role="button"
                 tabindex="0"
@@ -3972,15 +4000,29 @@ exports[`Storyshots Generics / SingleSelectField with error hint 1`] = `
           data-shrink="false"
         />
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-error-id MuiFilledInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4035,15 +4077,29 @@ exports[`Storyshots Generics / SingleSelectField with hint 1`] = `
           data-shrink="false"
         />
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4100,15 +4156,29 @@ exports[`Storyshots Generics / SingleSelectField with label 1`] = `
           Lorem ipsum
         </label>
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4160,15 +4230,29 @@ exports[`Storyshots Generics / SingleSelectField with label and hint 1`] = `
           Lorem
         </label>
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4223,15 +4307,29 @@ exports[`Storyshots Generics / SingleSelectField with no value 1`] = `
           data-shrink="false"
         />
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:79.5px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:0.01px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4281,15 +4379,29 @@ exports[`Storyshots Generics / SingleSelectField with value 1`] = `
           data-shrink="true"
         />
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:8px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:143px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -4339,15 +4451,29 @@ exports[`Storyshots Generics / SingleSelectField with value, label and hint 1`]
           Lorem
         </label>
         <div
-          class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+          class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
         >
+          <fieldset
+            aria-hidden="true"
+            class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+            style="padding-left:8px"
+          >
+            <legend
+              class="MuiPrivateNotchedOutline-legend-id"
+              style="width:143px"
+            >
+              <span>
+                ​
+              </span>
+            </legend>
+          </fieldset>
           <div
             class="MuiSelect-root-id"
           >
             <div
               aria-haspopup="true"
               aria-pressed="false"
-              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+              class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
               role="button"
               tabindex="0"
             >
@@ -6266,8 +6392,22 @@ exports[`Storyshots Orders / OrderHistory default 1`] = `
               class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
             >
               <div
-                class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
               >
+                <fieldset
+                  aria-hidden="true"
+                  class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                  style="padding-left:8px"
+                >
+                  <legend
+                    class="MuiPrivateNotchedOutline-legend-id"
+                    style="width:0.01px"
+                  >
+                    <span>
+                      ​
+                    </span>
+                  </legend>
+                </fieldset>
                 <div
                   class="MuiPrivateTextarea-root-id"
                 >
@@ -6287,7 +6427,7 @@ exports[`Storyshots Orders / OrderHistory default 1`] = `
                   />
                   <textarea
                     aria-invalid="false"
-                    class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                    class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                     name="message"
                     placeholder="Leave your note here..."
                     rows="1"
@@ -6578,15 +6718,29 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
                       id="select-inputType"
                       role="button"
                       tabindex="0"
@@ -6618,43 +6772,22 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -6684,7 +6817,7 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -6929,45 +7062,27 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -7009,43 +7124,22 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -7065,49 +7159,27 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -7116,49 +7188,27 @@ exports[`Storyshots Views / Attributes / Attribute details create 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -7314,15 +7364,29 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-inputType"
                       role="button"
                     >
@@ -7353,43 +7417,22 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -7419,7 +7462,7 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -7664,45 +7707,27 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -7744,43 +7769,22 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -7800,48 +7804,27 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -7850,49 +7833,27 @@ exports[`Storyshots Views / Attributes / Attribute details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -8053,15 +8014,29 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-inputType"
                       role="button"
                     >
@@ -8092,43 +8067,22 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -8158,7 +8112,7 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -8403,45 +8357,27 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -8488,43 +8424,22 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -8544,48 +8459,27 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -8594,49 +8488,27 @@ exports[`Storyshots Views / Attributes / Attribute details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -8799,15 +8671,29 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-inputType"
                       role="button"
                     >
@@ -8836,45 +8722,26 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
                 class="FormSpacer-spacer-id"
               />
               <label
-                class="MuiFormControlLabel-root-id"
+                class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                    disabled=""
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
-                  class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                  class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -8904,7 +8771,7 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -9078,47 +8945,29 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                    disabled=""
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -9161,45 +9010,24 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                    disabled=""
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -9219,51 +9047,29 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                    disabled=""
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -9272,51 +9078,29 @@ exports[`Storyshots Views / Attributes / Attribute details loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                    disabled=""
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -9472,15 +9256,29 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-inputType"
                       role="button"
                     >
@@ -9511,43 +9309,22 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -9577,7 +9354,7 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -9822,45 +9599,27 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -9902,43 +9661,22 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -9958,48 +9696,27 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -10008,49 +9725,27 @@ exports[`Storyshots Views / Attributes / Attribute details multiple select input
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -10206,15 +9901,29 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
                   Catalog Input type for Store Owner
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-inputType"
                       role="button"
                     >
@@ -10245,43 +9954,22 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="valueRequired"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="valueRequired"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Value Required
-                    </span>
-                    <div />
-                  </div>
+                  Value Required
                 </span>
               </label>
             </div>
@@ -10311,7 +9999,7 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add value
+                    Assign value
                   </span>
                 </button>
               </div>
@@ -10484,45 +10172,27 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="filterableInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in faceted navigation
-                    </span>
-                    <div />
-                  </div>
+                  Use in faceted navigation
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <div
                 class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
               >
@@ -10564,43 +10234,22 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="visibleInStorefront"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="visibleInStorefront"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Visible on Product Page in Storefront
-                    </span>
-                    <div />
-                  </div>
+                  Visible on Product Page in Storefront
                 </span>
               </label>
               <div
@@ -10620,48 +10269,27 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="filterableInDashboard"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="filterableInDashboard"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Use in Filtering
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use in Filtering
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enabled, you’ll be able to use this attribute to filter products in product list.
-                      </span>
-                    </div>
-                  </div>
+                    If enabled, you’ll be able to use this attribute to filter products in product list.
+                  </span>
                 </span>
               </label>
               <div
@@ -10670,49 +10298,27 @@ exports[`Storyshots Views / Attributes / Attribute details no values 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="availableInGrid"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="availableInGrid"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Add to Column Options
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Add to Column Options
-                    </span>
-                    <div>
-                      <span
-                        class="MuiTypography-root-id MuiTypography-caption-id"
-                      >
-                        If enable this attribute can be used as a column in product table.
-                      </span>
-                    </div>
-                  </div>
+                    If enable this attribute can be used as a column in product table.
+                  </span>
                 </span>
               </label>
             </div>
@@ -10753,22 +10359,7 @@ exports[`Storyshots Views / Attributes / Attribute list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add attribute
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create attribute
             </span>
           </button>
         </div>
@@ -11478,22 +11069,7 @@ exports[`Storyshots Views / Attributes / Attribute list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add attribute
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create attribute
             </span>
           </button>
         </div>
@@ -11744,22 +11320,7 @@ exports[`Storyshots Views / Attributes / Attribute list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add attribute
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create attribute
             </span>
           </button>
         </div>
@@ -12433,22 +11994,7 @@ exports[`Storyshots Views / Categories / Category list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add category
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create category
             </span>
           </button>
         </div>
@@ -12862,22 +12408,7 @@ exports[`Storyshots Views / Categories / Category list empty 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add category
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create category
             </span>
           </button>
         </div>
@@ -13081,22 +12612,7 @@ exports[`Storyshots Views / Categories / Category list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add category
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create category
             </span>
           </button>
         </div>
@@ -15086,7 +14602,7 @@ Ctrl + K"
               <span
                 class="MuiButton-label-id"
               >
-                Add subcategory
+                Create subcategory
               </span>
             </button>
           </div>
@@ -15776,7 +15292,7 @@ Ctrl + K"
               <span
                 class="MuiButton-label-id"
               >
-                Add subcategory
+                Create subcategory
               </span>
             </button>
           </div>
@@ -16823,7 +16339,7 @@ Ctrl + K"
               <span
                 class="MuiButton-label-id"
               >
-                Add subcategory
+                Create subcategory
               </span>
             </button>
           </div>
@@ -18830,7 +18346,7 @@ Ctrl + K"
               <span
                 class="MuiButton-label-id"
               >
-                Add subcategory
+                Create subcategory
               </span>
             </button>
           </div>
@@ -21927,46 +21443,89 @@ Ctrl + K"
                 <div
                   class="VisibilityCard-expandedSwitchContainer-id"
                 >
-                  <label
-                    class="MuiFormControlLabel-root-id"
+                  <div
+                    class="MuiFormControl-root-id RadioGroupField-formControl-id"
                   >
-                    <span
-                      class="MuiSwitch-root-id"
+                    <div
+                      aria-label="isPublished"
+                      class="MuiFormGroup-root-id"
+                      role="radiogroup"
                     >
-                      <span
-                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
+                      <label
+                        class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                       >
                         <span
-                          class="MuiIconButton-label-id"
+                          class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
                         >
                           <span
-                            class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                          />
-                          <input
-                            checked=""
-                            class="MuiPrivateSwitchBase-input-id"
-                            name="isPublished"
-                            type="checkbox"
-                          />
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              checked=""
+                              class="MuiPrivateSwitchBase-input-id"
+                              name="isPublished"
+                              type="radio"
+                              value="true"
+                            />
+                          </span>
                         </span>
-                      </span>
-                      <span
-                        class="MuiSwitch-bar-id"
-                      />
-                    </span>
-                    <span
-                      class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                    >
-                      <div
-                        class="ControlledSwitch-label-id"
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                        >
+                          Visible
+                          <span>
+                            since Aug 25, 2018
+                          </span>
+                        </span>
+                      </label>
+                      <label
+                        class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                       >
-                        Visible
-                        <div>
-                          since Aug 25, 2018
-                        </div>
-                      </div>
-                    </span>
-                  </label>
+                        <span
+                          class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
+                        >
+                          <span
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              class="MuiPrivateSwitchBase-input-id"
+                              name="isPublished"
+                              type="radio"
+                              value="false"
+                            />
+                          </span>
+                        </span>
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                        >
+                          Hidden
+                          <span />
+                        </span>
+                      </label>
+                    </div>
+                  </div>
                 </div>
                 <div
                   class="FormSpacer-spacer-id"
@@ -21974,43 +21533,22 @@ Ctrl + K"
                 <label
                   class="MuiFormControlLabel-root-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <button
+                    class="MuiButtonBase-root-id Checkbox-root-id"
+                    tabindex="0"
+                    type="button"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                    >
-                      <span
-                        class="MuiIconButton-label-id"
-                      >
-                        <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isFeatured"
-                          type="checkbox"
-                        />
-                      </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
+                    <input
+                      class="Checkbox-box-id Checkbox-checked-id"
+                      name="isFeatured"
+                      type="checkbox"
+                      value="true"
                     />
-                  </span>
+                  </button>
                   <span
                     class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                   >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      <span
-                        class="ControlledSwitch-labelText-id"
-                      >
-                        Feature on Homepage
-                      </span>
-                      <div />
-                    </div>
+                    Feature on Homepage
                   </span>
                 </label>
               </div>
@@ -22850,127 +22388,121 @@ Ctrl + K"
                 <div
                   class="VisibilityCard-switchContainer-id"
                 >
-                  <label
-                    class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                  <div
+                    class="MuiFormControl-root-id RadioGroupField-formControl-id"
                   >
-                    <span
-                      class="MuiSwitch-root-id"
+                    <div
+                      aria-label="isPublished"
+                      class="MuiFormGroup-root-id"
+                      role="radiogroup"
                     >
-                      <span
-                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                        tabindex="-1"
+                      <label
+                        class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                       >
                         <span
-                          class="MuiIconButton-label-id"
+                          class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                          tabindex="-1"
                         >
                           <span
-                            class="MuiSwitch-icon-id"
-                          />
-                          <input
-                            class="MuiPrivateSwitchBase-input-id"
-                            disabled=""
-                            name="isPublished"
-                            type="checkbox"
-                          />
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              class="MuiPrivateSwitchBase-input-id"
+                              disabled=""
+                              name="isPublished"
+                              type="radio"
+                              value="true"
+                            />
+                          </span>
                         </span>
-                      </span>
-                      <span
-                        class="MuiSwitch-bar-id"
-                      />
-                    </span>
-                    <span
-                      class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                    >
-                      <div
-                        class="ControlledSwitch-label-id"
-                      >
-                        Hidden
-                        <div />
-                      </div>
-                    </span>
-                  </label>
-                </div>
-                <div
-                  class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-                >
-                  <label
-                    class="MuiFormLabel-root-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                    data-shrink="true"
-                  >
-                    Publish on
-                  </label>
-                  <div
-                    class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                  >
-                    <fieldset
-                      aria-hidden="true"
-                      class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                      style="padding-left:8px"
-                    >
-                      <legend
-                        class="MuiPrivateNotchedOutline-legend-id"
-                        style="width:0"
-                      >
-                        <span>
-                          ​
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                        >
+                          Visible
+                          <span />
                         </span>
-                      </legend>
-                    </fieldset>
-                    <input
-                      aria-invalid="false"
-                      class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputType-id"
-                      disabled=""
-                      name="publicationDate"
-                      type="date"
-                      value=""
-                    />
+                      </label>
+                      <label
+                        class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
+                      >
+                        <span
+                          class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                          tabindex="-1"
+                        >
+                          <span
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              checked=""
+                              class="MuiPrivateSwitchBase-input-id"
+                              disabled=""
+                              name="isPublished"
+                              type="radio"
+                              value="false"
+                            />
+                          </span>
+                        </span>
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                        >
+                          Hidden
+                          <span />
+                        </span>
+                      </label>
+                    </div>
                   </div>
                 </div>
+                <p
+                  class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+                >
+                   Set publication date
+                </p>
                 <div
                   class="FormSpacer-spacer-id"
                 />
                 <label
                   class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <button
+                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                    disabled=""
+                    tabindex="-1"
+                    type="button"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                      tabindex="-1"
-                    >
-                      <span
-                        class="MuiIconButton-label-id"
-                      >
-                        <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          disabled=""
-                          name="isFeatured"
-                          type="checkbox"
-                        />
-                      </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
+                    <input
+                      class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                      disabled=""
+                      name="isFeatured"
+                      type="checkbox"
+                      value="true"
                     />
-                  </span>
+                  </button>
                   <span
                     class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                   >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      <span
-                        class="ControlledSwitch-labelText-id"
-                      >
-                        Feature on Homepage
-                      </span>
-                      <div />
-                    </div>
+                    Feature on Homepage
                   </span>
                 </label>
               </div>
@@ -23996,48 +23528,93 @@ Ctrl + K"
                 <div
                   class="VisibilityCard-expandedSwitchContainer-id"
                 >
-                  <label
-                    class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                  <div
+                    class="MuiFormControl-root-id RadioGroupField-formControl-id"
                   >
-                    <span
-                      class="MuiSwitch-root-id"
+                    <div
+                      aria-label="isPublished"
+                      class="MuiFormGroup-root-id"
+                      role="radiogroup"
                     >
-                      <span
-                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                        tabindex="-1"
+                      <label
+                        class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                       >
                         <span
-                          class="MuiIconButton-label-id"
+                          class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                          tabindex="-1"
                         >
                           <span
-                            class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                          />
-                          <input
-                            checked=""
-                            class="MuiPrivateSwitchBase-input-id"
-                            disabled=""
-                            name="isPublished"
-                            type="checkbox"
-                          />
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              checked=""
+                              class="MuiPrivateSwitchBase-input-id"
+                              disabled=""
+                              name="isPublished"
+                              type="radio"
+                              value="true"
+                            />
+                          </span>
                         </span>
-                      </span>
-                      <span
-                        class="MuiSwitch-bar-id"
-                      />
-                    </span>
-                    <span
-                      class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                    >
-                      <div
-                        class="ControlledSwitch-label-id"
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                        >
+                          Visible
+                          <span>
+                            since Aug 25, 2018
+                          </span>
+                        </span>
+                      </label>
+                      <label
+                        class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                       >
-                        Visible
-                        <div>
-                          since Aug 25, 2018
-                        </div>
-                      </div>
-                    </span>
-                  </label>
+                        <span
+                          class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                          tabindex="-1"
+                        >
+                          <span
+                            class="MuiIconButton-label-id"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root-id"
+                              focusable="false"
+                              role="presentation"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                              />
+                            </svg>
+                            <input
+                              class="MuiPrivateSwitchBase-input-id"
+                              disabled=""
+                              name="isPublished"
+                              type="radio"
+                              value="false"
+                            />
+                          </span>
+                        </span>
+                        <span
+                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                        >
+                          Hidden
+                          <span />
+                        </span>
+                      </label>
+                    </div>
+                  </div>
                 </div>
                 <div
                   class="FormSpacer-spacer-id"
@@ -24045,45 +23622,24 @@ Ctrl + K"
                 <label
                   class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <button
+                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                    disabled=""
+                    tabindex="-1"
+                    type="button"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                      tabindex="-1"
-                    >
-                      <span
-                        class="MuiIconButton-label-id"
-                      >
-                        <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          disabled=""
-                          name="isFeatured"
-                          type="checkbox"
-                        />
-                      </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
+                    <input
+                      class="Checkbox-box-id Checkbox-checked-id Checkbox-disabled-id"
+                      disabled=""
+                      name="isFeatured"
+                      type="checkbox"
+                      value="true"
                     />
-                  </span>
+                  </button>
                   <span
                     class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                   >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      <span
-                        class="ControlledSwitch-labelText-id"
-                      >
-                        Feature on Homepage
-                      </span>
-                      <div />
-                    </div>
+                    Feature on Homepage
                   </span>
                 </label>
               </div>
@@ -24125,22 +23681,7 @@ exports[`Storyshots Views / Collections / Collection list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add collection
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create collection
             </span>
           </button>
         </div>
@@ -24579,22 +24120,7 @@ exports[`Storyshots Views / Collections / Collection list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add collection
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create collection
             </span>
           </button>
         </div>
@@ -25424,79 +24950,93 @@ Ctrl + K"
                     <div
                       class="VisibilityCard-switchContainer-id"
                     >
-                      <label
-                        class="MuiFormControlLabel-root-id"
+                      <div
+                        class="MuiFormControl-root-id RadioGroupField-formControl-id"
                       >
-                        <span
-                          class="MuiSwitch-root-id"
+                        <div
+                          aria-label="isPublished"
+                          class="MuiFormGroup-root-id"
+                          role="radiogroup"
                         >
-                          <span
-                            class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
+                          <label
+                            class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                           >
                             <span
-                              class="MuiIconButton-label-id"
+                              class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
                             >
                               <span
-                                class="MuiSwitch-icon-id"
-                              />
-                              <input
-                                class="MuiPrivateSwitchBase-input-id"
-                                name="isPublished"
-                                type="checkbox"
-                              />
+                                class="MuiIconButton-label-id"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="MuiSvgIcon-root-id"
+                                  focusable="false"
+                                  role="presentation"
+                                  viewBox="0 0 24 24"
+                                >
+                                  <path
+                                    d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                                  />
+                                </svg>
+                                <input
+                                  class="MuiPrivateSwitchBase-input-id"
+                                  name="isPublished"
+                                  type="radio"
+                                  value="true"
+                                />
+                              </span>
                             </span>
-                          </span>
-                          <span
-                            class="MuiSwitch-bar-id"
-                          />
-                        </span>
-                        <span
-                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                        >
-                          <div
-                            class="ControlledSwitch-label-id"
-                          >
-                            Hidden
-                            <div />
-                          </div>
-                        </span>
-                      </label>
-                    </div>
-                    <div
-                      class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-                    >
-                      <label
-                        class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                        data-shrink="true"
-                      >
-                        Publish on
-                      </label>
-                      <div
-                        class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                      >
-                        <fieldset
-                          aria-hidden="true"
-                          class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                          style="padding-left:8px"
-                        >
-                          <legend
-                            class="MuiPrivateNotchedOutline-legend-id"
-                            style="width:0"
-                          >
-                            <span>
-                              ​
+                            <span
+                              class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                            >
+                              Visible
+                              <span />
                             </span>
-                          </legend>
-                        </fieldset>
-                        <input
-                          aria-invalid="false"
-                          class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputType-id"
-                          name="publicationDate"
-                          type="date"
-                          value=""
-                        />
+                          </label>
+                          <label
+                            class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
+                          >
+                            <span
+                              class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
+                            >
+                              <span
+                                class="MuiIconButton-label-id"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="MuiSvgIcon-root-id"
+                                  focusable="false"
+                                  role="presentation"
+                                  viewBox="0 0 24 24"
+                                >
+                                  <path
+                                    d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                                  />
+                                </svg>
+                                <input
+                                  checked=""
+                                  class="MuiPrivateSwitchBase-input-id"
+                                  name="isPublished"
+                                  type="radio"
+                                  value="false"
+                                />
+                              </span>
+                            </span>
+                            <span
+                              class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                            >
+                              Hidden
+                              <span />
+                            </span>
+                          </label>
+                        </div>
                       </div>
                     </div>
+                    <p
+                      class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+                    >
+                       Set publication date
+                    </p>
                     <div
                       class="FormSpacer-spacer-id"
                     />
@@ -26111,82 +25651,97 @@ Ctrl + K"
                     <div
                       class="VisibilityCard-switchContainer-id"
                     >
-                      <label
-                        class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                      <div
+                        class="MuiFormControl-root-id RadioGroupField-formControl-id"
                       >
-                        <span
-                          class="MuiSwitch-root-id"
+                        <div
+                          aria-label="isPublished"
+                          class="MuiFormGroup-root-id"
+                          role="radiogroup"
                         >
-                          <span
-                            class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                            tabindex="-1"
+                          <label
+                            class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                           >
                             <span
-                              class="MuiIconButton-label-id"
+                              class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                              tabindex="-1"
                             >
                               <span
-                                class="MuiSwitch-icon-id"
-                              />
-                              <input
-                                class="MuiPrivateSwitchBase-input-id"
-                                disabled=""
-                                name="isPublished"
-                                type="checkbox"
-                              />
+                                class="MuiIconButton-label-id"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="MuiSvgIcon-root-id"
+                                  focusable="false"
+                                  role="presentation"
+                                  viewBox="0 0 24 24"
+                                >
+                                  <path
+                                    d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                                  />
+                                </svg>
+                                <input
+                                  class="MuiPrivateSwitchBase-input-id"
+                                  disabled=""
+                                  name="isPublished"
+                                  type="radio"
+                                  value="true"
+                                />
+                              </span>
                             </span>
-                          </span>
-                          <span
-                            class="MuiSwitch-bar-id"
-                          />
-                        </span>
-                        <span
-                          class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                        >
-                          <div
-                            class="ControlledSwitch-label-id"
-                          >
-                            Hidden
-                            <div />
-                          </div>
-                        </span>
-                      </label>
-                    </div>
-                    <div
-                      class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-                    >
-                      <label
-                        class="MuiFormLabel-root-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                        data-shrink="true"
-                      >
-                        Publish on
-                      </label>
-                      <div
-                        class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                      >
-                        <fieldset
-                          aria-hidden="true"
-                          class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                          style="padding-left:8px"
-                        >
-                          <legend
-                            class="MuiPrivateNotchedOutline-legend-id"
-                            style="width:0"
-                          >
-                            <span>
-                              ​
+                            <span
+                              class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                            >
+                              Visible
+                              <span />
                             </span>
-                          </legend>
-                        </fieldset>
-                        <input
-                          aria-invalid="false"
-                          class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputType-id"
-                          disabled=""
-                          name="publicationDate"
-                          type="date"
-                          value=""
-                        />
+                          </label>
+                          <label
+                            class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
+                          >
+                            <span
+                              class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                              tabindex="-1"
+                            >
+                              <span
+                                class="MuiIconButton-label-id"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="MuiSvgIcon-root-id"
+                                  focusable="false"
+                                  role="presentation"
+                                  viewBox="0 0 24 24"
+                                >
+                                  <path
+                                    d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                                  />
+                                </svg>
+                                <input
+                                  checked=""
+                                  class="MuiPrivateSwitchBase-input-id"
+                                  disabled=""
+                                  name="isPublished"
+                                  type="radio"
+                                  value="false"
+                                />
+                              </span>
+                            </span>
+                            <span
+                              class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                            >
+                              Hidden
+                              <span />
+                            </span>
+                          </label>
+                        </div>
                       </div>
                     </div>
+                    <p
+                      class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+                    >
+                       Set publication date
+                    </p>
                     <div
                       class="FormSpacer-spacer-id"
                     />
@@ -26226,516 +25781,414 @@ exports[`Storyshots Views / Configuration default 1`] = `
       </div>
     </div>
     <div
-      class="ConfigurationPage-root-id"
+      class="ConfigurationPage-configurationCategory-id"
     >
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationLabel-id"
       >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
         >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M40.1538 15.3077C40.1538 18.8763 37.2609 21.7692 33.6923 21.7692C30.1237 21.7692 27.2308 18.8763 27.2308 15.3077C27.2308 11.7391 30.1237 8.84615 33.6923 8.84615C37.2609 8.84615 40.1538 11.7391 40.1538 15.3077ZM42 15.3077C42 19.8959 38.2805 23.6154 33.6923 23.6154C29.1041 23.6154 25.3846 19.8959 25.3846 15.3077C25.3846 10.7195 29.1041 7 33.6923 7C38.2805 7 42 10.7195 42 15.3077ZM20.7692 14.3846H7.84615V27.3077H20.7692V14.3846ZM6 12.5385V29.1538H22.6154V12.5385H6ZM28.1554 24.5385L18.5625 41.1538H37.7483L28.1554 24.5385ZM28.1554 28.2308L21.7601 39.3077H34.5507L28.1554 28.2308Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="35.808"
-                  y1="7"
-                  y2="46.78"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Attributes
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Determine attributes used to create product types
-            </p>
-          </div>
-        </div>
+          Attributes and Product Types
+        </p>
       </div>
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationItem-id"
       >
         <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
         >
           <div
-            class="ConfigurationPage-icon-id"
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              <path
-                clip-rule="evenodd"
-                d="M40.1538 15.3077C40.1538 18.8763 37.2609 21.7692 33.6923 21.7692C30.1237 21.7692 27.2308 18.8763 27.2308 15.3077C27.2308 11.7391 30.1237 8.84615 33.6923 8.84615C37.2609 8.84615 40.1538 11.7391 40.1538 15.3077ZM42 15.3077C42 19.8959 38.2805 23.6154 33.6923 23.6154C29.1041 23.6154 25.3846 19.8959 25.3846 15.3077C25.3846 10.7195 29.1041 7 33.6923 7C38.2805 7 42 10.7195 42 15.3077ZM20.7692 14.3846H7.84615V27.3077H20.7692V14.3846ZM6 12.5385V29.1538H22.6154V12.5385H6ZM28.1554 24.5385L18.5625 41.1538H37.7483L28.1554 24.5385ZM28.1554 28.2308L21.7601 39.3077H34.5507L28.1554 28.2308Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="35.808"
-                  y1="7"
-                  y2="46.78"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Product Types
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Define types of products you sell
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M24 13.2C24 16.1823 21.5823 18.6 18.6 18.6C15.6177 18.6 13.2 16.1823 13.2 13.2C13.2 10.2177 15.6177 7.8 18.6 7.8C21.5823 7.8 24 10.2177 24 13.2ZM25.8 13.2C25.8 17.1764 22.5765 20.4 18.6 20.4C14.6236 20.4 11.4 17.1764 11.4 13.2C11.4 9.22355 14.6236 6 18.6 6C22.5765 6 25.8 9.22355 25.8 13.2ZM8.0821 40.2L10.449 24H25.851L26.7355 30.0541L26.7 30.3H26.7715L28.2179 40.2H8.0821ZM28.5906 30.3L30.3 42H6L8.89286 22.2H27.4071L27.6403 23.7956L28.5214 17.7H34.35H40.1786L42 30.3H28.5906ZM34.35 17.7C31.6162 17.7 29.4 15.4838 29.4 12.75C29.4 10.0162 31.6162 7.8 34.35 7.8C37.0838 7.8 39.3 10.0162 39.3 12.75C39.3 15.4838 37.0838 17.7 34.35 17.7ZM34.35 15.9C36.0897 15.9 37.5 14.4897 37.5 12.75C37.5 11.0103 36.0897 9.6 34.35 9.6C32.6103 9.6 31.2 11.0103 31.2 12.75C31.2 14.4897 32.6103 15.9 34.35 15.9ZM28.7789 28.5L30.0799 19.5H38.6201L39.9211 28.5H28.7789Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="37.8615"
-                  y1="6"
-                  y2="46.2508"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Staff Members
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage your employees and their permissions
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M6 6H32.4V17.04H42V35.6776L35.6776 42H12.72V23.8424L14.2424 22.32H6V6ZM30.48 9.02192V17.04H19.5224L16.1624 20.4H7.92V8.77191L19.4404 14.7625L30.48 9.02192ZM28.4374 7.92H10.4434L19.4404 12.5984L28.4374 7.92ZM17.04 22.32H16.9576L15.9976 23.28H34.4025L38.7225 18.96H20.3176L17.04 22.2376V22.32ZM35.28 25.1178L40.08 20.3178V34.8824L35.28 39.6824V25.1178ZM14.64 25.2V40.08H33.36V25.2H14.64ZM22.8 33.84H30V31.92H22.8V33.84ZM22.8 37.2H28.56V35.28H22.8V37.2Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="6"
-                  x2="45.6"
-                  y1="6"
-                  y2="47.1429"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Shipping Methods
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage how you ship out orders
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M8 6H37.3684V24.9474H35.4737V7.89474H9.89474V40.1053H35.4737V37.7368H37.3684V42H8V6ZM13.6848 24H16.5269V26.8421H13.6848V24ZM21.2624 24H18.4203V26.8421H21.2624V24ZM23.1594 24H26.0015V26.8421H23.1594V24ZM30.737 24H27.8949V26.8421H30.737V24ZM13.6848 28.7355H16.5269V31.5777H13.6848V28.7355ZM21.2624 28.7355H18.4203V31.5777H21.2624V28.7355ZM23.1594 28.7355H26.0015V31.5777H23.1594V28.7355ZM16.5269 33.4746H13.6848V36.3167H16.5269V33.4746ZM18.4203 33.4746H21.2624V36.3167H18.4203V33.4746ZM26.0015 33.4746H23.1594V36.3167H26.0015V33.4746ZM29.79 14.5252H15.5795V19.262H29.79V14.5252ZM13.6848 12.6305V21.1568H31.6848V12.6305H13.6848ZM40.2116 33.4746H37.3695V36.3167H40.2116V33.4746ZM31.6848 27.7898H34.5269V30.632H31.6848V27.7898ZM32.3531 36.9845L40.8794 28.4581L39.5396 27.1184L31.0133 35.6447L32.3531 36.9845Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="7.03296"
-                  x2="40.4173"
-                  y1="6"
-                  y2="43.2798"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Taxes
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage how your store charges tax
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M23.5868 40.7841C32.5324 40.7841 39.7841 33.5324 39.7841 24.5868C39.7841 15.6413 32.5324 8.38954 23.5868 8.38954C14.6413 8.38954 7.38954 15.6413 7.38954 24.5868C7.38954 33.5324 14.6413 40.7841 23.5868 40.7841ZM23.5868 42.5838C33.5263 42.5838 41.5838 34.5263 41.5838 24.5868C41.5838 14.6474 33.5263 6.58984 23.5868 6.58984C13.6474 6.58984 5.58984 14.6474 5.58984 24.5868C5.58984 34.5263 13.6474 42.5838 23.5868 42.5838Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <path
-                clip-rule="evenodd"
-                d="M30.4053 12.7808L17.5705 20.8424L22.3034 23.575C22.7981 22.9452 23.6933 22.7584 24.407 23.1704C25.1207 23.5825 25.4065 24.4512 25.1084 25.1945L29.8412 27.9269L30.4053 12.7808ZM22.0683 23.9832C21.7721 24.7258 22.0581 25.5927 22.7709 26.0042C23.4837 26.4158 24.3774 26.23 24.8725 25.6022L29.6052 28.3346L16.7703 36.3963L17.3345 21.2501L22.0683 23.9832ZM28.4802 16.1153L21.0575 20.7775L28.1539 24.8747L28.4802 16.1153Z"
-                fill="url(#paint1_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.5312"
-                  x2="37.4461"
-                  y1="6.58984"
-                  y2="46.8339"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint1_linear"
-                  x1="23.9086"
-                  x2="36.5382"
-                  y1="9.02991"
-                  y2="33.2176"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Navigation
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Define how users can navigate through your store
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M34.6387 11.9972L33.7134 14.5158L34.3905 15.2663C35.8323 16.8641 36.9274 18.7948 37.5523 20.9335L37.8454 21.9364L40.3256 22.3641V27.8214L37.8454 28.2491L37.5524 29.252C36.9666 31.2566 35.9678 33.0786 34.6575 34.615L34.0222 35.36L34.9932 38.0028L30.0553 40.8475L28.4228 38.897L27.4032 39.1548C26.3148 39.43 25.1752 39.5765 24 39.5765C22.8248 39.5765 21.6852 39.43 20.5968 39.1548L19.5772 38.897L17.9447 40.8475L13.0068 38.0028L13.9778 35.36L13.3425 34.615C12.0322 33.0786 11.0334 31.2566 10.4476 29.252L10.1546 28.2491L7.67442 27.8214L7.67442 22.3641L10.1546 21.9364L10.4477 20.9335C11.0726 18.7948 12.1677 16.8641 13.6095 15.2663L14.2866 14.5158L13.3612 11.9972L18.2992 9.15248L19.9813 11.1624L20.9758 10.9407C21.9487 10.7237 22.9603 10.6092 24 10.6092C25.0397 10.6092 26.0513 10.7237 27.0242 10.9407L28.0187 11.1624L29.7008 9.15248L34.6387 11.9972ZM42 29.2318V20.9537L39.1595 20.4639C38.4629 18.0799 37.2421 15.927 35.6337 14.1445L36.6969 11.2506L29.3188 7L27.3886 9.30636C26.2969 9.06298 25.1631 8.93475 24 8.93475C22.8369 8.93475 21.7031 9.06298 20.6114 9.30636L18.6812 7L11.303 11.2506L12.3663 14.1445C10.7579 15.927 9.53708 18.0799 8.84047 20.4639L6 20.9537V29.2318L8.84043 29.7216C9.49337 31.9562 10.6069 33.9878 12.0685 35.7016L10.9486 38.7495L18.3267 43L20.1863 40.7781C21.4077 41.087 22.6851 41.2509 24 41.2509C25.3149 41.2509 26.5923 41.087 27.8137 40.7781L29.6733 43L37.0514 38.7495L35.9315 35.7016C37.3931 33.9878 38.5066 31.9562 39.1596 29.7216L42 29.2318ZM31.5996 25.0013C31.5996 29.1977 28.1977 32.5996 24.0013 32.5996C19.8049 32.5996 16.403 29.1977 16.403 25.0013C16.403 20.8049 19.8049 17.403 24.0013 17.403C28.1977 17.403 31.5996 20.8049 31.5996 25.0013ZM33.274 25.0013C33.274 30.1225 29.1225 34.274 24.0013 34.274C18.8801 34.274 14.7286 30.1225 14.7286 25.0013C14.7286 19.8801 18.8801 15.7286 24.0013 15.7286C29.1225 15.7286 33.274 19.8801 33.274 25.0013Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="37.8615"
-                  y1="7"
-                  y2="47.2508"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Site Settings
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              View and update your site settings
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M22.3617 7H35.5267L42.0006 13.4739V36.5548H28.2148V34.7644H40.2103V14.2155L40.012 14.0172H34.8V8.80523L34.7851 8.79036H24.1521V12.3573H22.3617V7ZM6 11.4613H19.165L25.6389 17.9352V41.0161H24.7437H6V11.4613ZM18.6 13.4283V19.4172H23.8485V39.2257H7.79036V13.2517H18.4234L18.6 13.4283ZM22.2 23.0172H9.6V25.7172H22.2V23.0172ZM9.6 27.5172H22.2V30.2172H9.6V27.5172ZM37.5 16.7172H28.5V19.4172H37.5V16.7172ZM28.5 21.2172H37.5V31.1172H28.5V21.2172ZM22.2 32.0172H9.6V34.7172H22.2V32.0172Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94116"
-                  x2="35.6523"
-                  y1="7"
-                  y2="46.7403"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Pages
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage and add additional pages
-            </p>
-          </div>
-        </div>
-      </div>
-      <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
-      >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
-        >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              preserveAspectRatio="xMinYMin meet"
-              role="presentation"
-              viewBox="-8 -5 44 44"
-            >
-              <g>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
                 <path
                   clip-rule="evenodd"
-                  d="M7.12891 6.10352e-05H12.9999V7.80006H18.7418V6.10352e-05H24.6128V7.80006H31.9999V14.6751H29.0967V29.7876H20.7418V33.6876H16.8708V40.0001H14.8708V33.6876H10.9999V29.7876H2.9031V14.6751H-0.00012207V7.80006H7.12891V6.10352e-05ZM9.12891 7.80006H10.9999V2.00006H9.12891V7.80006ZM4.9031 14.6751V27.7876H27.0967V14.6751H4.9031ZM12.9999 29.7876V31.6876H18.7418V29.7876H12.9999ZM22.6128 7.80006V2.00006H20.7418V7.80006H22.6128ZM1.99988 9.80006V12.6751H29.9999V9.80006H1.99988Z"
+                  d="M37.9487 10.4808C37.9487 14.4459 34.7343 17.6603 30.7692 17.6603C26.8041 17.6603 23.5897 14.4459 23.5897 10.4808C23.5897 6.51565 26.8041 3.30128 30.7692 3.30128C34.7343 3.30128 37.9487 6.51565 37.9487 10.4808ZM40 10.4808C40 15.5788 35.8672 19.7115 30.7692 19.7115C25.6712 19.7115 21.5385 15.5788 21.5385 10.4808C21.5385 5.38275 25.6712 1.25 30.7692 1.25C35.8672 1.25 40 5.38275 40 10.4808ZM16.4103 9.45484H2.05128V23.8138H16.4103V9.45484ZM0 7.40356V25.8651H18.4615V7.40356H0ZM24.6154 20.7371L13.9566 39.1987H35.2741L24.6154 20.7371ZM24.6154 24.8397L17.5095 37.1474H31.7212L24.6154 24.8397Z"
                   fill="#06847B"
                   fill-rule="evenodd"
                 />
-              </g>
-            </svg>
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Attributes
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Determine attributes used to create product types
+              </p>
+            </div>
           </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              Plugins
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M0 6.5V33L20 40L40 33V6.5L20 0L0 6.5ZM2.5 8.69935V31.2263L18.75 36.9138V14.3869L2.5 8.69935ZM21.25 14.3869V36.9138L37.5 31.2263V8.69935L21.25 14.3869ZM34.1436 7.22539L20 2.62872L5.8564 7.22539L20 12.1756L34.1436 7.22539Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Product Types
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Define types of products you sell
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
+      <div
+        class="ConfigurationPage-configurationLabel-id"
+      >
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
+        >
+          Product Settings
+        </p>
+      </div>
+      <div
+        class="ConfigurationPage-configurationItem-id"
+      >
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              View and update your plugins and their settings.
-            </p>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M0 0H29.3333V12.2666H40V32.9751L32.9752 40H7.4667V19.8248L9.15816 18.1333H0V0ZM27.2 3.35694V12.2666H15.0249L11.2915 16H2.13333V3.07966L14.9333 9.73563L27.2 3.35694ZM24.929 2.13333H4.93756L14.9333 7.33111L24.929 2.13333ZM12.2667 18.1333H12.1752L11.1085 19.2H31.5582L36.3582 14.4H15.9085L12.2667 18.0418V18.1333ZM32.5334 21.2418L37.8667 15.9085V32.0915L32.5334 37.4248V21.2418ZM9.60003 21.3333V37.8666H30.4V21.3333H9.60003ZM18.6667 30.9333H26.6667V28.8H18.6667V30.9333ZM18.6667 34.6666H25.0667V32.5333H18.6667V34.6666Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Shipping Methods
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage how you ship out orders
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M2 0H34.6316V21.0526H32.5263V2.10526H4.10526V37.8947H32.5263V35.2632H34.6316V40H2V0ZM8.31579 20H11.4737V23.1579H8.31579V20ZM16.7368 20H13.5789V23.1579H16.7368V20ZM18.8421 20H22V23.1579H18.8421V20ZM27.2632 20H24.1053V23.1579H27.2632V20ZM8.31579 25.2632H11.4737V28.4211H8.31579V25.2632ZM16.7368 25.2632H13.5789V28.4211H16.7368V25.2632ZM18.8421 25.2632H22V28.4211H18.8421V25.2632ZM11.4737 30.5263H8.31579V33.6842H11.4737V30.5263ZM13.5789 30.5263H16.7368V33.6842H13.5789V30.5263ZM22 30.5263H18.8421V33.6842H22V30.5263ZM26.2105 9.47368H10.4211V14.7368H26.2105V9.47368ZM8.31579 7.36842V16.8421H28.3158V7.36842H8.31579ZM37.7895 30.5263H34.6316V33.6842H37.7895V30.5263ZM28.3158 24.2105H31.4737V27.3684H28.3158V24.2105ZM29.0602 34.4285L38.5339 24.9548L37.0452 23.4662L27.5715 32.9398L29.0602 34.4285Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Taxes
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage how your store charges tax
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
+      <div
+        class="ConfigurationPage-configurationLabel-id"
+      >
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
+        >
+          Staff Settings
+        </p>
+      </div>
+      <div
+        class="ConfigurationPage-configurationItem-id"
+      >
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M20 8C20 11.3137 17.3137 14 14 14C10.6863 14 8 11.3137 8 8C8 4.68629 10.6863 2 14 2C17.3137 2 20 4.68629 20 8ZM22 8C22 12.4183 18.4183 16 14 16C9.58172 16 6 12.4183 6 8C6 3.58172 9.58172 0 14 0C18.4183 0 22 3.58172 22 8ZM2.31344 38L4.94331 20H22.0567L23.0395 26.7268L23 27H23.0794L24.6866 38H2.31344ZM25.1006 27L27 40H0L3.21429 18H23.7857L24.0447 19.7729L25.0238 13H31.5H37.9762L40 27H25.1006ZM31.5 13C28.4624 13 26 10.5376 26 7.5C26 4.46243 28.4624 2 31.5 2C34.5376 2 37 4.46243 37 7.5C37 10.5376 34.5376 13 31.5 13ZM31.5 11C33.433 11 35 9.433 35 7.5C35 5.567 33.433 4 31.5 4C29.567 4 28 5.567 28 7.5C28 9.433 29.567 11 31.5 11ZM25.3099 25L26.7555 15H36.2445L37.6901 25H25.3099Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Staff Members
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage your employees and their permissions
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
+      <div
+        class="ConfigurationPage-configurationLabel-id"
+      >
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
+        >
+          Miscellaneous
+        </p>
+      </div>
+      <div
+        class="ConfigurationPage-configurationItem-id"
+      >
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M35.9075 11.3232C40.8772 19.931 37.928 30.9378 29.3202 35.9075C20.7123 40.8772 9.70553 37.928 4.7358 29.3201C-0.233933 20.7123 2.71533 9.70553 11.3232 4.7358C19.931 -0.233933 30.9378 2.71533 35.9075 11.3232ZM37.6393 10.3233C43.1612 19.8876 39.8842 32.1173 30.32 37.6393C20.7557 43.1612 8.52596 39.8842 3.00404 30.32C-2.51789 20.7557 0.759069 8.52596 10.3233 3.00404C19.8876 -2.51789 32.1173 0.759069 37.6393 10.3233ZM14.9402 14.5709L31.0335 9.60975L26.0724 25.7031L21.7789 21.4096C22.3117 20.6975 22.2544 19.6836 21.6072 19.0364C20.9599 18.3891 19.946 18.3319 19.2339 18.8647L14.9402 14.5709ZM19.0359 21.6077C18.3884 20.9602 18.3314 19.946 18.8646 19.2338L14.571 14.9402L9.6098 31.0335L25.7032 26.0723L21.4097 21.7789C20.6976 22.3122 19.6833 22.2551 19.0359 21.6077ZM18.7012 15.504L28.0085 12.6348L25.1393 21.9421L18.7012 15.504Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Navigation
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Define how users can navigate through your store
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M31.8208 5.55248L30.7926 8.35093L31.545 9.18475C33.147 10.9601 34.3637 13.1054 35.0581 15.4817L35.3837 16.596L38.1395 17.0712V23.1349L35.3838 23.6101L35.0582 24.7244C34.4073 26.9518 33.2976 28.9763 31.8417 30.6834L31.1357 31.5111L32.2146 34.4475L26.7281 37.6084L24.9142 35.4411L23.7814 35.7276C22.572 36.0334 21.3058 36.1961 20 36.1961C18.6942 36.1961 17.428 36.0334 16.2186 35.7276L15.0858 35.4411L13.2719 37.6084L7.78535 34.4475L8.86424 31.5111L8.15831 30.6834C6.70243 28.9763 5.59267 26.9518 4.94182 24.7244L4.61622 23.6101L1.86047 23.1349L1.86047 17.0712L4.61625 16.596L4.94186 15.4817C5.63625 13.1054 6.85296 10.9601 8.45495 9.18475L9.20736 8.35093L8.17916 5.55248L13.6657 2.39164L15.5348 4.62486L16.6397 4.37851C17.7208 4.1375 18.8448 4.01018 20 4.01018C21.1552 4.01018 22.2792 4.1375 23.3603 4.37851L24.4652 4.62486L26.3343 2.39164L31.8208 5.55248ZM40 24.702V15.5042L36.8439 14.9599C36.0699 12.311 34.7134 9.91885 32.9263 7.93836L34.1077 4.72285L25.9098 0L23.7651 2.56262C22.5521 2.2922 21.2924 2.14972 20 2.14972C18.7076 2.14972 17.4479 2.2922 16.2349 2.56262L14.0902 0L5.89227 4.72285L7.07371 7.93836C5.28657 9.91885 3.93009 12.311 3.15607 14.9599L0 15.5042V24.702L3.15603 25.2462C3.88152 27.7291 5.11876 29.9864 6.74273 31.8906L5.49846 35.2772L13.6964 40L15.7625 37.5313C17.1197 37.8744 18.539 38.0565 20 38.0565C21.461 38.0565 22.8803 37.8744 24.2375 37.5313L26.3036 40L34.5015 35.2772L33.2573 31.8906C34.8812 29.9864 36.1185 27.7291 36.844 25.2462L40 24.702ZM28.4425 20C28.4425 24.6627 24.6627 28.4425 20 28.4425C15.3373 28.4425 11.5574 24.6627 11.5574 20C11.5574 15.3373 15.3373 11.5574 20 11.5574C24.6627 11.5574 28.4425 15.3373 28.4425 20ZM30.303 20C30.303 25.6902 25.6902 30.303 20 30.303C14.3097 30.303 9.69693 25.6902 9.69693 20C9.69693 14.3097 14.3097 9.69693 20 9.69693C25.6902 9.69693 30.303 14.3097 30.303 20Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Site Settings
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                View and update your site settings
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M18.179 1.20349H32.8068L40 8.39671V34.0421H24.6825V32.0528H38.0107V9.2207L37.79 9H32V3.20999L31.9828 3.19278H20.1683V7.15606H18.179V1.20349ZM0 6.16142H14.6278L21.821 13.3546V39H20.8264H0V6.16142ZM14 8.34692V15H19.8317V37.0107H1.98929V8.15071H13.8038L14 8.34692ZM18 19H4V22H18V19ZM4 24H18V27H4V24ZM35 12H25V15H35V12ZM25 17H35V28H25V17ZM18 29H4V32H18V29Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Pages
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage and add additional pages
+              </p>
+            </div>
+          </div>
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
+            >
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                preserveAspectRatio="xMinYMin meet"
+                role="presentation"
+                viewBox="-8 -5 44 44"
+              >
+                <g>
+                  <path
+                    clip-rule="evenodd"
+                    d="M7.12891 6.10352e-05H12.9999V7.80006H18.7418V6.10352e-05H24.6128V7.80006H31.9999V14.6751H29.0967V29.7876H20.7418V33.6876H16.8708V40.0001H14.8708V33.6876H10.9999V29.7876H2.9031V14.6751H-0.00012207V7.80006H7.12891V6.10352e-05ZM9.12891 7.80006H10.9999V2.00006H9.12891V7.80006ZM4.9031 14.6751V27.7876H27.0967V14.6751H4.9031ZM12.9999 29.7876V31.6876H18.7418V29.7876H12.9999ZM22.6128 7.80006V2.00006H20.7418V7.80006H22.6128ZM1.99988 9.80006V12.6751H29.9999V9.80006H1.99988Z"
+                    fill="#06847B"
+                    fill-rule="evenodd"
+                  />
+                </g>
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Plugins
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                View and update your plugins and their settings.
+              </p>
+            </div>
           </div>
         </div>
       </div>
@@ -26768,307 +26221,258 @@ exports[`Storyshots Views / Configuration partial access 1`] = `
       </div>
     </div>
     <div
-      class="ConfigurationPage-root-id"
+      class="ConfigurationPage-configurationCategory-id"
     >
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationLabel-id"
+      >
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
+        >
+          Attributes and Product Types
+        </p>
+      </div>
+      <div
+        class="ConfigurationPage-configurationItem-id"
       >
         <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
         >
           <div
-            class="ConfigurationPage-icon-id"
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              <path
-                clip-rule="evenodd"
-                d="M40.1538 15.3077C40.1538 18.8763 37.2609 21.7692 33.6923 21.7692C30.1237 21.7692 27.2308 18.8763 27.2308 15.3077C27.2308 11.7391 30.1237 8.84615 33.6923 8.84615C37.2609 8.84615 40.1538 11.7391 40.1538 15.3077ZM42 15.3077C42 19.8959 38.2805 23.6154 33.6923 23.6154C29.1041 23.6154 25.3846 19.8959 25.3846 15.3077C25.3846 10.7195 29.1041 7 33.6923 7C38.2805 7 42 10.7195 42 15.3077ZM20.7692 14.3846H7.84615V27.3077H20.7692V14.3846ZM6 12.5385V29.1538H22.6154V12.5385H6ZM28.1554 24.5385L18.5625 41.1538H37.7483L28.1554 24.5385ZM28.1554 28.2308L21.7601 39.3077H34.5507L28.1554 28.2308Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="35.808"
-                  y1="7"
-                  y2="46.78"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M37.9487 10.4808C37.9487 14.4459 34.7343 17.6603 30.7692 17.6603C26.8041 17.6603 23.5897 14.4459 23.5897 10.4808C23.5897 6.51565 26.8041 3.30128 30.7692 3.30128C34.7343 3.30128 37.9487 6.51565 37.9487 10.4808ZM40 10.4808C40 15.5788 35.8672 19.7115 30.7692 19.7115C25.6712 19.7115 21.5385 15.5788 21.5385 10.4808C21.5385 5.38275 25.6712 1.25 30.7692 1.25C35.8672 1.25 40 5.38275 40 10.4808ZM16.4103 9.45484H2.05128V23.8138H16.4103V9.45484ZM0 7.40356V25.8651H18.4615V7.40356H0ZM24.6154 20.7371L13.9566 39.1987H35.2741L24.6154 20.7371ZM24.6154 24.8397L17.5095 37.1474H31.7212L24.6154 24.8397Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Attributes
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Determine attributes used to create product types
+              </p>
+            </div>
           </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              Attributes
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Determine attributes used to create product types
-            </p>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M0 6.5V33L20 40L40 33V6.5L20 0L0 6.5ZM2.5 8.69935V31.2263L18.75 36.9138V14.3869L2.5 8.69935ZM21.25 14.3869V36.9138L37.5 31.2263V8.69935L21.25 14.3869ZM34.1436 7.22539L20 2.62872L5.8564 7.22539L20 12.1756L34.1436 7.22539Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Product Types
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Define types of products you sell
+              </p>
+            </div>
           </div>
         </div>
       </div>
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationLabel-id"
+      >
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
+        >
+          Product Settings
+        </p>
+      </div>
+      <div
+        class="ConfigurationPage-configurationItem-id"
       >
         <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
         >
           <div
-            class="ConfigurationPage-icon-id"
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              <path
-                clip-rule="evenodd"
-                d="M40.1538 15.3077C40.1538 18.8763 37.2609 21.7692 33.6923 21.7692C30.1237 21.7692 27.2308 18.8763 27.2308 15.3077C27.2308 11.7391 30.1237 8.84615 33.6923 8.84615C37.2609 8.84615 40.1538 11.7391 40.1538 15.3077ZM42 15.3077C42 19.8959 38.2805 23.6154 33.6923 23.6154C29.1041 23.6154 25.3846 19.8959 25.3846 15.3077C25.3846 10.7195 29.1041 7 33.6923 7C38.2805 7 42 10.7195 42 15.3077ZM20.7692 14.3846H7.84615V27.3077H20.7692V14.3846ZM6 12.5385V29.1538H22.6154V12.5385H6ZM28.1554 24.5385L18.5625 41.1538H37.7483L28.1554 24.5385ZM28.1554 28.2308L21.7601 39.3077H34.5507L28.1554 28.2308Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94118"
-                  x2="35.808"
-                  y1="7"
-                  y2="46.78"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Product Types
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Define types of products you sell
-            </p>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M2 0H34.6316V21.0526H32.5263V2.10526H4.10526V37.8947H32.5263V35.2632H34.6316V40H2V0ZM8.31579 20H11.4737V23.1579H8.31579V20ZM16.7368 20H13.5789V23.1579H16.7368V20ZM18.8421 20H22V23.1579H18.8421V20ZM27.2632 20H24.1053V23.1579H27.2632V20ZM8.31579 25.2632H11.4737V28.4211H8.31579V25.2632ZM16.7368 25.2632H13.5789V28.4211H16.7368V25.2632ZM18.8421 25.2632H22V28.4211H18.8421V25.2632ZM11.4737 30.5263H8.31579V33.6842H11.4737V30.5263ZM13.5789 30.5263H16.7368V33.6842H13.5789V30.5263ZM22 30.5263H18.8421V33.6842H22V30.5263ZM26.2105 9.47368H10.4211V14.7368H26.2105V9.47368ZM8.31579 7.36842V16.8421H28.3158V7.36842H8.31579ZM37.7895 30.5263H34.6316V33.6842H37.7895V30.5263ZM28.3158 24.2105H31.4737V27.3684H28.3158V24.2105ZM29.0602 34.4285L38.5339 24.9548L37.0452 23.4662L27.5715 32.9398L29.0602 34.4285Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Taxes
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage how your store charges tax
+              </p>
+            </div>
           </div>
         </div>
       </div>
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationLabel-id"
       >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
         >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M8 6H37.3684V24.9474H35.4737V7.89474H9.89474V40.1053H35.4737V37.7368H37.3684V42H8V6ZM13.6848 24H16.5269V26.8421H13.6848V24ZM21.2624 24H18.4203V26.8421H21.2624V24ZM23.1594 24H26.0015V26.8421H23.1594V24ZM30.737 24H27.8949V26.8421H30.737V24ZM13.6848 28.7355H16.5269V31.5777H13.6848V28.7355ZM21.2624 28.7355H18.4203V31.5777H21.2624V28.7355ZM23.1594 28.7355H26.0015V31.5777H23.1594V28.7355ZM16.5269 33.4746H13.6848V36.3167H16.5269V33.4746ZM18.4203 33.4746H21.2624V36.3167H18.4203V33.4746ZM26.0015 33.4746H23.1594V36.3167H26.0015V33.4746ZM29.79 14.5252H15.5795V19.262H29.79V14.5252ZM13.6848 12.6305V21.1568H31.6848V12.6305H13.6848ZM40.2116 33.4746H37.3695V36.3167H40.2116V33.4746ZM31.6848 27.7898H34.5269V30.632H31.6848V27.7898ZM32.3531 36.9845L40.8794 28.4581L39.5396 27.1184L31.0133 35.6447L32.3531 36.9845Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="7.03296"
-                  x2="40.4173"
-                  y1="6"
-                  y2="43.2798"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Taxes
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage how your store charges tax
-            </p>
-          </div>
-        </div>
+          Staff Settings
+        </p>
       </div>
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationItem-id"
+      />
+    </div>
+    <div
+      class="ConfigurationPage-configurationCategory-id"
+    >
+      <div
+        class="ConfigurationPage-configurationLabel-id"
       >
-        <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+        <p
+          class="MuiTypography-root-id MuiTypography-body2-id"
         >
-          <div
-            class="ConfigurationPage-icon-id"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
-            >
-              <path
-                clip-rule="evenodd"
-                d="M23.5868 40.7841C32.5324 40.7841 39.7841 33.5324 39.7841 24.5868C39.7841 15.6413 32.5324 8.38954 23.5868 8.38954C14.6413 8.38954 7.38954 15.6413 7.38954 24.5868C7.38954 33.5324 14.6413 40.7841 23.5868 40.7841ZM23.5868 42.5838C33.5263 42.5838 41.5838 34.5263 41.5838 24.5868C41.5838 14.6474 33.5263 6.58984 23.5868 6.58984C13.6474 6.58984 5.58984 14.6474 5.58984 24.5868C5.58984 34.5263 13.6474 42.5838 23.5868 42.5838Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <path
-                clip-rule="evenodd"
-                d="M30.4053 12.7808L17.5705 20.8424L22.3034 23.575C22.7981 22.9452 23.6933 22.7584 24.407 23.1704C25.1207 23.5825 25.4065 24.4512 25.1084 25.1945L29.8412 27.9269L30.4053 12.7808ZM22.0683 23.9832C21.7721 24.7258 22.0581 25.5927 22.7709 26.0042C23.4837 26.4158 24.3774 26.23 24.8725 25.6022L29.6052 28.3346L16.7703 36.3963L17.3345 21.2501L22.0683 23.9832ZM28.4802 16.1153L21.0575 20.7775L28.1539 24.8747L28.4802 16.1153Z"
-                fill="url(#paint1_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.5312"
-                  x2="37.4461"
-                  y1="6.58984"
-                  y2="46.8339"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint1_linear"
-                  x1="23.9086"
-                  x2="36.5382"
-                  y1="9.02991"
-                  y2="33.2176"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
-          </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
-            >
-              Navigation
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Define how users can navigate through your store
-            </p>
-          </div>
-        </div>
+          Miscellaneous
+        </p>
       </div>
       <div
-        class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        class="ConfigurationPage-configurationItem-id"
       >
         <div
-          class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
         >
           <div
-            class="ConfigurationPage-icon-id"
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
-              focusable="false"
-              role="presentation"
-              viewBox="0 0 44 44"
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              <path
-                clip-rule="evenodd"
-                d="M22.3617 7H35.5267L42.0006 13.4739V36.5548H28.2148V34.7644H40.2103V14.2155L40.012 14.0172H34.8V8.80523L34.7851 8.79036H24.1521V12.3573H22.3617V7ZM6 11.4613H19.165L25.6389 17.9352V41.0161H24.7437H6V11.4613ZM18.6 13.4283V19.4172H23.8485V39.2257H7.79036V13.2517H18.4234L18.6 13.4283ZM22.2 23.0172H9.6V25.7172H22.2V23.0172ZM9.6 27.5172H22.2V30.2172H9.6V27.5172ZM37.5 16.7172H28.5V19.4172H37.5V16.7172ZM28.5 21.2172H37.5V31.1172H28.5V21.2172ZM22.2 32.0172H9.6V34.7172H22.2V32.0172Z"
-                fill="url(#paint0_linear)"
-                fill-rule="evenodd"
-              />
-              <defs>
-                <linearGradient
-                  gradientUnits="userSpaceOnUse"
-                  id="paint0_linear"
-                  x1="4.94116"
-                  x2="35.6523"
-                  y1="7"
-                  y2="46.7403"
-                >
-                  <stop
-                    stop-color="#06847B"
-                  />
-                  <stop
-                    offset="1"
-                    stop-color="#3EE7CD"
-                  />
-                </linearGradient>
-              </defs>
-            </svg>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M35.9075 11.3232C40.8772 19.931 37.928 30.9378 29.3202 35.9075C20.7123 40.8772 9.70553 37.928 4.7358 29.3201C-0.233933 20.7123 2.71533 9.70553 11.3232 4.7358C19.931 -0.233933 30.9378 2.71533 35.9075 11.3232ZM37.6393 10.3233C43.1612 19.8876 39.8842 32.1173 30.32 37.6393C20.7557 43.1612 8.52596 39.8842 3.00404 30.32C-2.51789 20.7557 0.759069 8.52596 10.3233 3.00404C19.8876 -2.51789 32.1173 0.759069 37.6393 10.3233ZM14.9402 14.5709L31.0335 9.60975L26.0724 25.7031L21.7789 21.4096C22.3117 20.6975 22.2544 19.6836 21.6072 19.0364C20.9599 18.3891 19.946 18.3319 19.2339 18.8647L14.9402 14.5709ZM19.0359 21.6077C18.3884 20.9602 18.3314 19.946 18.8646 19.2338L14.571 14.9402L9.6098 31.0335L25.7032 26.0723L21.4097 21.7789C20.6976 22.3122 19.6833 22.2551 19.0359 21.6077ZM18.7012 15.504L28.0085 12.6348L25.1393 21.9421L18.7012 15.504Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Navigation
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Define how users can navigate through your store
+              </p>
+            </div>
           </div>
-          <div>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+        </div>
+        <div
+          class="MuiPaper-root-id MuiPaper-elevation1-id MuiPaper-rounded-id MuiCard-root-id ConfigurationPage-card-id"
+        >
+          <div
+            class="MuiCardContent-root-id ConfigurationPage-cardContent-id"
+          >
+            <div
+              class="ConfigurationPage-icon-id"
             >
-              Pages
-            </p>
-            <p
-              class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
-            >
-              Manage and add additional pages
-            </p>
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
+                focusable="false"
+                role="presentation"
+                viewBox="0 0 44 44"
+              >
+                <path
+                  clip-rule="evenodd"
+                  d="M18.179 1.20349H32.8068L40 8.39671V34.0421H24.6825V32.0528H38.0107V9.2207L37.79 9H32V3.20999L31.9828 3.19278H20.1683V7.15606H18.179V1.20349ZM0 6.16142H14.6278L21.821 13.3546V39H20.8264H0V6.16142ZM14 8.34692V15H19.8317V37.0107H1.98929V8.15071H13.8038L14 8.34692ZM18 19H4V22H18V19ZM4 24H18V27H4V24ZM35 12H25V15H35V12ZM25 17H35V28H25V17ZM18 29H4V32H18V29Z"
+                  fill="#06847B"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </div>
+            <div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id MuiTypography-colorPrimary-id ConfigurationPage-sectionTitle-id"
+              >
+                Pages
+              </p>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id ConfigurationPage-sectionDescription-id"
+              >
+                Manage and add additional pages
+              </p>
+            </div>
           </div>
         </div>
       </div>
@@ -27107,21 +26511,6 @@ exports[`Storyshots Views / Customers / Address Book default 1`] = `
               class="MuiButton-label-id"
             >
               Add address
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -27139,12 +26528,7 @@ exports[`Storyshots Views / Customers / Address Book default 1`] = `
           <span
             class="MuiTypography-root-id MuiTypography-h5-id CardTitle-title-id"
           >
-            Address 1
-            <span
-              class="MuiTypography-root-id MuiTypography-caption-id"
-            >
-              Default Address
-            </span>
+            Default Address
           </span>
           <div
             class="CardTitle-toolbar-id"
@@ -27241,7 +26625,7 @@ exports[`Storyshots Views / Customers / Address Book default 1`] = `
               <span
                 class="MuiButton-label-id"
               >
-                Remove
+                Delete
               </span>
             </button>
           </div>
@@ -27255,12 +26639,7 @@ exports[`Storyshots Views / Customers / Address Book default 1`] = `
         >
           <span
             class="MuiTypography-root-id MuiTypography-h5-id CardTitle-title-id"
-          >
-            Address 2
-            <span
-              class="MuiTypography-root-id MuiTypography-caption-id"
-            />
-          </span>
+          />
           <div
             class="CardTitle-toolbar-id"
           >
@@ -27355,7 +26734,7 @@ exports[`Storyshots Views / Customers / Address Book default 1`] = `
               <span
                 class="MuiButton-label-id"
               >
-                Remove
+                Delete
               </span>
             </button>
           </div>
@@ -27396,21 +26775,6 @@ exports[`Storyshots Views / Customers / Address Book loading 1`] = `
               class="MuiButton-label-id"
             >
               Add address
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -27511,7 +26875,7 @@ exports[`Storyshots Views / Customers / Address Book loading 1`] = `
               <span
                 class="MuiButton-label-id"
               >
-                Remove
+                Delete
               </span>
             </button>
           </div>
@@ -27551,21 +26915,6 @@ exports[`Storyshots Views / Customers / Address Book no data 1`] = `
           class="MuiButton-label-id"
         >
           Add address
-          <svg
-            aria-hidden="true"
-            class="MuiSvgIcon-root-id"
-            focusable="false"
-            role="presentation"
-            viewBox="0 0 24 24"
-          >
-            <path
-              d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-            />
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-            />
-          </svg>
         </span>
       </button>
     </div>
@@ -28864,7 +28213,7 @@ exports[`Storyshots Views / Customers / Create customer form errors 1`] = `
                       class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                     >
                       <label
-                        class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                        class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                         data-shrink="false"
                       >
                         Country
@@ -28915,7 +28264,7 @@ exports[`Storyshots Views / Customers / Create customer form errors 1`] = `
                         </div>
                       </div>
                       <p
-                        class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
+                        class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
                       >
                         Generic form error
                       </p>
@@ -34396,21 +33745,6 @@ exports[`Storyshots Views / Customers / Customer list default 1`] = `
               class="MuiButton-label-id"
             >
               Add customer
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -35438,21 +34772,6 @@ exports[`Storyshots Views / Customers / Customer list loading 1`] = `
               class="MuiButton-label-id"
             >
               Add customer
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -35708,21 +35027,6 @@ exports[`Storyshots Views / Customers / Customer list no data 1`] = `
               class="MuiButton-label-id"
             >
               Add customer
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -40054,22 +39358,7 @@ exports[`Storyshots Views / Discounts / Sale list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Sale
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Sale
             </span>
           </button>
         </div>
@@ -40510,22 +39799,7 @@ exports[`Storyshots Views / Discounts / Sale list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Sale
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Sale
             </span>
           </button>
         </div>
@@ -40796,22 +40070,7 @@ exports[`Storyshots Views / Discounts / Sale list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Sale
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Sale
             </span>
           </button>
         </div>
@@ -41164,6 +40423,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Fixed Amount
+                        <span />
                       </span>
                     </label>
                     <label
@@ -41198,6 +40458,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Percentage
+                        <span />
                       </span>
                     </label>
                     <label
@@ -41232,6 +40493,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Free Shipping
+                        <span />
                       </span>
                     </label>
                   </div>
@@ -41320,43 +40582,27 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="applyOncePerOrder"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="applyOncePerOrder"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Only once per order
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    Only once per order
-                    <span
-                      class="MuiTypography-root-id MuiTypography-caption-id"
-                    >
-                      If this option is disabled, discount will be counted for every eligible product
-                    </span>
-                    <div />
-                  </div>
+                    If this option is disabled, discount will be counted for every eligible product
+                  </span>
                 </span>
               </label>
             </div>
@@ -41429,6 +40675,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       None
+                      <span />
                     </span>
                   </label>
                   <label
@@ -41463,6 +40710,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimal order value
+                      <span />
                     </span>
                   </label>
                   <label
@@ -41497,6 +40745,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimum quantity of items
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -41885,6 +41134,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Fixed Amount
+                        <span />
                       </span>
                     </label>
                     <label
@@ -41919,6 +41169,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Percentage
+                        <span />
                       </span>
                     </label>
                     <label
@@ -41953,6 +41204,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Free Shipping
+                        <span />
                       </span>
                     </label>
                   </div>
@@ -42046,43 +41298,27 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="applyOncePerOrder"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="applyOncePerOrder"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Only once per order
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    Only once per order
-                    <span
-                      class="MuiTypography-root-id MuiTypography-caption-id"
-                    >
-                      If this option is disabled, discount will be counted for every eligible product
-                    </span>
-                    <div />
-                  </div>
+                    If this option is disabled, discount will be counted for every eligible product
+                  </span>
                 </span>
               </label>
             </div>
@@ -42155,6 +41391,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       None
+                      <span />
                     </span>
                   </label>
                   <label
@@ -42189,6 +41426,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimal order value
+                      <span />
                     </span>
                   </label>
                   <label
@@ -42223,6 +41461,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimum quantity of items
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -42605,6 +41844,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Fixed Amount
+                        <span />
                       </span>
                     </label>
                     <label
@@ -42639,6 +41879,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Percentage
+                        <span />
                       </span>
                     </label>
                     <label
@@ -42673,6 +41914,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Free Shipping
+                        <span />
                       </span>
                     </label>
                   </div>
@@ -42801,6 +42043,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Entire order
+                      <span />
                     </span>
                   </label>
                   <label
@@ -42835,6 +42078,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Specific products
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -42851,43 +42095,27 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="applyOncePerOrder"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="applyOncePerOrder"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Only once per order
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    Only once per order
-                    <span
-                      class="MuiTypography-root-id MuiTypography-caption-id"
-                    >
-                      If this option is disabled, discount will be counted for every eligible product
-                    </span>
-                    <div />
-                  </div>
+                    If this option is disabled, discount will be counted for every eligible product
+                  </span>
                 </span>
               </label>
             </div>
@@ -42965,6 +42193,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       None
+                      <span />
                     </span>
                   </label>
                   <label
@@ -43000,6 +42229,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimal order value
+                      <span />
                     </span>
                   </label>
                   <label
@@ -43034,6 +42264,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimum quantity of items
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -43574,6 +42805,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Fixed Amount
+                        <span />
                       </span>
                     </label>
                     <label
@@ -43608,6 +42840,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Percentage
+                        <span />
                       </span>
                     </label>
                     <label
@@ -43642,6 +42875,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                       >
                         Free Shipping
+                        <span />
                       </span>
                     </label>
                   </div>
@@ -43780,6 +43014,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Entire order
+                      <span />
                     </span>
                   </label>
                   <label
@@ -43814,6 +43049,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Specific products
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -43835,43 +43071,27 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="applyOncePerOrder"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="applyOncePerOrder"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Only once per order
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    Only once per order
-                    <span
-                      class="MuiTypography-root-id MuiTypography-caption-id"
-                    >
-                      If this option is disabled, discount will be counted for every eligible product
-                    </span>
-                    <div />
-                  </div>
+                    If this option is disabled, discount will be counted for every eligible product
+                  </span>
                 </span>
               </label>
             </div>
@@ -43949,6 +43169,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       None
+                      <span />
                     </span>
                   </label>
                   <label
@@ -43984,6 +43205,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimal order value
+                      <span />
                     </span>
                   </label>
                   <label
@@ -44018,6 +43240,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                     >
                       Minimum quantity of items
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -44575,6 +43798,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                       >
                         Fixed Amount
+                        <span />
                       </span>
                     </label>
                     <label
@@ -44611,6 +43835,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                       >
                         Percentage
+                        <span />
                       </span>
                     </label>
                     <label
@@ -44647,6 +43872,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                         class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                       >
                         Free Shipping
+                        <span />
                       </span>
                     </label>
                   </div>
@@ -44778,6 +44004,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                     >
                       Entire order
+                      <span />
                     </span>
                   </label>
                   <label
@@ -44814,6 +44041,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                     >
                       Specific products
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -44830,45 +44058,29 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="applyOncePerOrder"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-disabled-id"
+                    disabled=""
+                    name="applyOncePerOrder"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
+                  Only once per order
+                  <span
+                    class="MuiTypography-root-id MuiTypography-caption-id"
                   >
-                    Only once per order
-                    <span
-                      class="MuiTypography-root-id MuiTypography-caption-id"
-                    >
-                      If this option is disabled, discount will be counted for every eligible product
-                    </span>
-                    <div />
-                  </div>
+                    If this option is disabled, discount will be counted for every eligible product
+                  </span>
                 </span>
               </label>
             </div>
@@ -44949,6 +44161,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                     >
                       None
+                      <span />
                     </span>
                   </label>
                   <label
@@ -44985,6 +44198,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                     >
                       Minimal order value
+                      <span />
                     </span>
                   </label>
                   <label
@@ -45021,6 +44235,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
                       class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                     >
                       Minimum quantity of items
+                      <span />
                     </span>
                   </label>
                 </div>
@@ -45419,22 +44634,7 @@ exports[`Storyshots Views / Discounts / Voucher list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add voucher
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create voucher
             </span>
           </button>
         </div>
@@ -45772,22 +44972,7 @@ exports[`Storyshots Views / Discounts / Voucher list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add voucher
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create voucher
             </span>
           </button>
         </div>
@@ -46088,22 +45273,7 @@ exports[`Storyshots Views / Discounts / Voucher list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add voucher
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create voucher
             </span>
           </button>
         </div>
@@ -46418,32 +45588,14 @@ exports[`Storyshots Views / HomePage default 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M31.4911 6H40.8033V14.5361L37.0667 11.1109L26.5267 21.6509L16.854 19.7163L7.49492 30.9473L6 29.7015L16.1003 17.5811L25.8871 19.5385L35.6308 9.79474L31.4911 6ZM13.0731 35.1892H9.18117V40.0541H13.0731V35.1892ZM7.23522 33.2432V42H15.019V33.2432H7.23522ZM17.9379 25.4595H21.8298V40.0541H17.9379V25.4595ZM15.992 42V23.5135H23.7758V42H15.992ZM30.5866 28.3784H26.6947V40.0541H30.5866V28.3784ZM24.7487 26.4324V42H32.5325V26.4324H24.7487ZM35.4514 19.6216H39.3433V40.0541H35.4514V19.6216ZM33.5055 42V17.6757H41.2893V42H33.5055Z"
-                    fill="url(#paint0_linear)"
+                    d="M40.1974 14H49.7682V22.7732L45.9287 19.2537L35.0969 30.0855L25.1555 28.0973L15.5364 39.6402L14 38.3598L24.3809 25.9027L34.4395 27.9145L44.453 17.901L40.1974 14ZM21.2682 44H17.2682V49H21.2682V44ZM15.2682 42V51H23.2682V42H15.2682ZM26.2682 34H30.2682V49H26.2682V34ZM24.2682 51V32H32.2682V51H24.2682ZM39.2682 37H35.2682V49H39.2682V37ZM33.2682 35V51H41.2682V35H33.2682ZM44.2682 28H48.2682V49H44.2682V28ZM42.2682 51V26H50.2682V51H42.2682Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="6"
-                      x2="45.6223"
-                      y1="6"
-                      y2="46.3533"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -46479,32 +45631,14 @@ exports[`Storyshots Views / HomePage default 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M34.5789 6H9V42H34.5789V36.7895H32.6842V40.1053H10.8947V7.89474H32.6842V25.4211H34.5789V6ZM31.7369 35.2872L39.5121 27.5121L38.1723 26.1723L31.7369 32.6077L28.6173 29.4881L27.2775 30.8279L31.7369 35.2872ZM14.6842 11.6842H17.5263V14.5263H14.6842V11.6842ZM27.9474 11.6842H19.4211V14.5263H27.9474V11.6842ZM14.6842 17.3684H17.5263V20.2105H14.6842V17.3684ZM27.9474 17.3684H19.4211V20.2105H27.9474V17.3684ZM14.6842 23.0526H17.5263V25.8947H14.6842V23.0526ZM27.9474 23.0526H19.4211V25.8947H27.9474V23.0526Z"
-                    fill="url(#paint0_linear)"
+                    d="M43 13H16V51H43V45.5H41V49H18V15H41V33.5H43V13ZM40 43.9142L48.2071 35.7071L46.7928 34.2929L40 41.0858L36.7071 37.7929L35.2928 39.2071L40 43.9142ZM22 19H25V22H22V19ZM36 19H27V22H36V19ZM22 25H25V28H22V25ZM36 25H27V28H36V25ZM22 31H25V34H22V31ZM36 31H27V34H36V31Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="9"
-                      x2="48.3106"
-                      y1="6"
-                      y2="40.6161"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -47132,32 +46266,14 @@ exports[`Storyshots Views / HomePage loading 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M31.4911 6H40.8033V14.5361L37.0667 11.1109L26.5267 21.6509L16.854 19.7163L7.49492 30.9473L6 29.7015L16.1003 17.5811L25.8871 19.5385L35.6308 9.79474L31.4911 6ZM13.0731 35.1892H9.18117V40.0541H13.0731V35.1892ZM7.23522 33.2432V42H15.019V33.2432H7.23522ZM17.9379 25.4595H21.8298V40.0541H17.9379V25.4595ZM15.992 42V23.5135H23.7758V42H15.992ZM30.5866 28.3784H26.6947V40.0541H30.5866V28.3784ZM24.7487 26.4324V42H32.5325V26.4324H24.7487ZM35.4514 19.6216H39.3433V40.0541H35.4514V19.6216ZM33.5055 42V17.6757H41.2893V42H33.5055Z"
-                    fill="url(#paint0_linear)"
+                    d="M40.1974 14H49.7682V22.7732L45.9287 19.2537L35.0969 30.0855L25.1555 28.0973L15.5364 39.6402L14 38.3598L24.3809 25.9027L34.4395 27.9145L44.453 17.901L40.1974 14ZM21.2682 44H17.2682V49H21.2682V44ZM15.2682 42V51H23.2682V42H15.2682ZM26.2682 34H30.2682V49H26.2682V34ZM24.2682 51V32H32.2682V51H24.2682ZM39.2682 37H35.2682V49H39.2682V37ZM33.2682 35V51H41.2682V35H33.2682ZM44.2682 28H48.2682V49H44.2682V28ZM42.2682 51V26H50.2682V51H42.2682Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="6"
-                      x2="45.6223"
-                      y1="6"
-                      y2="46.3533"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -47198,32 +46314,14 @@ exports[`Storyshots Views / HomePage loading 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M34.5789 6H9V42H34.5789V36.7895H32.6842V40.1053H10.8947V7.89474H32.6842V25.4211H34.5789V6ZM31.7369 35.2872L39.5121 27.5121L38.1723 26.1723L31.7369 32.6077L28.6173 29.4881L27.2775 30.8279L31.7369 35.2872ZM14.6842 11.6842H17.5263V14.5263H14.6842V11.6842ZM27.9474 11.6842H19.4211V14.5263H27.9474V11.6842ZM14.6842 17.3684H17.5263V20.2105H14.6842V17.3684ZM27.9474 17.3684H19.4211V20.2105H27.9474V17.3684ZM14.6842 23.0526H17.5263V25.8947H14.6842V23.0526ZM27.9474 23.0526H19.4211V25.8947H27.9474V23.0526Z"
-                    fill="url(#paint0_linear)"
+                    d="M43 13H16V51H43V45.5H41V49H18V15H41V33.5H43V13ZM40 43.9142L48.2071 35.7071L46.7928 34.2929L40 41.0858L36.7071 37.7929L35.2928 39.2071L40 43.9142ZM22 19H25V22H22V19ZM36 19H27V22H36V19ZM22 25H25V28H22V25ZM36 25H27V28H36V25ZM22 31H25V34H22V31ZM36 31H27V34H36V31Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="9"
-                      x2="48.3106"
-                      y1="6"
-                      y2="40.6161"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -47543,32 +46641,14 @@ exports[`Storyshots Views / HomePage no data 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M31.4911 6H40.8033V14.5361L37.0667 11.1109L26.5267 21.6509L16.854 19.7163L7.49492 30.9473L6 29.7015L16.1003 17.5811L25.8871 19.5385L35.6308 9.79474L31.4911 6ZM13.0731 35.1892H9.18117V40.0541H13.0731V35.1892ZM7.23522 33.2432V42H15.019V33.2432H7.23522ZM17.9379 25.4595H21.8298V40.0541H17.9379V25.4595ZM15.992 42V23.5135H23.7758V42H15.992ZM30.5866 28.3784H26.6947V40.0541H30.5866V28.3784ZM24.7487 26.4324V42H32.5325V26.4324H24.7487ZM35.4514 19.6216H39.3433V40.0541H35.4514V19.6216ZM33.5055 42V17.6757H41.2893V42H33.5055Z"
-                    fill="url(#paint0_linear)"
+                    d="M40.1974 14H49.7682V22.7732L45.9287 19.2537L35.0969 30.0855L25.1555 28.0973L15.5364 39.6402L14 38.3598L24.3809 25.9027L34.4395 27.9145L44.453 17.901L40.1974 14ZM21.2682 44H17.2682V49H21.2682V44ZM15.2682 42V51H23.2682V42H15.2682ZM26.2682 34H30.2682V49H26.2682V34ZM24.2682 51V32H32.2682V51H24.2682ZM39.2682 37H35.2682V49H39.2682V37ZM33.2682 35V51H41.2682V35H33.2682ZM44.2682 28H48.2682V49H44.2682V28ZM42.2682 51V26H50.2682V51H42.2682Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="6"
-                      x2="45.6223"
-                      y1="6"
-                      y2="46.3533"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -47604,32 +46684,14 @@ exports[`Storyshots Views / HomePage no data 1`] = `
                   class="MuiSvgIcon-root-id MuiSvgIcon-fontSizeInherit-id"
                   focusable="false"
                   role="presentation"
-                  viewBox="0 0 48 48"
+                  viewBox="0 0 64 64"
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M34.5789 6H9V42H34.5789V36.7895H32.6842V40.1053H10.8947V7.89474H32.6842V25.4211H34.5789V6ZM31.7369 35.2872L39.5121 27.5121L38.1723 26.1723L31.7369 32.6077L28.6173 29.4881L27.2775 30.8279L31.7369 35.2872ZM14.6842 11.6842H17.5263V14.5263H14.6842V11.6842ZM27.9474 11.6842H19.4211V14.5263H27.9474V11.6842ZM14.6842 17.3684H17.5263V20.2105H14.6842V17.3684ZM27.9474 17.3684H19.4211V20.2105H27.9474V17.3684ZM14.6842 23.0526H17.5263V25.8947H14.6842V23.0526ZM27.9474 23.0526H19.4211V25.8947H27.9474V23.0526Z"
-                    fill="url(#paint0_linear)"
+                    d="M43 13H16V51H43V45.5H41V49H18V15H41V33.5H43V13ZM40 43.9142L48.2071 35.7071L46.7928 34.2929L40 41.0858L36.7071 37.7929L35.2928 39.2071L40 43.9142ZM22 19H25V22H22V19ZM36 19H27V22H36V19ZM22 25H25V28H22V25ZM36 25H27V28H36V25ZM22 31H25V34H22V31ZM36 31H27V34H36V31Z"
+                    fill="#06847B"
                     fill-rule="evenodd"
                   />
-                  <defs>
-                    <linearGradient
-                      gradientUnits="userSpaceOnUse"
-                      id="paint0_linear"
-                      x1="9"
-                      x2="48.3106"
-                      y1="6"
-                      y2="40.6161"
-                    >
-                      <stop
-                        stop-color="#06847B"
-                      />
-                      <stop
-                        offset="1"
-                        stop-color="#3EE7CD"
-                      />
-                    </linearGradient>
-                  </defs>
                 </svg>
               </div>
             </div>
@@ -48627,7 +47689,7 @@ exports[`Storyshots Views / Navigation / Menu details default 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add new item
+                  Create new item
                 </span>
               </button>
             </div>
@@ -48783,7 +47845,7 @@ exports[`Storyshots Views / Navigation / Menu details loading 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add new item
+                  Create new item
                 </span>
               </button>
             </div>
@@ -48948,7 +48010,7 @@ exports[`Storyshots Views / Navigation / Menu details no data 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add new item
+                  Create new item
                 </span>
               </button>
             </div>
@@ -48989,22 +48051,7 @@ exports[`Storyshots Views / Navigation / Menu list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Menu
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Menu
             </span>
           </button>
         </div>
@@ -49329,22 +48376,7 @@ exports[`Storyshots Views / Navigation / Menu list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Menu
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Menu
             </span>
           </button>
         </div>
@@ -49624,22 +48656,7 @@ exports[`Storyshots Views / Navigation / Menu list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Menu
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Menu
             </span>
           </button>
         </div>
@@ -49896,21 +48913,6 @@ exports[`Storyshots Views / Orders / Draft order list default 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -51028,21 +50030,6 @@ exports[`Storyshots Views / Orders / Draft order list loading 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -51319,21 +50306,6 @@ exports[`Storyshots Views / Orders / Draft order list when no data 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -52083,8 +51055,22 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -52104,7 +51090,7 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -53071,8 +52057,22 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -53092,7 +52092,7 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -54089,8 +53089,22 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -54110,7 +53124,7 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -55680,8 +54694,22 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -55701,7 +54729,7 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -56698,8 +55726,22 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -56719,7 +55761,7 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -57716,8 +56758,22 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -57737,7 +56793,7 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -58734,8 +57790,22 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -58755,7 +57825,7 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -59752,8 +58822,22 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -59773,7 +58857,7 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -60770,8 +59854,22 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -60791,7 +59889,7 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -61788,8 +60886,22 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -61809,7 +60921,7 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -62806,8 +61918,22 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -62827,7 +61953,7 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -63824,8 +62950,22 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -63845,7 +62985,7 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -64842,8 +63982,22 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -64863,7 +64017,7 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -65565,8 +64719,22 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -65586,7 +64754,7 @@ exports[`Storyshots Views / Orders / Order draft default 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -66351,8 +65519,22 @@ exports[`Storyshots Views / Orders / Order draft without lines 1`] = `
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id TimelineAddNote-input-id"
                   >
                     <div
-                      class="MuiInputBase-root-id MuiInput-root-id MuiInput-underline-id MuiInputBase-fullWidth-id MuiInput-fullWidth-id MuiInputBase-formControl-id MuiInput-formControl-id MuiInputBase-multiline-id MuiInput-multiline-id MuiInputBase-adornedEnd-id"
+                      class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-multiline-id MuiOutlinedInput-multiline-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
                     >
+                      <fieldset
+                        aria-hidden="true"
+                        class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                        style="padding-left:8px"
+                      >
+                        <legend
+                          class="MuiPrivateNotchedOutline-legend-id"
+                          style="width:0.01px"
+                        >
+                          <span>
+                            ​
+                          </span>
+                        </legend>
+                      </fieldset>
                       <div
                         class="MuiPrivateTextarea-root-id"
                       >
@@ -66372,7 +65554,7 @@ exports[`Storyshots Views / Orders / Order draft without lines 1`] = `
                         />
                         <textarea
                           aria-invalid="false"
-                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiInput-input-id MuiInputBase-inputMultiline-id MuiInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id"
+                          class="MuiPrivateTextarea-textarea-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputMultiline-id MuiOutlinedInput-inputMultiline-id MuiInputBase-inputAdornedEnd-id MuiOutlinedInput-inputAdornedEnd-id"
                           name="message"
                           placeholder="Leave your note here..."
                           rows="1"
@@ -66571,21 +65753,6 @@ exports[`Storyshots Views / Orders / Order list default 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -68196,21 +67363,6 @@ exports[`Storyshots Views / Orders / Order list loading 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -68639,21 +67791,6 @@ exports[`Storyshots Views / Orders / Order list when no data 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -68998,21 +68135,6 @@ exports[`Storyshots Views / Orders / Order list with custom filters 1`] = `
               class="MuiButton-label-id"
             >
               Create order
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
             </span>
           </button>
         </div>
@@ -71806,79 +70928,93 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputType-id"
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -72649,84 +71785,93 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="true"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputType-id"
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
-                <p
-                  class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
-                >
-                  Generic form error
-                </p>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -73295,82 +72440,97 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                      tabindex="-1"
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          disabled=""
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputType-id"
-                    disabled=""
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -73412,22 +72572,7 @@ exports[`Storyshots Views / Pages / Page list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add page
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create page
             </span>
           </button>
         </div>
@@ -73790,22 +72935,7 @@ exports[`Storyshots Views / Pages / Page list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add page
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create page
             </span>
           </button>
         </div>
@@ -74066,22 +73196,7 @@ exports[`Storyshots Views / Pages / Page list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add page
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create page
             </span>
           </button>
         </div>
@@ -74353,43 +73468,22 @@ exports[`Storyshots Views / Plugins / Plugin details default 1`] = `
             <label
               class="MuiFormControlLabel-root-id"
             >
-              <span
-                class="MuiSwitch-root-id"
+              <button
+                class="MuiButtonBase-root-id Checkbox-root-id"
+                tabindex="0"
+                type="button"
               >
-                <span
-                  class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                >
-                  <span
-                    class="MuiIconButton-label-id"
-                  >
-                    <span
-                      class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                    />
-                    <input
-                      checked=""
-                      class="MuiPrivateSwitchBase-input-id"
-                      name="active"
-                      type="checkbox"
-                    />
-                  </span>
-                </span>
-                <span
-                  class="MuiSwitch-bar-id"
+                <input
+                  class="Checkbox-box-id Checkbox-checked-id"
+                  name="active"
+                  type="checkbox"
+                  value="true"
                 />
-              </span>
+              </button>
               <span
                 class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
               >
-                <div
-                  class="ControlledSwitch-label-id"
-                >
-                  <span
-                    class="ControlledSwitch-labelText-id"
-                  >
-                    Set plugin as Active
-                  </span>
-                  <div />
-                </div>
+                Set plugin as Active
               </span>
             </label>
           </div>
@@ -74524,43 +73618,22 @@ exports[`Storyshots Views / Plugins / Plugin details default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="Use sandbox"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="Use sandbox"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use sandbox
-                    </span>
-                    <div />
-                  </div>
+                  Use sandbox
                 </span>
               </label>
             </div>
@@ -74669,43 +73742,22 @@ exports[`Storyshots Views / Plugins / Plugin details form errors 1`] = `
             <label
               class="MuiFormControlLabel-root-id"
             >
-              <span
-                class="MuiSwitch-root-id"
+              <button
+                class="MuiButtonBase-root-id Checkbox-root-id"
+                tabindex="0"
+                type="button"
               >
-                <span
-                  class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                >
-                  <span
-                    class="MuiIconButton-label-id"
-                  >
-                    <span
-                      class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                    />
-                    <input
-                      checked=""
-                      class="MuiPrivateSwitchBase-input-id"
-                      name="active"
-                      type="checkbox"
-                    />
-                  </span>
-                </span>
-                <span
-                  class="MuiSwitch-bar-id"
+                <input
+                  class="Checkbox-box-id Checkbox-checked-id"
+                  name="active"
+                  type="checkbox"
+                  value="true"
                 />
-              </span>
+              </button>
               <span
                 class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
               >
-                <div
-                  class="ControlledSwitch-label-id"
-                >
-                  <span
-                    class="ControlledSwitch-labelText-id"
-                  >
-                    Set plugin as Active
-                  </span>
-                  <div />
-                </div>
+                Set plugin as Active
               </span>
             </label>
           </div>
@@ -74840,43 +73892,22 @@ exports[`Storyshots Views / Plugins / Plugin details form errors 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="Use sandbox"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="Use sandbox"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Use sandbox
-                    </span>
-                    <div />
-                  </div>
+                  Use sandbox
                 </span>
               </label>
             </div>
@@ -74973,42 +74004,22 @@ exports[`Storyshots Views / Plugins / Plugin details loading 1`] = `
             <label
               class="MuiFormControlLabel-root-id"
             >
-              <span
-                class="MuiSwitch-root-id"
+              <button
+                class="MuiButtonBase-root-id Checkbox-root-id"
+                tabindex="0"
+                type="button"
               >
-                <span
-                  class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                >
-                  <span
-                    class="MuiIconButton-label-id"
-                  >
-                    <span
-                      class="MuiSwitch-icon-id"
-                    />
-                    <input
-                      class="MuiPrivateSwitchBase-input-id"
-                      name="active"
-                      type="checkbox"
-                    />
-                  </span>
-                </span>
-                <span
-                  class="MuiSwitch-bar-id"
+                <input
+                  class="Checkbox-box-id"
+                  name="active"
+                  type="checkbox"
+                  value="false"
                 />
-              </span>
+              </button>
               <span
                 class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
               >
-                <div
-                  class="ControlledSwitch-label-id"
-                >
-                  <span
-                    class="ControlledSwitch-labelText-id"
-                  >
-                    Set plugin as Active
-                  </span>
-                  <div />
-                </div>
+                Set plugin as Active
               </span>
             </label>
           </div>
@@ -78616,22 +77627,7 @@ exports[`Storyshots Views / Product types / Product types list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add product type 
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              create product type 
             </span>
           </button>
         </div>
@@ -78997,22 +77993,7 @@ exports[`Storyshots Views / Product types / Product types list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add product type 
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              create product type 
             </span>
           </button>
         </div>
@@ -79302,7 +78283,6 @@ exports[`Storyshots Views / Products / Create product When loading 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       disabled=""
                       name="name"
-                      rows="5"
                       type="text"
                       value=""
                     />
@@ -80211,82 +79191,97 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                      tabindex="-1"
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          disabled=""
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputType-id"
-                    disabled=""
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -80384,7 +79379,6 @@ exports[`Storyshots Views / Products / Create product default 1`] = `
                       aria-invalid="false"
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                       name="name"
-                      rows="5"
                       type="text"
                       value=""
                     />
@@ -81286,79 +80280,93 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputType-id"
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -81456,7 +80464,6 @@ exports[`Storyshots Views / Products / Create product form errors 1`] = `
                       aria-invalid="true"
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                       name="name"
-                      rows="5"
                       type="text"
                       value=""
                     />
@@ -82138,7 +81145,7 @@ Ctrl + K"
                   class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                 >
                   <label
-                    class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                    class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                     data-shrink="false"
                   >
                     Product Type
@@ -82189,7 +81196,7 @@ Ctrl + K"
                     </div>
                   </div>
                   <p
-                    class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
+                    class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
                   >
                     Generic form error
                   </p>
@@ -82212,7 +81219,7 @@ Ctrl + K"
                   class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                 >
                   <label
-                    class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                    class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                     data-shrink="false"
                   >
                     Category
@@ -82263,7 +81270,7 @@ Ctrl + K"
                     </div>
                   </div>
                   <p
-                    class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
+                    class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
                   >
                     Generic form error
                   </p>
@@ -82378,79 +81385,93 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-inputType-id"
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -84069,7 +83090,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
                       data-shrink="false"
                     >
                       Color
@@ -84120,7 +83141,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
                       </div>
                     </div>
                     <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
+                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id"
                     >
                       Generic form error
                     </p>
@@ -84463,7 +83484,6 @@ exports[`Storyshots Views / Products / Product edit when data is fully loaded 1`
                       aria-invalid="false"
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                       name="name"
-                      rows="5"
                       type="text"
                       value="Ergonomic Plastic Bacon"
                     />
@@ -85590,7 +84610,7 @@ Ctrl + K"
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add variant
+                    Create variant
                   </span>
                 </button>
               </div>
@@ -85601,15 +84621,6 @@ Ctrl + K"
             <hr
               class="CardTitle-hr-id"
             />
-            <div
-              class="MuiCardContent-root-id"
-            >
-              <p
-                class="MuiTypography-root-id MuiTypography-body2-id"
-              >
-                Use variants for products that come in a variety of versions for example different sizes or colors
-              </p>
-            </div>
             <table
               class="MuiTable-root-id ProductVariants-denseTable-id"
             >
@@ -86049,46 +85060,89 @@ Ctrl + K"
               <div
                 class="VisibilityCard-expandedSwitchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span>
+                          since Aug 25, 2018
+                        </span>
+                      </span>
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
-                      Visible
-                      <div>
-                        since Aug 25, 2018
-                      </div>
-                    </div>
-                  </span>
-                </label>
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
+                </div>
               </div>
               <div
                 class="FormSpacer-spacer-id"
@@ -86193,7 +85247,6 @@ exports[`Storyshots Views / Products / Product edit when loading data 1`] = `
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       disabled=""
                       name="name"
-                      rows="5"
                       type="text"
                       value=""
                     />
@@ -87119,82 +86172,97 @@ Ctrl + K"
               <div
                 class="VisibilityCard-switchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                      tabindex="-1"
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
                       >
                         <span
-                          class="MuiSwitch-icon-id"
-                        />
-                        <input
-                          class="MuiPrivateSwitchBase-input-id"
-                          disabled=""
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
-                    >
-                      Hidden
-                      <div />
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                class="MuiFormControl-root-id MuiFormControl-fullWidth-id VisibilityCard-date-id"
-              >
-                <label
-                  class="MuiFormLabel-root-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
-                  data-shrink="true"
-                >
-                  Publish on
-                </label>
-                <div
-                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
-                >
-                  <fieldset
-                    aria-hidden="true"
-                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
-                    style="padding-left:8px"
-                  >
-                    <legend
-                      class="MuiPrivateNotchedOutline-legend-id"
-                      style="width:0"
-                    >
-                      <span>
-                        ​
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Visible
+                        <span />
                       </span>
-                    </legend>
-                  </fieldset>
-                  <input
-                    aria-invalid="false"
-                    class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-inputType-id"
-                    disabled=""
-                    name="publicationDate"
-                    type="date"
-                    value=""
-                  />
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id RadioGroupField-radioLabel-id"
+                    >
+                      <span
+                        class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id MuiPrivateSwitchBase-disabled-id MuiRadio-disabled-id"
+                        tabindex="-1"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            disabled=""
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
                 </div>
               </div>
+              <p
+                class="MuiTypography-root-id MuiTypography-body2-id VisibilityCard-setPublicationDate-id"
+              >
+                 Set publication date
+              </p>
               <div
                 class="FormSpacer-spacer-id"
               />
@@ -87292,7 +86360,6 @@ exports[`Storyshots Views / Products / Product edit when product has no images 1
                       aria-invalid="false"
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                       name="name"
-                      rows="5"
                       type="text"
                       value="Ergonomic Plastic Bacon"
                     />
@@ -88326,7 +87393,7 @@ Ctrl + K"
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add variant
+                    Create variant
                   </span>
                 </button>
               </div>
@@ -88337,15 +87404,6 @@ Ctrl + K"
             <hr
               class="CardTitle-hr-id"
             />
-            <div
-              class="MuiCardContent-root-id"
-            >
-              <p
-                class="MuiTypography-root-id MuiTypography-body2-id"
-              >
-                Use variants for products that come in a variety of versions for example different sizes or colors
-              </p>
-            </div>
             <table
               class="MuiTable-root-id ProductVariants-denseTable-id"
             >
@@ -88785,46 +87843,89 @@ Ctrl + K"
               <div
                 class="VisibilityCard-expandedSwitchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span>
+                          since Aug 25, 2018
+                        </span>
+                      </span>
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
-                      Visible
-                      <div>
-                        since Aug 25, 2018
-                      </div>
-                    </div>
-                  </span>
-                </label>
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
+                </div>
               </div>
               <div
                 class="FormSpacer-spacer-id"
@@ -88923,7 +88024,6 @@ exports[`Storyshots Views / Products / Product edit when product has no variants
                       aria-invalid="false"
                       class="MuiInputBase-input-id MuiOutlinedInput-input-id"
                       name="name"
-                      rows="5"
                       type="text"
                       value="Ergonomic Plastic Bacon"
                     />
@@ -90432,46 +89532,89 @@ Ctrl + K"
               <div
                 class="VisibilityCard-expandedSwitchContainer-id"
               >
-                <label
-                  class="MuiFormControlLabel-root-id"
+                <div
+                  class="MuiFormControl-root-id RadioGroupField-formControl-id"
                 >
-                  <span
-                    class="MuiSwitch-root-id"
+                  <div
+                    aria-label="isPublished"
+                    class="MuiFormGroup-root-id"
+                    role="radiogroup"
                   >
-                    <span
-                      class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
                       <span
-                        class="MuiIconButton-label-id"
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiRadio-checked-id"
                       >
                         <span
-                          class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                        />
-                        <input
-                          checked=""
-                          class="MuiPrivateSwitchBase-input-id"
-                          name="isPublished"
-                          type="checkbox"
-                        />
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zm0-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            checked=""
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="true"
+                          />
+                        </span>
                       </span>
-                    </span>
-                    <span
-                      class="MuiSwitch-bar-id"
-                    />
-                  </span>
-                  <span
-                    class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
-                  >
-                    <div
-                      class="ControlledSwitch-label-id"
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Visible
+                        <span>
+                          since Aug 25, 2018
+                        </span>
+                      </span>
+                    </label>
+                    <label
+                      class="MuiFormControlLabel-root-id RadioGroupField-radioLabel-id"
                     >
-                      Visible
-                      <div>
-                        since Aug 25, 2018
-                      </div>
-                    </div>
-                  </span>
-                </label>
+                      <span
+                        class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiRadio-root-id MuiRadio-colorPrimary-id"
+                      >
+                        <span
+                          class="MuiIconButton-label-id"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="MuiSvgIcon-root-id"
+                            focusable="false"
+                            role="presentation"
+                            viewBox="0 0 24 24"
+                          >
+                            <path
+                              d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                            />
+                          </svg>
+                          <input
+                            class="MuiPrivateSwitchBase-input-id"
+                            name="isPublished"
+                            type="radio"
+                            value="false"
+                          />
+                        </span>
+                      </span>
+                      <span
+                        class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
+                      >
+                        Hidden
+                        <span />
+                      </span>
+                    </label>
+                  </div>
+                </div>
               </div>
               <div
                 class="FormSpacer-spacer-id"
@@ -90982,22 +90125,7 @@ exports[`Storyshots Views / Products / Product list default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Product
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Product
             </span>
           </button>
         </div>
@@ -92569,22 +91697,7 @@ exports[`Storyshots Views / Products / Product list loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Product
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Product
             </span>
           </button>
         </div>
@@ -93063,22 +92176,7 @@ exports[`Storyshots Views / Products / Product list no data 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Product
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Product
             </span>
           </button>
         </div>
@@ -93464,22 +92562,7 @@ exports[`Storyshots Views / Products / Product list with custom filters 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add Product
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Create Product
             </span>
           </button>
         </div>
@@ -95678,7 +94761,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
                       data-shrink="true"
                     >
                       Borders
@@ -95729,7 +94812,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                       </div>
                     </div>
                     <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
+                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
                     >
                       Generic form error
                     </p>
@@ -95743,7 +94826,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                     class="MuiFormControl-root-id MuiFormControl-fullWidth-id"
                   >
                     <label
-                      class="MuiFormLabel-root-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
+                      class="MuiFormLabel-root-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id"
                       data-shrink="true"
                     >
                       Legacy
@@ -95794,7 +94877,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
                       </div>
                     </div>
                     <p
-                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
+                      class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
                     >
                       Generic form error
                     </p>
@@ -97824,7 +96907,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -98057,7 +97140,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details default 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -98478,7 +97561,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -98711,7 +97794,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details form errors 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -99132,7 +98215,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details loading 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -99302,7 +98385,7 @@ exports[`Storyshots Views / Shipping / Shipping zone details loading 1`] = `
                   <span
                     class="MuiButton-label-id"
                   >
-                    Add rate
+                    Create rate
                   </span>
                 </button>
               </div>
@@ -99503,7 +98586,7 @@ exports[`Storyshots Views / Shipping / Shipping zones list default 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add shipping zone
+                  Create shipping zone
                 </span>
               </button>
             </div>
@@ -100007,15 +99090,29 @@ exports[`Storyshots Views / Shipping / Shipping zones list default 1`] = `
                   Shipping Weight Unit
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
                       id="select-unit"
                       role="button"
                       tabindex="0"
@@ -100122,7 +99219,7 @@ exports[`Storyshots Views / Shipping / Shipping zones list loading 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add shipping zone
+                  Create shipping zone
                 </span>
               </button>
             </div>
@@ -100408,15 +99505,29 @@ exports[`Storyshots Views / Shipping / Shipping zones list loading 1`] = `
                   Shipping Weight Unit
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-disabled-id MuiFilledInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id MuiInputBase-disabled-id MuiFilledInput-disabled-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-disabled-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
                       id="select-unit"
                       role="button"
                     >
@@ -100522,7 +99633,7 @@ exports[`Storyshots Views / Shipping / Shipping zones list no data 1`] = `
                 <span
                   class="MuiButton-label-id"
                 >
-                  Add shipping zone
+                  Create shipping zone
                 </span>
               </button>
             </div>
@@ -100730,15 +99841,29 @@ exports[`Storyshots Views / Shipping / Shipping zones list no data 1`] = `
                   Shipping Weight Unit
                 </label>
                 <div
-                  class="MuiInputBase-root-id MuiFilledInput-root-id MuiFilledInput-underline-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
+                  class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
                 >
+                  <fieldset
+                    aria-hidden="true"
+                    class="MuiPrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
+                    style="padding-left:8px"
+                  >
+                    <legend
+                      class="MuiPrivateNotchedOutline-legend-id"
+                      style="width:143px"
+                    >
+                      <span>
+                        ​
+                      </span>
+                    </legend>
+                  </fieldset>
                   <div
                     class="MuiSelect-root-id"
                   >
                     <div
                       aria-haspopup="true"
                       aria-pressed="false"
-                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-filled-id MuiInputBase-input-id MuiFilledInput-input-id"
+                      class="MuiSelect-select-id MuiSelect-selectMenu-id MuiSelect-outlined-id MuiInputBase-input-id MuiOutlinedInput-input-id"
                       id="select-unit"
                       role="button"
                       tabindex="0"
@@ -104476,22 +103601,7 @@ exports[`Storyshots Views / Staff / Staff members default 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add staff member
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Invite staff member
             </span>
           </button>
         </div>
@@ -105052,22 +104162,7 @@ exports[`Storyshots Views / Staff / Staff members when loading 1`] = `
             <span
               class="MuiButton-label-id"
             >
-              Add staff member
-              <svg
-                aria-hidden="true"
-                class="MuiSvgIcon-root-id"
-                focusable="false"
-                role="presentation"
-                viewBox="0 0 24 24"
-              >
-                <path
-                  d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
-                />
-                <path
-                  d="M0 0h24v24H0z"
-                  fill="none"
-                />
-              </svg>
+              Invite staff member
             </span>
           </button>
         </div>
@@ -105900,125 +104995,70 @@ exports[`Storyshots Views / Taxes / Country List default 1`] = `
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="includeTax"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="includeTax"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      All products prices are entered with tax included
-                    </span>
-                    <div />
-                  </div>
+                  All products prices are entered with tax included
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-checked-id MuiSwitch-checked-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id MuiSwitch-iconChecked-id"
-                      />
-                      <input
-                        checked=""
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="showGross"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-checked-id"
+                    name="showGross"
+                    type="checkbox"
+                    value="true"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Show gross prices to customers in the storefront
-                    </span>
-                    <div />
-                  </div>
+                  Show gross prices to customers in the storefront
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <label
                 class="MuiFormControlLabel-root-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id Checkbox-root-id"
+                  tabindex="0"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiIconButton-root-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        name="chargeTaxesOnShipping"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id"
+                    name="chargeTaxesOnShipping"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Charge taxes on shipping rates
-                    </span>
-                    <div />
-                  </div>
+                  Charge taxes on shipping rates
                 </span>
               </label>
               <div
@@ -106177,130 +105217,76 @@ exports[`Storyshots Views / Taxes / Country List loading 1`] = `
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="includeTax"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-disabled-id"
+                    disabled=""
+                    name="includeTax"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      All products prices are entered with tax included
-                    </span>
-                    <div />
-                  </div>
+                  All products prices are entered with tax included
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="showGross"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-disabled-id"
+                    disabled=""
+                    name="showGross"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Show gross prices to customers in the storefront
-                    </span>
-                    <div />
-                  </div>
+                  Show gross prices to customers in the storefront
                 </span>
               </label>
+              <div
+                class="FormSpacer-spacer-id"
+              />
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
               >
-                <span
-                  class="MuiSwitch-root-id"
+                <button
+                  class="MuiButtonBase-root-id MuiButtonBase-disabled-id Checkbox-root-id"
+                  disabled=""
+                  tabindex="-1"
+                  type="button"
                 >
-                  <span
-                    class="MuiButtonBase-root-id MuiButtonBase-disabled-id MuiIconButton-root-id MuiIconButton-disabled-id MuiPrivateSwitchBase-root-id MuiSwitch-switchBase-id MuiSwitch-colorPrimary-id MuiPrivateSwitchBase-disabled-id MuiSwitch-disabled-id"
-                    tabindex="-1"
-                  >
-                    <span
-                      class="MuiIconButton-label-id"
-                    >
-                      <span
-                        class="MuiSwitch-icon-id"
-                      />
-                      <input
-                        class="MuiPrivateSwitchBase-input-id"
-                        disabled=""
-                        name="chargeTaxesOnShipping"
-                        type="checkbox"
-                      />
-                    </span>
-                  </span>
-                  <span
-                    class="MuiSwitch-bar-id"
+                  <input
+                    class="Checkbox-box-id Checkbox-disabled-id"
+                    disabled=""
+                    name="chargeTaxesOnShipping"
+                    type="checkbox"
+                    value="false"
                   />
-                </span>
+                </button>
                 <span
                   class="MuiTypography-root-id MuiTypography-body2-id MuiFormControlLabel-label-id MuiFormControlLabel-disabled-id"
                 >
-                  <div
-                    class="ControlledSwitch-label-id"
-                  >
-                    <span
-                      class="ControlledSwitch-labelText-id"
-                    >
-                      Charge taxes on shipping rates
-                    </span>
-                    <div />
-                  </div>
+                  Charge taxes on shipping rates
                 </span>
               </label>
               <div