diff --git a/docker-for-mac/faqs.md b/docker-for-mac/faqs.md
index bcd51121a9..c0d7e86351 100644
--- a/docker-for-mac/faqs.md
+++ b/docker-for-mac/faqs.md
@@ -104,6 +104,11 @@ provides discussion threads as well, and you can create discussion topics there,
 but we recommend using the GitHub issues over the forums for better tracking and
 response.
 
+### How can I opt out of sending my usage data?
+
+If you do not want auto-send of usage data, use the Stable channel. For more
+information, see [Stable and Edge channels](#stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Mac?").
+
 ### Can I use Docker for Mac with new swarm mode?
 
 Yes, you can use Docker for Mac to test single-node features of [swarm
diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md
index 96b05e921d..4e43e51757 100644
--- a/docker-for-mac/install.md
+++ b/docker-for-mac/install.md
@@ -45,6 +45,7 @@ For more about Stable and Edge channels, see the
     best channel to use if you want a reliable platform to work with. These releases follow the Docker Engine stable releases.<br><br>
    On this channel, you can select whether to send usage
    statistics and other data. <br><br>Stable builds are released once per quarter.
+   </td>
     <td width="50%">This installer provides the latest Edge release of
     Docker for Mac and Engine, and typically offers new features in development. Use this channel if you want to get experimental features faster, and can weather some instability and bugs. We collect all usage data on Edge releases across the board. <br><br>Edge builds are released once per month.
     </td>
diff --git a/docker-for-windows/faqs.md b/docker-for-windows/faqs.md
index 169f666dd8..65eba7e1ac 100644
--- a/docker-for-windows/faqs.md
+++ b/docker-for-windows/faqs.md
@@ -95,6 +95,11 @@ provides discussion threads as well, and you can create discussion topics there,
 but we recommend using the GitHub issues over the forums for better tracking and
 response.
 
+### How can I opt out of sending my usage data?
+
+If you do not want auto-send of usage data, use the Stable channel. For more
+information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Windows?").
+
 ### Can I use Docker for Windows with new swarm mode?
 
 Yes! You can use Docker for Windows to test single-node features of
diff --git a/kitematic/images/cli-redis-container.png b/kitematic/images/cli-redis-container.png
index b497529ada..a68daa0faf 100644
Binary files a/kitematic/images/cli-redis-container.png and b/kitematic/images/cli-redis-container.png differ
diff --git a/kitematic/images/cli-redis-general.png b/kitematic/images/cli-redis-general.png
new file mode 100644
index 0000000000..928a70796a
Binary files /dev/null and b/kitematic/images/cli-redis-general.png differ
diff --git a/kitematic/images/kitematic-login.png b/kitematic/images/kitematic-login.png
new file mode 100644
index 0000000000..5ae73052ab
Binary files /dev/null and b/kitematic/images/kitematic-login.png differ
diff --git a/kitematic/userguide.md b/kitematic/userguide.md
index 8ced328a51..83bb7dd6a2 100644
--- a/kitematic/userguide.md
+++ b/kitematic/userguide.md
@@ -24,7 +24,19 @@ and configuring volumes.  You can use Kitematic to change environment variables,
 stream logs, and single click terminal into your Docker container all from the
 GUI.
 
-First, if you haven't yet done so, download and start Kitematic by installing [Docker Toolbox](/toolbox/overview.md#ready-to-get-started).
+First, if you haven't yet done so, download and install Kitematic in one of the following ways:
+
+* Choose **Kitematic** from the Docker for Mac or Docker for Windows menu to get started with the Kitematic install.
+
+* Install [Docker Toolbox](/toolbox/overview.md#ready-to-get-started) (on older systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/install.md#what-to-know-before-you-install) or [Docker for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)).
+
+* Download Kitematic directly from the [Kitematic releases page](https://github.com/docker/kitematic/releases/).
+
+Start Kitematic. (On desktop systems, click on the app.)
+
+## Log in with your Docker ID
+
+Provide your Docker ID and user name and click **LOG IN** or click **Skip for now** to browse Docker Hub as a guest.
 
 ## Container list
 
@@ -85,7 +97,7 @@ The "Terminal" icon at the top of the container summary will `docker exec -i -t
 This will allow you to make quick changes, or to debug a problem.
 
 > **Note**: Your exec'ed `sh` process will not have the same environment settings
-> as the main container process and its children. 
+> as the main container process and its children.
 > Get the environment commands for your shell: `docker-machine env default`.
 
 ### Managing Volumes