diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
index 207a56ca12533..aefa4dcaa47a4 100644
--- a/docs/html/preview/features/direct-boot.jd
+++ b/docs/html/preview/features/direct-boot.jd
@@ -4,8 +4,8 @@ page.tags=androidn
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
   <h2>In this document</h2>
   <ol>
     <li><a href="#run">Requesting Access to Run During Direct Boot</a></li>
diff --git a/docs/html/preview/features/icu4j-framework.jd b/docs/html/preview/features/icu4j-framework.jd
index edc7759e7dd01..66981946520c3 100644
--- a/docs/html/preview/features/icu4j-framework.jd
+++ b/docs/html/preview/features/icu4j-framework.jd
@@ -2,8 +2,8 @@ page.title=ICU4J Android Framework APIs
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
 <h2>In this document:</h2>
 <ol>
     <li><a href="#relation">Relationship to ICU4J</a></li>
diff --git a/docs/html/preview/features/multilingual-support.jd b/docs/html/preview/features/multilingual-support.jd
index 855f93efc46c1..3d798707181c2 100644
--- a/docs/html/preview/features/multilingual-support.jd
+++ b/docs/html/preview/features/multilingual-support.jd
@@ -1,8 +1,8 @@
 page.title=Language and Locale
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
 <h2>In this document:</h2>
 <ol>
 	  <li><a href="#preN">Challenges in Resolving Language Resources</a></li>
diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd
index fa86ed200a8de..7440dea9268e7 100644
--- a/docs/html/preview/features/notification-updates.jd
+++ b/docs/html/preview/features/notification-updates.jd
@@ -7,8 +7,8 @@ trainingnavtop=true
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
 
 <!-- table of contents -->
 <h2>This document includes</h2>
diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd
index 1cd8f611edf4a..e0fb0bb1eabe2 100644
--- a/docs/html/preview/features/picture-in-picture.jd
+++ b/docs/html/preview/features/picture-in-picture.jd
@@ -4,8 +4,8 @@ page.tags=androidn
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
 
 <h2>In this document</h2>
 <ol>
diff --git a/docs/html/preview/features/scoped-folder-access.jd b/docs/html/preview/features/scoped-folder-access.jd
index 92c7966811f99..932d8a97ccb63 100644
--- a/docs/html/preview/features/scoped-folder-access.jd
+++ b/docs/html/preview/features/scoped-folder-access.jd
@@ -4,8 +4,8 @@ page.tags=androidn
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
   <h2>In this document</h2>
   <ol>
     <li><a href="#accessing">Accessing an External Storage Directory</a></li>
diff --git a/docs/html/preview/features/tv-recording-api.jd b/docs/html/preview/features/tv-recording-api.jd
index 6b49fbc42338d..ee37bffc089b6 100644
--- a/docs/html/preview/features/tv-recording-api.jd
+++ b/docs/html/preview/features/tv-recording-api.jd
@@ -4,8 +4,8 @@ page.tags=androidn
 
 @jd:body
 
-<div id="tb-wrapper">
-<div id="tb">
+<div id="qv-wrapper">
+<div id="qv">
   <h2>In this document</h2>
   <ol>
     <li><a href="#supporting">Indicating Support for Recording</a></li>
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 1734abb182356..65be22042fe9c 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -10,7 +10,11 @@ page.image=images/cards/card-n-sdk_2x.png
   <div id="qv">
 <ol>
   <li><a href="#get-as13">Get Android Studio 2.1</a></li>
-  <li><a href="#get-sdk">Get the Android N SDK</a></li>
+  <li><a href="#get-sdk">Get the Android N SDK</a>
+    <ol>
+      <li><a href="#docs-dl">Reference documentation</a>
+    </ol>
+  </li>
   <li><a href="#java8">Get the Java 8 JDK and JRE</a></li>
   <li><a href="#create-update">Update or Create a Project</a></li>
   <li><a href="#next">Next Steps</a></li>
