Organize the sidenav to make developer guide pages easier to find.

TEST=none
BUG=none
TBR=aa
Review URL: http://codereview.chromium.org/313008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29661 0039d316-1c4b-4281-b951-d872f2087c98

31 files changed, 876 insertions, 422 deletions

diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index 4e44c2d..5345b3d 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/api_other.html b/chrome/common/extensions/docs/api_other.html
index 806e16f..85a530d 100644
--- a/chrome/common/extensions/docs/api_other.html
+++ b/chrome/common/extensions/docs/api_other.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/autoupdate.html b/chrome/common/extensions/docs/autoupdate.html
index b3dfc79..b7bd25d 100644
--- a/chrome/common/extensions/docs/autoupdate.html
+++ b/chrome/common/extensions/docs/autoupdate.html
@@ -10,6 +10,7 @@
 --><html xmlns="http://www.w3.org/1999/xhtml"><head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="css/ApiRefStyles.css" rel="stylesheet" type="text/css">
+    <link href="css/print.css" rel="stylesheet" type="text/css" media="print">
     <script type="text/javascript" src="../../../third_party/jstemplate/jstemplate_compiled.js">
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
@@ -99,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li class="leftNavSelected">Autoupdate</li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li class="leftNavSelected">Autoupdating</li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html
index 4826d00..b01ba02 100644
--- a/chrome/common/extensions/docs/background_pages.html
+++ b/chrome/common/extensions/docs/background_pages.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li class="leftNavSelected">Background Pages</li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li class="leftNavSelected">Background Pages</li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html
index d256968..a0b9bba 100644
--- a/chrome/common/extensions/docs/bookmarks.html
+++ b/chrome/common/extensions/docs/bookmarks.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li class="leftNavSelected">Bookmarks</li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li class="leftNavSelected">Bookmarks</li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html
index 57232eb..72ecb3c 100644
--- a/chrome/common/extensions/docs/browserAction.html
+++ b/chrome/common/extensions/docs/browserAction.html
@@ -10,6 +10,7 @@
 --><html xmlns="http://www.w3.org/1999/xhtml"><head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="css/ApiRefStyles.css" rel="stylesheet" type="text/css">
+    <link href="css/print.css" rel="stylesheet" type="text/css" media="print">
     <script type="text/javascript" src="../../../third_party/jstemplate/jstemplate_compiled.js">
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
@@ -99,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li class="leftNavSelected">Browser Actions</li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li class="leftNavSelected">Browser Actions</li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html
index 4c6bc57..82f1d66 100644
--- a/chrome/common/extensions/docs/content_scripts.html
+++ b/chrome/common/extensions/docs/content_scripts.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li class="leftNavSelected">Content Scripts</li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li class="leftNavSelected">Content Scripts</li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html
index c7a9b01..8bc835f 100644
--- a/chrome/common/extensions/docs/devguide.html
+++ b/chrome/common/extensions/docs/devguide.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li><div class="leftNavSelected">Developer's Guide</div> 
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/devtools.html b/chrome/common/extensions/docs/devtools.html
index b9cab0a..2171417 100644
--- a/chrome/common/extensions/docs/devtools.html
+++ b/chrome/common/extensions/docs/devtools.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html
index b694861..e0e68f0 100644
--- a/chrome/common/extensions/docs/events.html
+++ b/chrome/common/extensions/docs/events.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li class="leftNavSelected">Events</li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li class="leftNavSelected">Events</li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html
index 4079934..d6c9e29 100644
--- a/chrome/common/extensions/docs/extension.html
+++ b/chrome/common/extensions/docs/extension.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html
index 63d599d..2c718c3 100644
--- a/chrome/common/extensions/docs/getstarted.html
+++ b/chrome/common/extensions/docs/getstarted.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/hosting.html b/chrome/common/extensions/docs/hosting.html
index faefe4b..e35b3b2 100644
--- a/chrome/common/extensions/docs/hosting.html
+++ b/chrome/common/extensions/docs/hosting.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html
index fa185a8..8a8e6c9 100644
--- a/chrome/common/extensions/docs/i18n.html
+++ b/chrome/common/extensions/docs/i18n.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html
index e884f90..fd82ae8 100644
--- a/chrome/common/extensions/docs/index.html
+++ b/chrome/common/extensions/docs/index.html
@@ -10,6 +10,7 @@
 --><html xmlns="http://www.w3.org/1999/xhtml"><head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="css/ApiRefStyles.css" rel="stylesheet" type="text/css">
