diff --git a/__tests__/__snapshots__/snapshots.test.js.snap b/__tests__/__snapshots__/snapshots.test.js.snap
index 97ea2955b..027089d41 100644
--- a/__tests__/__snapshots__/snapshots.test.js.snap
+++ b/__tests__/__snapshots__/snapshots.test.js.snap
@@ -2,465 +2,449 @@
 
 exports[`@financial-times/x-gift-article renders a default Free article x-gift-article 1`] = `
 <div
-  data-x-dash-id="base-gift-article-static-id"
+  className="GiftArticle_container__nGwU_"
 >
-  <div
-    className="GiftArticle_container__nGwU_"
+  <form
+    name="gift-form"
   >
-    <form
-      name="gift-form"
+    <fieldset
+      className="o-forms GiftArticle_form__lC3qs"
     >
-      <fieldset
-        className="o-forms GiftArticle_form__lC3qs"
+      <div
+        className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
       >
+        Share this article (free)
+      </div>
+      <div
+        className="GiftArticle_url-section__Bsa7N"
+        data-section-id="nonGiftLink"
+        data-trackable="nonGiftLink"
+      >
+        <input
+          className="o-forms__text GiftArticle_url__17SKH"
+          disabled={false}
+          name="non-gift-link"
+          readOnly={true}
+          type="text"
+          value="https://www.ft.com/content/blahblahblah"
+        />
         <div
-          className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
+          className="GiftArticle_message__2zqH2"
         >
-          Share this article (free)
+          This article is currently 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
+          >
+            free
+          </span>
+           for anyone to read
         </div>
         <div
-          className="GiftArticle_url-section__Bsa7N"
-          data-section-id="nonGiftLink"
-          data-trackable="nonGiftLink"
+          className="GiftArticle_buttons__SB7ql"
         >
-          <input
-            className="o-forms__text GiftArticle_url__17SKH"
-            disabled={false}
-            name="non-gift-link"
-            readOnly={true}
-            type="text"
-            value="https://www.ft.com/content/blahblahblah"
-          />
-          <div
-            className="GiftArticle_message__2zqH2"
-          >
-            This article is currently 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              free
-            </span>
-             for anyone to read
-          </div>
-          <div
-            className="GiftArticle_buttons__SB7ql"
+          <a
+            className="o-buttons o-buttons--primary o-buttons--big"
+            href="mailto:?subject=Title%20Title%20Title%20Title&body=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
           >
-            <a
-              className="o-buttons o-buttons--primary o-buttons--big"
-              href="mailto:?subject=Title%20Title%20Title%20Title&body=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah"
-              onClick={[Function]}
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              Email link
-            </a>
-          </div>
+            Email link
+          </a>
         </div>
-      </fieldset>
-    </form>
-  </div>
+      </div>
+    </fieldset>
+  </form>
 </div>
 `;
 
 exports[`@financial-times/x-gift-article renders a default With gift credits x-gift-article 1`] = `
 <div
-  data-x-dash-id="base-gift-article-static-id"
+  className="GiftArticle_container__nGwU_"
 >
-  <div
-    className="GiftArticle_container__nGwU_"
+  <form
+    name="gift-form"
   >
-    <form
-      name="gift-form"
+    <fieldset
+      className="o-forms GiftArticle_form__lC3qs"
     >
-      <fieldset
-        className="o-forms GiftArticle_form__lC3qs"
+      <div
+        className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
       >
-        <div
-          className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
+        Share this article (with credit)
+      </div>
+      <div
+        className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+      >
+        <input
+          checked={true}
+          className="o-forms__radio"
+          id="giftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="giftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="giftLink"
         >
-          Share this article (with credit)
-        </div>
-        <div
-          className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
+          >
+            anyone
+          </span>
+           (uses 1 gift credit)
+        </label>
+        <input
+          checked={false}
+          className="o-forms__radio"
+          id="nonGiftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="nonGiftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="nonGiftLink"
         >
-          <input
-            checked={true}
-            className="o-forms__radio"
-            id="giftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="giftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="giftLink"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              anyone
-            </span>
-             (uses 1 gift credit)
-          </label>
-          <input
-            checked={false}
-            className="o-forms__radio"
-            id="nonGiftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="nonGiftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="nonGiftLink"
+            other FT subscribers
+          </span>
+        </label>
+      </div>
+      <div
+        className="GiftArticle_url-section__Bsa7N"
+        data-section-id="giftLink"
+        data-trackable="giftLink"
+      >
+        <input
+          className="o-forms__text GiftArticle_url__17SKH"
+          disabled={true}
+          name="example-gift-link"
+          readOnly={true}
+          type="text"
+          value="https://on.ft.com/gift_link"
+        />
+        <div
+          className="GiftArticle_message__2zqH2"
+        >
+          You have 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              other FT subscribers
-            </span>
-          </label>
+             gift article 
+            credits
+          </span>
+           left this month
         </div>
         <div
-          className="GiftArticle_url-section__Bsa7N"
-          data-section-id="giftLink"
-          data-trackable="giftLink"
+          className="GiftArticle_buttons__SB7ql"
         >
-          <input
-            className="o-forms__text GiftArticle_url__17SKH"
-            disabled={true}
-            name="example-gift-link"
-            readOnly={true}
-            type="text"
-            value="https://on.ft.com/gift_link"
-          />
-          <div
-            className="GiftArticle_message__2zqH2"
-          >
-            You have 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-               gift article 
-              credits
-            </span>
-             left this month
-          </div>
-          <div
-            className="GiftArticle_buttons__SB7ql"
+          <button
+            className="o-buttons o-buttons--primary o-buttons--big"
+            onClick={[Function]}
+            type="button"
           >
-            <button
-              className="o-buttons o-buttons--primary o-buttons--big"
-              onClick={[Function]}
-              type="button"
-            >
-              Create gift link
-            </button>
-          </div>
+            Create gift link
+          </button>
         </div>
-      </fieldset>
-    </form>
+      </div>
+    </fieldset>
+  </form>
+  <div
+    className="o-share o-share--inverse MobileShareButtons_container__3eAtc"
+    data-o-component="o-share"
+  >
     <div
-      className="o-share o-share--inverse MobileShareButtons_container__3eAtc"
-      data-o-component="o-share"
+      className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
     >
-      <div
-        className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
+      Share on Social
+    </div>
+    <ul>
+      <li
+        className="o-share__action MobileShareButtons_button__17W-1"
+        data-share="facebook"
       >
-        Share on Social
-      </div>
-      <ul>
-        <li
-          className="o-share__action MobileShareButtons_button__17W-1"
-          data-share="facebook"
+        <a
+          className="o-share__icon o-share__icon--facebook MobileShareButtons_facebook__1ji2o"
+          data-trackable="facebook"
+          href="http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;t=Title%20Title%20Title%20Title"
+          rel="noopener"
         >
-          <a
-            className="o-share__icon o-share__icon--facebook MobileShareButtons_facebook__1ji2o"
-            data-trackable="facebook"
-            href="http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;t=Title%20Title%20Title%20Title"
-            rel="noopener"
+          Facebook 
+          <span
+            className="o-share__text"
           >
-            Facebook 
-            <span
-              className="o-share__text"
-            >
-              (opens new window)
-            </span>
-          </a>
-        </li>
-        <li
-          className="o-share__action MobileShareButtons_button__17W-1"
-          data-share="twitter"
+            (opens new window)
+          </span>
+        </a>
+      </li>
+      <li
+        className="o-share__action MobileShareButtons_button__17W-1"
+        data-share="twitter"
+      >
+        <a
+          className="o-share__icon o-share__icon--twitter MobileShareButtons_twitter__1QRsw"
+          data-trackable="twitter"
+          href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;text=Title%20Title%20Title%20Title&amp;via=financialtimes"
+          rel="noopener"
         >
-          <a
-            className="o-share__icon o-share__icon--twitter MobileShareButtons_twitter__1QRsw"
-            data-trackable="twitter"
-            href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;text=Title%20Title%20Title%20Title&amp;via=financialtimes"
-            rel="noopener"
+          Twitter 
+          <span
+            className="o-share__text"
           >
-            Twitter 
-            <span
-              className="o-share__text"
-            >
-              (opens new window)
-            </span>
-          </a>
-        </li>
-        <li
-          className="o-share__action MobileShareButtons_button__17W-1"
-          data-share="linkedin"
+            (opens new window)
+          </span>
+        </a>
+      </li>
+      <li
+        className="o-share__action MobileShareButtons_button__17W-1"
+        data-share="linkedin"
+      >
+        <a
+          className="o-share__icon o-share__icon--linkedin MobileShareButtons_linkedin__1-2-Y"
+          data-trackable="linkedin"
+          href="http://www.linkedin.com/shareArticle?mini=true&amp;url=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;title=Title%20Title%20Title%20Title&amp;source=Financial+Times"
+          rel="noopener"
         >
-          <a
-            className="o-share__icon o-share__icon--linkedin MobileShareButtons_linkedin__1-2-Y"
-            data-trackable="linkedin"
-            href="http://www.linkedin.com/shareArticle?mini=true&amp;url=https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah&amp;title=Title%20Title%20Title%20Title&amp;source=Financial+Times"
-            rel="noopener"
+          LinkedIn 
+          <span
+            className="o-share__text"
           >
-            LinkedIn 
-            <span
-              className="o-share__text"
-            >
-              (opens new window)
-            </span>
-          </a>
-        </li>
-        <li
-          className="o-share__action MobileShareButtons_button__17W-1 o-share__action--whatsapp"
-          data-share="whatsapp"
+            (opens new window)
+          </span>
+        </a>
+      </li>
+      <li
+        className="o-share__action MobileShareButtons_button__17W-1 o-share__action--whatsapp"
+        data-share="whatsapp"
+      >
+        <a
+          className="o-share__icon o-share__icon--whatsapp MobileShareButtons_whatsapp__16VoZ"
+          data-trackable="whatsapp"
+          href="whatsapp://send?text=Title%20Title%20Title%20Title%20-%20https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah"
+          rel="noopener"
         >
-          <a
-            className="o-share__icon o-share__icon--whatsapp MobileShareButtons_whatsapp__16VoZ"
-            data-trackable="whatsapp"
-            href="whatsapp://send?text=Title%20Title%20Title%20Title%20-%20https%3A%2F%2Fwww.ft.com%2Fcontent%2Fblahblahblah"
-            rel="noopener"
+          Whatsapp 
+          <span
+            className="o-share__text"
           >
-            Whatsapp 
-            <span
-              className="o-share__text"
-            >
-              (opens new window)
-            </span>
-          </a>
-        </li>
-      </ul>
-    </div>
+            (opens new window)
+          </span>
+        </a>
+      </li>
+    </ul>
   </div>
 </div>
 `;
 
 exports[`@financial-times/x-gift-article renders a default With native share on App x-gift-article 1`] = `
 <div
-  data-x-dash-id="base-gift-article-static-id"
+  className="GiftArticle_container__nGwU_"
 >
-  <div
-    className="GiftArticle_container__nGwU_"
+  <form
+    name="gift-form"
   >
-    <form
-      name="gift-form"
+    <fieldset
+      className="o-forms GiftArticle_form__lC3qs"
     >
-      <fieldset
-        className="o-forms GiftArticle_form__lC3qs"
+      <div
+        className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
       >
-        <div
-          className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
+        Share this article (on App)
+      </div>
+      <div
+        className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+      >
+        <input
+          checked={true}
+          className="o-forms__radio"
+          id="giftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="giftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="giftLink"
         >
-          Share this article (on App)
-        </div>
-        <div
-          className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
+          >
+            anyone
+          </span>
+           (uses 1 gift credit)
+        </label>
+        <input
+          checked={false}
+          className="o-forms__radio"
+          id="nonGiftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="nonGiftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="nonGiftLink"
         >
-          <input
-            checked={true}
-            className="o-forms__radio"
-            id="giftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="giftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="giftLink"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              anyone
-            </span>
-             (uses 1 gift credit)
-          </label>
-          <input
-            checked={false}
-            className="o-forms__radio"
-            id="nonGiftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="nonGiftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="nonGiftLink"
+            other FT subscribers
+          </span>
+        </label>
+      </div>
+      <div
+        className="GiftArticle_url-section__Bsa7N"
+        data-section-id="giftLink"
+        data-trackable="giftLink"
+      >
+        <input
+          className="o-forms__text GiftArticle_url__17SKH"
+          disabled={true}
+          name="example-gift-link"
+          readOnly={true}
+          type="text"
+          value="https://on.ft.com/gift_link"
+        />
+        <div
+          className="GiftArticle_message__2zqH2"
+        >
+          You have 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              other FT subscribers
-            </span>
-          </label>
+             gift article 
+            credits
+          </span>
+           left this month
         </div>
         <div
-          className="GiftArticle_url-section__Bsa7N"
-          data-section-id="giftLink"
-          data-trackable="giftLink"
+          className="GiftArticle_buttons__SB7ql"
         >
-          <input
-            className="o-forms__text GiftArticle_url__17SKH"
-            disabled={true}
-            name="example-gift-link"
-            readOnly={true}
-            type="text"
-            value="https://on.ft.com/gift_link"
-          />
-          <div
-            className="GiftArticle_message__2zqH2"
-          >
-            You have 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-               gift article 
-              credits
-            </span>
-             left this month
-          </div>
-          <div
-            className="GiftArticle_buttons__SB7ql"
+          <button
+            className="o-buttons o-buttons--primary o-buttons--big"
+            onClick={[Function]}
+            type="button"
           >
-            <button
-              className="o-buttons o-buttons--primary o-buttons--big"
-              onClick={[Function]}
-              type="button"
-            >
-              Create gift link
-            </button>
-          </div>
+            Create gift link
+          </button>
         </div>
-      </fieldset>
-    </form>
-  </div>
+      </div>
+    </fieldset>
+  </form>
 </div>
 `;
 
 exports[`@financial-times/x-gift-article renders a default Without gift credits x-gift-article 1`] = `
 <div
-  data-x-dash-id="base-gift-article-static-id"
+  className="GiftArticle_container__nGwU_"
 >
-  <div
-    className="GiftArticle_container__nGwU_"
+  <form
+    name="gift-form"
   >
-    <form
-      name="gift-form"
+    <fieldset
+      className="o-forms GiftArticle_form__lC3qs"
     >
-      <fieldset
-        className="o-forms GiftArticle_form__lC3qs"
+      <div
+        className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
       >
-        <div
-          className="GiftArticle_title__3wb0x GiftArticle_bold__Ys2Sp"
+        Share this article (without credit)
+      </div>
+      <div
+        className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+      >
+        <input
+          checked={true}
+          className="o-forms__radio"
+          id="giftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="giftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="giftLink"
         >
-          Share this article (without credit)
-        </div>
-        <div
-          className="o-forms__group o-forms__group--inline GiftArticle_radio-button-section__h1-xz"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
+          >
+            anyone
+          </span>
+           (uses 1 gift credit)
+        </label>
+        <input
+          checked={false}
+          className="o-forms__radio"
+          id="nonGiftLink"
+          name="gift-form__radio"
+          onChange={[Function]}
+          type="radio"
+          value="nonGiftLink"
+        />
+        <label
+          className="o-forms__label"
+          htmlFor="nonGiftLink"
         >
-          <input
-            checked={true}
-            className="o-forms__radio"
-            id="giftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="giftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="giftLink"
+          with 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              anyone
-            </span>
-             (uses 1 gift credit)
-          </label>
-          <input
-            checked={false}
-            className="o-forms__radio"
-            id="nonGiftLink"
-            name="gift-form__radio"
-            onChange={[Function]}
-            type="radio"
-            value="nonGiftLink"
-          />
-          <label
-            className="o-forms__label"
-            htmlFor="nonGiftLink"
+            other FT subscribers
+          </span>
+        </label>
+      </div>
+      <div
+        className="GiftArticle_url-section__Bsa7N"
+        data-section-id="giftLink"
+        data-trackable="giftLink"
+      >
+        <input
+          className="o-forms__text GiftArticle_url__17SKH"
+          disabled={true}
+          name="example-gift-link"
+          readOnly={true}
+          type="text"
+          value="https://on.ft.com/gift_link"
+        />
+        <div
+          className="GiftArticle_message__2zqH2"
+        >
+          You have 
+          <span
+            className="GiftArticle_bold__Ys2Sp"
           >
-            with 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-              other FT subscribers
-            </span>
-          </label>
+             gift article 
+            credits
+          </span>
+           left this month
         </div>
         <div
-          className="GiftArticle_url-section__Bsa7N"
-          data-section-id="giftLink"
-          data-trackable="giftLink"
+          className="GiftArticle_buttons__SB7ql"
         >
-          <input
-            className="o-forms__text GiftArticle_url__17SKH"
-            disabled={true}
-            name="example-gift-link"
-            readOnly={true}
-            type="text"
-            value="https://on.ft.com/gift_link"
-          />
-          <div
-            className="GiftArticle_message__2zqH2"
+          <button
+            className="o-buttons o-buttons--primary o-buttons--big"
+            onClick={[Function]}
+            type="button"
           >
-            You have 
-            <span
-              className="GiftArticle_bold__Ys2Sp"
-            >
-               gift article 
-              credits
-            </span>
-             left this month
-          </div>
-          <div
-            className="GiftArticle_buttons__SB7ql"
-          >
-            <button
-              className="o-buttons o-buttons--primary o-buttons--big"
-              onClick={[Function]}
-              type="button"
-            >
-              Create gift link
-            </button>
-          </div>
+            Create gift link
+          </button>
         </div>
-      </fieldset>
-    </form>
-  </div>
+      </div>
+    </fieldset>
+  </form>
 </div>
 `;