diff --git a/src/components/FilterPanel/__snapshots__/FilterPanel.test.js.snap b/src/components/FilterPanel/__snapshots__/FilterPanel.test.js.snap
index d941b9f6..1d195eeb 100644
--- a/src/components/FilterPanel/__snapshots__/FilterPanel.test.js.snap
+++ b/src/components/FilterPanel/__snapshots__/FilterPanel.test.js.snap
@@ -1,22 +1,23 @@
 exports[`FilterPanel matches snapshot 1`] = `
 <div>
-  <h1
-    className={undefined}>
+  <h1>
     Filters
   </h1>
-  <a
-    className=""
-    href="/s/listings"
-    onClick={[Function]}
-    style={Object {}}>
+  <NamedLink
+    hash=""
+    name="SearchListingsPage"
+    params={Object {}}
+    query={Object {}}
+    state={Object {}}>
     See studios
-  </a>
-  <a
-    className=""
-    href="/s/listings"
-    onClick={[Function]}
-    style={Object {}}>
+  </NamedLink>
+  <NamedLink
+    hash=""
+    name="SearchListingsPage"
+    params={Object {}}
+    query={Object {}}
+    state={Object {}}>
     X
-  </a>
+  </NamedLink>
 </div>
 `;
diff --git a/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap b/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap
index 2c06adbf..384050ab 100644
--- a/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap
+++ b/src/components/ListingCard/__snapshots__/ListingCard.test.js.snap
@@ -1,44 +1,39 @@
 exports[`ListingCard matches snapshot 1`] = `
-<div
-  className={undefined}>
-  <div
-    className={undefined}>
-    <div
-      className={undefined}>
+<div>
+  <div>
+    <div>
       <img
         alt="Listing Title"
-        className={undefined}
         src="http://placehold.it/400x300" />
     </div>
   </div>
-  <div
-    className={undefined}>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/l/Banyan-Studios/123"
-        onClick={[Function]}
-        style={Object {}}>
+  <div>
+    <div>
+      <NamedLink
+        hash=""
+        name="ListingPage"
+        params={
+          Object {
+            "id": 123,
+            "slug": "Banyan-Studios",
+          }
+        }
+        query={Object {}}
+        state={Object {}}>
         Banyan Studios
-      </a>
-      <div
-        className={undefined}>
+      </NamedLink>
+      <div>
         55€ / day
       </div>
     </div>
-    <div
-      className={undefined}>
+    <div>
       Organic Music Production in a Sustainable, Ethical and Professional Studio.
     </div>
-    <div
-      className={undefined}>
-      <div
-        className={undefined}>
+    <div>
+      <div>
         New York, NY • 40mi away
       </div>
-      <div
-        className={undefined}>
+      <div>
         (
         <span>
           4
@@ -54,23 +49,17 @@ exports[`ListingCard matches snapshot 1`] = `
       </div>
     </div>
     <hr />
-    <div
-      className={undefined}>
-      <div
-        className={undefined}>
+    <div>
+      <div>
         <img
           alt="The Stardust Collective"
-          className={undefined}
           src="http://placehold.it/44x44" />
       </div>
-      <div
-        className={undefined}>
-        <span
-          className={undefined}>
+      <div>
+        <span>
           The Stardust Collective
         </span>
-        <div
-          className={undefined}>
+        <div>
           review: 
           <span>
             4
diff --git a/src/components/MapPanel/__snapshots__/MapPanel.test.js.snap b/src/components/MapPanel/__snapshots__/MapPanel.test.js.snap
index 8b5b9f82..f155b0fe 100644
--- a/src/components/MapPanel/__snapshots__/MapPanel.test.js.snap
+++ b/src/components/MapPanel/__snapshots__/MapPanel.test.js.snap
@@ -1,24 +1,24 @@
 exports[`MapPanel matches snapshot 1`] = `
 <div>
-  <div
-    className={undefined}>
+  <div>
     Map
   </div>
-  <div
-    className={undefined} />
-  <a
-    className=""
-    href="/s/filters"
-    onClick={[Function]}
-    style={Object {}}>
+  <div />
+  <NamedLink
+    hash=""
+    name="SearchFiltersPage"
+    params={Object {}}
+    query={Object {}}
+    state={Object {}}>
     Filters
-  </a>
-  <a
-    className=""
-    href="/s/listings"
-    onClick={[Function]}
-    style={Object {}}>
+  </NamedLink>
+  <NamedLink
+    hash=""
+    name="SearchListingsPage"
+    params={Object {}}
+    query={Object {}}
+    state={Object {}}>
     X
-  </a>
+  </NamedLink>
 </div>
 `;
