diff --git a/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap b/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
index ebb82943..91327ee1 100644
--- a/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
+++ b/src/components/ActivityFeed/__snapshots__/ActivityFeed.test.js.snap
@@ -53,8 +53,8 @@ exports[`ActivityFeed matches snapshot 1`] = `
       <div>
         <p>
           Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
         </p>
         <p>
           2017-11-09, 08:12
@@ -70,8 +70,8 @@ exports[`ActivityFeed matches snapshot 1`] = `
       <div>
         <p>
           Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
         </p>
       </div>
       <p>
diff --git a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap
index 584f98ce..547b6e0f 100644
--- a/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap
+++ b/src/components/TransactionPanel/__snapshots__/TransactionPanel.test.js.snap
@@ -407,8 +407,8 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -433,8 +433,8 @@ exports[`TransactionPanel - Order accepted matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -1098,8 +1098,8 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -1124,8 +1124,8 @@ exports[`TransactionPanel - Order autodeclined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -1789,8 +1789,8 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -1815,8 +1815,8 @@ exports[`TransactionPanel - Order canceled matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -2480,8 +2480,8 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -2506,8 +2506,8 @@ exports[`TransactionPanel - Order declined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -3181,8 +3181,8 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -3207,8 +3207,8 @@ exports[`TransactionPanel - Order delivered matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -3877,8 +3877,8 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -3903,8 +3903,8 @@ exports[`TransactionPanel - Order enquired matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -4566,8 +4566,8 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -4592,8 +4592,8 @@ exports[`TransactionPanel - Order preauthorized matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -5257,8 +5257,8 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -5283,8 +5283,8 @@ exports[`TransactionPanel - Sale accepted matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -5948,8 +5948,8 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -5974,8 +5974,8 @@ exports[`TransactionPanel - Sale autodeclined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -6639,8 +6639,8 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -6665,8 +6665,8 @@ exports[`TransactionPanel - Sale canceled matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -7330,8 +7330,8 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -7356,8 +7356,8 @@ exports[`TransactionPanel - Sale declined matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -8031,8 +8031,8 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -8057,8 +8057,8 @@ exports[`TransactionPanel - Sale delivered matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -8727,8 +8727,8 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -8753,8 +8753,8 @@ exports[`TransactionPanel - Sale enquired matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -9416,8 +9416,8 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg1
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
@@ -9442,8 +9442,8 @@ exports[`TransactionPanel - Sale preauthorized matches snapshot 1`] = `
             Object {
               "attributes": Object {
                 "content": "Message msg2
-          
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
                 "createdAt": 2017-11-09T08:12:00.000Z,
               },
               "id": UUID {
diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
index e8a68266..c232399e 100644
--- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
+++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
@@ -30,7 +30,7 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
     >
       <div>
         <div>
-          <Component
+          <LinkTabNavHorizontal
             className={null}
             rootClassName={null}
             skin="light"
@@ -48,14 +48,12 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
                     },
                   },
                   "selected": false,
-                  "text": <h1
-                    className={undefined}
-              >
+                  "text": <h1>
                     <FormattedMessage
-                          id="AuthenticationPage.signupLinkText"
-                          values={Object {}}
+                      id="AuthenticationPage.signupLinkText"
+                      values={Object {}}
                     />
-              </h1>,
+                  </h1>,
                 },
                 Object {
                   "linkProps": Object {
@@ -67,14 +65,12 @@ exports[`AuthenticationPageComponent matches snapshot 1`] = `
                     },
                   },
                   "selected": true,
-                  "text": <h1
-                    className={undefined}
-              >
+                  "text": <h1>
                     <FormattedMessage
-                          id="AuthenticationPage.loginLinkText"
-                          values={Object {}}
+                      id="AuthenticationPage.loginLinkText"
+                      values={Object {}}
                     />
-              </h1>,
+                  </h1>,
                 },
               ]
             }
diff --git a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
index 90cfd87f..4a236187 100644
--- a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
+++ b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
@@ -36,7 +36,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="ContactDetailsPage.contactDetailsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -46,7 +46,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="ContactDetailsPage.passwordTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -56,7 +56,7 @@ exports[`ContactDetailsPage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="ContactDetailsPage.paymentsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
         ]
       }
diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
index 5190eb80..34eadb9d 100644
--- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
+++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
@@ -46,10 +46,10 @@ exports[`InboxPage matches snapshot 1`] = `
               "selected": true,
               "text": <span>
                 <FormattedMessage
-                      id="InboxPage.ordersTabTitle"
-                      values={Object {}}
+                  id="InboxPage.ordersTabTitle"
+                  values={Object {}}
                 />
-          </span>,
+              </span>,
             },
             Object {
               "linkProps": Object {
@@ -61,10 +61,10 @@ exports[`InboxPage matches snapshot 1`] = `
               "selected": false,
               "text": <span>
                 <FormattedMessage
-                      id="InboxPage.salesTabTitle"
-                      values={Object {}}
+                  id="InboxPage.salesTabTitle"
+                  values={Object {}}
                 />
-          </span>,
+              </span>,
             },
           ]
         }
@@ -78,7 +78,7 @@ exports[`InboxPage matches snapshot 1`] = `
         <li
           key="order-1"
         >
-          <Component
+          <InboxItem
             intl={
               Object {
                 "formatDate": [Function],
@@ -216,7 +216,7 @@ exports[`InboxPage matches snapshot 1`] = `
         <li
           key="order-2"
         >
-          <Component
+          <InboxItem
             intl={
               Object {
                 "formatDate": [Function],
@@ -468,10 +468,10 @@ exports[`InboxPage matches snapshot 3`] = `
               "selected": false,
               "text": <span>
                 <FormattedMessage
-                      id="InboxPage.ordersTabTitle"
-                      values={Object {}}
+                  id="InboxPage.ordersTabTitle"
+                  values={Object {}}
                 />
-          </span>,
+              </span>,
             },
             Object {
               "linkProps": Object {
@@ -483,10 +483,10 @@ exports[`InboxPage matches snapshot 3`] = `
               "selected": true,
               "text": <span>
                 <FormattedMessage
-                      id="InboxPage.salesTabTitle"
-                      values={Object {}}
+                  id="InboxPage.salesTabTitle"
+                  values={Object {}}
                 />
-          </span>,
+              </span>,
             },
           ]
         }
@@ -500,7 +500,7 @@ exports[`InboxPage matches snapshot 3`] = `
         <li
           key="sale-1"
         >
-          <Component
+          <InboxItem
             intl={
               Object {
                 "formatDate": [Function],
@@ -638,7 +638,7 @@ exports[`InboxPage matches snapshot 3`] = `
         <li
           key="sale-2"
         >
-          <Component
+          <InboxItem
             intl={
               Object {
                 "formatDate": [Function],
diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
index 44b190a8..3d30ecdf 100644
--- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
+++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
@@ -119,7 +119,6 @@ exports[`ListingPage matches snapshot 1`] = `
               formattedPrice={55}
               hostLink={
                 <NamedLink
-                  className={undefined}
                   name="ListingPage"
                   params={
                     Object {
@@ -323,7 +322,7 @@ exports[`ListingPage matches snapshot 1`] = `
                        
                       title
                       
-                  </span>,
+                    </span>,
                   }
                 }
               />
diff --git a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
index a6048b43..fb617c5c 100644
--- a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
+++ b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
@@ -36,7 +36,7 @@ exports[`PasswordChangePage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="PasswordChangePage.contactDetailsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -46,7 +46,7 @@ exports[`PasswordChangePage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="PasswordChangePage.passwordTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -56,7 +56,7 @@ exports[`PasswordChangePage matches snapshot 1`] = `
             "text": <FormattedMessage
               id="PasswordChangePage.paymentsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
         ]
       }
diff --git a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
index ca06ee77..676aa411 100644
--- a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
+++ b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
@@ -36,7 +36,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe connected 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.contactDetailsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -46,7 +46,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe connected 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.passwordTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -56,7 +56,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe connected 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.paymentsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
         ]
       }