@@ -105,12 +109,18 @@ Android N Preview SDK in Android Studio as follows:</p>
   </li>
 </ol>
 
-<p>In addition to these preview components, you should download the Android
-N Preview API docs from the following table. This is an offline version
-of the developer.android.com web site, except it includes the updated
-API reference for the Android N APIs and an API difference report.</p>
 
-<table id="docs-dl">
+<h3 id="docs-dl">Get the N Preview reference documentation</h3>
+
+<p>
+  Detailed information about the Android N APIs is available in the N Preview
+  reference documentation, which you can download from the following table.
+  This package contains an abridged, offline version of the Android developer
+  web site, and includes an updated API reference for the Android N APIs and an
+  API difference report.
+</p>
+
+<table>
   <tr>
     <th scope="col">Documentation</th>
     <th scope="col">Checksums</th>
diff --git a/docs/html/preview/known-issues.jd b/docs/html/preview/support.jd
similarity index 90%
rename from docs/html/preview/known-issues.jd
rename to docs/html/preview/support.jd
index c932d8bedc794..d3ee1513e24db 100644
--- a/docs/html/preview/known-issues.jd
+++ b/docs/html/preview/support.jd
@@ -1,10 +1,6 @@
-page.title=Known Issues
-@jd:body
+page.title=Support and Release Notes
 
-<p>Date: March 2016</p>
-<p>Builds: NPC56P, NPC56R (N Preview 1 Release)</p>
-<p>Emulator support: x86 & ARM 32/64-bit</p>
-<p>Google Play services: 8.4</p>
+@jd:body
 
 <p>Two primary support channels are available to you when developing and testing
 with the Android N Developer Preview: Please file bugs at
@@ -14,7 +10,24 @@ For issues in other apps, please contact the developer directly.</p>
 <p>To discuss issues or ideas with other developers working with Android N, join the
 <a href="{@docRoot}preview/dev-community">Developer Preview Google+ community</a>.</p>
 
-<h2 id="general">General advisories</h2>
+
+<h2 id="dp1">Developer Preview 1</h2>
+
+<div class="wrap">
+  <div class="cols">
+    <div class="col-6of12">
+      <p>
+        <em>Date: March 2016<br>
+        Builds: NPC56P, NPC56R<br>
+        Emulator support: x86 &amp; ARM (32/64-bit)<br>
+        Google Play services: 8.4</em>
+      </p>
+    </div>
+  </div>
+</div>
+
+
+<h3 id="general">General advisories</h3>
 
 <p>This Developer Preview release is for app developers only and is designed for use in compatibility testing and early development only. Please be aware of these general notes about the release:</p>
 
@@ -28,22 +41,22 @@ For issues in other apps, please contact the developer directly.</p>
   <li>This preview release supports the following devices: Nexus 5X, Nexus 6, Nexus 6P, Nexus 9, Nexus Player, and Pixel C, as well as General Mobile 4G (Android One).</li>
 </ul>
 
-<h2 id="platform">Platform Issues</h2>
+<h3 id="platform">Platform Issues</h3>
 
-<h3 id="performance">Performance and battery</h3>
+<h4 id="performance">Performance and battery</h4>
 
 <ul>
    <li>System and apps may be slow and experience periodic slowdowns and unresponsiveness.</li>
   <li>Battery life may be regressed in this release for screen-on and screen-off use cases.</li>
 </ul>
 
-<h3 id="dialer">Dialer</h3>
+<h4 id="dialer">Dialer</h4>
 <ul>
    <li>Dialer app does not support Direct boot. This will be addressed later in N Developer Preview.</li>
    <li>Voicemail playback does not work.</li>
 </ul>
 
-<h3 id="ui">System UI</h3>
+<h4 id="ui">System UI</h4>
 
 <ul>
    <li>Some new or modified strings in the system UI are not translated to all languages.</li>
