diff --git a/website/core/Footer.js b/website/core/Footer.js
index 205bbb4c140..516b178d64f 100644
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -12,17 +12,14 @@
 var React = require('React');
 
 function getGitHubPath(path) {
-  return [
-    'https://github.com/facebook/react-native/blob/master',
-    path
-  ].join('/');
+  return 'https://github.com/facebook/react-native/blob/master/' + path;
 }
 
 var Footer = React.createClass({
   render: function() {
     return (
       <p className="edit-page-block">
-        You can <a target="_blank" href={getGitHubPath(this.props.path)} >edit this page on GitHub</a> and send us a pull request!
+        You can <a target="_blank" href={getGitHubPath(this.props.path)}>edit the content above on GitHub</a> and send us a pull request!
       </p>
     );
   }
diff --git a/website/core/HeaderWithGithub.js b/website/core/HeaderWithGithub.js
index c73a1e59abc..e6d0e3caf2c 100644
--- a/website/core/HeaderWithGithub.js
+++ b/website/core/HeaderWithGithub.js
@@ -12,13 +12,8 @@
 var H = require('Header');
 var React = require('React');
 
-function getVersionedGithubPath(path, version) {
-  version = version || 'next';
-  return [
-    'https://github.com/facebook/react-native/blob',
-    version === 'next' ? 'master' : version + '-stable',
-    path
-  ].join('/');
+function getGitHubPath(path) {
+  return  'https://github.com/facebook/react-native/blob/' + path;
 }
 
 var HeaderWithGithub = React.createClass({
@@ -40,8 +35,8 @@ var HeaderWithGithub = React.createClass({
             <td style={{textAlign: 'right'}}>
               <a
                 target="_blank"
-                href={getVersionedGithubPath(this.props.path, this.context.version)}>
-                View on GitHub
+                href={getGitHubPath(this.props.path)}>
+                Edit on GitHub
               </a>
             </td>
           </tr>
diff --git a/website/layout/AutodocsLayout.js b/website/layout/AutodocsLayout.js
index 0029ce542e3..80521c4ff69 100644
--- a/website/layout/AutodocsLayout.js
+++ b/website/layout/AutodocsLayout.js
@@ -13,6 +13,7 @@
 
 var DocsSidebar = require('DocsSidebar');
 var Header = require('Header');
+var HeaderWithGithub = require('HeaderWithGithub');
 var Footer = require('Footer');
 var Marked = require('Marked');
 var Prism = require('Prism');
@@ -830,14 +831,11 @@ var Autodocs = React.createClass({
     }
     return (
       <div>
-        <Header
-          toSlug='Description'
-        >
-          Description
-        </Header>
+        <Header level={1}>Description</Header>
         <Marked>
           {docs.fullDescription}
         </Marked>
+        <Footer path={'docs/' + docs.componentName + '.md'} />
       </div>
     );
   },
@@ -849,13 +847,12 @@ var Autodocs = React.createClass({
 
     return (
       <div>
-        <Header
+        <HeaderWithGithub
+          title={example.title || 'Examples'}
           level={example.title ? 4 : 3}
           path={example.path}
           metadata={metadata}
-        >
-          {example.title || 'Examples'}
-        </Header>
+        />
         <div className="example-container">
           <Prism>
            {example.content.replace(/^[\s\S]*?\*\//, '').trim()}
@@ -892,19 +889,14 @@ var Autodocs = React.createClass({
           <DocsSidebar metadata={metadata} />
           <div className="inner-content">
             <a id="content" />
-            <Header
-              level={1}
-            >
-              {metadata.title}
-            </Header>
-            {content}
+            <Header level={1}>{metadata.title}</Header>            {content}
+            <Footer path={metadata.path} />
             {this.renderFullDescription(docs)}
             {this.renderExamples(docs, metadata)}
             <div className="docs-prevnext">
               {metadata.previous && <a className="docs-prev" href={'docs/' + metadata.previous + '.html#content'}>&larr; Prev</a>}
               {metadata.next && <a className="docs-next" href={'docs/' + metadata.next + '.html#content'}>Next &rarr;</a>}
             </div>
-            <Footer path={metadata.path} />
           </div>
         </section>
       </Site>
diff --git a/website/layout/DocsLayout.js b/website/layout/DocsLayout.js
index d9c54b7896f..6ac99affd71 100644
--- a/website/layout/DocsLayout.js
+++ b/website/layout/DocsLayout.js
@@ -39,9 +39,7 @@ var DocsLayout = React.createClass({
           <DocsSidebar metadata={metadata} />
           <div className="inner-content">
             <a id="content" />
-            <Header level={1} >
-              {metadata.title}
-            </Header>
+            <Header level={1}>{metadata.title}</Header>
             <Marked>{content}</Marked>
             <div className="docs-prevnext">
               {metadata.previous && <a className="docs-prev" href={'docs/' + metadata.previous + '.html#content'}>&larr; Prev</a>}
diff --git a/website/src/react-native/css/react-native.css b/website/src/react-native/css/react-native.css
index 8de6e385a2b..9a9891ce944 100644
--- a/website/src/react-native/css/react-native.css
+++ b/website/src/react-native/css/react-native.css
@@ -1632,6 +1632,7 @@ input#algolia-doc-search:focus {
 
 .edit-page-block {
     padding: 5px;
+    margin-bottom: 40px;
     font-size: 12px;
     color: #887766;
     text-align: center;