diff --git a/template/js/ClassPanel.js b/template/js/ClassPanel.js
index d4f4c5850a1557beb31a89d73c8d3e72cc0dbcee..b97f663c61e8a1b5e8c5c813a5c5e868bd68af79 100644
--- a/template/js/ClassPanel.js
+++ b/template/js/ClassPanel.js
@@ -7,6 +7,12 @@ Ext.define('Docs.ClassPanel', {
     style: 'border-color: #bfbfbf;',
     plain: true,
 
+    /**
+     * @cfg {Object} docClass
+     * Documentation for a class.
+     */
+    docClass: {},
+
     // Remember tab scroll position on Webkit
     listeners: {
         beforetabchange: function(tabPanel, newCard, oldCard) {
@@ -24,7 +30,9 @@ Ext.define('Docs.ClassPanel', {
 
     initComponent: function() {
         this.height = Ext.get('docContent').getHeight() - 55;
-        this.items = [ Ext.create('Docs.OverviewPanel') ];
+        this.items = Ext.create('Docs.OverviewPanel', {
+          docClass: this.docClass
+        });
         this.callParent(arguments);
     }
 });
diff --git a/template/js/OverviewPanel.js b/template/js/OverviewPanel.js
index e87b032482ffe46f21c0abb4eed0b934c8f11a64..991da84321c8d0f7193ae87a80bdf31fc24d4708 100644
--- a/template/js/OverviewPanel.js
+++ b/template/js/OverviewPanel.js
@@ -6,6 +6,12 @@ Ext.define('Docs.OverviewPanel', {
     title: 'Overview',
     autoScroll: true,
 
+    /**
+     * @cfg {Object} docClass
+     * Documentation for a class.
+     */
+    docClass: {},
+
     scrollToEl: function(query) {
         var el = Ext.get(Ext.query(query)[0]);
         if (el) {
@@ -41,7 +47,9 @@ Ext.define('Docs.OverviewPanel', {
 
     initComponent: function() {
         this.dockedItems = [
-            Ext.create('Docs.OverviewToolbar')
+            Ext.create('Docs.OverviewToolbar', {
+              docClass: this.docClass
+            })
         ];
 
         if (Ext.get('doc-overview-content')) {
@@ -49,5 +57,13 @@ Ext.define('Docs.OverviewPanel', {
         }
 
         this.callParent(arguments);
+    },
+
+    load: function(docClass) {
+      this.removeDocked(Ext.getCmp('overview-toolbar'), true);
+      this.addDocked(Ext.create('Docs.OverviewToolbar', {
+        docClass: docClass
+      }));
+      this.update(docClass.doc);
     }
 });
diff --git a/template/js/OverviewToolbar.js b/template/js/OverviewToolbar.js
index 27cf667de67cb952dcefd085f2d42b711eabd708..393a2eef54a465ee2250e499fbf2150c25182d70 100644
--- a/template/js/OverviewToolbar.js
+++ b/template/js/OverviewToolbar.js
@@ -8,6 +8,12 @@ Ext.define('Docs.OverviewToolbar', {
     cls: 'member-links',
     padding: '3 5',
 
+    /**
+     * @cfg {Object} docClass
+     * Documentation for a class.
+     */
+    docClass: {},
+
     initComponent: function() {
         this.items = [];
 
@@ -18,7 +24,7 @@ Ext.define('Docs.OverviewToolbar', {
             event: "Events"
         };
         for (var type in memberTitles) {
-            var members = clsInfo[type];
+            var members = this.docClass[type];
             if (members.length) {
                 this.items.push(this.createMemberButton({
                     items: members,
@@ -28,9 +34,9 @@ Ext.define('Docs.OverviewToolbar', {
             }
         }
 
-        if (clsInfo.subclasses.length) {
+        if (this.docClass.subclasses.length) {
             this.items.push(this.createSubClassesButton({
-                items: clsInfo.subclasses,
+                items: this.docClass.subclasses,
                 title: "Sub Classes"
             }));
         }
diff --git a/template/js/functions.js b/template/js/functions.js
index 88adc09cbdd231b6f976805af525fdd65bed8e4d..a514ebd3ae3deb1bf8020465afacf11c0f790a53 100644
--- a/template/js/functions.js
+++ b/template/js/functions.js
@@ -57,12 +57,12 @@ var getDocClass = function(cls, noHistory) {
 };
 
 var showClass = function(cls, anchor) {
-    window.clsInfo = cls;
-
     var docTabPanel = Ext.getCmp('docTabPanel');
     if (!docTabPanel) {
          Ext.get('docContent').update('');
-         Ext.create('Docs.ClassPanel');
+         Ext.create('Docs.ClassPanel', {
+           docClass: cls
+         });
     }
 
     Ext.get('docTabPanel').show();
@@ -72,10 +72,7 @@ var showClass = function(cls, anchor) {
     }
 
     var docOverviewTab = Ext.getCmp('doc-overview');
-
-    docOverviewTab.update(cls.doc);
-    docOverviewTab.removeDocked(Ext.getCmp('overview-toolbar'), true);
-    docOverviewTab.addDocked(Ext.create('Docs.OverviewToolbar'));
+    docOverviewTab.load(cls);
     docOverviewTab.setLoading(false);
 
     prettyPrint();