diff --git a/src/components/Page/Page.js b/src/components/Page/Page.js
index 3714466d..6be3286f 100644
--- a/src/components/Page/Page.js
+++ b/src/components/Page/Page.js
@@ -1,8 +1,8 @@
-import React from 'react';
+import React, { PropTypes } from 'react';
 import Helmet from 'react-helmet';
 import { Topbar } from '../../containers';
 
-export default props => {
+const Page = props => {
   const { className, title, children } = props;
   return (
     <div className={className}>
@@ -12,4 +12,12 @@ export default props => {
       {children}
     </div>
   );
-}
+};
+
+const { string, any } = PropTypes;
+
+Page.defaultProps = { className: '', children: null };
+
+Page.propTypes = { className: string, title: string.isRequired, children: any };
+
+export default Page;
diff --git a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
index 9cc33dc9..84a7e3c8 100644
--- a/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
+++ b/src/containers/AuthenticationPage/__snapshots__/AuthenticationPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`AuthenticationPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap b/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
index e2c4df66..174de42a 100644
--- a/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
+++ b/src/containers/CheckoutPage/__snapshots__/CheckoutPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`CheckoutPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
index a2e2ebad..39028580 100644
--- a/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
+++ b/src/containers/ContactDetailsPage/__snapshots__/ContactDetailsPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`ContactDetailsPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/ConversationPage/__snapshots__/ConversationPage.test.js.snap b/src/containers/ConversationPage/__snapshots__/ConversationPage.test.js.snap
index 66093d7b..a27ae8e8 100644
--- a/src/containers/ConversationPage/__snapshots__/ConversationPage.test.js.snap
+++ b/src/containers/ConversationPage/__snapshots__/ConversationPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`ConversationPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap b/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
index 139e002d..c6ed5569 100644
--- a/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
+++ b/src/containers/EditProfilePage/__snapshots__/EditProfilePage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`EditProfilePage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
index dea299ef..a6abb226 100644
--- a/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
+++ b/src/containers/InboxPage/__snapshots__/InboxPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`InboxPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
index df7c24f4..7539e939 100644
--- a/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
+++ b/src/containers/LandingPage/__snapshots__/LandingPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`LandingPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
index 98224ab5..1cb197ab 100644
--- a/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
+++ b/src/containers/ListingPage/__snapshots__/ListingPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`ListingPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
index 6897197d..17515d29 100644
--- a/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
+++ b/src/containers/ManageListingsPage/__snapshots__/ManageListingsPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`ManageListingsPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
index 203cf9bd..614025f2 100644
--- a/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
+++ b/src/containers/NotFoundPage/__snapshots__/NotFoundPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`NotFoundPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/NotificationSettingsPage/__snapshots__/NotificationSettingsPage.test.js.snap b/src/containers/NotificationSettingsPage/__snapshots__/NotificationSettingsPage.test.js.snap
index 34c59dc1..2c9aa203 100644
--- a/src/containers/NotificationSettingsPage/__snapshots__/NotificationSettingsPage.test.js.snap
+++ b/src/containers/NotificationSettingsPage/__snapshots__/NotificationSettingsPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`NotificationSettingsPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
index 32a56395..624f4918 100644
--- a/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
+++ b/src/containers/OrderPage/__snapshots__/OrderPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`OrderPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
index 067a9ce3..11f87b8a 100644
--- a/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
+++ b/src/containers/PasswordChangePage/__snapshots__/PasswordChangePage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`PasswordChangePage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap b/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
index d3666add..bd61ab68 100644
--- a/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
+++ b/src/containers/PasswordForgottenPage/__snapshots__/PasswordForgottenPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`PasswordForgottenPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/PaymentMethodsPage/__snapshots__/PaymentMethodsPage.test.js.snap b/src/containers/PaymentMethodsPage/__snapshots__/PaymentMethodsPage.test.js.snap
index 45a031ec..71d5ee6e 100644
--- a/src/containers/PaymentMethodsPage/__snapshots__/PaymentMethodsPage.test.js.snap
+++ b/src/containers/PaymentMethodsPage/__snapshots__/PaymentMethodsPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`PaymentMethodsPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
index 2edfdd0a..3ce5d713 100644
--- a/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
+++ b/src/containers/PayoutPreferencesPage/__snapshots__/PayoutPreferencesPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`PayoutPreferencesPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
index 363bf351..9a6ca998 100644
--- a/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
+++ b/src/containers/ProfilePage/__snapshots__/ProfilePage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`ProfilePage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap b/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
index e5cf64b6..999c6422 100644
--- a/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
+++ b/src/containers/SalesConversationPage/__snapshots__/SalesConversationPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`SalesConversationPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index 2c14241b..cf17ef7e 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`SearchPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a
diff --git a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
index bf9add5b..8fff65ea 100644
--- a/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
+++ b/src/containers/SecurityPage/__snapshots__/SecurityPage.test.js.snap
@@ -1,6 +1,6 @@
 exports[`SecurityPage matches snapshot 1`] = `
 <div
-  className={undefined}>
+  className="">
   <div
     className={undefined}>
     <a