diff --git a/source/_components/group.markdown b/source/_components/group.markdown
index 9f611f776f9..3eb481b314f 100644
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@@ -45,8 +45,8 @@ Configuration variables:
 
 - **view** (*Optional*): If yes then the entry will be shown as a view (tab).
 - **name** (*Optional*): Name of the group.
-- **icon** (*Optional*): If you specify an icon it will show in the frontend instead of the name. This only applies to views; regular groups can't have icons.
-- **entities** array or comma delimited string (*Required*): List of entites to group.
+- **icon** (*Optional*): If the group is a view, this icon will show at the top in the frontend instead of the name. If it's not a view, then the icon shows when this group is used in another group.
+- **entities** (*Required*): array or comma delimited string, list of entities to group.
 
 <p class='img'>
 <img src='/images/blog/2016-01-release-12/views.png'>
@@ -64,9 +64,7 @@ Notice in the example below that in order to refer to the group "Living Room", y
     entities:
       - light.light_family_1
       - binary_sensor.motion_living
-  Bedroom:
-    entities:
-      - light.light_bedroom
+  Bedroom: light.light_bedroom, switch.sleeping
   Rooms:                                                                                                                                                       
     view: yes                                                                                                                                                  
     name: Rooms
diff --git a/source/getting-started/devices.markdown b/source/getting-started/devices.markdown
index 967325c0799..118a7b35cd8 100644
--- a/source/getting-started/devices.markdown
+++ b/source/getting-started/devices.markdown
@@ -15,9 +15,8 @@ See the [components overview page](/components/) to find installation instructio
 
 Usually every entity needs its own entry in the `configuration.yaml` file. There are two styles for multiple entries:
 
-#### {% linkable_title Style 1 %}
-
-Collect every entity under the "parent". 
+#### {% linkable_title Style 1: Collect every entity under the "parent" %}
+ 
 
 ```yaml
 sensor:
@@ -34,9 +33,8 @@ switch:
   - platform: vera
 ```
 
-#### {% linkable_title Style 2 %}
+#### {% linkable_title Style 2: List each device separately %}
 
-List each device separately.  
 You need to append numbers or strings to differentiate the entries, as in the example below. The appended number or string must be unique.
 
 ```yaml