diff --git a/website/core/Footer.js b/website/core/Footer.js
index 97a40a030f..286ebec50e 100644
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -7,6 +7,24 @@
 
 const React = require("react");
 
+const GithubButton = props => (
+  <a
+    className="github-button" // part of the https://buttons.github.io/buttons.js script in siteConfig.js
+    href={`https://github.com/${props.config.organizationName}/${props.config.projectName}`}
+    data-icon="octicon-star"
+    data-count-href={`/${props.config.organizationName}/${props.config.projectName}/stargazers`}
+    data-count-api={`/repos/${props.config.organizationName}/${props.config.projectName}#stargazers_count`}
+    data-count-aria-label="# stargazers on GitHub"
+    aria-label="Star this project on GitHub"
+  >
+    Star
+  </a>
+);
+
+GithubButton.propTypes = {
+  config: React.PropTypes.object
+};
+
 class Footer extends React.Component {
   render() {
     return (
@@ -25,10 +43,28 @@ class Footer extends React.Component {
             <h5>Docs</h5>
             <a
               href={`
-                ${this.props.config.baseUrl}docs/installation.html`}
+                ${this.props.config.baseUrl}docs/${this.props.language}/installation.html`}
             >
               Getting Started
             </a>
+            <a
+              href={`
+                ${this.props.config.baseUrl}docs/${this.props.language}/versioning.html`}
+            >
+              Versioning
+            </a>
+            <a
+              href={`
+                ${this.props.config.baseUrl}docs/${this.props.language}/translation.html`}
+            >
+              Localization
+            </a>
+            <a
+              href={`
+                ${this.props.config.baseUrl}docs/${this.props.language}/search.html`}
+            >
+              Adding Search
+            </a>
           </div>
           <div>
             <h5>Community</h5>
@@ -38,21 +74,16 @@ class Footer extends React.Component {
             >
               User Showcase
             </a>
+            <a href="https://twitter.com/docusaurus">
+              Twitter
+            </a>
           </div>
           <div>
             <h5>More</h5>
             <a href="https://github.com/facebook/docusaurus">
               GitHub
             </a>
-            <a
-              className="github-button"
-              href="https://github.com/facebook/docusaurus"
-              data-icon="octicon-star"
-              data-show-count="true"
-              aria-label="Star this project on GitHub"
-            >
-              Star
-            </a>
+            <GithubButton config={this.props.config} />
           </div>
         </section>
 
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 157e2aae25..f0c962c5cd 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -81,7 +81,8 @@ const siteConfig = {
   copyright: "Copyright © " + new Date().getFullYear() + " Facebook Inc.",
   highlight: {
     theme: "solarized-dark"
-  }
+  },
+  scripts: ["https://buttons.github.io/buttons.js"]
 };
 
 module.exports = siteConfig;