auto import from //branches/cupcake/...@132276
diff --git a/tools/droiddoc/templates/sampleindex.cs b/tools/droiddoc/templates/sampleindex.cs
index 173ae70..6e57cfd 100644
--- a/tools/droiddoc/templates/sampleindex.cs
+++ b/tools/droiddoc/templates/sampleindex.cs
@@ -5,11 +5,15 @@
 <?cs include:"head_tag.cs" ?>
 <?cs include:"header.cs" ?>
 
-<div class="g-unit" id="doc-content">
+<div class="g-unit" id="doc-content"><a name="top"></a>
 
-<div id="jd-header">
-<h1><?cs var:projectTitle ?></h1>
-<?cs var:subdir ?>
+<div id="jd-header" class="guide-header">
+
+  <span class="crumb">
+    <a href="<?cs var:toroot ?>guide/samples/index.html">Sample Code &gt;</a>
+    
+  </span>
+<h1><?cs var:page.title ?></h1>
 </div>
 
 <div id="jd-content">
@@ -20,7 +24,7 @@
     <h2>Subdirectories</h2>
     <ul class="nolist">
     <?cs each:dir=subdirs ?>
-      <li><a href="<?cs var:dir.name ?>/"><?cs var:dir.name ?>/</a></li>
+      <li><a href="<?cs var:dir.name ?>/index.html"><?cs var:dir.name ?>/</a></li>
     <?cs /each ?>
     </ul>
 <?cs /if ?>