diff --git a/lib/helpers.js b/lib/helpers.js
index 562101f..144781d 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -83,19 +83,74 @@ helpers.filesToTree = function(files){
   
 }
 
+//
+// Function to use with sorting the ToC.
+//
+helpers.tocSort = function (a, b) {
+  // For future reference, here is the list from the top-level.
+  /*[
+    'cryptography',
+    'advanced',
+    'intermediate',
+    'errors',
+    'file-system',
+    'javascript-conventions',
+    'child-processes',
+    'command-line',
+    'REPL',
+    'getting-started',
+    'HTTP' ]
+  */
+
+  // These items should be listed *first*.
+  var first = [
+    'getting-started',
+    'javascript-conventions'
+  ];
+
+  // These items should be listed *last*.
+  var last = [
+    'intermediate',
+    'advanced',
+    'cryptography'
+  ];
+
+  //a > b: --> 1
+
+  // Handles the case where a and/or b is in the "first" list.
+  if ( -~first.indexOf(a) || -~first.indexOf(b) ) {
+
+    return ( -~first.indexOf(a) && -~first.indexOf(b) )
+      ? (first.indexOf(a) - first.indexOf(b))
+      : ( -~first.indexOf(a) ? -1 : 1);
+
+  }
+
+  if ( -~last.indexOf(a) || -~last.indexOf(b) ) {
+    return (-~last.indexOf(a) && -~last.indexOf(b))
+      ? (last.indexOf(a) - last.indexOf(b))
+      : ( -~last.indexOf(a) ? 1 : -1);
+  }
+
+  return a > b ? 1 : (a < b ? -1 : 0);
+};
+
 helpers.treeToHTML = function(values, parent) {
 
-   var str = '<ul>';
+  var str = '<ul>';
 
-   for(var key in values){
+  //
+  // Sort the keys here for a reasonable ToC layout.
+  //
+  Object.keys(values).sort(helpers.tocSort).forEach( function(key) {
 
-     if(typeof values[key]=='object' && values[key] != null){
-       var newParent = parent || '';
-       newParent = newParent + '/' + key;
-       var link = '/articles' + newParent;
-       str+='<li><a href="' + link + '">'+key.replace(/-/g, ' ')+'</a>' +helpers.treeToHTML(values[key], newParent)+'</li>';
-     }
+    if (typeof values[key]=='object' && values[key] != null){
+      var newParent = parent || '';
+      newParent = newParent + '/' + key;
+      var link = '/articles' + newParent;
+      str+='<li><a href="' + link + '">'+key.replace(/-/g, ' ')+'</a>' +helpers.treeToHTML(values[key], newParent)+'</li>';
     }
+  });
 
    str+='</ul>';
 
diff --git a/theme/article.html b/theme/article.html
index f8e31f1..94d43b7 100644
--- a/theme/article.html
+++ b/theme/article.html
@@ -22,10 +22,19 @@
     })();
 
   </script>
+
+  <script type="text/javascript">
+    //This changes the "edit this page" link to go to the "fork and edit" url of the docs.
+    document.ready = function () {
+        var edit = document.getElementById("edit");
+        edit.innerHTML = "<a href='https://github.com/nodejitsu/docs/edit/master"+window.location.pathname+"/article.md'>Edit this page on GitHub</a>";
+    }
+  </script>
+
 </head>
 <body>
   <header>
-    <div class="link"><a href="http://github.com/nodejitsu/docs">Edit this page on GitHub</a></div>
+    <div class="link" id="edit"><a href="http://github.com/nodejitsu/docs">Edit this page on GitHub</a></div>
     <div class="title">docs.nodejitsu.com</div>
   </header>
 
