diff --git a/src/components/App.js b/src/components/App.js
index df435f23..b0415f4d 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -28,7 +28,7 @@ const App = ({ children, path, version, breadcrumbs }) => {
           <a href="https://redux-form.com" className={styles.brand} />
           <a
             className={styles.github}
-            href="https://github.com/erikras/redux-form"
+            href="https://github.com/redux-form/redux-form"
             title="Github"
             target="_blank"
           >
@@ -60,7 +60,7 @@ const App = ({ children, path, version, breadcrumbs }) => {
             </a>
             <a
               className={styles.help}
-              href="https://github.com/erikras/redux-form/issues/new"
+              href="https://github.com/redux-form/redux-form/issues/new"
               title="Github"
               target="_blank"
             >
diff --git a/src/components/App.scss b/src/components/App.scss
index a3b2c922..defa2c07 100644
--- a/src/components/App.scss
+++ b/src/components/App.scss
@@ -170,7 +170,7 @@ code {
   .github {
     display: inline-block;
     padding: 10px;
-    margin: 10px;
+    margin: 45px 10px 10px;
     border-radius: 5px;
     border: 1px solid #ccc;
     background: white;
diff --git a/src/components/Home.js b/src/components/Home.js
index 68ff9593..f282e56a 100644
--- a/src/components/Home.js
+++ b/src/components/Home.js
@@ -34,7 +34,7 @@ const Home = ({ version }) => {
           .
         </h3>
         <GithubButton
-          user="erikras"
+          user="redux-form"
           repo="redux-form"
           type="star"
           width={160}
@@ -43,7 +43,7 @@ const Home = ({ version }) => {
           large
         />
         <GithubButton
-          user="erikras"
+          user="redux-form"
           repo="redux-form"
           type="fork"
           width={160}
diff --git a/src/components/TwitterFollowButton.js b/src/components/TwitterFollowButton.js
index 19c78856..f5179955 100644
--- a/src/components/TwitterFollowButton.js
+++ b/src/components/TwitterFollowButton.js
@@ -1,3 +1,5 @@
+import styles from "./TwitterFollowButton.scss";
+
 import React from 'react'
 import PropTypes from 'prop-types'
 
@@ -13,7 +15,7 @@ const TwitterFollowButton = ({ username, showUsername, showCount, large }) => {
     props[ 'data-size' ] = 'large'
   }
   return (
-    <a href={`https://twitter.com/${username}`} className="twitter-follow-button" {...props}>
+    <a href={`https://twitter.com/${username}`} className={styles.twitterFollowButton} {...props}>
       Follow @{username}
     </a>
   )
diff --git a/src/components/TwitterFollowButton.scss b/src/components/TwitterFollowButton.scss
new file mode 100644
index 00000000..6f57b805
--- /dev/null
+++ b/src/components/TwitterFollowButton.scss
@@ -0,0 +1,8 @@
+@import "./constants";
+
+.twitter-follow-button,
+.twitterFollowButton {
+  & a:not(:last_child) {
+    margin-right: 10px;
+  } 
+}
\ No newline at end of file