3 files changed, 23 insertions, 39 deletions
diff --git a/documentation/introduction/intro-eclipse.asciidoc b/documentation/introduction/intro-eclipse.asciidoc
index b2fb127f7b..09a8c50570 100644
--- a/documentation/introduction/intro-eclipse.asciidoc
+++ b/documentation/introduction/intro-eclipse.asciidoc
@@ -9,32 +9,24 @@ layout: page
 
 While Vaadin is not bound to any specific IDE, and you can in fact easily use it
 without any IDE altogether, we provide special support for the Eclipse IDE,
-which has become the most used environment for Java development. The support is
-provided in the Vaadin Plugin for Eclipse, which helps you in:
+which has become the most used environment for Java development.
 
-* Creating new Vaadin projects
+*_Vaadin Plug-in for Eclipse_* helps you in:
 
-* Creating custom themes
+* creating new Vaadin projects,
 
-* Creating custom client-side widgets
+* creating custom themes,
 
-* Easily upgrading to a newer version of the Vaadin library
+* creating custom client-side widgets, and
 
+* easily upgrading to a newer version of the Vaadin library.
 
-Using the Vaadin Plugin for Eclipse is the recommended way of installing Vaadin
-for development. Downloading the installation package that contains the JARs or
-defining Vaadin as a Maven dependency is also possible.
-
-Installing and updating the Eclipse plugin is covered in
-<<dummy/../../../framework/getting-started/getting-started-eclipse#getting-started.eclipse,"Vaadin
-Plugin for Eclipse">> and the creation of a new Vaadin project using the plugin
-in
-<<dummy/../../../framework/getting-started/getting-started-first-project#getting-started.first-project.creation,"Creating
-the Project">>. See
-<<dummy/../../../framework/themes/themes-eclipse#themes.eclipse,"Creating a
-Theme in Eclipse">> and
-<<dummy/../../../framework/gwt/gwt-eclipse#gwt.eclipse,"Starting It Simple With
-Eclipse">> for instructions on using the different features of the plugin.
-
+Using the Vaadin plug-in for Eclipse is the recommended way of installing Vaadin for development.
+Downloading the installation package that contains the JARs or defining Vaadin as a Maven dependency is also possible.
 
+*_Vaadin Designer_* is a commercial Eclipse plug-in that enables visual editing of Vaadin UIs and composites.
+See <<dummy/../../../designer/designer-overview#designer.overview, "Vaadin Designer">> for its complete reference.
 
+Installation of the Eclipse plug-in is covered in <<dummy/../../../framework/getting-started/getting-started-eclipse#getting-started.eclipse,"Vaadin plug-in for Eclipse">>.
+The creation of a new Vaadin project using the plug-in is covered in <<dummy/../../../framework/getting-started/getting-started-first-project#getting-started.first-project.creation,"Creating the Project">>.
+See <<dummy/../../../framework/themes/themes-eclipse#themes.eclipse,"Creating a Theme in Eclipse">> and <<dummy/../../../framework/gwt/gwt-eclipse#gwt.eclipse,"Starting It Simple With Eclipse">> for instructions on using the different features of the plug-in.
diff --git a/documentation/introduction/intro-goals.asciidoc b/documentation/introduction/intro-goals.asciidoc
index 0972a998cf..e2173b0875 100644
--- a/documentation/introduction/intro-goals.asciidoc
+++ b/documentation/introduction/intro-goals.asciidoc
@@ -31,14 +31,13 @@ frameworks and ensuring that our implementation represents an ideal solution for
 its purpose without clutter or bloat.
 
 
-== XML is not designed for programming
-
-The Web is inherently document-centered and very much bound to the declarative
-presentation of user interfaces. While Vaadin allows for declarative designs of
-views, layouts, and even entire UIs, the programmatic approach by building the
-UIs from Java components frees the programmer from these limitations. To create
-highly dynamic views, it is more natural to create them by programming.
+== Choice between declarative and dynamic UIs
 
+The Web is inherently document-centered and very much bound to the declarative presentation of user interfaces.
+Vaadin allows for declarative designs of views, layouts, and even entire UIs.
+Vaadin Designer enables creating such designs visually.
+Nevertheless, the programmatic approach by building the UIs from Java components frees the programmer from its limitations.
+To create highly dynamic views, it is more natural to create them by programming.
 
 == Tools should not limit your work
 
@@ -47,7 +46,3 @@ some reason the user interface components do not support what you need to
 achieve, it must be easy to add new ones to your application. When you need to
 create new components, the role of the framework is critical: it makes it easy
 to create re-usable components that are easy to maintain.
-
-
-
-
diff --git a/documentation/introduction/intro-walkthrough.asciidoc b/documentation/introduction/intro-walkthrough.asciidoc
index 218e76b337..152817c0ed 100644
--- a/documentation/introduction/intro-walkthrough.asciidoc
+++ b/documentation/introduction/intro-walkthrough.asciidoc
@@ -8,8 +8,8 @@ layout: page
 = Example Application Walkthrough
 
 Let us follow the long tradition of first saying "Hello World!" when learning a
-new programming framework. First, using the primary server-side API.
-
+new programming framework.
+First, using the primary server-side API.
 
 [source, java]
 ----
@@ -29,7 +29,7 @@ public class HelloWorld extends UI {
         // Display the greeting
         content.addComponent(new Label("Hello World!"));
 
-        // Have a clickable button        
+        // Have a clickable button
         content.addComponent(new Button("Push Me!",
             new ClickListener() {
                 @Override
@@ -77,7 +77,7 @@ The result of the Hello World application, when opened in a browser, is shown in
 
 [[figure.intro.walkthrough]]
 .Hello World Application
-image::img/HelloWorld.png[]
+image::img/HelloWorld.png[scaledwidth=70%]
 
 To run a program, you need to package it as a web application WAR package and
 deploy it to a server, as explained in
@@ -106,6 +106,3 @@ to write client-side widgets, which you can then use from a server-side Vaadin
 application. For more information regarding client-side development, see
 <<dummy/../../../framework/clientside/clientside-overview.asciidoc#clientside.overview,"Client-Side
 Vaadin Development">>.
-
-
-