diff --git a/website/layout/AutodocsLayout.js b/website/layout/AutodocsLayout.js
index 9ee1d01f4d97d9..bd54f0e6003f6f 100644
--- a/website/layout/AutodocsLayout.js
+++ b/website/layout/AutodocsLayout.js
@@ -100,6 +100,7 @@ var ComponentDoc = React.createClass({
             link =
               <a href={slugify(name) + '.html#style'}>{name}#style...</a>;
           } else {
+            name = 'Flexbox';
             link =
               <a href={slugify(name) + '.html#proptypes'}>{name}...</a>;
           }
diff --git a/website/server/extractDocs.js b/website/server/extractDocs.js
index d5a44f6fe1c301..59088d7a2c5886 100644
--- a/website/server/extractDocs.js
+++ b/website/server/extractDocs.js
@@ -19,6 +19,9 @@ function getNameFromPath(filepath) {
   while (ext = path.extname(filepath)) {
     filepath = path.basename(filepath, ext);
   }
+  if (filepath === 'LayoutPropTypes') {
+    return 'Flexbox';
+  }
   return filepath;
 }
 
@@ -39,7 +42,7 @@ function componentsToMarkdown(type, json, filepath, i, styles) {
     'id: ' + slugify(componentName),
     'title: ' + componentName,
     'layout: autodocs',
-    'category: ' + type + 's',
+    'category: ' + (type === 'style' ? 'Polyfills' : type + 's'),
     'permalink: docs/' + slugify(componentName) + '.html',
     'next: ' + (all[i + 1] ?
       slugify(getNameFromPath(all[i + 1])) :