+    <link href="css/print.css" rel="stylesheet" type="text/css" media="print">
     <script type="text/javascript" src="../../../third_party/jstemplate/jstemplate_compiled.js">
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
@@ -99,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html
index 78d1a8e..952768c 100644
--- a/chrome/common/extensions/docs/manifest.html
+++ b/chrome/common/extensions/docs/manifest.html
@@ -10,6 +10,7 @@
 --><html xmlns="http://www.w3.org/1999/xhtml"><head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="css/ApiRefStyles.css" rel="stylesheet" type="text/css">
+    <link href="css/print.css" rel="stylesheet" type="text/css" media="print">
     <script type="text/javascript" src="../../../third_party/jstemplate/jstemplate_compiled.js">
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
@@ -99,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html
index 8731a6e..e4ec828 100644
--- a/chrome/common/extensions/docs/match_patterns.html
+++ b/chrome/common/extensions/docs/match_patterns.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/npapi.html b/chrome/common/extensions/docs/npapi.html
index d9dc672..11c6fdf 100644
--- a/chrome/common/extensions/docs/npapi.html
+++ b/chrome/common/extensions/docs/npapi.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li class="leftNavSelected">NPAPI Plugins</li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li class="leftNavSelected">NPAPI Plugins</li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html
index 55ed90e..b411ef5 100644
--- a/chrome/common/extensions/docs/overview.html
+++ b/chrome/common/extensions/docs/overview.html
@@ -100,20 +100,35 @@
           <li class="leftNavSelected">Overview </li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
@@ -257,7 +272,7 @@ from XMLHttpRequest to JSON to HTML5 local storage.
 Many extensions add UI to Google Chrome,
 in the form of
 <a href="toolstrip.html">toolstrips</a> (toolbar additions),
-<a href="browserAction.html">browser actions</a>, 
+<a href="browserAction.html">browser actions</a>,
 or <a href="pageAction.html">page actions</a>
 (clickable badges in the address bar).
 Extensions can also interact programmatically
diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html
index 4da8a1f..4dc7d5f 100644
--- a/chrome/common/extensions/docs/packaging.html
+++ b/chrome/common/extensions/docs/packaging.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li class="leftNavSelected">Packaging</li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li class="leftNavSelected">Packaging</li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html
index 1fa5843..eb96f53 100644
--- a/chrome/common/extensions/docs/pageAction.html
+++ b/chrome/common/extensions/docs/pageAction.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li class="leftNavSelected">Page Actions</li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li class="leftNavSelected">Page Actions</li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/static/overview.html b/chrome/common/extensions/docs/static/overview.html
index 3bd9f63..d29f2f8 100644
--- a/chrome/common/extensions/docs/static/overview.html
+++ b/chrome/common/extensions/docs/static/overview.html
@@ -28,7 +28,7 @@ from XMLHttpRequest to JSON to HTML5 local storage.
 Many extensions add UI to Google Chrome,
 in the form of
 <a href="toolstrip.html">toolstrips</a> (toolbar additions),
-<a href="browserAction.html">browser actions</a>, 
+<a href="browserAction.html">browser actions</a>,
 or <a href="pageAction.html">page actions</a>
 (clickable badges in the address bar).
 Extensions can also interact programmatically
diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html
index 00e0d49..7a34f68 100644
--- a/chrome/common/extensions/docs/tabs.html
+++ b/chrome/common/extensions/docs/tabs.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li class="leftNavSelected">Tabs</li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li class="leftNavSelected">Tabs</li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/template/api_template.html b/chrome/common/extensions/docs/template/api_template.html
index 790c5b6..8c1ceab 100644
--- a/chrome/common/extensions/docs/template/api_template.html
+++ b/chrome/common/extensions/docs/template/api_template.html
@@ -84,20 +84,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><A href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/test.html b/chrome/common/extensions/docs/test.html
index 06d606f..eececc2 100644
--- a/chrome/common/extensions/docs/test.html
+++ b/chrome/common/extensions/docs/test.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html
index 754b401..77a2794 100644
--- a/chrome/common/extensions/docs/themes.html
+++ b/chrome/common/extensions/docs/themes.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li class="leftNavSelected">Themes</li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li class="leftNavSelected">Themes</li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/toolstrip.html b/chrome/common/extensions/docs/toolstrip.html
index 0bc35fb..5683bd9 100644
--- a/chrome/common/extensions/docs/toolstrip.html
+++ b/chrome/common/extensions/docs/toolstrip.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li class="leftNavSelected">Toolstrips</li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html
index b5b339a..d880ca6 100644
--- a/chrome/common/extensions/docs/tut_debugging.html
+++ b/chrome/common/extensions/docs/tut_debugging.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/tutorials.html b/chrome/common/extensions/docs/tutorials.html
index b43dbea6..b985fff 100644
--- a/chrome/common/extensions/docs/tutorials.html
+++ b/chrome/common/extensions/docs/tutorials.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><div class="leftNavSelected">Tutorials</div>
diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html
index c1cae45..7f3aa68 100644
--- a/chrome/common/extensions/docs/windows.html
+++ b/chrome/common/extensions/docs/windows.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li class="leftNavSelected">Windows</li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li><a href="xhr.html">Cross-Origin XHR</a></li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li class="leftNavSelected">Windows</li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li><a href="xhr.html">Cross-Origin XHR</a></li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>
diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html
index f9f2234..2815387 100644
--- a/chrome/common/extensions/docs/xhr.html
+++ b/chrome/common/extensions/docs/xhr.html
@@ -100,20 +100,35 @@
           <li> <a href="overview.html">Overview</a></li>
           <li> <a href="devguide.html"><div>Developer's Guide</div></a>
             <ul>
-              <li><a href="toolstrip.html">Toolstrips</a></li>
-              <li><a href="browserAction.html">Browser Actions</a></li>
-              <li><a href="pageAction.html">Page Actions</a></li>
-              <li><a href="background_pages.html">Background Pages</a></li>
-              <li><a href="content_scripts.html">Content Scripts</a></li>
-              <li><a href="events.html">Events</a></li>
-              <li><a href="tabs.html">Tabs</a></li>
-              <li><a href="windows.html">Windows</a></li>
-              <li><a href="bookmarks.html">Bookmarks</a></li>
-              <li><a href="themes.html">Themes</a></li>
-              <li><a href="npapi.html">NPAPI Plugins</a></li>
-              <li class="leftNavSelected">Cross-Origin XHR</li>
-              <li><a href="packaging.html">Packaging</a></li>
-              <li><a href="autoupdate.html">Autoupdate</a></li>
+              <li> UI Surfaces
+                <ul>
+                  <li><a href="browserAction.html">Browser Actions</a></li>
+                  <li><a href="pageAction.html">Page Actions</a></li>
+                  <li><a href="themes.html">Themes</a></li>
+                </ul>
+              </li>
+              <li> More Interaction
+                <ul>
+                  <li><a href="bookmarks.html">Bookmarks</a></li>
+                  <li><a href="events.html">Events</a></li>
+                  <li><a href="tabs.html">Tabs</a></li>
+                  <li><a href="windows.html">Windows</a></li>
+                </ul>
+              </li>
+              <li> Implementation
+                <ul>
+                  <li><a href="background_pages.html">Background Pages</a></li>
+                  <li><a href="content_scripts.html">Content Scripts</a></li>
+                  <li class="leftNavSelected">Cross-Origin XHR</li>
+                  <li><a href="npapi.html">NPAPI Plugins</a></li>
+                </ul>
+              </li>
+              <li> Finishing
+                <ul>
+                  <li><a href="autoupdate.html">Autoupdating</a></li>
+                  <li><a href="packaging.html">Packaging</a></li>
+                </ul>
+              </li>
             </ul>
           </li>
           <li><a href="tutorials.html"><div>Tutorials</div></a>