diff --git a/website/css/protractor.less b/website/css/protractor.less
index dc9b6fbbd..97b0e8ffa 100644
--- a/website/css/protractor.less
+++ b/website/css/protractor.less
@@ -84,8 +84,30 @@ a code {
 
   .child {
     color: @child-color;
+  }
+
+  .depth-1 {
     margin-left: 20px;
   }
+
+  .depth-2 {
+    margin-left: 40px;
+  }
+
+  .depth-3 {
+    margin-left: 60px;
+  }
+}
+
+.api-left-nav a, .mobile-menu a {
+  display: inline-block;
+}
+
+.api-left-nav .extension, .mobile-menu .extension {
+  &:before {
+    content: 'Inherited from ';
+  }
+  font-style: italic;
 }
 
 // The grid is too wide.
diff --git a/website/js/api-controller.js b/website/js/api-controller.js
index 889946a3f..befefa233 100644
--- a/website/js/api-controller.js
+++ b/website/js/api-controller.js
@@ -98,7 +98,8 @@
       });
 
       self.setViewProperties(list);
-      var items = self.addTitleItems(list);
+      self.addExtends(list);
+      var items = self.organizeItems(list);
 
       $scope.items = items;
       $scope.version = data.version;
@@ -113,7 +114,6 @@
         });
       }
 
-      self.addExtends(list);
     });
   };
 
@@ -122,7 +122,7 @@
    * @param list
    */
   ApiCtrl.prototype.setViewProperties = function(list) {
-    var itemsByName = {};
+    var itemsByName = this.itemsByName = {};
 
     var getTitle = function(item) {
       if (item.alias) {
@@ -189,31 +189,64 @@
   };
 
   /**
-   * Add the title rows to the list.
-   * @param list
-   * @return {Array}
+   * Organize items according to class & inheritance, note every item's depth,
+   * and add file name items to the list.
+   *
+   * @param list The list of items
+   * @return {Array} A modified, reorganized list
    */
-  ApiCtrl.prototype.addTitleItems = function(list) {
-    var itemsPlusTitles = [],
-        prevFileName = null;
+  ApiCtrl.prototype.organizeItems = function(list) {
+    var newList = [];
+    var self = this;
 
-    list.forEach(function(item) {
-      if (prevFileName !== item.fileName) {
-        prevFileName = item.fileName;
-        itemsPlusTitles.push({
-          displayName: item.fileName,
-          isTitle: true,
-          type: 'title'
+    var addItemToList = function(item, depth) {
+      if (item.inList) {
+        console.log(item.name);
+        return;
+      }
+      item.treeClasses = 'depth-' + depth;
+      if (item.extension) {
+        item.treeClasses += ' extension';
+        depth--; // For the children
+      }
+      item.inList = true;
+      newList.push(item);
+      if (item.children) {
+        item.children.forEach(function(child) {
+          addItemToList(child, depth + 1);
         });
       }
+      if (item.extends) {
+        console.log(item.base.name);
+        var parent = self.itemsByName[item.base.name];
+        if (parent != null) {
+          addItemToList(parent, depth + 1);
+        }
+      }
+    };
+    
+    var prevFileName;
+    list.forEach(function(item) {
+      if ((item.type !== 'child') && !item.extension) {
+        if (prevFileName !== item.fileName) {
+          prevFileName = item.fileName;
+          newList.push({
+            displayName: item.fileName,
+            isTitle: true,
+            type: 'title',
+            treeClasses: 'depth-0'
+          });
+        }
 
-      itemsPlusTitles.push(item);
+        addItemToList(item, 0);
+      }
     });
 
-    return itemsPlusTitles;
+    return newList;
   };
 
   ApiCtrl.prototype.addExtends = function(list) {
+    var self = this;
     list.forEach(function(item) {
       if (!item.extends) {
         return;
@@ -230,6 +263,10 @@
           return item.name && item.name.match(nameExpr);
         })
       };
+
+      if (self.itemsByName[parentName]) {
+        self.itemsByName[parentName].extension = true;
+      }
     });
   };
 
diff --git a/website/partials/api.html b/website/partials/api.html
index 51435ef4a..0608348c1 100644
--- a/website/partials/api.html
+++ b/website/partials/api.html
@@ -33,15 +33,18 @@ <h3 id="title">Protractor API <small>{{::version}}</small></h3>
             ng-switch="item.type">
             <div ng-switch-when="title"
                 class="title"
+                ng-class="item.treeClasses"
                 ng-bind="item.displayName">
             </div>
             <span ng-switch-when="child">
               <a href="#/api?view={{item.name}}"
                   class="child"
+                  ng-class="item.treeClasses"
                   ng-bind="item.displayName"></a>
             </span>
             <div ng-switch-default class="parent">
               <a href="#/api?view={{item.name}}"
+                  ng-class="item.treeClasses"
                   ng-bind="item.title"></a>
             </div>
         </span>
@@ -57,15 +60,18 @@ <h3 id="title">Protractor API <small>{{::version}}</small></h3>
               ng-switch="item.type">
             <span ng-switch-when="title"
                 class="title"
+                ng-class="item.treeClasses"
                 ng-bind="item.displayName">
             </span>
             <a ng-switch-when="child"
                 href="#/api?view={{item.name}}"
                 class="child"
+                ng-class="item.treeClasses"
                 ng-bind="item.displayName">
             </a>
             <a ng-switch-default
                 href="#/api?view={{item.name}}"
+                ng-class="item.treeClasses"
                 ng-bind="item.title"></a>
           </li>
         </ul>