diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index b00530d41a2c9b70093937857d355a5c94443e44..e3f6f58cf25300026c6ad53f8a5372ab3f2474d4 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -47,9 +47,9 @@ import "Styles/Settings.js" as Settings
     \qmltype Button
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup controls
-    \brief A normal button
+    \brief A push button with a text label.
 
-    A normal command button. Similar to the QPushButton widget.
+    A normal push button. Similar to the QPushButton widget.
 
     The push button is perhaps the most commonly used widget in any graphical user interface.
     Push (click) a button to command the computer to perform some action, or to answer a question.
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index d2ee44ce4906f164293f94db2ac8c4b79cdd63db..e9c03073c8f2ae2330d2f43203c49a5e90e1f681 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -48,7 +48,7 @@ import "Styles/Settings.js" as Settings
     \qmltype CheckBox
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup controls
-    \brief A checkbox with a text label
+    \brief A checkbox with a text label.
 
     A CheckBox is an option button that can be toggled on (checked) or off
     (unchecked). Checkboxes are typically used to represent features in an
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index e1b019e1da80de13b7f162e106ef81315c9b8e3b..f5dbaca8a590be727b02c8992f1beab54341e614 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -47,8 +47,9 @@ import "Styles/Settings.js" as Settings
     \qmltype ComboBox
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup controls
-    \brief ComboBox is a combined button and popup list. The popup menu itself is platform
-        native, and cannot by styled from QML code.
+    \brief ComboBox is a combined button and popup list.
+
+    The popup menu itself is platform native, and cannot by styled from QML code.
 
     Add menu items to the comboBox by either adding MenuItem children inside the popup, or
     assign it a ListModel (or both).
diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index 36169635627fc7529a779f819da2792fee3c7447..6e01701b880678f3054867440c7058e9671c685e 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -44,7 +44,7 @@ import QtQuick 2.0
     \qmltype Label
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup controls
-    \brief Label is a text display.
+    \brief A text label.
 
     In addition to the normal \l Text element, Label follows the font and
     color scheme of the system.
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 5018c1a8dba2f9ab7354077fc62ed4887d8254dc..6f351d12672ec700b7af0fa17dc3b04b747624ee 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -47,6 +47,7 @@ import "Styles/Settings.js" as Settings
 /*!
     \qmltype MenuBar
     \inqmlmodule QtQuick.Controls 1.0
+    \ingroup applicationwindow
     \inherits Item
     \brief The MenuBar item provides a horizontal menu bar.
 
diff --git a/src/controls/Page.qml b/src/controls/Page.qml
index ed64c88949f9c8cfc8be691d20cfd5cc025b004b..35c07be784ada0a71912473a75651fc65cc33c46 100644
--- a/src/controls/Page.qml
+++ b/src/controls/Page.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls 1.0
 /*!
     \qmltype Page
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup navigation
+    \ingroup viewitems
     \brief A Page is an Item you can push on a PageStack
 
     A \a Page is the main Item pushed onto a \l PageStack. It normally contains a discrete
diff --git a/src/controls/PageStack.qml b/src/controls/PageStack.qml
index a1a13558ff34f98b2ceafd6d8f50602d59f552cc..b98244c6566e5400c87f1922c8541ad992849ba6 100644
--- a/src/controls/PageStack.qml
+++ b/src/controls/PageStack.qml
@@ -46,9 +46,10 @@ import "Private/PageStack.js" as JSArray
 /*!
     \qmltype PageStack
     \inherits Item
+    \ingroup views
     \inqmlmodule QtQuick.Controls 1.0
 
-    \brief The central component for building page-based applications
+    \brief Provides a stack-based navigation model.
 
     PageStack implements a stack-based navigation model for an application.
     A stack-based navigation model means that "pages" (discrete views of information)
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index 12a7c14057605d5b3a87a00554297e0e823a3eb0..e7260d3b9988c3b0601f4ff38a56c82d6e5689c9 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -46,8 +46,8 @@ import "Styles/Settings.js" as Settings
 /*!
     \qmltype ProgressBar
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup indicators
-    \brief A progress bar
+    \ingroup controls
+    \brief A progress indicator.
 
     The ProgressBar is used to give an indication of the progress of an operation.
     \l value is updated regularly and must be between \l minimumValue and \l maximumValue.
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 21812b5a8e2afa4bcb20e46f8c6ea2dbc50cac5e..a8f2621a4534c2cc3a86c1449bb53278271e9448 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -45,7 +45,7 @@ import QtQuick.Controls.Private 1.0
 /*!
     \qmltype ScrollView
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup navigation
+    \ingroup views
     \brief The ScrollView class provides a scrolling view onto another Item.
 
     A ScrollView can be used either instead of a \l Flickable or to decorate an
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 68beeaab075c35aca4c0e6b56e92e5c93a05a5f4..8ae7cfc8b5e792cd0d3a4e708781f660e90432d9 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -46,7 +46,7 @@ import QtQuick.Controls.Private 1.0
     \qmltype StatusBar
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup applicationwindow
-    \brief StatusBar is for containing status informating in your app
+    \brief StatusBar is for containing status informating in your app.
 
     The common way of using StatusBar is in relation to \l ApplicationWindow.
 
diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml
index 568ce8ceb40dd1fa5f56f0787edcc04251624f9f..119c17756d34d3342f77111284e063b5fa930246 100644
--- a/src/controls/Tab.qml
+++ b/src/controls/Tab.qml
@@ -43,14 +43,16 @@ import QtQuick 2.0
 /*!
     \qmltype Tab
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup navigation
-    \brief Tab is doing bla...bla...
+    \ingroup viewaddons
+    \brief Tab represents the content of a tab in a TabView
 */
 
 Item {
     id:tab
     anchors.fill: parent
+
+    /*! This property holds the title of the tab. */
     property string title
-    property int contentMargin
+
     Accessible.role: Accessible.PageTab
 }
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index e5996bde14c3a6a784bc9905864e406b677eac8e..89649255f9661708549b80ed0f19103965855dc8 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -46,8 +46,8 @@ import "Styles/Settings.js" as Settings
 /*!
     \qmltype TabView
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup navigation
-    \brief Represents a control that contains multiple items that share the same space on the screen.
+    \ingroup views
+    \brief A conrol that allows the user to select one of multiple stacked items.
 
 */
 
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml
index 7b09f7fe346227580304298c4e3ce4762a9d94bc..62d57d9d4d9cdce89a79b94bab9ebcdb933beaa2 100644
--- a/src/controls/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -43,7 +43,7 @@ import QtQuick 2.0
 /*!
     \qmltype TableViewColumn
     \inqmlmodule QtQuick.Controls 1.0
-    \ingroup views
+    \ingroup viewitems
     \brief Used by the \l TableView to define a column header.
 */
 
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index 13266cbddbe85c88c069d073f399e93c07c8971e..55d90fa763c5a07776b42b80bbdb0d5190a22fad 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -48,7 +48,7 @@ import "Styles/Settings.js" as Settings
     \qmltype TextField
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup controls
-    \brief TextField displays a single line of editable plain text
+    \brief TextField displays a single line of editable plain text.
 
     TextField is used to accept a line of text input. Input constraints
     can be placed on a TextField item (for example, through a \l validator or \l inputMask),
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 5a756d2a5eabcb18efca8e9e68b0a19d427586de..02c98a076dd511237c0204a5c50aea4f8f1b7b31 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -47,7 +47,7 @@ import "Styles/Settings.js" as Settings
     \qmltype ToolButton
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup applicationwindow
-    \brief ToolButton provides a button type that is typically used within a ToolBar
+    \brief ToolButton provides a button type that is typically used within a ToolBar.
 
      ToolButton is functionally similar to \l Button but can provide a look that is more
      suitable within a \l ToolBar.
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc
index 1f3ab44e0a13a0e879601182f2d844b5c21f284e..abb96416d9d7637f70f8e8cf27fd059c17772a06 100644
--- a/src/controls/doc/src/qtquickcontrols-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-index.qdoc
@@ -31,33 +31,25 @@
 
     \brief The Qt Quick Controls module is an add-on module of Qt.
 
