diff --git a/v1/website/core/Showcase.js b/v1/website/core/Showcase.js
new file mode 100644
index 0000000000..55cc63b33f
--- /dev/null
+++ b/v1/website/core/Showcase.js
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const React = require('react');
+const PropTypes = require('prop-types');
+
+const UserLink = ({infoLink, image, caption}) => (
+  <a className="link" href={infoLink} key={infoLink}>
+    <img src={image} alt={caption} title={caption} />
+    <span className="caption">{caption}</span>
+  </a>
+);
+
+UserLink.propTypes = {
+  infoLink: PropTypes.string.isRequired,
+  image: PropTypes.string.isRequired,
+  caption: PropTypes.string.isRequired,
+};
+
+const Showcase = ({users}) => (
+  <div className="showcase">
+    {users.map(user => (
+      <UserLink key={user.infoLink} {...user} />
+    ))}
+  </div>
+);
+
+Showcase.propTypes = {
+  users: PropTypes.array.isRequired,
+};
+
+Showcase.defaultProps = {
+  users: [],
+};
+
+module.exports = Showcase;
diff --git a/v1/website/pages/en/index.js b/v1/website/pages/en/index.js
index 65519b6a9b..0fd8ff5ed6 100755
--- a/v1/website/pages/en/index.js
+++ b/v1/website/pages/en/index.js
@@ -6,10 +6,12 @@
  */
 
 const React = require('react');
+
 const CompLibrary = require('../../core/CompLibrary.js');
 
 const Container = CompLibrary.Container;
 const GridBlock = CompLibrary.GridBlock;
+const Showcase = require(`${process.cwd()}/core/Showcase.js`);
 const siteConfig = require(`${process.cwd()}/siteConfig.js`);
 const translate = require('../../server/translate.js').translate;
 
@@ -74,11 +76,7 @@ class HomeSplash extends React.Component {
 class Index extends React.Component {
   render() {
     const language = this.props.language || 'en';
-    const showcase = siteConfig.users.filter(user => user.pinned).map(user => (
-      <a href={user.infoLink} key={user.infoLink}>
-        <img src={user.image} alt={user.caption} title={user.caption} />
-      </a>
-    ));
+    const pinnedUsersToShowcase = siteConfig.users.filter(user => user.pinned);
 
     return (
       <div>
@@ -234,7 +232,7 @@ class Index extends React.Component {
                 Docusaurus is building websites for these projects...
               </translate>
             </p>
-            <div className="logos">{showcase}</div>
+            <Showcase users={pinnedUsersToShowcase} />
             <div className="more-users">
               <a
                 className="button"
diff --git a/v1/website/pages/en/users.js b/v1/website/pages/en/users.js
index df5e05d9ef..b4db5ae5ca 100644
--- a/v1/website/pages/en/users.js
+++ b/v1/website/pages/en/users.js
@@ -9,26 +9,16 @@ const React = require('react');
 const CompLibrary = require('../../core/CompLibrary.js');
 
 const Container = CompLibrary.Container;
+const Showcase = require(`${process.cwd()}/core/Showcase.js`);
 const siteConfig = require(`${process.cwd()}/siteConfig.js`);
 const translate = require('../../server/translate.js').translate;
 
 class Users extends React.Component {
-  renderUser(user) {
-    return (
-      <a href={user.infoLink} key={user.infoLink}>
-        <img src={user.image} alt={user.caption} title={user.caption} />
-      </a>
-    );
-  }
-
   render() {
-    const fbShowcase = siteConfig.users
-      .filter(user => user.fbOpenSource)
-      .map((user, i) => this.renderUser(user, i));
-
-    const showcase = siteConfig.users
-      .filter(user => !user.fbOpenSource)
-      .map((user, i) => this.renderUser(user, i));
+    const fbUsersToShowcase = siteConfig.users.filter(
+      user => user.fbOpenSource,
+    );
+    const restToShowcase = siteConfig.users.filter(user => !user.fbOpenSource);
 
     return (
       <div className="mainContainer">
@@ -46,7 +36,7 @@ class Users extends React.Component {
                 .
               </p>
             </div>
-            <div className="logos">{fbShowcase}</div>
+            <Showcase users={fbUsersToShowcase} />
             <div className="prose">
               <p>
                 <translate>
@@ -54,7 +44,7 @@ class Users extends React.Component {
                 </translate>
               </p>
             </div>
-            <div className="logos">{showcase}</div>
+            <Showcase users={restToShowcase} />
             <div className="prose">
               <p>
                 <translate>Is your project using Docusaurus?</translate>
diff --git a/v1/website/static/css/custom.css b/v1/website/static/css/custom.css
index 3356af39ee..63660eb610 100644
--- a/v1/website/static/css/custom.css
+++ b/v1/website/static/css/custom.css
@@ -12,3 +12,48 @@
 table td:first-child > code {
   white-space: nowrap;
 }
+
+.showcase {
+  align-items: center;
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+.showcase .link {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 180px;
+  margin: 5px;
+  padding: 5px;
+}
+
+.showcase .link:hover {
+  text-decoration: underline;
+}
+
+.showcase .link .caption {
+  line-height: 20px;
+  height: 20px;
+}
+
+.showcase .link img {
+  max-height: 110px;
+  padding: 20px;
+  width: 110px;
+  align-self: center;
+}
+
+@media only screen and (max-width: 735px) {
+  .showcase .link {
+    height: 134px;
+  }
+
+  .showcase .link img {
+    max-height: 64px;
+    padding: 20px;
+    width: 64px;
+  }
+}