diff --git a/src/components/Card/Card.jsx b/src/components/Card/Card.jsx
index 6c8d93af77..c203f25ae4 100644
--- a/src/components/Card/Card.jsx
+++ b/src/components/Card/Card.jsx
@@ -41,9 +41,6 @@ const CardWrapper = ({
   onMouseUp,
   onTouchEnd,
   onTouchStart,
-  onMouseOver,
-  onFocus,
-  onBlur,
   tabIndex,
   testID,
   ...others
@@ -60,9 +57,6 @@ const CardWrapper = ({
       onTouchEnd={onTouchEnd}
       onTouchStart={onTouchStart}
       onScroll={onScroll}
-      onMouseOver={onMouseOver}
-      onFocus={onFocus}
-      onBlur={onBlur}
       tabIndex={tabIndex}
       className={classnames(className, `${iotPrefix}--card--wrapper`)}
       {...validOthers}
@@ -123,12 +117,6 @@ CardWrapper.propTypes = {
   onTouchEnd: PropTypes.func,
   onTouchStart: PropTypes.func,
   onScroll: PropTypes.func,
-  /** Allows custom mouse over event handlers, such as changing the style */
-  onMouseOver: PropTypes.func,
-  /** Allows custom keyboard event handlers, such as changing the style */
-  onFocus: PropTypes.func,
-  /** Allows custom keyboard event handlers, such as changing the style */
-  onBlur: PropTypes.func,
   /** Optionally sets a keyboard tab index for the container */
   tabIndex: PropTypes.number,
 };
@@ -141,9 +129,6 @@ CardWrapper.defaultProps = {
   onTouchEnd: undefined,
   onTouchStart: undefined,
   onScroll: undefined,
-  onMouseOver: undefined,
-  onFocus: undefined,
-  onBlur: undefined,
   tabIndex: undefined,
 };
 CardContent.propTypes = {
diff --git a/src/components/CardEditor/CardEditor.jsx b/src/components/CardEditor/CardEditor.jsx
index 19f545a94a..9f5c0e0cb8 100644
--- a/src/components/CardEditor/CardEditor.jsx
+++ b/src/components/CardEditor/CardEditor.jsx
@@ -37,11 +37,11 @@ const defaultProps = {
   supportedTypes: ['BAR', 'TIMESERIES', 'VALUE', 'IMAGE', 'TABLE'],
 };
 
+const baseClassName = `${iotPrefix}--card-editor`;
+
 const CardEditor = ({ cardJson, onShowGallery, onChange, onAddCard, supportedTypes, i18n }) => {
   const mergedI18N = { ...defaultProps.i18n, ...i18n };
 
-  const baseClassName = `${iotPrefix}--card-editor`;
-
   // show the gallery if no card is being edited
   const showGallery = cardJson === null || cardJson === undefined;
 
diff --git a/src/components/CardEditor/CardEditor.story.jsx b/src/components/CardEditor/CardEditor.story.jsx
index 07ca7adbad..3f21926f81 100644
--- a/src/components/CardEditor/CardEditor.story.jsx
+++ b/src/components/CardEditor/CardEditor.story.jsx
@@ -24,7 +24,7 @@ const CardEditorInteractive = () => {
       </div>
       <div style={{ position: 'absolute', right: 0, height: 'calc(100vh - 6rem)' }}>
         <CardEditor
-          value={data}
+          cardJson={data}
           onShowGallery={() => setData(null)}
           onAddCard={type => {
             setData({ ...defaultCard, id: `card-${counter + 1}`, type });
@@ -42,7 +42,7 @@ storiesOf('Watson IoT Experimental/CardEditor', module)
   .add('default', () => (
     <div style={{ position: 'absolute', right: 0, height: 'calc(100vh - 6rem)' }}>
       <CardEditor
-        value={object('value', {
+        cardJson={object('cardJson', {
           content: {
             attributes: [
               {
diff --git a/src/components/CardEditor/CardEditor.test.jsx b/src/components/CardEditor/CardEditor.test.jsx
index 3eda3b4471..1b3ecb5736 100644
--- a/src/components/CardEditor/CardEditor.test.jsx
+++ b/src/components/CardEditor/CardEditor.test.jsx
@@ -27,7 +27,7 @@ describe('CardEditor', () => {
         onAddCard={actions.onAddCard}
       />
     );
-    const addTableCardBtn = screen.getByTestId('card-gallery-list-TABLE-add');
+    const addTableCardBtn = screen.getByTitle('Data table');
     userEvent.click(addTableCardBtn);
     expect(actions.onAddCard).toHaveBeenCalledTimes(1);
   });
@@ -35,7 +35,7 @@ describe('CardEditor', () => {
   it('fires onChange when user edits title in form', () => {
     render(
       <CardEditor
-        value={defaultCard}
+        cardJson={defaultCard}
         onShowGallery={actions.onShowGallery}
         onChange={actions.onChange}
         onAddCard={actions.onAddCard}
@@ -59,7 +59,7 @@ describe('CardEditor', () => {
   it('fires onChange when user edits description in form', () => {
     render(
       <CardEditor
-        value={defaultCard}
+        cardJson={defaultCard}
         onShowGallery={actions.onShowGallery}
         onChange={actions.onChange}
         onAddCard={actions.onAddCard}
@@ -77,7 +77,7 @@ describe('CardEditor', () => {
   it('fires onShowGallery when user clicks button', () => {
     render(
       <CardEditor
-        value={defaultCard}
+        cardJson={defaultCard}
         onShowGallery={actions.onShowGallery}
         onChange={actions.onChange}
         onAddCard={actions.onAddCard}
@@ -94,7 +94,7 @@ describe('CardEditor', () => {
   it('opens and closes JSON code modal through button clicks', () => {
     render(
       <CardEditor
-        value={defaultCard}
+        cardJson={defaultCard}
         onShowGallery={actions.onShowGallery}
         onChange={actions.onChange}
         onAddCard={actions.onAddCard}
diff --git a/src/components/CardEditor/__snapshots__/CardEditor.story.storyshot b/src/components/CardEditor/__snapshots__/CardEditor.story.storyshot
index d6a64fdd26..608e153860 100644
--- a/src/components/CardEditor/__snapshots__/CardEditor.story.storyshot
+++ b/src/components/CardEditor/__snapshots__/CardEditor.story.storyshot
@@ -24,294 +24,282 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
       <div
         className="iot--card-editor"
       >
+        <div
+          className="iot--card-editor--header"
+        >
+          <button
+            className="gallery-button iot--btn bx--btn bx--btn--sm bx--btn--ghost"
+            disabled={false}
+            onClick={[Function]}
+            tabIndex={0}
+            type="button"
+          >
+            Add card
+            <svg
+              aria-hidden={true}
+              className="bx--btn__icon"
+              fill="currentColor"
+              focusable="false"
+              height={16}
+              preserveAspectRatio="xMidYMid meet"
+              viewBox="0 0 16 16"
+              width={16}
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M4 2v2H2V2h2zm1-1H1v4h4V1zM9 2v2H7V2h2zm1-1H6v4h4V1zM14 2v2h-2V2h2zm1-1h-4v4h4V1zM4 7v2H2V7h2zm1-1H1v4h4V6zM9 7v2H7V7h2zm1-1H6v4h4V6zM14 7v2h-2V7h2zm1-1h-4v4h4V6zM4 12v2H2v-2h2zm1-1H1v4h4v-4zM9 12v2H7v-2h2zm1-1H6v4h4v-4zM14 12v2h-2v-2h2zm1-1h-4v4h4v-4z"
+              />
+            </svg>
+          </button>
+        </div>
         <div
           className="iot--card-editor--content"
         >
           <div
-            className="iot--list iot--list__full-height"
+            className="iot--card-edit-form"
           >
             <div
-              className="iot--list-header-container"
+              className="bx--tabs"
+              role="navigation"
+              selected={0}
             >
               <div
-                className="iot--list-header"
+                aria-label="listbox"
+                className="bx--tabs-trigger"
+                onClick={[Function]}
+                onKeyPress={[Function]}
+                role="listbox"
+                tabIndex={0}
               >
-                <div
-                  className="iot--list-header--title"
+                <a
+                  className="bx--tabs-trigger-text"
+                  href="#"
+                  onClick={[Function]}
+                  tabIndex={-1}
                 >
-                  Gallery
-                </div>
-                <div
-                  className="iot--list-header--btn-container"
-                />
+                  Content
+                </a>
+                <svg
+                  aria-hidden={true}
+                  fill="currentColor"
+                  focusable="false"
+                  height={16}
+                  preserveAspectRatio="xMidYMid meet"
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                  />
+                  <title>
+                    show menu options
+                  </title>
+                </svg>
               </div>
-              <div
-                className="iot--list-header--search"
+              <ul
+                className="bx--tabs__nav bx--tabs__nav--hidden"
+                role="tablist"
               >
-                <div
-                  aria-labelledby="iot--list-header--search-search"
-                  className="bx--search bx--search--sm"
-                  role="search"
+                <li
+                  aria-controls="undefined__panel"
+                  aria-selected={true}
+                  className="bx--tabs__nav-item bx--tabs__nav-item--selected"
+                  onClick={[Function]}
+                  onKeyDown={[Function]}
+                  role="tab"
+                  tabIndex={-1}
                 >
-                  <svg
-                    aria-hidden={true}
-                    className="bx--search-magnifier"
-                    fill="currentColor"
-                    focusable="false"
-                    height={16}
-                    preserveAspectRatio="xMidYMid meet"
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
-                    />
-                  </svg>
-                  <label
-                    className="bx--label"
-                    htmlFor="iot--list-header--search"
-                    id="iot--list-header--search-search"
-                  >
-                    Enter a value
-                  </label>
-                  <input
-                    autoComplete="off"
-                    className="bx--search-input"
-                    id="iot--list-header--search"
-                    onChange={[Function]}
-                    placeholder="Enter a value"
-                    role="searchbox"
-                    type="text"
-                    value=""
-                  />
-                  <button
-                    aria-label="Clear search input"
-                    className="bx--search-close bx--search-close--hidden"
-                    onClick={[Function]}
-                    type="button"
+                  <a
+                    className="bx--tabs__nav-link"
+                    href="#"
+                    tabIndex={0}
                   >
-                    <svg
-                      aria-hidden={true}
-                      fill="currentColor"
-                      focusable="false"
-                      height={16}
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 32 32"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
-                      />
-                    </svg>
-                  </button>
-                </div>
-              </div>
+                    Content
+                  </a>
+                </li>
+              </ul>
             </div>
             <div
-              className="iot--list--content__full-height iot--list--content"
+              aria-hidden={false}
+              className="bx--tab-content"
+              hidden={false}
+              role="tabpanel"
+              selected={true}
             >
               <div
-                className="iot--list-item-parent"
-                data-floating-menu-container={true}
+                className="iot--card-edit-form--content"
               >
                 <div
-                  className="iot--list-item iot--list-item__selectable"
-                  data_testid={null}
-                  onClick={[Function]}
-                  onKeyPress={[Function]}
-                  role="button"
-                  tabIndex={0}
+                  className="iot--card-edit-form--input"
                 >
                   <div
-                    className="iot--list-item--content"
+                    className="bx--form-item bx--text-input-wrapper bx--text-input-wrapper--light"
                   >
-                    <div
-                      className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                    <label
+                      className="bx--label"
+                      htmlFor="title"
                     >
-                      <img
-                        alt="Simple bar"
-                        src="simple-bar-graph.svg"
-                      />
-                    </div>
+                      Card title
+                    </label>
                     <div
-                      className="iot--list-item--content--values"
+                      className="bx--text-input__field-outer-wrapper"
                     >
                       <div
-                        className="iot--list-item--content--values--main"
+                        className="bx--text-input__field-wrapper"
+                        data-invalid={null}
+                        data-warn={null}
                       >
-                        <div
-                          className="iot--list-item--content--values--value"
-                          title="Simple bar"
-                        >
-                          Simple bar
-                        </div>
+                        <input
+                          className="bx--text-input bx--text__input bx--text-input--light"
+                          disabled={false}
+                          id="title"
+                          onChange={[Function]}
+                          onClick={[Function]}
+                          type="text"
+                          value="Calculated"
+                        />
                       </div>
                     </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="iot--list-item-parent"
-                data-floating-menu-container={true}
-              >
                 <div
-                  className="iot--list-item iot--list-item__selectable"
-                  data_testid={null}
-                  onClick={[Function]}
-                  onKeyPress={[Function]}
-                  role="button"
-                  tabIndex={0}
+                  className="iot--card-edit-form--input"
                 >
                   <div
-                    className="iot--list-item--content"
+                    className="bx--form-item"
                   >
-                    <div
-                      className="iot--list-item--content--icon iot--list-item--content--icon__left"
-                    >
-                      <img
-                        alt="Time series"
-                        src="line-graph.svg"
-                      />
-                    </div>
-                    <div
-                      className="iot--list-item--content--values"
+                    <label
+                      className="bx--label"
+                      htmlFor="description"
                     >
-                      <div
-                        className="iot--list-item--content--values--main"
-                      >
-                        <div
-                          className="iot--list-item--content--values--value"
-                          title="Time series line"
-                        >
-                          Time series line
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="iot--list-item-parent"
-                data-floating-menu-container={true}
-              >
-                <div
-                  className="iot--list-item iot--list-item__selectable"
-                  data_testid={null}
-                  onClick={[Function]}
-                  onKeyPress={[Function]}
-                  role="button"
-                  tabIndex={0}
-                >
-                  <div
-                    className="iot--list-item--content"
-                  >
+                      Description (Optional)
+                    </label>
                     <div
-                      className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                      className="bx--text-area__wrapper"
+                      data-invalid={null}
                     >
-                      <img
-                        alt="Value / KPI"
-                        src="value-kpi.svg"
+                      <textarea
+                        aria-describedby={null}
+                        aria-invalid={null}
+                        className="bx--text-area bx--text-area--light"
+                        cols={50}
+                        disabled={false}
+                        id="description"
+                        onChange={[Function]}
+                        onClick={[Function]}
+                        placeholder=""
+                        rows={4}
                       />
                     </div>
-                    <div
-                      className="iot--list-item--content--values"
-                    >
-                      <div
-                        className="iot--list-item--content--values--main"
-                      >
-                        <div
-                          className="iot--list-item--content--values--value"
-                          title="Value / KPI"
-                        >
-                          Value / KPI
-                        </div>
-                      </div>
-                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="iot--list-item-parent"
-                data-floating-menu-container={true}
-              >
                 <div
-                  className="iot--list-item iot--list-item__selectable"
-                  data_testid={null}
-                  onClick={[Function]}
-                  onKeyPress={[Function]}
-                  role="button"
-                  tabIndex={0}
+                  className="iot--card-edit-form--input"
                 >
                   <div
-                    className="iot--list-item--content"
+                    className="bx--dropdown__wrapper bx--list-box__wrapper"
                   >
-                    <div
-                      className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                    <label
+                      className="bx--label"
+                      htmlFor="downshift-0-toggle-button"
+                      id="downshift-0-label"
                     >
-                      <img
-                        alt="Image card"
-                        src="image.svg"
-                      />
-                    </div>
+                      Size
+                    </label>
                     <div
-                      className="iot--list-item--content--values"
+                      className="bx--dropdown bx--dropdown--light bx--list-box bx--list-box--light"
+                      id="size"
+                      onClick={[Function]}
+                      onKeyDown={[Function]}
                     >
-                      <div
-                        className="iot--list-item--content--values--main"
+                      <button
+                        aria-disabled={false}
+                        aria-expanded={false}
+                        aria-haspopup="listbox"
+                        aria-labelledby="downshift-0-label downshift-0-toggle-button"
+                        className="bx--list-box__field"
+                        disabled={false}
+                        id="downshift-0-toggle-button"
+                        onClick={[Function]}
+                        onKeyDown={[Function]}
+                        type="button"
                       >
+                        <span
+                          className="bx--list-box__label"
+                        >
+                          Medium thin (4x2)
+                        </span>
                         <div
-                          className="iot--list-item--content--values--value"
-                          title="Image"
+                          className="bx--list-box__menu-icon"
                         >
-                          Image
+                          <svg
+                            aria-label="Open menu"
+                            fill="currentColor"
+                            focusable="false"
+                            height={16}
+                            name="chevron--down"
+                            preserveAspectRatio="xMidYMid meet"
+                            role="img"
+                            viewBox="0 0 16 16"
+                            width={16}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                            />
+                            <title>
+                              Open menu
+                            </title>
+                          </svg>
                         </div>
-                      </div>
+                      </button>
+                      <div
+                        aria-labelledby="downshift-0-label"
+                        className="bx--list-box__menu"
+                        id="downshift-0-menu"
+                        onBlur={[Function]}
+                        onKeyDown={[Function]}
+                        onMouseLeave={[Function]}
+                        role="listbox"
+                        tabIndex={-1}
+                      />
                     </div>
                   </div>
                 </div>
               </div>
-              <div
-                className="iot--list-item-parent"
-                data-floating-menu-container={true}
+            </div>
+            <div
+              className="iot--card-edit-form--footer"
+            >
+              <button
+                className="iot--btn bx--btn bx--btn--sm bx--btn--tertiary"
+                disabled={false}
+                onClick={[Function]}
+                tabIndex={0}
+                type="button"
               >
-                <div
-                  className="iot--list-item iot--list-item__selectable"
-                  data_testid={null}
-                  onClick={[Function]}
-                  onKeyPress={[Function]}
-                  role="button"
-                  tabIndex={0}
+                Open JSON editor
+                <svg
+                  aria-hidden={true}
+                  className="bx--btn__icon"
+                  fill="currentColor"
+                  focusable="false"
+                  height={16}
+                  preserveAspectRatio="xMidYMid meet"
+                  viewBox="0 0 32 32"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <div
-                    className="iot--list-item--content"
-                  >
-                    <div
-                      className="iot--list-item--content--icon iot--list-item--content--icon__left"
-                    >
-                      <img
-                        alt="Table"
-                        src="data-table.svg"
-                      />
-                    </div>
-                    <div
-                      className="iot--list-item--content--values"
-                    >
-                      <div
-                        className="iot--list-item--content--values--main"
-                      >
-                        <div
-                          className="iot--list-item--content--values--value"
-                          title="Data table"
-                        >
-                          Data table
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
+                  <path
+                    d="M31 16L24 23 22.59 21.59 28.17 16 22.59 10.41 24 9 31 16zM1 16L8 9 9.41 10.41 3.83 16 9.41 21.59 8 23 1 16z"
+                  />
+                  <path
+                    d="M5.91 15H26.080000000000002V17H5.91z"
+                    transform="rotate(-75 15.996 16)"
+                  />
+                </svg>
+              </button>
             </div>
           </div>
         </div>
@@ -385,294 +373,282 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <div
           className="iot--card-editor"
         >
+          <div
+            className="iot--card-editor--header"
+          >
+            <button
+              className="gallery-button iot--btn bx--btn bx--btn--sm bx--btn--ghost"
+              disabled={false}
+              onClick={[Function]}
+              tabIndex={0}
+              type="button"
+            >
+              Add card
+              <svg
+                aria-hidden={true}
+                className="bx--btn__icon"
+                fill="currentColor"
+                focusable="false"
+                height={16}
+                preserveAspectRatio="xMidYMid meet"
+                viewBox="0 0 16 16"
+                width={16}
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M4 2v2H2V2h2zm1-1H1v4h4V1zM9 2v2H7V2h2zm1-1H6v4h4V1zM14 2v2h-2V2h2zm1-1h-4v4h4V1zM4 7v2H2V7h2zm1-1H1v4h4V6zM9 7v2H7V7h2zm1-1H6v4h4V6zM14 7v2h-2V7h2zm1-1h-4v4h4V6zM4 12v2H2v-2h2zm1-1H1v4h4v-4zM9 12v2H7v-2h2zm1-1H6v4h4v-4zM14 12v2h-2v-2h2zm1-1h-4v4h4v-4z"
+                />
+              </svg>
+            </button>
+          </div>
           <div
             className="iot--card-editor--content"
           >
             <div
-              className="iot--list iot--list__full-height"
+              className="iot--card-edit-form"
             >
               <div
-                className="iot--list-header-container"
+                className="bx--tabs"
+                role="navigation"
+                selected={0}
               >
                 <div
-                  className="iot--list-header"
+                  aria-label="listbox"
+                  className="bx--tabs-trigger"
+                  onClick={[Function]}
+                  onKeyPress={[Function]}
+                  role="listbox"
+                  tabIndex={0}
                 >
-                  <div
-                    className="iot--list-header--title"
+                  <a
+                    className="bx--tabs-trigger-text"
+                    href="#"
+                    onClick={[Function]}
+                    tabIndex={-1}
                   >
-                    Gallery
-                  </div>
-                  <div
-                    className="iot--list-header--btn-container"
-                  />
+                    Content
+                  </a>
+                  <svg
+                    aria-hidden={true}
+                    fill="currentColor"
+                    focusable="false"
+                    height={16}
+                    preserveAspectRatio="xMidYMid meet"
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                    />
+                    <title>
+                      show menu options
+                    </title>
+                  </svg>
                 </div>
-                <div
-                  className="iot--list-header--search"
+                <ul
+                  className="bx--tabs__nav bx--tabs__nav--hidden"
+                  role="tablist"
                 >
-                  <div
-                    aria-labelledby="iot--list-header--search-search"
-                    className="bx--search bx--search--sm"
-                    role="search"
+                  <li
+                    aria-controls="undefined__panel"
+                    aria-selected={true}
+                    className="bx--tabs__nav-item bx--tabs__nav-item--selected"
+                    onClick={[Function]}
+                    onKeyDown={[Function]}
+                    role="tab"
+                    tabIndex={-1}
                   >
-                    <svg
-                      aria-hidden={true}
-                      className="bx--search-magnifier"
-                      fill="currentColor"
-                      focusable="false"
-                      height={16}
-                      preserveAspectRatio="xMidYMid meet"
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M15,14.3L10.7,10c1.9-2.3,1.6-5.8-0.7-7.7S4.2,0.7,2.3,3S0.7,8.8,3,10.7c2,1.7,5,1.7,7,0l4.3,4.3L15,14.3z M2,6.5	C2,4,4,2,6.5,2S11,4,11,6.5S9,11,6.5,11S2,9,2,6.5z"
-                      />
-                    </svg>
-                    <label
-                      className="bx--label"
-                      htmlFor="iot--list-header--search"
-                      id="iot--list-header--search-search"
-                    >
-                      Enter a value
-                    </label>
-                    <input
-                      autoComplete="off"
-                      className="bx--search-input"
-                      id="iot--list-header--search"
-                      onChange={[Function]}
-                      placeholder="Enter a value"
-                      role="searchbox"
-                      type="text"
-                      value=""
-                    />
-                    <button
-                      aria-label="Clear search input"
-                      className="bx--search-close bx--search-close--hidden"
-                      onClick={[Function]}
-                      type="button"
+                    <a
+                      className="bx--tabs__nav-link"
+                      href="#"
+                      tabIndex={0}
                     >
-                      <svg
-                        aria-hidden={true}
-                        fill="currentColor"
-                        focusable="false"
-                        height={16}
-                        preserveAspectRatio="xMidYMid meet"
-                        viewBox="0 0 32 32"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
-                        />
-                      </svg>
-                    </button>
-                  </div>
-                </div>
+                      Content
+                    </a>
+                  </li>
+                </ul>
               </div>
               <div
-                className="iot--list--content__full-height iot--list--content"
+                aria-hidden={false}
+                className="bx--tab-content"
+                hidden={false}
+                role="tabpanel"
+                selected={true}
               >
                 <div
-                  className="iot--list-item-parent"
-                  data-floating-menu-container={true}
+                  className="iot--card-edit-form--content"
                 >
                   <div
-                    className="iot--list-item iot--list-item__selectable"
-                    data_testid={null}
-                    onClick={[Function]}
-                    onKeyPress={[Function]}
-                    role="button"
-                    tabIndex={0}
+                    className="iot--card-edit-form--input"
                   >
                     <div
-                      className="iot--list-item--content"
+                      className="bx--form-item bx--text-input-wrapper bx--text-input-wrapper--light"
                     >
-                      <div
-                        className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                      <label
+                        className="bx--label"
+                        htmlFor="title"
                       >
-                        <img
-                          alt="Simple bar"
-                          src="simple-bar-graph.svg"
-                        />
-                      </div>
+                        Card title
+                      </label>
                       <div
-                        className="iot--list-item--content--values"
+                        className="bx--text-input__field-outer-wrapper"
                       >
                         <div
-                          className="iot--list-item--content--values--main"
+                          className="bx--text-input__field-wrapper"
+                          data-invalid={null}
+                          data-warn={null}
                         >
-                          <div
-                            className="iot--list-item--content--values--value"
-                            title="Simple bar"
-                          >
-                            Simple bar
-                          </div>
+                          <input
+                            className="bx--text-input bx--text__input bx--text-input--light"
+                            disabled={false}
+                            id="title"
+                            onChange={[Function]}
+                            onClick={[Function]}
+                            type="text"
+                            value="New card"
+                          />
                         </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  className="iot--list-item-parent"
-                  data-floating-menu-container={true}
-                >
                   <div
-                    className="iot--list-item iot--list-item__selectable"
-                    data_testid={null}
-                    onClick={[Function]}
-                    onKeyPress={[Function]}
-                    role="button"
-                    tabIndex={0}
+                    className="iot--card-edit-form--input"
                   >
                     <div
-                      className="iot--list-item--content"
+                      className="bx--form-item"
                     >
-                      <div
-                        className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                      <label
+                        className="bx--label"
+                        htmlFor="description"
                       >
-                        <img
-                          alt="Time series"
-                          src="line-graph.svg"
-                        />
-                      </div>
+                        Description (Optional)
+                      </label>
                       <div
-                        className="iot--list-item--content--values"
+                        className="bx--text-area__wrapper"
+                        data-invalid={null}
                       >
-                        <div
-                          className="iot--list-item--content--values--main"
-                        >
-                          <div
-                            className="iot--list-item--content--values--value"
-                            title="Time series line"
-                          >
-                            Time series line
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  className="iot--list-item-parent"
-                  data-floating-menu-container={true}
-                >
-                  <div
-                    className="iot--list-item iot--list-item__selectable"
-                    data_testid={null}
-                    onClick={[Function]}
-                    onKeyPress={[Function]}
-                    role="button"
-                    tabIndex={0}
-                  >
-                    <div
-                      className="iot--list-item--content"
-                    >
-                      <div
-                        className="iot--list-item--content--icon iot--list-item--content--icon__left"
-                      >
-                        <img
-                          alt="Value / KPI"
-                          src="value-kpi.svg"
+                        <textarea
+                          aria-describedby={null}
+                          aria-invalid={null}
+                          className="bx--text-area bx--text-area--light"
+                          cols={50}
+                          disabled={false}
+                          id="description"
+                          onChange={[Function]}
+                          onClick={[Function]}
+                          placeholder=""
+                          rows={4}
                         />
                       </div>
-                      <div
-                        className="iot--list-item--content--values"
-                      >
-                        <div
-                          className="iot--list-item--content--values--main"
-                        >
-                          <div
-                            className="iot--list-item--content--values--value"
-                            title="Value / KPI"
-                          >
-                            Value / KPI
-                          </div>
-                        </div>
-                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  className="iot--list-item-parent"
-                  data-floating-menu-container={true}
-                >
                   <div
-                    className="iot--list-item iot--list-item__selectable"
-                    data_testid={null}
-                    onClick={[Function]}
-                    onKeyPress={[Function]}
-                    role="button"
-                    tabIndex={0}
+                    className="iot--card-edit-form--input"
                   >
                     <div
-                      className="iot--list-item--content"
+                      className="bx--dropdown__wrapper bx--list-box__wrapper"
                     >
-                      <div
-                        className="iot--list-item--content--icon iot--list-item--content--icon__left"
+                      <label
+                        className="bx--label"
+                        htmlFor="downshift-1-toggle-button"
+                        id="downshift-1-label"
                       >
-                        <img
-                          alt="Image card"
-                          src="image.svg"
-                        />
-                      </div>
+                        Size
+                      </label>
                       <div
-                        className="iot--list-item--content--values"
+                        className="bx--dropdown bx--dropdown--light bx--list-box bx--list-box--light"
+                        id="size"
+                        onClick={[Function]}
+                        onKeyDown={[Function]}
                       >
-                        <div
-                          className="iot--list-item--content--values--main"
+                        <button
+                          aria-disabled={false}
+                          aria-expanded={false}
+                          aria-haspopup="listbox"
+                          aria-labelledby="downshift-1-label downshift-1-toggle-button"
+                          className="bx--list-box__field"
+                          disabled={false}
+                          id="downshift-1-toggle-button"
+                          onClick={[Function]}
+                          onKeyDown={[Function]}
+                          type="button"
                         >
+                          <span
+                            className="bx--list-box__label"
+                          >
+                            Small (4x1)
+                          </span>
                           <div
-                            className="iot--list-item--content--values--value"
-                            title="Image"
+                            className="bx--list-box__menu-icon"
                           >
-                            Image
+                            <svg
+                              aria-label="Open menu"
+                              fill="currentColor"
+                              focusable="false"
+                              height={16}
+                              name="chevron--down"
+                              preserveAspectRatio="xMidYMid meet"
+                              role="img"
+                              viewBox="0 0 16 16"
+                              width={16}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
+                              />
+                              <title>
+                                Open menu
+                              </title>
+                            </svg>
                           </div>
-                        </div>
+                        </button>
+                        <div
+                          aria-labelledby="downshift-1-label"
+                          className="bx--list-box__menu"
+                          id="downshift-1-menu"
+                          onBlur={[Function]}
+                          onKeyDown={[Function]}
+                          onMouseLeave={[Function]}
+                          role="listbox"
+                          tabIndex={-1}
+                        />
                       </div>
                     </div>
                   </div>
                 </div>
-                <div
-                  className="iot--list-item-parent"
-                  data-floating-menu-container={true}
+              </div>
+              <div
+                className="iot--card-edit-form--footer"
+              >
+                <button
+                  className="iot--btn bx--btn bx--btn--sm bx--btn--tertiary"
+                  disabled={false}
+                  onClick={[Function]}
+                  tabIndex={0}
+                  type="button"
                 >
-                  <div
-                    className="iot--list-item iot--list-item__selectable"
-                    data_testid={null}
-                    onClick={[Function]}
-                    onKeyPress={[Function]}
-                    role="button"
-                    tabIndex={0}
+                  Open JSON editor
+                  <svg
+                    aria-hidden={true}
+                    className="bx--btn__icon"
+                    fill="currentColor"
+                    focusable="false"
+                    height={16}
+                    preserveAspectRatio="xMidYMid meet"
+                    viewBox="0 0 32 32"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
                   >
-                    <div
-                      className="iot--list-item--content"
-                    >
-                      <div
-                        className="iot--list-item--content--icon iot--list-item--content--icon__left"
-                      >
-                        <img
-                          alt="Table"
-                          src="data-table.svg"
-                        />
-                      </div>
-                      <div
-                        className="iot--list-item--content--values"
-                      >
-                        <div
-                          className="iot--list-item--content--values--main"
-                        >
-                          <div
-                            className="iot--list-item--content--values--value"
-                            title="Data table"
-                          >
-                            Data table
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
+                    <path
+                      d="M31 16L24 23 22.59 21.59 28.17 16 22.59 10.41 24 9 31 16zM1 16L8 9 9.41 10.41 3.83 16 9.41 21.59 8 23 1 16z"
+                    />
+                    <path
+                      d="M5.91 15H26.080000000000002V17H5.91z"
+                      transform="rotate(-75 15.996 16)"
+                    />
+                  </svg>
+                </button>
               </div>
             </div>
           </div>
diff --git a/src/components/ComboBox/__snapshots__/ComboBox.story.storyshot b/src/components/ComboBox/__snapshots__/ComboBox.story.storyshot
index 47a35efbb9..e078873b5f 100644
--- a/src/components/ComboBox/__snapshots__/ComboBox.story.storyshot
+++ b/src/components/ComboBox/__snapshots__/ComboBox.story.storyshot
@@ -29,7 +29,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <div
           aria-expanded={false}
           aria-haspopup="listbox"
-          aria-labelledby="downshift-0-label"
+          aria-labelledby="downshift-2-label"
           aria-owns={null}
           className="bx--list-box__wrapper"
           role="combobox"
@@ -37,7 +37,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
           <label
             className="bx--label"
             htmlFor="carbon-combobox-example"
-            id="downshift-0-label"
+            id="downshift-2-label"
           >
             Combobox title
           </label>
@@ -64,7 +64,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 aria-activedescendant={null}
                 aria-autocomplete="list"
                 aria-controls={null}
-                aria-labelledby="downshift-0-label"
+                aria-labelledby="downshift-2-label"
                 autoComplete="off"
                 className="bx--text-input bx--text-input--empty"
                 data-testid="combo-box"
@@ -169,7 +169,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <div
           aria-expanded={false}
           aria-haspopup="listbox"
-          aria-labelledby="downshift-4-label"
+          aria-labelledby="downshift-6-label"
           aria-owns={null}
           className="bx--list-box__wrapper"
           role="combobox"
@@ -177,7 +177,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
           <label
             className="bx--label"
             htmlFor="carbon-combobox-example"
-            id="downshift-4-label"
+            id="downshift-6-label"
           >
             Combobox title
           </label>
@@ -204,7 +204,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 aria-activedescendant={null}
                 aria-autocomplete="list"
                 aria-controls={null}
-                aria-labelledby="downshift-4-label"
+                aria-labelledby="downshift-6-label"
                 autoComplete="off"
                 className="bx--text-input bx--text-input--empty"
                 data-testid="combo-box"
@@ -309,7 +309,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <div
           aria-expanded={false}
           aria-haspopup="listbox"
-          aria-labelledby="downshift-3-label"
+          aria-labelledby="downshift-5-label"
           aria-owns={null}
           className="bx--list-box__wrapper"
           role="combobox"
@@ -317,7 +317,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
           <label
             className="bx--label"
             htmlFor="carbon-combobox-example"
-            id="downshift-3-label"
+            id="downshift-5-label"
           >
             Combobox title
           </label>
@@ -344,7 +344,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 aria-activedescendant={null}
                 aria-autocomplete="list"
                 aria-controls={null}
-                aria-labelledby="downshift-3-label"
+                aria-labelledby="downshift-5-label"
                 autoComplete="off"
                 className="bx--text-input bx--text-input--empty"
                 data-testid="combo-box"
@@ -453,7 +453,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <div
           aria-expanded={false}
           aria-haspopup="listbox"
-          aria-labelledby="downshift-1-label"
+          aria-labelledby="downshift-3-label"
           aria-owns={null}
           className="bx--list-box__wrapper"
           role="combobox"
@@ -461,7 +461,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
           <label
             className="bx--label"
             htmlFor="carbon-combobox-example"
-            id="downshift-1-label"
+            id="downshift-3-label"
           >
             Combobox title
           </label>
@@ -488,7 +488,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 aria-activedescendant={null}
                 aria-autocomplete="list"
                 aria-controls={null}
-                aria-labelledby="downshift-1-label"
+                aria-labelledby="downshift-3-label"
                 autoComplete="off"
                 className="bx--text-input bx--text-input--empty"
                 data-testid="combo-box"
@@ -585,7 +585,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
       <div
         aria-expanded={false}
         aria-haspopup="listbox"
-        aria-labelledby="downshift-2-label"
+        aria-labelledby="downshift-4-label"
         aria-owns={null}
         className="bx--list-box__wrapper"
         role="combobox"
@@ -593,7 +593,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
         <label
           className="bx--label"
           htmlFor="carbon-combobox-example"
-          id="downshift-2-label"
+          id="downshift-4-label"
         >
           Combobox title
         </label>
@@ -620,7 +620,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
               aria-activedescendant={null}
               aria-autocomplete="list"
               aria-controls={null}
-              aria-labelledby="downshift-2-label"
+              aria-labelledby="downshift-4-label"
               autoComplete="off"
               className="bx--text-input"
               data-testid="combo-box"
diff --git a/src/components/DashboardEditor/DashboardEditor.jsx b/src/components/DashboardEditor/DashboardEditor.jsx
index 064b890851..d695aa4d1b 100644
--- a/src/components/DashboardEditor/DashboardEditor.jsx
+++ b/src/components/DashboardEditor/DashboardEditor.jsx
@@ -110,7 +110,6 @@ const DashboardEditor = ({
   // show the gallery if no card is being edited
   const [dashboardJson, setDashboardJson] = useState(initialValue);
   const [selectedCardId, setSelectedCardId] = useState();
-  const [borderHoveredCardId, setBorderHoveredCardId] = useState(null);
 
   const addCard = type => {
     const cardData = getDefaultCard(type);
@@ -158,7 +157,7 @@ const DashboardEditor = ({
         {notification}
         <div className={`${baseClassName}--preview`}>
           <DashboardGrid
-            isEditable={!!borderHoveredCardId}
+            isEditable
             onBreakpointChange={() => {}}
             onLayoutChange={(newLayout, newLayouts) =>
               setDashboardJson({
@@ -169,7 +168,6 @@ const DashboardEditor = ({
           >
             {dashboardJson.cards.map(cardData => {
               const isSelected = selectedCardId === cardData.id;
-              const isBorderHovered = borderHoveredCardId === cardData.id;
               const onSelectCard = () => setSelectedCardId(cardData.id);
               const onDuplicateCard = id => duplicateCard(id);
               const onRemoveCard = id => removeCard(id);
@@ -179,21 +177,11 @@ const DashboardEditor = ({
                 renderCardPreview(
                   cardData,
                   isSelected,
-                  isBorderHovered,
-                  setBorderHoveredCardId,
                   onSelectCard,
                   onDuplicateCard,
                   onRemoveCard
                 ) ??
-                getCardPreview(
-                  cardData,
-                  isSelected,
-                  isBorderHovered,
-                  setBorderHoveredCardId,
-                  onSelectCard,
-                  onDuplicateCard,
-                  onRemoveCard
-                )
+                getCardPreview(cardData, isSelected, onSelectCard, onDuplicateCard, onRemoveCard)
               );
             })}
           </DashboardGrid>
diff --git a/src/components/DashboardEditor/__snapshots__/DashboardEditor.story.storyshot b/src/components/DashboardEditor/__snapshots__/DashboardEditor.story.storyshot
index cf031ce405..3a65e6a1a9 100644
--- a/src/components/DashboardEditor/__snapshots__/DashboardEditor.story.storyshot
+++ b/src/components/DashboardEditor/__snapshots__/DashboardEditor.story.storyshot
@@ -285,7 +285,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 }
               >
                 <div
-                  className="iot--card react-grid-item react-resizable-hide react-resizable iot--card--wrapper"
+                  className="iot--card react-grid-item react-draggable react-resizable-hide react-resizable iot--card--wrapper"
                   data-testid="Card"
                   id="Custom"
                   onMouseDown={[Function]}
@@ -403,14 +403,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                   </div>
                 </div>
                 <div
-                  className="iot--card react-grid-item react-resizable-hide react-resizable iot--card--wrapper"
+                  className="iot--card react-grid-item react-draggable react-resizable-hide react-resizable iot--card--wrapper"
                   data-testid="Card"
                   id="Standard"
-                  onBlur={[Function]}
                   onClick={[Function]}
-                  onFocus={[Function]}
                   onMouseDown={[Function]}
-                  onMouseOver={[Function]}
                   onMouseUp={[Function]}
                   onTouchEnd={[Function]}
                   role="presentation"
@@ -2185,14 +2182,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                 }
               >
                 <div
-                  className="iot--card react-grid-item react-resizable-hide react-resizable iot--card--wrapper"
+                  className="iot--card react-grid-item react-draggable react-resizable-hide react-resizable iot--card--wrapper"
                   data-testid="Card"
                   id="Custom"
-                  onBlur={[Function]}
                   onClick={[Function]}
-                  onFocus={[Function]}
                   onMouseDown={[Function]}
-                  onMouseOver={[Function]}
                   onMouseUp={[Function]}
                   onTouchEnd={[Function]}
                   role="presentation"
@@ -2311,14 +2305,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT Exper
                   </div>
                 </div>
                 <div
-                  className="iot--card react-grid-item react-resizable-hide react-resizable iot--card--wrapper"
+                  className="iot--card react-grid-item react-draggable react-resizable-hide react-resizable iot--card--wrapper"
                   data-testid="Card"
                   id="Standard"
-                  onBlur={[Function]}
                   onClick={[Function]}
-                  onFocus={[Function]}
                   onMouseDown={[Function]}
-                  onMouseOver={[Function]}
                   onMouseUp={[Function]}
                   onTouchEnd={[Function]}
                   role="presentation"
diff --git a/src/components/DashboardEditor/_dashboard-editor.scss b/src/components/DashboardEditor/_dashboard-editor.scss
index 8ce79a78ef..e3e92e0262 100644
--- a/src/components/DashboardEditor/_dashboard-editor.scss
+++ b/src/components/DashboardEditor/_dashboard-editor.scss
@@ -55,17 +55,12 @@
   }
   &--preview {
     flex: 1;
-    padding: 0 $spacing-07 $spacing-05 $spacing-07;
 
     &__selected-card {
       border: solid $spacing-01 $interactive-04;
       box-sizing: content-box;
       margin: -$spacing-01;
     }
-
-    &__border-hovered-card {
-      cursor: move;
-    }
   }
   &--sidebar {
     height: 100%;
diff --git a/src/components/DashboardEditor/editorUtils.jsx b/src/components/DashboardEditor/editorUtils.jsx
index d1fa35ad8d..558ad727cf 100644
--- a/src/components/DashboardEditor/editorUtils.jsx
+++ b/src/components/DashboardEditor/editorUtils.jsx
@@ -316,26 +316,20 @@ const renderImageCard = (cardJson, commonProps) => (
 export const getCardPreview = (
   cardData,
   isSelected,
-  isBorderHovered,
-  setBorderHoveredCardId,
   onSelectCard,
   onDuplicateCard,
   onRemoveCard
 ) => {
   const commonProps = {
-    ...(isSelected || isBorderHovered
+    ...(isSelected
       ? {
           className: classNames({
             [`${baseClassName}--preview__selected-card`]: isSelected,
-            [`${baseClassName}--preview__border-hovered-card`]: isBorderHovered,
           }),
         }
       : {}),
-    availableActions: { edit: true, clone: true, delete: true },
+    availableActions: { clone: true, delete: true },
     onCardAction: (id, actionId) => {
-      if (actionId === CARD_ACTIONS.EDIT_CARD) {
-        onSelectCard();
-      }
       if (actionId === CARD_ACTIONS.CLONE_CARD) {
         onDuplicateCard(id);
       }
@@ -343,26 +337,6 @@ export const getCardPreview = (
         onRemoveCard(id);
       }
     },
-    onMouseOver: e => {
-      if (
-        // if the card is already selected, the full card wrapper can be captured in the event
-        e.target?.getAttribute('class')?.includes('iot--card ') ||
-        // if the card is not selected, use the relatedTarget, AKA where the event originated
-        // from which is the outer editor preview or the grid-layout
-        e.relatedTarget?.getAttribute('class')?.includes('iot--dashboard-editor--preview') ||
-        e.relatedTarget?.getAttribute('class')?.includes('react-grid-layout')
-      ) {
-        setBorderHoveredCardId(cardData.id);
-      } else {
-        setBorderHoveredCardId(null);
-      }
-    },
-    onFocus: () => {
-      setBorderHoveredCardId(cardData.id);
-    },
-    onBlur: () => {
-      setBorderHoveredCardId(null);
-    },
     tabIndex: 0,
     onClick: () => onSelectCard(),
   };
diff --git a/src/components/Table/TableViewDropdown/__snapshots__/TableViewDropdown.story.storyshot b/src/components/Table/TableViewDropdown/__snapshots__/TableViewDropdown.story.storyshot
index bd49358625..9a1440856c 100644
--- a/src/components/Table/TableViewDropdown/__snapshots__/TableViewDropdown.story.storyshot
+++ b/src/components/Table/TableViewDropdown/__snapshots__/TableViewDropdown.story.storyshot
@@ -38,10 +38,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               aria-disabled={false}
               aria-expanded={false}
               aria-haspopup="listbox"
-              aria-labelledby="downshift-18-label downshift-18-toggle-button"
+              aria-labelledby="downshift-20-label downshift-20-toggle-button"
               className="bx--list-box__field"
               disabled={false}
-              id="downshift-18-toggle-button"
+              id="downshift-20-toggle-button"
               onClick={[Function]}
               onKeyDown={[Function]}
               type="button"
@@ -108,9 +108,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
               </div>
             </button>
             <div
-              aria-labelledby="downshift-18-label"
+              aria-labelledby="downshift-20-label"
               className="bx--list-box__menu"
-              id="downshift-18-menu"
+              id="downshift-20-menu"
               onBlur={[Function]}
               onKeyDown={[Function]}
               onMouseLeave={[Function]}
diff --git a/src/components/Table/__snapshots__/Table.story.storyshot b/src/components/Table/__snapshots__/Table.story.storyshot
index 8e971be7c1..f197133ca7 100644
--- a/src/components/Table/__snapshots__/Table.story.storyshot
+++ b/src/components/Table/__snapshots__/Table.story.storyshot
@@ -3446,7 +3446,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      aria-labelledby="downshift-17-label"
+                      aria-labelledby="downshift-19-label"
                       aria-owns={null}
                       className="bx--list-box__wrapper"
                       role="combobox"
@@ -3475,7 +3475,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-autocomplete="list"
                             aria-controls={null}
                             aria-label="Filter"
-                            aria-labelledby="downshift-17-label"
+                            aria-labelledby="downshift-19-label"
                             autoComplete="off"
                             className="bx--text-input"
                             disabled={false}
@@ -66670,10 +66670,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     aria-disabled={false}
                     aria-expanded={false}
                     aria-haspopup="listbox"
-                    aria-labelledby="downshift-6-label downshift-6-toggle-button"
+                    aria-labelledby="downshift-8-label downshift-8-toggle-button"
                     className="bx--list-box__field"
                     disabled={false}
-                    id="downshift-6-toggle-button"
+                    id="downshift-8-toggle-button"
                     onClick={[Function]}
                     onKeyDown={[Function]}
                     type="button"
@@ -66740,9 +66740,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     </div>
                   </button>
                   <div
-                    aria-labelledby="downshift-6-label"
+                    aria-labelledby="downshift-8-label"
                     className="bx--list-box__menu"
-                    id="downshift-6-menu"
+                    id="downshift-8-menu"
                     onBlur={[Function]}
                     onKeyDown={[Function]}
                     onMouseLeave={[Function]}
@@ -67469,7 +67469,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        aria-labelledby="downshift-7-label"
+                        aria-labelledby="downshift-9-label"
                         aria-owns={null}
                         className="bx--list-box__wrapper"
                         role="combobox"
@@ -67498,7 +67498,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               aria-autocomplete="list"
                               aria-controls={null}
                               aria-label="Filter"
-                              aria-labelledby="downshift-7-label"
+                              aria-labelledby="downshift-9-label"
                               autoComplete="off"
                               className="bx--text-input bx--text-input--empty"
                               disabled={false}
@@ -119944,7 +119944,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        aria-labelledby="downshift-5-label"
+                        aria-labelledby="downshift-7-label"
                         aria-owns={null}
                         className="bx--list-box__wrapper"
                         role="combobox"
@@ -119973,7 +119973,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               aria-autocomplete="list"
                               aria-controls={null}
                               aria-label="Filter"
-                              aria-labelledby="downshift-5-label"
+                              aria-labelledby="downshift-7-label"
                               autoComplete="off"
                               className="bx--text-input"
                               disabled={false}
@@ -124291,10 +124291,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-disabled={false}
                             aria-expanded={false}
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-11-label downshift-11-toggle-button"
+                            aria-labelledby="downshift-13-label downshift-13-toggle-button"
                             className="bx--list-box__field"
                             disabled={false}
-                            id="downshift-11-toggle-button"
+                            id="downshift-13-toggle-button"
                             onClick={[Function]}
                             onKeyDown={[Function]}
                             type="button"
@@ -124330,10 +124330,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             </div>
                           </button>
                           <div
-                            aria-labelledby="downshift-11-label"
+                            aria-labelledby="downshift-13-label"
                             aria-multiselectable="true"
                             className="bx--list-box__menu"
-                            id="downshift-11-menu"
+                            id="downshift-13-menu"
                             onBlur={[Function]}
                             onKeyDown={[Function]}
                             onMouseLeave={[Function]}
@@ -128681,10 +128681,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-disabled={false}
                             aria-expanded={false}
                             aria-haspopup="listbox"
-                            aria-labelledby="downshift-10-label downshift-10-toggle-button"
+                            aria-labelledby="downshift-12-label downshift-12-toggle-button"
                             className="bx--list-box__field"
                             disabled={false}
-                            id="downshift-10-toggle-button"
+                            id="downshift-12-toggle-button"
                             onClick={[Function]}
                             onKeyDown={[Function]}
                             type="button"
@@ -128745,10 +128745,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             </div>
                           </button>
                           <div
-                            aria-labelledby="downshift-10-label"
+                            aria-labelledby="downshift-12-label"
                             aria-multiselectable="true"
                             className="bx--list-box__menu"
-                            id="downshift-10-menu"
+                            id="downshift-12-menu"
                             onBlur={[Function]}
                             onKeyDown={[Function]}
                             onMouseLeave={[Function]}
@@ -136659,7 +136659,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        aria-labelledby="downshift-12-label"
+                        aria-labelledby="downshift-14-label"
                         aria-owns={null}
                         className="bx--list-box__wrapper"
                         role="combobox"
@@ -136688,7 +136688,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               aria-autocomplete="list"
                               aria-controls={null}
                               aria-label="Filter"
-                              aria-labelledby="downshift-12-label"
+                              aria-labelledby="downshift-14-label"
                               autoComplete="off"
                               className="bx--text-input"
                               disabled={false}
@@ -140847,10 +140847,10 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     aria-disabled={false}
                     aria-expanded={false}
                     aria-haspopup="listbox"
-                    aria-labelledby="downshift-8-label downshift-8-toggle-button"
+                    aria-labelledby="downshift-10-label downshift-10-toggle-button"
                     className="bx--list-box__field"
                     disabled={false}
-                    id="downshift-8-toggle-button"
+                    id="downshift-10-toggle-button"
                     onClick={[Function]}
                     onKeyDown={[Function]}
                     type="button"
@@ -140917,9 +140917,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     </div>
                   </button>
                   <div
-                    aria-labelledby="downshift-8-label"
+                    aria-labelledby="downshift-10-label"
                     className="bx--list-box__menu"
-                    id="downshift-8-menu"
+                    id="downshift-10-menu"
                     onBlur={[Function]}
                     onKeyDown={[Function]}
                     onMouseLeave={[Function]}
@@ -141646,7 +141646,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        aria-labelledby="downshift-9-label"
+                        aria-labelledby="downshift-11-label"
                         aria-owns={null}
                         className="bx--list-box__wrapper"
                         role="combobox"
@@ -141675,7 +141675,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               aria-autocomplete="list"
                               aria-controls={null}
                               aria-label="Filter"
-                              aria-labelledby="downshift-9-label"
+                              aria-labelledby="downshift-11-label"
                               autoComplete="off"
                               className="bx--text-input bx--text-input--empty"
                               disabled={false}
@@ -163670,7 +163670,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                       <div
                         aria-expanded={false}
                         aria-haspopup="listbox"
-                        aria-labelledby="downshift-15-label"
+                        aria-labelledby="downshift-17-label"
                         aria-owns={null}
                         className="bx--list-box__wrapper"
                         role="combobox"
@@ -163699,7 +163699,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                               aria-autocomplete="list"
                               aria-controls={null}
                               aria-label="Filter"
-                              aria-labelledby="downshift-15-label"
+                              aria-labelledby="downshift-17-label"
                               autoComplete="off"
                               className="bx--text-input"
                               disabled={false}
@@ -166932,7 +166932,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      aria-labelledby="downshift-16-label"
+                      aria-labelledby="downshift-18-label"
                       aria-owns={null}
                       className="bx--list-box__wrapper"
                       role="combobox"
@@ -166961,7 +166961,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-autocomplete="list"
                             aria-controls={null}
                             aria-label="Filter"
-                            aria-labelledby="downshift-16-label"
+                            aria-labelledby="downshift-18-label"
                             autoComplete="off"
                             className="bx--text-input"
                             disabled={false}
@@ -194652,7 +194652,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      aria-labelledby="downshift-13-label"
+                      aria-labelledby="downshift-15-label"
                       aria-owns={null}
                       className="bx--list-box__wrapper"
                       role="combobox"
@@ -194681,7 +194681,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-autocomplete="list"
                             aria-controls={null}
                             aria-label="Filter"
-                            aria-labelledby="downshift-13-label"
+                            aria-labelledby="downshift-15-label"
                             autoComplete="off"
                             className="bx--text-input"
                             disabled={false}
@@ -229854,7 +229854,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                     <div
                       aria-expanded={false}
                       aria-haspopup="listbox"
-                      aria-labelledby="downshift-14-label"
+                      aria-labelledby="downshift-16-label"
                       aria-owns={null}
                       className="bx--list-box__wrapper"
                       role="combobox"
@@ -229883,7 +229883,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Table
                             aria-autocomplete="list"
                             aria-controls={null}
                             aria-label="Filter"
-                            aria-labelledby="downshift-14-label"
+                            aria-labelledby="downshift-16-label"
                             autoComplete="off"
                             className="bx--text-input bx--text-input--empty"
                             disabled={false}
diff --git a/src/components/WizardModal/WizardModal.test.jsx b/src/components/WizardModal/WizardModal.test.jsx
index c0292e983c..8ae197b871 100644
--- a/src/components/WizardModal/WizardModal.test.jsx
+++ b/src/components/WizardModal/WizardModal.test.jsx
@@ -159,33 +159,35 @@ describe('WizardModal', () => {
   it('clicking on previous button or previous step will call onBack', () => {
     const callBack = jest.fn();
 
-    const getStep = (step) => screen.getByTestId(`iot--progress-step-button-main-${step}`);
+    const getStep = step => screen.getByTestId(`iot--progress-step-button-main-${step}`);
 
-    render(<WizardModal 
-      {...commonWizardProps} 
-      onBack={callBack}
+    render(
+      <WizardModal
+        {...commonWizardProps}
+        onBack={callBack}
         steps={[
-        { label: 'step1', content: 'page 1' },
-        { label: 'step2', content: 'page 2' },
-        { label: 'step3', content: 'page 3' },
-      ]} 
-    />);
-
-      // Go to second step
-      getStep('step2').click();
-
-      // clicking previous step in progressIndicator will call callBack
-      userEvent.click(getStep('step1'));
-      expect(callBack).toHaveBeenCalled();
-      expect(callBack.mock.calls[0][0]).toBe(0);
-
-      // Go to third step
-      getStep('step3').click();
-
-      // clicking on previous button will trigger onBack
-      userEvent.click(screen.getByText('Previous'));
-      expect(callBack).toHaveBeenCalledTimes(2);
-      expect(callBack.mock.calls[1][0]).toBe(1);
+          { label: 'step1', content: 'page 1' },
+          { label: 'step2', content: 'page 2' },
+          { label: 'step3', content: 'page 3' },
+        ]}
+      />
+    );
+
+    // Go to second step
+    getStep('step2').click();
+
+    // clicking previous step in progressIndicator will call callBack
+    userEvent.click(getStep('step1'));
+    expect(callBack).toHaveBeenCalled();
+    expect(callBack.mock.calls[0][0]).toBe(0);
+
+    // Go to third step
+    getStep('step3').click();
+
+    // clicking on previous button will trigger onBack
+    userEvent.click(screen.getByText('Previous'));
+    expect(callBack).toHaveBeenCalledTimes(2);
+    expect(callBack.mock.calls[1][0]).toBe(1);
   });
   it('clicking on progressIndicator steps will render related content', () => {
     render(