diff --git a/_includes/header.html b/_includes/header.html
index 795d62985b8..6aca3295adb 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,6 +1,7 @@
 <header class="site-header">
   <div class="wrapper">
     <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+    <span class="project-status">(tech preview)</span>
     <nav class="site-nav">
       <a href="#" class="menu-icon">
         <svg viewBox="0 0 18 15">
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
index 8b829c2aca7..5d58db04b97 100644
--- a/_sass/_layout.scss
+++ b/_sass/_layout.scss
@@ -9,6 +9,12 @@
 
     // Positioning context for the mobile navigation icon
     position: relative;
+
+    .project-status {
+      font-size: 14px;
+      line-height: 56px;
+      color: $grey-color-light;
+    }
 }
 
 .site-title {
@@ -17,6 +23,7 @@
     letter-spacing: -1px;
     margin-bottom: 0;
     float: left;
+    margin-right: 9px;
 
     &,
     &:visited {
diff --git a/index.md b/index.md
index 3cbfbdd7447..9d3e11829d2 100644
--- a/index.md
+++ b/index.md
@@ -16,8 +16,11 @@ today. We hope you try it out and send us
 
 ## Getting started
 
-Check out our [Getting started guide](getting-started)
-to install Flutter and run your first app on Android and iOS.
+First, [set up your machine](/setup/)
+with Flutter and iOS/Android tools.
+Then, check out our
+[Getting Started guide](getting-started)
+to run your first app on Android and iOS.
 
 ## Next steps
 
diff --git a/setup.md b/setup.md
index 201a3798ec8..cdcd2b953a2 100644
--- a/setup.md
+++ b/setup.md
@@ -1,15 +1,9 @@
 ---
 layout: page
 title: Flutter Setup
-nav_title: Flutter Setup
 permalink: /setup/
 ---
 
-(Please remember, Flutter is in _technology preview_. Thanks
-for trying it out, and please don't hesitate to
-[file issues or bugs](https://github.com/flutter/flutter/issues/new)
-for us.)
-
 This guide describes how to set up your development environment to run Flutter apps on
 iOS or Android.
 
@@ -117,6 +111,14 @@ $ flutter doctor
 The first time your run the `flutter` command, it will download its dependencies and compile
 itself. Subsequent runs should be much faster.
 
+If `flutter doctor` prints all checkmarks (`[✓]`), then you are cleared
+for takeoff!
+
+If `flutter doctor` displays one or more errors (`[x]`), then one or more
+of your dependencies is misconfigured or missing. If you can't resolve it,
+please [file an issue](https://github.com/flutter/flutter/issues/new)
+and we'll be happy to help.
+
 ## Atom editor
 
 We recommend using [Atom](https://atom.io/) for editing, running, and debugging Flutter apps.
@@ -139,3 +141,8 @@ Before creating your Flutter project in Atom, you’ll need to perform these pre
 root directory where you installed the Flutter SDK.
 3. Open **Packages > Dart > Package Settings**, and set the **Dart SDK Location** field to the
 `bin/cache/dart-sdk` directory in your Flutter SDK’s root folder.
+
+## Next steps
+
+Now, follow our [Getting Started guide](/getting-started/)
+to run your first Flutter app on iOS and Android.