diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs
index a116c67..64a87c0 100644
--- a/tools/droiddoc/templates-sdk/customization.cs
+++ b/tools/droiddoc/templates-sdk/customization.cs
@@ -50,7 +50,7 @@
 <div class="g-section g-tpl-240" id="body-content">
   <div class="g-unit g-first not-resizable" id="side-nav">
     <div id="devdoc-nav">
-      <?cs include:"../../../java/android/html/sdk/sdk_toc.cs" ?>
+      <?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
     </div>
   </div> <!-- end side-nav -->
 <?cs /def ?>
@@ -59,7 +59,7 @@
 <div class="g-section g-tpl-240" id="body-content">
   <div class="g-unit g-first side-nav-resizable" id="side-nav">
     <div id="devdoc-nav">
-      <?cs include:"../../../java/android/html/guide/guide_toc.cs" ?>
+      <?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
     </div>
   </div> <!-- end side-nav -->
   <script>
@@ -69,20 +69,9 @@
   </script>
 <?cs /def ?>
 
-<?cs def:publish_nav() ?>
-<div class="g-section g-tpl-180" id="body-content">
-  <div class="g-unit g-first" id="side-nav">
-    <div id="devdoc-nav">
-      <?cs include:"../../../java/android/html/publish/publish_toc.cs" ?>
-    </div>
-  </div> <!-- end side-nav -->
-<?cs /def ?>
-
 <?cs def:custom_left_nav() ?>
   <?cs if:guide ?>
     <?cs call:guide_nav() ?>
-  <?cs elif:publish ?>
-    <?cs call:publish_nav() ?> 
   <?cs elif:sdk ?>
     <?cs call:sdk_nav() ?>
   <?cs else ?>
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 97fab66..a9a1e21 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -19,8 +19,6 @@
   
 <div class="g-unit" id="doc-content" >
 
-<div id="jd-content">
-
 <?cs if:sdk.redirect ?>
   Redirecting to 
   <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html">
@@ -28,7 +26,14 @@
   </a>...
 <?cs else ?>
   
-    <h1><?cs var:page.title ?></h1>
+  <div id="jd-header" class="guide-header" >
+    <span class="crumb">&nbsp;</span>
+    <h1><?cs if:android.whichdoc == "online" ?>Download <?cs /if ?><?cs var:page.title ?></h1>
+  </div>
+
+
+<div id="jd-content">
+
     <p><em>
     <?cs var:sdk.date ?>
     </em></p>
@@ -41,6 +46,12 @@
 <?cs /if ?>
   
   
+<?cs if:android.whichdoc != "online" ?>
+
+<p>The sections below provide an overview of the SDK package. </p>
+
+<?cs else ?>
+
 <p>Before downloading, please read the <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.version ?>/requirements.html">
 System Requirements</a> document. As you start the download, you will also need to review and agree to 
 the Terms and Conditions that govern the use of the Android SDK. </p>
@@ -77,11 +88,12 @@
     <td><?cs var:sdk.linux_checksum ?></td>
   </tr>
   </table>
-  
-      <?cs call:tag_list(root.descr) ?>
 
 <?cs /if ?>
 
+      <?cs call:tag_list(root.descr) ?>
+
+<?cs /if ?>
 </div><!-- end jd-content -->
 
 <?cs include:"footer.cs" ?>