diff --git a/src/components/AddImages/AddImages.example.js b/src/components/AddImages/AddImages.example.js
index 42f11092..690dc274 100644
--- a/src/components/AddImages/AddImages.example.js
+++ b/src/components/AddImages/AddImages.example.js
@@ -82,4 +82,5 @@ class AddImagesTest extends Component {
 
 export const Empty = {
   component: AddImagesTest,
+  group: 'inputs',
 };
diff --git a/src/components/BirthdayInput/BirthdayInput.example.js b/src/components/BirthdayInput/BirthdayInput.example.js
index 0b9a0d17..9fc4d7d4 100644
--- a/src/components/BirthdayInput/BirthdayInput.example.js
+++ b/src/components/BirthdayInput/BirthdayInput.example.js
@@ -37,4 +37,5 @@ export const Empty = {
       console.log('birthday changed to:', birthday ? birthday.toUTCString() : birthday);
     },
   },
+  group: 'inputs',
 };
diff --git a/src/components/CurrencyInput/CurrencyInput.example.js b/src/components/CurrencyInput/CurrencyInput.example.js
index fc3a89db..ba37dcdd 100644
--- a/src/components/CurrencyInput/CurrencyInput.example.js
+++ b/src/components/CurrencyInput/CurrencyInput.example.js
@@ -39,6 +39,7 @@ export const EmptyWithEnUS = {
     currencyConfig: defaultConfig,
     locale: 'en-US',
   },
+  group: 'inputs',
 };
 
 // Default value with fi-FI locale
@@ -49,4 +50,5 @@ export const defaultValueWithFiFI = {
     locale: 'fi-FI',
     defaultValue: 9999.99,
   },
+  group: 'inputs',
 };
diff --git a/src/components/DateInput/DateInput.example.js b/src/components/DateInput/DateInput.example.js
index 6dd3b506..392985b9 100644
--- a/src/components/DateInput/DateInput.example.js
+++ b/src/components/DateInput/DateInput.example.js
@@ -73,4 +73,5 @@ export const Empty = {
       console.log('Submitting a form with values:', v);
     },
   },
+  group: 'inputs',
 };
diff --git a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.example.js b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.example.js
index ddc99197..026f18c4 100644
--- a/src/components/LocationAutocompleteInput/LocationAutocompleteInput.example.js
+++ b/src/components/LocationAutocompleteInput/LocationAutocompleteInput.example.js
@@ -65,4 +65,5 @@ class FormContainer extends Component {
 
 export const Empty = {
   component: FormContainer,
+  group: 'inputs',
 };
diff --git a/src/components/NamedLink/NamedLink.example.js b/src/components/NamedLink/NamedLink.example.js
index 87d4816a..269a7751 100644
--- a/src/components/NamedLink/NamedLink.example.js
+++ b/src/components/NamedLink/NamedLink.example.js
@@ -7,4 +7,5 @@ export const NamedLinkToSearchPage = {
     name: 'SearchPage',
     children: 'SearchPage',
   },
+  group: 'navigation',
 };
diff --git a/src/components/PaginationLinks/PaginationLinks.example.js b/src/components/PaginationLinks/PaginationLinks.example.js
index c11720ef..76433bef 100644
--- a/src/components/PaginationLinks/PaginationLinks.example.js
+++ b/src/components/PaginationLinks/PaginationLinks.example.js
@@ -46,4 +46,5 @@ Pagination.propTypes = {
 
 export const Empty = {
   component: withRouter(Pagination),
+  group: 'navigation',
 };
diff --git a/src/components/StripeBankAccountToken/StripeBankAccountToken.example.js b/src/components/StripeBankAccountToken/StripeBankAccountToken.example.js
index 229f96bf..b392b143 100644
--- a/src/components/StripeBankAccountToken/StripeBankAccountToken.example.js
+++ b/src/components/StripeBankAccountToken/StripeBankAccountToken.example.js
@@ -77,4 +77,5 @@ class FormContainer extends Component {
 
 export const Empty = {
   component: FormContainer,
+  group: 'inputs',
 };
diff --git a/src/components/TabNav/TabNav.example.js b/src/components/TabNav/TabNav.example.js
index eba655cf..0de0666d 100644
--- a/src/components/TabNav/TabNav.example.js
+++ b/src/components/TabNav/TabNav.example.js
@@ -13,4 +13,5 @@ export const Empty = {
       { text: 'Selected', linkProps: selfLinkProps, selected: true },
     ],
   },
+  group: 'navigation',
 };
diff --git a/src/components/Tabs/Tabs.example.js b/src/components/Tabs/Tabs.example.js
index d12e1040..9127a937 100644
--- a/src/components/Tabs/Tabs.example.js
+++ b/src/components/Tabs/Tabs.example.js
@@ -33,4 +33,5 @@ const TabsWrapper = () => {
 export const Example = {
   component: TabsWrapper,
   props: {},
+  group: 'navigation',
 };
diff --git a/src/containers/BookingDatesForm/BookingDatesForm.example.js b/src/containers/BookingDatesForm/BookingDatesForm.example.js
index c1558b77..ef8cf4b0 100644
--- a/src/containers/BookingDatesForm/BookingDatesForm.example.js
+++ b/src/containers/BookingDatesForm/BookingDatesForm.example.js
@@ -10,4 +10,5 @@ export const Empty = {
     },
     price: new types.Money(1099, 'USD'),
   },