diff --git a/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap b/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap
index 5cff1983..d3239ea5 100644
--- a/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap
+++ b/src/components/OrderDetailsPanel/__snapshots__/OrderDetailsPanel.test.js.snap
@@ -12,53 +12,33 @@ exports[`OrderDetailsPanel matches snapshot 1`] = `
   <h3>
     Test order
   </h3>
-  <div>
-    <p>
-      Some road 1
-    </p>
-    <p>
-      Some city, somewhere
-    </p>
-    <p>
-      Some phone number
-    </p>
-    <p>
-      Get directions
-    </p>
-  </div>
+  <ContactInfo
+    addressLine1="Some road 1"
+    addressLine2="Some city, somewhere"
+    phoneNumber="Some phone number" />
   <p>
     Confirmation code 
     some-test-confirmation-code
   </p>
-  <dl>
-    <dt>
-      Price per day:
-    </dt>
-    <dd>
-      10$
-    </dd>
-    <dt>
-      Booking period:
-    </dt>
-    <dd>
-      some booking period, some booking duration
-    </dd>
-    <dt>
-      Total
-    </dt>
-    <dd>
-      100$
-    </dd>
-  </dl>
+  <BookingInfo
+    bookingDuration="some booking duration"
+    bookingPeriod="some booking period"
+    pricePerDay="10$"
+    total="100$" />
   <p>
     Cancel booking
   </p>
-  <a
-    className=""
-    href="/order/some-test-order-id/discussion"
-    onClick={[Function]}
-    style={Object {}}>
+  <NamedLink
+    hash=""
+    name="OrderDiscussionPage"
+    params={
+      Object {
+        "id": "some-test-order-id",
+      }
+    }
+    query={Object {}}
+    state={Object {}}>
     You have a new message!
-  </a>
+  </NamedLink>
 </div>
 `;
diff --git a/src/components/SearchResultsPanel/__snapshots__/SearchResultsPanel.test.js.snap b/src/components/SearchResultsPanel/__snapshots__/SearchResultsPanel.test.js.snap
index a93c2baa..c29b02f6 100644
--- a/src/components/SearchResultsPanel/__snapshots__/SearchResultsPanel.test.js.snap
+++ b/src/components/SearchResultsPanel/__snapshots__/SearchResultsPanel.test.js.snap
@@ -1,29 +1,23 @@
 exports[`SearchResultsPanel matches snapshot 1`] = `
 <div>
-  <div
-    className={undefined}>
-    New York, Jan 2nd – Jan 4th 
-    <span
-      className={undefined}>
-      ▼
-    </span>
-  </div>
-  <div
-    className={undefined}>
-    <a
-      className=""
-      href="/s/filters"
-      onClick={[Function]}
-      style={Object {}}>
+  <Menu />
+  <div>
+    <NamedLink
+      hash=""
+      name="SearchFiltersPage"
+      params={Object {}}
+      query={Object {}}
+      state={Object {}}>
       Filters
-    </a>
-    <a
-      className=""
-      href="/s/map"
-      onClick={[Function]}
-      style={Object {}}>
+    </NamedLink>
+    <NamedLink
+      hash=""
+      name="SearchMapPage"
+      params={Object {}}
+      query={Object {}}
+      state={Object {}}>
       Map
-    </a>
+    </NamedLink>
   </div>
 </div>
 `;
diff --git a/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap b/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
index 45e41e39..6bf1f3bc 100644
--- a/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
+++ b/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
@@ -1,106 +1,6 @@
 exports[`CheckoutPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Book Banyan Studios (some-listing-id)
-  </h1>
+<Connect(PageLayout)
+  title="Book Banyan Studios (some-listing-id)">
   <img
     alt="Banyan Studios"
     src="http://placehold.it/750x470"
@@ -109,35 +9,27 @@ exports[`CheckoutPage matches snapshot 1`] = `
         "width": "100%",
       }
     } />
