diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 9b88919aa1e..3c677639711 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -4,7 +4,7 @@ title: Getting Started
 layout: docs
 category: Quick Start
 permalink: docs/getting-started.html
-next: network
+next: pixels
 ---
 
 Our first React Native implementation is `ReactKit`, targeting iOS.  We are also
diff --git a/docs/Network.md b/docs/Network.md
index 70ecb10e83a..0dee55298dd 100644
--- a/docs/Network.md
+++ b/docs/Network.md
@@ -2,9 +2,9 @@
 id: network
 title: Network
 layout: docs
-category: Guides
+category: Polyfills
 permalink: docs/network.html
-next: pixels
+next: timers
 ---
 
 One of React Native goal is to be a playground where we can experiment with different architectures and crazy ideas. Since browsers are not flexible enough, we had no choice but to reimplement the entire stack. In the places that we did not intend to change, we tried to be as faithful as possible to the browser APIs. The networking stack is a great example.
diff --git a/docs/Style.md b/docs/Style.md
index 1d035ff5fc5..d3f4734a6f8 100644
--- a/docs/Style.md
+++ b/docs/Style.md
@@ -4,7 +4,7 @@ title: Style
 layout: docs
 category: Guides
 permalink: docs/style.html
-next: timers
+next: activityindicatorios
 ---
 
 ## Declaring Styles
diff --git a/docs/Timers.md b/docs/Timers.md
index ecca4290c33..b7cfbb8b0fa 100644
--- a/docs/Timers.md
+++ b/docs/Timers.md
@@ -2,9 +2,8 @@
 id: timers
 title: Timers
 layout: docs
-category: Guides
+category: Polyfills
 permalink: docs/timers.html
-next: activityindicatorios
 ---
 
 Timers are an important part of an application and React Native implements the [browser timers](https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Timers).
@@ -59,7 +58,7 @@ InteractionManager.clearInteractionHandle(handle);
 We found out that the primary cause of fatals in apps created with React Native was due to timers firing after a component was unmounted. To solve this recurring issue, we introduced `TimerMixin`. If you include `TimerMixin`, then you can replace your calls to `setTimeout(fn, 500)` with `this.setTimeout(fn, 500)` (just prepend `this.`) and everything will be properly cleaned up for you when the component unmounts.
 
 ```javascript
-var { TimerMixin } = React;
+var TimerMixin = require('react-timer-mixin');
 
 var Component = React.createClass({
   mixins: [TimerMixin],
diff --git a/website/server/extractDocs.js b/website/server/extractDocs.js
index b6c4114f1af..1c7f1906375 100644
--- a/website/server/extractDocs.js
+++ b/website/server/extractDocs.js
@@ -28,7 +28,9 @@ function componentsToMarkdown(type, json, filepath, i) {
     'layout: autodocs',
     'category: ' + type + 's',
     'permalink: docs/' + slugify(componentName) + '.html',
-    all[i + 1] && ('next: ' + slugify(getNameFromPath(all[i + 1]))),
+    'next: ' + (all[i + 1] ?
+      slugify(getNameFromPath(all[i + 1])) :
+      'network'),
     '---',
     JSON.stringify(json, null, 2),
   ].filter(function(line) { return line; }).join('\n');
diff --git a/website/src/react-native/css/react-native.css b/website/src/react-native/css/react-native.css
index f04b8d74a2b..35906a65205 100644
--- a/website/src/react-native/css/react-native.css
+++ b/website/src/react-native/css/react-native.css
@@ -345,15 +345,16 @@ h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-li
 }
 
 .nav-docs {
-  color: #2d2d2d;
   font-size: 14px;
   float: left;
   width: 210px;
+  margin-top: 5px;
 }
 
 .nav-docs ul {
   list-style: none;
   margin: 0;
+  margin-left: 10px;
 }
 
 .nav-docs ul ul {
@@ -383,10 +384,10 @@ h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-li
   color: #0485A9;
 }
 
-.nav-docs .nav-docs-section {
-  border-bottom: 1px solid #ccc;
-  border-top: 1px solid #eee;
-  padding: 12px 0;
+.nav-docs h3 {
+  margin: 0;
+  line-height: 25px;
+  margin-top: 5px;
 }
 
 .nav-docs .nav-docs-section:first-child {