-    \image placeholder.png
-
     \section1 Getting started
 
     The QML types can be imported into your applciation using the following import statement in your \c {.qml} file.
 
     \code
      import QtQuick.Controls 1.0
-     import QtQuick.Controls.Styles 1.0
     \endcode
 
-    \section1 Components
+    \section1 Application Window
+    Components used to describe the basic window properties of an application.
+    \annotatedlist applicationwindow
 
-    \section2 Application
-    \list
-    \li \l{Application Window}{Window}
-    \li \l{Application Menus}{Menus}
-    \li \l{Application Navigation}{Navigation}
-    \endlist
+    \section1 Navigation and Views
+    Views are controls that present or present other items on screen.
+    \annotatedlist views
 
-    \section2 Controls and Layout
-    \list
-    \li \l{Buttons and Controls}
-    \li \l{Layout and Containers}
-    \li \l{Tables}
-    \li \l{Status Indicators}
-    \endlist
+    \section1 Controls
+    Controls are typically items that are used to present or receive input from the user.
+    \annotatedlist controls
 
     \section1 Related information
 
@@ -69,7 +61,6 @@
     \section2 Reference
      \list
       \li \l{Qt Quick Controls QML Types}{Qt Quick Controls QML Types}
-      \li \l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles QML Types}
      \endlist
 
     \section2 Examples
diff --git a/src/controls/doc/src/views.qdoc b/src/controls/doc/src/views.qdoc
index c92cb7dae8aed04c398b1b6c02b21cef2094e323..cda1e38e726f20ecf0f7220eebe959c1339f667f 100644
--- a/src/controls/doc/src/views.qdoc
+++ b/src/controls/doc/src/views.qdoc
@@ -27,7 +27,5 @@
 
 /*!
     \group views
-    \title Views
-
-    \image placeholder.png
+    \title Application Navigation and Views
 */