-  <dl>
-    <dt>
-      Price per day:
-    </dt>
-    <dd>
-      55€
-    </dd>
-    <dt>
-      Booking period:
-    </dt>
-    <dd>
-      Jan 2nd - Jan 4th, 3 days
-    </dd>
-    <dt>
-      Total
-    </dt>
-    <dd>
-      165€
-    </dd>
-  </dl>
+  <BookingInfo
+    bookingDuration="3 days"
+    bookingPeriod="Jan 2nd - Jan 4th"
+    imageUrl="http://placehold.it/750x470"
+    pricePerDay="55€"
+    title="Banyan Studios"
+    total="165€" />
   <p>
     By confirming I accept the booking terms and conditions.
   </p>
-  <a
-    className=""
-    href="/order/12345/details"
-    onClick={[Function]}
-    style={Object {}}>
+  <NamedLink
+    hash=""
+    name="OrderDetailsPage"
+    params={
+      Object {
+        "id": 12345,
+      }
+    }
+    query={Object {}}
+    state={Object {}}>
     Confirm & Pay
-  </a>
-</div>
+  </NamedLink>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
index d46d6db5..0fa3d720 100644
--- a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
+++ b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
@@ -1,105 +1,4 @@
 exports[`ContactDetailsPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Contact details
-  </h1>
-</div>
+<Connect(PageLayout)
+  title="Contact details" />
 `;
diff --git a/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap b/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
index edcb6b76..d10c8eae 100644
--- a/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
+++ b/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
@@ -1,105 +1,4 @@
 exports[`EditProfilePage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Edit profile page with display name: my-shop
-  </h1>
-</div>
+<Connect(PageLayout)
+  title="Edit profile page with display name: my-shop" />
 `;
diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
index 43f4f97c..fa8ea0b1 100644
--- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
+++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
@@ -1,116 +1,20 @@
 exports[`InboxPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    inbox page
-  </h1>
+<Connect(PageLayout)
+  title="inbox page">
   <ul>
     <li>
-      <a
+      <Link
+        activeClassName=""
+        activeOnlyWhenExact={false}
+        activeStyle={Object {}}
         className=""
-        href="/conversation/1234"
-        onClick={[Function]}
-        style={Object {}}>
+        isActive={[Function]}
+        replace={false}
+        style={Object {}}
+        to="/conversation/1234">
         Single thread
-      </a>
+      </Link>
     </li>
   </ul>
-</div>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
index 4d483c64..c6cc2602 100644
--- a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
+++ b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
@@ -1,151 +1,9 @@
 exports[`LandingPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Landing page
-  </h1>
-  <section
-    className={undefined}>
-    <div
-      className={undefined}>
-      <div
-        className={undefined}>
-        <div
-          className={undefined}>
-          <span>
-            Book Studiotime anywhere
-          </span>
-        </div>
-        <div
-          className={undefined}>
-          <span>
-            The largest online community to rent music studios
-          </span>
-        </div>
-      </div>
-      <div
-        className={undefined}>
-        <form
-          onSubmit={[Function]}>
-          <input
-            className={undefined}
-            name="location"
-            onBlur={[Function]}
-            onChange={[Function]}
-            onDragStart={[Function]}
-            onDrop={[Function]}
-            onFocus={[Function]}
-            placeholder="Location search (soon)"
-            type="text"
-            value="" />
-          <button
-            className={undefined}
-            disabled={true}
-            type="submit">
-            <span>
-              Search
-            </span>
-          </button>
-        </form>
-      </div>
-    </div>
-  </section>
-</div>
+<Connect(PageLayout)
+  title="Landing page">
+  <HeroSection>
+    <ReduxForm
+      onSubmit={[Function]} />
+  </HeroSection>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
index 260122ed..615a80af 100644
--- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
+++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
@@ -1,158 +1,42 @@
 exports[`ListingPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Banyan Studios 55€ / day
-  </h1>
-  <div
-    className={undefined}>
+<Connect(PageLayout)
+  title="Banyan Studios 55€ / day">
+  <div>
     <img
       alt="img1"
-      className={undefined}
       src="http://placehold.it/750x470" />
-    <div
-      className={undefined}>
-      <div
-        className={undefined}>
-        <div
-          className={undefined}>
+    <div>
+      <div>
+        <div>
           <img
             alt="img2"
-            className={undefined}
             src="http://placehold.it/750x470" />
         </div>
       </div>
-      <div
-        className={undefined}>
-        <div
-          className={undefined}>
+      <div>
+        <div>
           <img
             alt="img3"
-            className={undefined}
             src="http://placehold.it/750x470" />
         </div>
       </div>
-      <div
-        className={undefined}>
-        <div
-          className={undefined}>
+      <div>
+        <div>
           <img
             alt="img4"
-            className={undefined}
             src="http://placehold.it/750x470" />
         </div>
       </div>
-      <div
-        className={undefined}>
-        <div
-          className={undefined}>
+      <div>
+        <div>
           <img
             alt="img5"
-            className={undefined}
             src="http://placehold.it/750x470" />
         </div>
       </div>
     </div>
   </div>
   <div
-    className={undefined}
     dangerouslySetInnerHTML={
       Object {
         "__html": "
@@ -169,8 +53,7 @@ exports[`ListingPage matches snapshot 1`] = `
         ",
       }
     } />
-  <div
-    className={undefined}>
+  <div>
     <h1>
       Here will be filters (or dragons)
     </h1>
@@ -190,24 +73,25 @@ exports[`ListingPage matches snapshot 1`] = `
        10am - 6pm
     </p>
   </div>
-  <a
+  <Link
+    activeClassName=""
+    activeOnlyWhenExact={false}
+    activeStyle={Object {}}
     className=""
-    href="mailto:studio.dude@mystudio.com"
-    onClick={[Function]}
-    style={Object {}}>
+    isActive={[Function]}
+    replace={false}
+    style={Object {}}
+    to="mailto:studio.dude@mystudio.com">
     <h2>
       Contact studio
     </h2>
-  </a>
-  <div
-    className={undefined}>
+  </Link>
+  <div>
     <h2>
       Studio reviews (1)
     </h2>
-    <div
-      className={undefined}>
-      <div
-        className={undefined}>
+    <div>
+      <div>
         <p>
           
                   Great studio in the New York for music professionals. Everything you need
@@ -215,28 +99,21 @@ exports[`ListingPage matches snapshot 1`] = `
                   we even got some tips for our songs! :)
                   
         </p>
-        <div
-          className={undefined}>
-          <div
-            className={undefined}>
+        <div>
+          <div>
             <img
               alt="Vesa L."
-              className={undefined}
               src="http://placehold.it/44x44" />
           </div>
-          <div
-            className={undefined}>
-            <span
-              className={undefined}>
+          <div>
+            <span>
               Vesa L.
             </span>
-            <span
-              className={undefined}>
+            <span>
               January 2017
             </span>
           </div>
-          <div
-            className={undefined}>
+          <div>
             review: 
             <span>
               4
@@ -249,16 +126,20 @@ exports[`ListingPage matches snapshot 1`] = `
       </div>
     </div>
   </div>
-  <div
-    className={undefined}>
+  <div>
     Map
   </div>
-  <a
-    className=""
-    href="/order/12345/details"
-    onClick={[Function]}
-    style={Object {}}>
+  <NamedLink
+    hash=""
+    name="OrderDetailsPage"
+    params={
+      Object {
+        "id": 12345,
+      }
+    }
+    query={Object {}}
+    state={Object {}}>
     Book Banyan Studios
-  </a>
-</div>
+  </NamedLink>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
index 6879e4cb..e025b8cd 100644
--- a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
+++ b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
@@ -1,116 +1,20 @@
 exports[`ManageListingsPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Manage listings
-  </h1>
+<Connect(PageLayout)
+  title="Manage listings">
   <ul>
     <li>
-      <a
+      <Link
+        activeClassName=""
+        activeOnlyWhenExact={false}
+        activeStyle={Object {}}
         className=""
-        href="/l/1234"
-        onClick={[Function]}
-        style={Object {}}>
+        isActive={[Function]}
+        replace={false}
+        style={Object {}}
+        to="/l/1234">
         Listing 1234
-      </a>
+      </Link>
     </li>
   </ul>
-</div>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
index 2c1e5015..9ecd3fdb 100644
--- a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
+++ b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
@@ -1,112 +1,16 @@
 exports[`NotFoundPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Page not found
-  </h1>
-  <a
+<Connect(PageLayout)
+  title="Page not found">
+  <Link
+    activeClassName=""
+    activeOnlyWhenExact={false}
+    activeStyle={Object {}}
     className=""
-    href="/"
-    onClick={[Function]}
-    style={Object {}}>
+    isActive={[Function]}
+    replace={false}
+    style={Object {}}
+    to="/">
     Index page
-  </a>
-</div>
+  </Link>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
index bd246ae3..d78b61fa 100644
--- a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
+++ b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
@@ -1,219 +1,67 @@
 exports[`OrderPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Your Banyan Studios booking is confirmed!
-  </h1>
-  <a
-    className=""
-    href="/order/1234/details"
-    onClick={[Function]}
+<Connect(PageLayout)
+  title="Your Banyan Studios booking is confirmed!">
+  <NamedLink
+    activeStyle={
+      Object {
+        "fontWeight": "bold",
+      }
+    }
+    hash=""
+    name="OrderDetailsPage"
+    params={
+      Object {
+        "id": 1234,
+      }
+    }
+    query={Object {}}
+    state={Object {}}
     style={
       Object {
         "marginRight": "2rem",
       }
     }>
     Booking details
-  </a>
-  <a
-    className=""
-    href="/order/1234/discussion"
-    onClick={[Function]}
-    style={Object {}}>
+  </NamedLink>
+  <NamedLink
+    activeStyle={
+      Object {
+        "fontWeight": "bold",
+      }
+    }
+    hash=""
+    name="OrderDiscussionPage"
+    params={
+      Object {
+        "id": 1234,
+      }
+    }
+    query={Object {}}
+    state={Object {}}>
     Discussion
-  </a>
-  <div
-    className="undefined">
-    <img
-      alt="Banyan Studios"
-      src="http://placehold.it/750x470"
-      style={
-        Object {
-          "width": "100%",
-        }
-      } />
-    <h3>
-      Banyan Studios
-    </h3>
-    <div>
-      <p>
-        350 5th Avenue
-      </p>
-      <p>
-        New York, NY 10118
-      </p>
-      <p>
-        +1 432 43184910
-      </p>
-      <p>
-        Get directions
-      </p>
-    </div>
-    <p>
-      Confirmation code 
-      X2587X
-    </p>
-    <dl>
-      <dt>
-        Price per day:
-      </dt>
-      <dd>
-        55€
-      </dd>
-      <dt>
-        Booking period:
-      </dt>
-      <dd>
-        Jan 2nd - Jan 4th, 3 days
-      </dd>
-      <dt>
-        Total
-      </dt>
-      <dd>
-        165€
-      </dd>
-    </dl>
-    <p>
-      Cancel booking
-    </p>
-    <a
-      className=""
-      href="/order/1234/discussion"
-      onClick={[Function]}
-      style={Object {}}>
-      You have a new message!
-    </a>
-  </div>
-  <div
-    className="">
-    <ul>
-      <li>
-        <span
-          className={undefined}>
-          2017-02-26T00:00:00.000Z
-        </span>
-        <div
-          className={undefined}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus ac tellus ornare, tempor lacus quis, imperdiet lectus. Morbi suscipit semper nisl at lacinia. Vestibulum malesuada mattis nisl, et venenatis enim volutpat sit amet. Nulla laoreet feugiat gravida. Fusce ultricies nisl quis aliquet ullamcorper. Nulla congue risus metus.
-        </div>
-        <span
-          className={undefined}>
-          John
-        </span>
-      </li>
-    </ul>
-    <form
-      className={undefined}
-      onSubmit={[Function]}>
-      <input
-        autoFocus={true}
-        className={undefined}
-        onChange={[Function]}
-        type="text"
-        value="" />
-      <button
-        className={undefined}
-        type="submit">
-        Send
-      </button>
-    </form>
-  </div>
-</div>
+  </NamedLink>
+  <OrderDetailsPanel
+    className="undefined"
+    confirmationCode="X2587X"
+    contact={
+      Object {
+        "addressLine1": "350 5th Avenue",
+        "addressLine2": "New York, NY 10118",
+        "phoneNumber": "+1 432 43184910",
+      }
+    }
+    imageUrl="http://placehold.it/750x470"
+    info={
+      Object {
+        "bookingDuration": "3 days",
+        "bookingPeriod": "Jan 2nd - Jan 4th",
+        "pricePerDay": "55€",
+        "total": "165€",
+      }
+    }
+    orderId={1234}
+    title="Banyan Studios" />
+  <OrderDiscussionPanel
+    className="" />
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
index c62e23cb..5d29a43e 100644
--- a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
+++ b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
@@ -1,139 +1,7 @@
 exports[`PasswordChangePage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Type new password
-  </h1>
-  <form
-    onSubmit={[Function]}>
-    <label
-      htmlFor="newPassword1">
-      New password
-    </label>
-    <input
-      name="newPassword1"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="password"
-      value="" />
-    <label
-      htmlFor="newPassword2">
-      New password, again
-    </label>
-    <input
-      name="newPassword2"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="password"
-      value="" />
-    <button
-      disabled={true}
-      type="submit">
-      Change password
-    </button>
-  </form>
-</div>
+<Connect(PageLayout)
+  title="Type new password">
+  <ReduxForm
+    onSubmit={[Function]} />
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap b/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
index 1abd2993..ade81882 100644
--- a/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
+++ b/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
@@ -1,129 +1,7 @@
 exports[`PasswordForgottenPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Request new password
-  </h1>
-  <form
-    onSubmit={[Function]}>
-    <label
-      htmlFor="email">
-      Email
-    </label>
-    <input
-      name="email"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="email"
-      value="" />
-    <p>
-      We will send you instructions to your email.
-    </p>
-    <button
-      disabled={true}
-      type="submit">
-      Send
-    </button>
-  </form>
-</div>
+<Connect(PageLayout)
+  title="Request new password">
+  <ReduxForm
+    onSubmit={[Function]} />
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
index b70f933d..51a5a9aa 100644
--- a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
+++ b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
@@ -1,105 +1,4 @@
 exports[`PayoutPreferencesPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Payout preferences
-  </h1>
-</div>
+<Connect(PageLayout)
+  title="Payout preferences" />
 `;
diff --git a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
index 5b747f1f..21bf0730 100644
--- a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
+++ b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
@@ -1,105 +1,4 @@
 exports[`ProfilePage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Profile page with display name: most-awesome-shop
-  </h1>
-</div>
+<Connect(PageLayout)
+  title="Profile page with display name: most-awesome-shop" />
 `;
diff --git a/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap b/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
index f5d72a41..6b7adf52 100644
--- a/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
+++ b/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
@@ -1,125 +1,33 @@
 exports[`SalesConversationPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Sales conversation page
-  </h1>
+<Connect(PageLayout)
+  title="Sales conversation page">
   <p>
     Sale id: 
     12345
   </p>
-  <a
+  <Link
+    activeClassName=""
+    activeOnlyWhenExact={false}
+    activeStyle={Object {}}
     className=""
-    href="/sale/12345/discussion"
-    onClick={[Function]}
-    style={Object {}}>
+    isActive={[Function]}
+    replace={false}
+    style={Object {}}
+    to="/sale/12345/discussion">
     Discussion tab
-  </a>
+  </Link>
   <br />
-  <a
+  <Link
+    activeClassName=""
+    activeOnlyWhenExact={false}
+    activeStyle={Object {}}
     className=""
-    href="/sale/12345/details"
-    onClick={[Function]}
-    style={Object {}}>
+    isActive={[Function]}
+    replace={false}
+    style={Object {}}
+    to="/sale/12345/details">
     Details tab
-  </a>
+  </Link>
   <p>
     Mobile layout needs different views for discussion and details.
   </p>
@@ -130,5 +38,5 @@ exports[`SalesConversationPage matches snapshot 1`] = `
     </i>
     )
   </p>
-</div>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index 4d3acc7e..35c35cbf 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -1,186 +1,19 @@
 exports[`SearchPageComponent matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Search page
-  </h1>
-  <div
-    className={undefined}>
+<Connect(PageLayout)
+  title="Search page">
+  <div>
     <div
       className="">
-      <div>
-        <h1
-          className={undefined}>
-          Filters
-        </h1>
-        <a
-          className=""
-          href="/s/listings"
-          onClick={[Function]}
-          style={Object {}}>
-          See studios
-        </a>
-        <a
-          className=""
-          href="/s/listings"
-          onClick={[Function]}
-          style={Object {}}>
-          X
-        </a>
-      </div>
+      <FilterPanel />
     </div>
     <div
       className="undefined">
-      <div>
-        <div
-          className={undefined}>
-          New York, Jan 2nd – Jan 4th 
-          <span
-            className={undefined}>
-            ▼
-          </span>
-        </div>
-        <div
-          className={undefined}>
-          <a
-            className=""
-            href="/s/filters"
-            onClick={[Function]}
-            style={Object {}}>
-            Filters
-          </a>
-          <a
-            className=""
-            href="/s/map"
-            onClick={[Function]}
-            style={Object {}}>
-            Map
-          </a>
-        </div>
-      </div>
+      <SearchResultsPanel />
     </div>
     <div
       className="">
-      <div>
-        <div
-          className={undefined}>
-          Map
-        </div>
-        <div
-          className={undefined} />
-        <a
-          className=""
-          href="/s/filters"
-          onClick={[Function]}
-          style={Object {}}>
-          Filters
-        </a>
-        <a
-          className=""
-          href="/s/listings"
-          onClick={[Function]}
-          style={Object {}}>
-          X
-        </a>
-      </div>
+      <MapPanel />
     </div>
   </div>
-</div>
+</Connect(PageLayout)>
 `;
diff --git a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
index 86c1c763..47abb137 100644
--- a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
+++ b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
@@ -1,155 +1,7 @@
 exports[`SecurityPage matches snapshot 1`] = `
-<div
-  className="">
-  <div
-    className={undefined}>
-    <div>
-      <a
-        className=""
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "&#127968;",
-          }
-        }
-        href="/"
-        onClick={[Function]}
-        style={Object {}} />
-      <select
-        className={undefined}
-        onChange={[Function]}
-        value="default">
-        <option
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "&#127828;",
-            }
-          }
-          value="default" />
-        <option
-          value="/s">
-          Search
-        </option>
-        <option
-          value="/l/Bike-Pelago/12345">
-          Listing page
-        </option>
-        <option
-          value="/u/Bikerrs">
-          Profile
-        </option>
-        <option
-          value="/u/Bikerrs/edit">
-          Edit profile
-        </option>
-        <option
-          value="/checkout/lid1234">
-          Checkout
-        </option>
-        <option
-          value="/inbox">
-          Inbox
-        </option>
-        <option
-          value="/orders">
-          Orders
-        </option>
-        <option
-          value="/sales">
-          Sales
-        </option>
-        <option
-          value="/password/forgotten">
-          Request password
-        </option>
-        <option
-          value="/password/change">
-          Change password
-        </option>
-        <option
-          value="/listings">
-          Manage listings
-        </option>
-        <option
-          value="/account">
-          Account settings
-        </option>
-        <option
-          value="/account/contact-details">
-          Contact details
-        </option>
-        <option
-          value="/account/payout-preferences">
-          Payout preferences
-        </option>
-        <option
-          value="/account/security">
-          Security
-        </option>
-      </select>
-    </div>
-    <div
-      className={undefined}>
-      <a
-        className=""
-        href="/login"
-        onClick={[Function]}
-        style={Object {}}>
-        Login
-      </a>
-    </div>
-  </div>
-  <h1>
-    Security
-  </h1>
-  <form
-    onSubmit={[Function]}>
-    <label
-      htmlFor="newPassword1">
-      New password
-    </label>
-    <input
-      name="newPassword1"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="password"
-      value="" />
-    <label
-      htmlFor="newPassword2">
-      New password, again
-    </label>
-    <input
-      name="newPassword2"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="password"
-      value="" />
-    <label
-      htmlFor="password">
-      Current password
-    </label>
-    <input
-      name="password"
-      onBlur={[Function]}
-      onChange={[Function]}
-      onDragStart={[Function]}
-      onDrop={[Function]}
-      onFocus={[Function]}
-      type="password"
-      value="" />
-    <p>
-      Delete account (module)
-    </p>
-    <button
-      disabled={true}
-      type="submit">
-      Save changes
-    </button>
-  </form>
-</div>
+<Connect(PageLayout)
+  title="Security">
+  <ReduxForm
+    onSubmit={[Function]} />
+</Connect(PageLayout)>
 `;