diff --git a/_includes/download_widget.md b/_includes/download_widget.md
index 8bd1ec8df..ada43559d 100644
--- a/_includes/download_widget.md
+++ b/_includes/download_widget.md
@@ -7,8 +7,8 @@ Download
         <div data-download-widget-controls style="display: inline-block"></div>
     </div>
     <div class="download-widget--body">
-        <p>The recommended way to get started using <code>{{ site.project }}</code> in
-        your project is with a dependency management system &ndash; the snippet below can
+        <p>The recommended way to get started with <code>{{ site.project }}</code> is to use <a href="http://start.spring.io/">Spring Initializr</a>. Just follow these <a href="https://docs.spring.io/spring-cloud-stream/docs/{@= version @}/reference/htmlsingle/#_quick_start"instructions</a>.
+		You can also start using it in your project with a dependency management system &ndash; the snippet below can
         be copied and pasted into your build. Need help? See our getting started guides
         on building with <a href="http://spring.io/guides/gs/maven/">Maven</a> and
         <a href="http://spring.io/guides/gs/gradle/">Gradle</a>.
diff --git a/_includes/pom.xml b/_includes/pom.xml
index 71c493668..d7bec6022 100644
--- a/_includes/pom.xml
+++ b/_includes/pom.xml
@@ -16,6 +16,6 @@
     </dependency>
     <dependency>
         <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-stream-kafka</artifactId>
+        <artifactId>spring-cloud-starter-stream-rabbit</artifactId> <!-- or '*-stream-kafka' -->
     </dependency>
 </dependencies>
diff --git a/img/SCSt-overview.png b/img/SCSt-overview.png
index 6adfa5fc6..4e646dabf 100644
Binary files a/img/SCSt-overview.png and b/img/SCSt-overview.png differ
diff --git a/index.html b/index.html
index eb18cd194..8d9c8b69e 100644
--- a/index.html
+++ b/index.html
@@ -34,19 +34,16 @@ badges:
 [Spring Cloud]({{ site.projects_site_url }}/spring-cloud)
 {% endcapture %}
 
-
 {% capture billboard_description %}
 
-Spring Cloud Stream is an event-driven microservices framework for building highly-scalable applications connected via shared messaging systems. 
+Spring Cloud Stream is a framework for building highly scalable event-driven microservices connected with shared messaging systems.
 
 <br >
 The framework provides flexible programming model built on already established and familiar Spring idioms and best practices, including support 
 for persistent pub/sub semantics, consumer groups, and stateful partitions.
 
 {% endcapture %}
-
 {% capture main_content %}
-
 The core building blocks of Spring Cloud Stream are:
 
 * *Destination Binders*: Components responsible to provide integration with the external messaging systems.
@@ -55,6 +52,8 @@ The core building blocks of Spring Cloud Stream are:
 
 <img class="styled-image" src="img/SCSt-overview.png" alt="Spring Cloud Stream overview" title="Spring Cloud Stream overview" border="5"/>
 
+Currently Spring Cloud Stream suports [Rabbit MQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) and [Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka) binders with more binder implementations in the pipeline (such as [Google PubSub](https://github.com/spring-cloud/spring-cloud-gcp/tree/master/spring-cloud-gcp-pubsub-stream-binder), [AWS Kinesis](https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis) and more).
+
 <span id="quick-start"></span>
 
 ## Quick Start
@@ -107,12 +106,10 @@ where it automatically creates the destination (that is, queue, topic, and other
 * We've added a handler method to receive incoming messages of type `Person`. Doing so lets you see one of the core features of the framework: It tries to automatically convert incoming message 
 payloads to type `Person`.
 
-You can start the application by simply running its main method.
+You can start the application by simply running its `main(..)` method.
 
 For more details please refer to the [Quick Start](https://docs.spring.io/spring-cloud-stream/docs/Elmhurst.RELEASE/reference/htmlsingle/#_quick_start) section of the user guide.
 
-Currently Spring Cloud Stream supports [RabbitMQ](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit) and [Kafka](https://github.com/spring-cloud/spring-cloud-stream-binder-kafka) binders with more binder implementations in the pipeline _(such as: [Google PubSub](https://github.com/spring-cloud/spring-cloud-gcp/tree/master/spring-cloud-gcp-pubsub-stream-binder) and [AWS Kinesis](https://github.com/spring-cloud/spring-cloud-stream-binder-aws-kinesis))_.
-
 ### Kafka Client Compatibility
 Spring Cloud Stream supports a variety of Kafka Client releases. To learn more about it, please refer to the [Kafka Client Compatibility](https://github.com/spring-cloud/spring-cloud-stream/wiki/Kafka-Client-Compatibility) section in the Wiki page.