@@ -54,7 +67,7 @@ For issues in other apps, please contact the developer directly.</p>
    <li>In the Gmail app, direct archiving of emails included in a notification bundle does not work properly.</li>
 </ul>
 
-<h3 id="afw">Android for Work</h3>
+<h4 id="afw">Android for Work</h4>
 
 <ul>
    <li>Work Security Challenge
@@ -114,19 +127,19 @@ For issues in other apps, please contact the developer directly.</p>
    </li>
 </ul>
 
-<h3 id="keyboard">Keyboard</h3>
+<h4 id="keyboard">Keyboard</h4>
 
 <ul>
 <li>Bluetooth pairing between keyboards and Android devices may be unstable. </li>
 </ul>
 
-<h3 id="video">Video</h3>
+<h4 id="video">Video</h4>
 
 <ul>
 <li>Video playback may lag and show interruptions.</li>
 </ul>
 
-<h3 id="wifi">Wi-Fi</h3>
+<h4 id="wifi">Wi-Fi</h4>
 
    <ul>
    <li>Wi-Fi has undergone some refactoring which may change API corner case behavior. Specifically, applications which attempt to connect to specific networks, or attempt to reconnect to networks should retest.</li>
@@ -134,7 +147,7 @@ For issues in other apps, please contact the developer directly.</p>
    supports is the DHCP client introduced in M.</li>
    </ul>
 
-<h3 id="direct">Direct boot</h3>
+<h4 id="direct">Direct boot</h4>
 
 <ul>
    <li>NFC doesn't function until first unlock.
@@ -147,7 +160,7 @@ For issues in other apps, please contact the developer directly.</p>
    </li>
 </ul>
 
-<h3 id="pip">Picture-in-picture for Android TV</h3>
+<h4 id="pip">Picture-in-picture for Android TV</h4>
 
 <ul>
 <li>The PIP integration in the Recents UI is not finalized, and is subject to change.
@@ -158,13 +171,13 @@ For issues in other apps, please contact the developer directly.</p>
 </li>
 </ul>
 
-<h3 id="bugs">Bug reports</h3>
+<h4 id="bugs">Bug reports</h4>
 
 <ul>
    <li>Bug reports do not always complete successfully (as a workaround, sometimes they can still be accessed through the bug report document provider in internal storage).</li>
 </ul>
 
-<h3 id="split">Split-screen Multi-window</h3>
+<h4 id="split">Split-screen Multi-window</h4>
 
 <ul>
    <li>Apps may experience crashes and unexpected UI behavior when put into split-screen mode. These are app issues that must be fixed by the app developer.</li>
@@ -174,7 +187,7 @@ For issues in other apps, please contact the developer directly.</p>
    <li>Animations are not yet final.</li>
 </ul>
 
-<h3 id="ime">Input method</h3>
+<h4 id="ime">Input method</h4>
 
 <ul>
    <li>
@@ -185,20 +198,20 @@ For issues in other apps, please contact the developer directly.</p>
 </ul>
 
 
-<h3 id="accessibility">Accessibility</h3>
+<h4 id="accessibility">Accessibility</h4>
 
 <ul>
    <li>TalkBack exhibits issues with features including Notifications, Quick Settings Tiles and Multi-window display that may cause system crashing or lack of spoken feedback from TalkBack. Future releases of the preview will address these issues.</li>
 </ul>
 
-<h2 id="device-sp">Device-Specific Notes and Issues</h2>
+<h3 id="device-sp">Device-Specific Notes and Issues</h3>
 
-<h3 id="player">Nexus Player</h3>
+<h4 id="player">Nexus Player</h4>
 <ul>
 <li>Video playback, app compatibility and stability issues are expected on Nexus Player in this release of the Preview.</li>
 </ul>
 
-<h3 id="pixelc">Pixel C</h3>
+<h4 id="pixelc">Pixel C</h4>
 <ul>
 <li>Multi-window resizing may cause crashing.</li>
 </ul>