+  group: 'forms',
 };
diff --git a/src/containers/ChangeAccountPasswordForm/ChangeAccountPasswordForm.example.js b/src/containers/ChangeAccountPasswordForm/ChangeAccountPasswordForm.example.js
index 513d1ea8..81610f9d 100644
--- a/src/containers/ChangeAccountPasswordForm/ChangeAccountPasswordForm.example.js
+++ b/src/containers/ChangeAccountPasswordForm/ChangeAccountPasswordForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('submit new password form values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/ChangePasswordForm/ChangePasswordForm.example.js b/src/containers/ChangePasswordForm/ChangePasswordForm.example.js
index c7dd7703..0e9de9b6 100644
--- a/src/containers/ChangePasswordForm/ChangePasswordForm.example.js
+++ b/src/containers/ChangePasswordForm/ChangePasswordForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('submit new password form values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.example.js b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.example.js
index 7d420b9a..61909c76 100644
--- a/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.example.js
+++ b/src/containers/EditListingDescriptionForm/EditListingDescriptionForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('Submit EditListingDescriptionForm with (unformatted) values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/EditListingLocationForm/EditListingLocationForm.example.js b/src/containers/EditListingLocationForm/EditListingLocationForm.example.js
index 08955f3a..a2efc812 100644
--- a/src/containers/EditListingLocationForm/EditListingLocationForm.example.js
+++ b/src/containers/EditListingLocationForm/EditListingLocationForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('Submit EditListingLocationForm with (unformatted) values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/EditListingPhotosForm/EditListingPhotosForm.example.js b/src/containers/EditListingPhotosForm/EditListingPhotosForm.example.js
index d901e0d8..ad5fe90c 100644
--- a/src/containers/EditListingPhotosForm/EditListingPhotosForm.example.js
+++ b/src/containers/EditListingPhotosForm/EditListingPhotosForm.example.js
@@ -16,4 +16,5 @@ export const Empty = {
       console.log('onUpdateImageOrder with new imageOrder:', imageOrder);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/EditListingPricingForm/EditListingPricingForm.example.js b/src/containers/EditListingPricingForm/EditListingPricingForm.example.js
index 222961ce..d0719e6d 100644
--- a/src/containers/EditListingPricingForm/EditListingPricingForm.example.js
+++ b/src/containers/EditListingPricingForm/EditListingPricingForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('Submit EditListingPricingForm with (unformatted) values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/LoginForm/LoginForm.example.js b/src/containers/LoginForm/LoginForm.example.js
index ef07e4a8..37c5d3f6 100644
--- a/src/containers/LoginForm/LoginForm.example.js
+++ b/src/containers/LoginForm/LoginForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('log in with form values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/PasswordForgottenForm/PasswordForgottenForm.example.js b/src/containers/PasswordForgottenForm/PasswordForgottenForm.example.js
index d2ea39ea..6b864451 100644
--- a/src/containers/PasswordForgottenForm/PasswordForgottenForm.example.js
+++ b/src/containers/PasswordForgottenForm/PasswordForgottenForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('submit forgotten password email:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/PayoutDetailsForm/PayoutDetailsForm.example.js b/src/containers/PayoutDetailsForm/PayoutDetailsForm.example.js
index 12692017..26b5cd38 100644
--- a/src/containers/PayoutDetailsForm/PayoutDetailsForm.example.js
+++ b/src/containers/PayoutDetailsForm/PayoutDetailsForm.example.js
@@ -8,4 +8,5 @@ export const USD = {
       console.log('submit payout details:', values); // eslint-disable-line
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/SearchForm/SearchForm.example.js b/src/containers/SearchForm/SearchForm.example.js
index 2b97df9e..0fb6f611 100644
--- a/src/containers/SearchForm/SearchForm.example.js
+++ b/src/containers/SearchForm/SearchForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('submit search query:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/SignupForm/SignupForm.example.js b/src/containers/SignupForm/SignupForm.example.js
index bbf3ea1c..47580c55 100644
--- a/src/containers/SignupForm/SignupForm.example.js
+++ b/src/containers/SignupForm/SignupForm.example.js
@@ -8,4 +8,5 @@ export const Empty = {
       console.log('sign up with form values:', values);
     },
   },
+  group: 'forms',
 };
diff --git a/src/containers/StripePaymentForm/StripePaymentForm.example.js b/src/containers/StripePaymentForm/StripePaymentForm.example.js
index 603f0820..e37b8501 100644
--- a/src/containers/StripePaymentForm/StripePaymentForm.example.js
+++ b/src/containers/StripePaymentForm/StripePaymentForm.example.js
@@ -23,4 +23,5 @@ class StripePaymentFormExample extends Component {
 export const Empty = {
   component: StripePaymentFormExample,
   props: { intl: fakeIntl },
+  group: 'forms',
 };