@@ -126,7 +126,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe not connected 1`] =
             "text": <FormattedMessage
               id="PayoutPreferencesPage.contactDetailsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -136,7 +136,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe not connected 1`] =
             "text": <FormattedMessage
               id="PayoutPreferencesPage.passwordTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -146,7 +146,7 @@ exports[`PayoutPreferencesPage matches snapshot with Stripe not connected 1`] =
             "text": <FormattedMessage
               id="PayoutPreferencesPage.paymentsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
         ]
       }
@@ -230,7 +230,7 @@ exports[`PayoutPreferencesPage matches snapshot with details submitted 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.contactDetailsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -240,7 +240,7 @@ exports[`PayoutPreferencesPage matches snapshot with details submitted 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.passwordTabTitle"
               values={Object {}}
-        />,
+            />,
           },
           Object {
             "linkProps": Object {
@@ -250,7 +250,7 @@ exports[`PayoutPreferencesPage matches snapshot with details submitted 1`] = `
             "text": <FormattedMessage
               id="PayoutPreferencesPage.paymentsTabTitle"
               values={Object {}}
-        />,
+            />,
           },
         ]
       }
diff --git a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
index ed075ee7..4b79d235 100644
--- a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
+++ b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
@@ -78,7 +78,7 @@ exports[`ProfilePage matches snapshot 1`] = `
           />
         </h1>
         <div>
-          <Component
+          <ButtonTabNavHorizontal
             className={null}
             rootClassName={null}
             skin="light"
@@ -89,34 +89,30 @@ exports[`ProfilePage matches snapshot 1`] = `
                 Object {
                   "onClick": [Function],
                   "selected": true,
-                  "text": <h3
-                    className={undefined}
-              >
+                  "text": <h3>
                     <FormattedMessage
-                          id="ProfilePage.reviewsOfProviderTitle"
-                          values={
-                                Object {
-                                      "count": 0,
-                                    }
-                          }
+                      id="ProfilePage.reviewsOfProviderTitle"
+                      values={
+                        Object {
+                          "count": 0,
+                        }
+                      }
                     />
-              </h3>,
+                  </h3>,
                 },
                 Object {
                   "onClick": [Function],
                   "selected": false,
-                  "text": <h3
-                    className={undefined}
-              >
+                  "text": <h3>
                     <FormattedMessage
-                          id="ProfilePage.reviewsOfCustomerTitle"
-                          values={
-                                Object {
-                                      "count": 0,
-                                    }
-                          }
+                      id="ProfilePage.reviewsOfCustomerTitle"
+                      values={
+                        Object {
+                          "count": 0,
+                        }
+                      }
                     />
-              </h3>,
+                  </h3>,
                 },
               ]
             }