diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index e9baef5eb43..304f576c92a 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -17,9 +17,10 @@
         </ul>
       </li>
       <li>
-        Configuration
+        {% active_link /getting-started/configuration/ Configuration  %}
         <ul>
-          <li>{% active_link /getting-started/configuration/ Configuration.yaml  %}</li>
+          <li>{% active_link /getting-started/yaml/ YAML %}</li>
+          <li>{% active_link /getting-started/basic/ Basic information %}</li>
           <li>{% active_link /getting-started/devices/ Setting up devices %}</li>
           <li>{% active_link /getting-started/customizing-devices/ Customizing devices and services %}</li>
           <li>{% active_link /getting-started/presence-detection/ Presence Detection %}</li>
diff --git a/source/getting-started/basic.markdown b/source/getting-started/basic.markdown
new file mode 100644
index 00000000000..f598229c3cf
--- /dev/null
+++ b/source/getting-started/basic.markdown
@@ -0,0 +1,57 @@
+---
+layout: page
+title: "Setup basic information"
+description: "Setting up the basic info of Home Assistant."
+date: 2015-03-23 12:50
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+By default Home Assistant will try to detect your location and will automatically select a temperature unit and time zone based on your location. You can overwrite this by adding the following information to your `configuration.yaml`:
+
+```yaml
+homeassistant:
+  # Omitted values in this section will be auto detected using freegeoip.io
+
+  # Location required to calculate the time the sun rises and sets
+  latitude: 32.87336
+  longitude: 117.22743
+
+  # C for Celsius, F for Fahrenheit
+  temperature_unit: C
+
+  # Pick yours from here:
+  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  time_zone: America/Los_Angeles
+
+  # Name of the location where Home Assistant is running
+  name: Home
+```
+
+### {% linkable_title Password protecting the web interface %}
+
+The first thing you will want to add is a password for the web interface. Use your favourite text editor to open `configuration.yaml` and edit the `http` section:
+
+```yaml
+http:
+  api_password: YOUR_PASSWORD
+```
+
+See the [HTTP component documentation](/components/http/) for more options like HTTPS encryption.
+
+### {% linkable_title Setting up your phone or tablet %}
+
+Home Assistant runs as a self-hosted web application and contains support to be added to your home screen. If you're on Android you can follow [the visual guide]({{site_root}}/getting-started/android/). For other devices, open Home Assistant on your mobile browser and tap the add to home screen option.
+
+### {% linkable_title Remote access %}
+
+To make Home Assistant accessible while away from home, you will have to setup port forwarding from your router to port 8123 on the computer that is hosting Home Assistant. Instructions on how to do this can be found by searching `<Router model> port forwarding instructions`.
+
+Some Internet service providers will only offer dynamic IPs. This can cause you to be unable to access Home Assistant while away. You can solve this by using a free Dynamic DNS service like [DuckDNS](https://www.duckdns.org/).
+
+You should definitely consider to encrypt your traffic if you are accessing your Home Assistant installation from abroad. For details please check the [Set up encryption using Let's Encrypt](/blog/2015/12/13/setup-encryption-using-lets-encrypt/) blog post.
+
+### [Next step: Setting up devices &raquo;](/getting-started/devices/)
+
diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 4de95de9257..38b5dbe18d6 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -25,102 +25,4 @@ If you run into trouble while configuring Home Assistant, have a look at [the co
   You will have to restart Home Assistant each time you make changes in `configuration.yaml` in order for these to take effect.
 </p>
 
-### {% linkable_title YAML %}
-
-Home Assistant uses the [YAML](http://yaml.org/) syntax for configuration. YAML might take a while to get used to but is really powerful in allowing you to express complex configurations.
-
-For each component that you want to use in Home Assistant, you add code in your `configuraton.yaml` file to specify its settings.
-The following example entry specifies that you want to use the [notify component](/components/notify) with the [pushbullet platform](/components/notify.pushbullet).
-
-
-```yaml
-notify:
-  platform: pushbullet
-  api_key: "o.1234abcd"
-  name: pushbullet
-```
-
-- A **component** provides the core logic for some functionality (like `notify` provides sending notifications). 
-- A **platform** makes the connection to a specific software or hardware platform (like `pushbullet` works with the service from pushbullet.com).
-
-The basics of YAML syntax are block collections and mappings containing key-value pairs. Each item in a collection starts with a `-` while mappings have the format `key: value`. If you specify duplicate keys, the last value for a key is used.
-
-Note that indentation is an important part of specifying relationships using YAML. Things that are indented are nested "inside" things that are one level higher. So in the above example, `platform: pushbullet` is a property of (nested inside) the `notify` component.
-Getting the right indentation can be tricky if you're not using an editor with a fixed width font. Tabs are not allowed to be used for indentation. Convention is to use 2 spaces for each level of indentation.
-
-Lines that start with **#** are comments and are ignored by the system.
-
-The next example shows an [input_select](/components/input_select) component that uses a block collection for the options values.
-The other properties (like name) are specified using mappings. Note that the second line just has `threat:` with no value on the same line. Here threat is the name of the input_select and the values for it are everything nested below it.
-
-```yaml
-input_select:
-  threat:
-    name: Threat level
-# A collection is used for options
-    options:
-     - 0
-     - 1
-     - 2
-     - 3
-    initial: 0
-```
-
-The following example shows nesting a collection of mappings in a mapping. In Home Assistant, this would create two sensors that each use the MQTT platform but have different values for their `state_topic` (one of the properties used for MQTT sensors). 
-
-```yaml
-sensor:
-  - platform: mqtt
-    state_topic: sensor/topic
-  - platform: mqtt
-    state_topic: sensor2/topic
-```
-
-
-### {% linkable_title Setting up the basic info %}
-
-By default Home Assistant will try to detect your location and will automatically select a temperature unit and time zone based on your location. You can overwrite this by adding the following information to your `configuration.yaml`:
-
-```yaml
-homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.io
-
-  # Location required to calculate the time the sun rises and sets
-  latitude: 32.87336
-  longitude: 117.22743
-
-  # C for Celsius, F for Fahrenheit
-  temperature_unit: C
-
-  # Pick yours from here:
-  # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-  time_zone: America/Los_Angeles
-
-  # Name of the location where Home Assistant is running
-  name: Home
-```
-
-### {% linkable_title Password protecting the web interface %}
-
-The first thing you will want to add is a password for the web interface. Use your favourite text editor to open `configuration.yaml` and edit the `http` section:
-
-```yaml
-http:
-  api_password: YOUR_PASSWORD
-```
-
-See the [HTTP component documentation](/components/http/) for more options like HTTPS encryption.
-
-### {% linkable_title Setting up your phone or tablet %}
-
-Home Assistant runs as a self-hosted web application and contains support to be added to your home screen. If you're on Android you can follow [the visual guide]({{site_root}}/getting-started/android/). For other devices, open Home Assistant on your mobile browser and tap the add to home screen option.
-
-### {% linkable_title Remote access %}
-
-To make Home Assistant accessible while away from home, you will have to setup port forwarding from your router to port 8123 on the computer that is hosting Home Assistant. Instructions on how to do this can be found by searching `<Router model> port forwarding instructions`.
-
-Some Internet service providers will only offer dynamic IPs. This can cause you to be unable to access Home Assistant while away. You can solve this by using a free Dynamic DNS service like [DuckDNS](https://www.duckdns.org/).
-
-You should definitely consider to encrypt your traffic if you are accessing your Home Assistant installation from abroad. For details please check the [Set up encryption using Let's Encrypt](/blog/2015/12/13/setup-encryption-using-lets-encrypt/) blog post.
-
-### [Next step: Setting up devices &raquo;](/getting-started/devices/)
+### [Next step: Get familiar with YAML &raquo;](/getting-started/yaml/)
diff --git a/source/getting-started/index.markdown b/source/getting-started/index.markdown
index dad391c03bc..b48d8943d37 100644
--- a/source/getting-started/index.markdown
+++ b/source/getting-started/index.markdown
@@ -11,7 +11,7 @@ footer: true
 
 Below you can find the standard instructions. See the sidebar for installation instructions for specific platforms. If you're running a Linux based platform, we suggest to follow the [VirtualEnv Linux instructions] to avoid having to use root.
 
-[VirtualEnv Linux instructions]: /getting-started/installation-virtualenv/
+[Virtualenv Linux instructions]: /getting-started/installation-virtualenv/
 
 Installing and running Home Assistant on your local machine is easy. Make sure you have [Python 3.4 or higher](https://www.python.org/downloads/) installed and execute the following code in a console:
 
@@ -41,7 +41,7 @@ In addition to this site, check out these sources for additional help:
  - [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
  - [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
 
-### {% linkable_title What's next %}
+### {% linkable_title What's next? %}
 
 To see what Home Assistant can do, launch demo mode: `hass --demo-mode` or visit the [demo page](/demo).
 
diff --git a/source/getting-started/yaml.markdown b/source/getting-started/yaml.markdown
new file mode 100644
index 00000000000..a814993b4bb
--- /dev/null
+++ b/source/getting-started/yaml.markdown
@@ -0,0 +1,61 @@
+---
+layout: page
+title: "YAML"
+description: "Details about YAML to configure Home Assistant."
+date: 2015-03-23 12:50
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+Home Assistant uses the [YAML](http://yaml.org/) syntax for configuration. YAML might take a while to get used to but is really powerful in allowing you to express complex configurations.
+
+For each component that you want to use in Home Assistant, you add code in your `configuraton.yaml` file to specify its settings.
+The following example entry specifies that you want to use the [notify component](/components/notify) with the [pushbullet platform](/components/notify.pushbullet).
+
+
+```yaml
+notify:
+  platform: pushbullet
+  api_key: "o.1234abcd"
+  name: pushbullet
+```
+
+- A **component** provides the core logic for some functionality (like `notify` provides sending notifications). 
+- A **platform** makes the connection to a specific software or hardware platform (like `pushbullet` works with the service from pushbullet.com).
+
+The basics of YAML syntax are block collections and mappings containing key-value pairs. Each item in a collection starts with a `-` while mappings have the format `key: value`. If you specify duplicate keys, the last value for a key is used.
+
+Note that indentation is an important part of specifying relationships using YAML. Things that are indented are nested "inside" things that are one level higher. So in the above example, `platform: pushbullet` is a property of (nested inside) the `notify` component.
+Getting the right indentation can be tricky if you're not using an editor with a fixed width font. Tabs are not allowed to be used for indentation. Convention is to use 2 spaces for each level of indentation.
+
+Lines that start with **#** are comments and are ignored by the system.
+
+The next example shows an [input_select](/components/input_select) component that uses a block collection for the options values.
+The other properties (like name) are specified using mappings. Note that the second line just has `threat:` with no value on the same line. Here threat is the name of the input_select and the values for it are everything nested below it.
+
+```yaml
+input_select:
+  threat:
+    name: Threat level
+# A collection is used for options
+    options:
+     - 0
+     - 1
+     - 2
+     - 3
+    initial: 0
+```
+
+The following example shows nesting a collection of mappings in a mapping. In Home Assistant, this would create two sensors that each use the MQTT platform but have different values for their `state_topic` (one of the properties used for MQTT sensors). 
+
+```yaml
+sensor:
+  - platform: mqtt
+    state_topic: sensor/topic
+  - platform: mqtt
+    state_topic: sensor2/topic
+```
+
+### [Next step: Setting up the basics &raquo;](/getting-started/basic/)