diff --git a/source/_includes/asides/hassio_navigation.html b/source/_includes/asides/hassio_navigation.html
index 764f3f9d36c..bdb885f868e 100644
--- a/source/_includes/asides/hassio_navigation.html
+++ b/source/_includes/asides/hassio_navigation.html
@@ -6,8 +6,15 @@
         {% active_link /hassio/ Hass.io %}
         <ul>
           <li>{% active_link /hassio/installation/ Installation %}</li>
-          <li>{% active_link /hassio/architecture/ Architecture %}</li>
           <li>{% active_link /addons/ Available add-ons %}</li>
+        </ul>
+      </li>
+    </ul>
+    <ul class='divided sidebar-menu'>
+      <li>
+        {% active_link /hassio/development/ Development %}
+        <ul>
+          <li>{% active_link /hassio/architecture/ Architecture %}</li>
           <li>{% active_link /hassio/create_hassio_addon/ Creating add-ons %}</li>
           <li>{% active_link /hassio/create_hassio_addon_repository/ Creating add-on repositories %}</li>
         </ul>
diff --git a/source/addons/index.html b/source/addons/index.html
index 4bb37dd3056..9e137982ac6 100644
--- a/source/addons/index.html
+++ b/source/addons/index.html
@@ -10,7 +10,7 @@ footer: true
 regenerate: true
 ---
 
-[Placeholder]
+<p>Add-ons are extensions for your Home Assistant installation.</p>
 
 {% assign addons = site.addons | sort: 'title' %}
 
diff --git a/source/hassio/architecture.markdown b/source/hassio/architecture.markdown
index c1335449e34..a923f8088af 100644
--- a/source/hassio/architecture.markdown
+++ b/source/hassio/architecture.markdown
@@ -9,4 +9,30 @@ sharing: true
 footer: true
 ---
 
-[Placeholder]
\ No newline at end of file
+<p class='img'>
+  <a href='/images/hassio/architecture.png'><img src='/images/hassio/architecture.png' alt='Architecture overview of Hass.io'></a>
+  Architecture overview of Hass.io
+</p>
+
+### {% linkable_title Host Control (HC) %}
+
+This is a daemon that runs on the host machine that allows the supervisor to control certain aspects of the host OS:
+
+ - Power cycle (restart, turn off)
+ - Manage network settings
+ - Update host control
+
+### {% linkable_title Host %}
+
+The operating system that runs Hass.io. Our pre-build images are based on [ResinOS]. Any Linux machine can be turned into a Hass.io host by running [the installer][linux].
+
+### {% linkable_title Supervisor %}
+
+The supervisor offers an API to manage the host and the running Docker containers.
+
+### {% linkable_title Configuration panel %}
+
+The configuration panel lives inside the supervisor but is accessible via the Home Assistant user interface. The configuration panel allows the user to manage the installation.
+
+[ResinOS]: https://resinos.io/
+[linux]: /hassio/installation/#alternative-install-on-generic-linux-server
diff --git a/source/hassio/create_hassio_addon.markdown b/source/hassio/create_hassio_addon.markdown
index 5924fe1a066..28645a8578a 100644
--- a/source/hassio/create_hassio_addon.markdown
+++ b/source/hassio/create_hassio_addon.markdown
@@ -9,4 +9,4 @@ sharing: true
 footer: true
 ---
 
-[Placeholder]
\ No newline at end of file
+For now, see the instructions in [the add-on repository](https://github.com/home-assistant/hassio-addons).
diff --git a/source/hassio/development.markdown b/source/hassio/development.markdown
new file mode 100644
index 00000000000..bcb7f084459
--- /dev/null
+++ b/source/hassio/development.markdown
@@ -0,0 +1,18 @@
+---
+layout: page
+title: "Hass.io development"
+description: "How to get started with Hass.io development."
+date: 2017-04-30 13:28
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+
+Seen all the Hass.io stuff and want to built on top of it? That's awesome.
+
+Before you get started with development, get familiar with [the architecture][arch].
+
+[Placeholder]
+
+[arch]: /hassio/architecture/
\ No newline at end of file
diff --git a/source/hassio/index.markdown b/source/hassio/index.markdown
index f1fced18769..1dbd5cd43ce 100644
--- a/source/hassio/index.markdown
+++ b/source/hassio/index.markdown
@@ -9,4 +9,4 @@ sharing: true
 footer: true
 ---
 
-[Placeholder]
+Hass.io turns your Raspberry Pi (or other device) into the ultimate Home Automation hub. It takes away all the hassle of installing Home Assistant and related applications and keeping them up to date. Updates to the operating system, Home Assistant and any add-ons can be done via the Home Assistant UI with a single click.
diff --git a/source/hassio/installation.markdown b/source/hassio/installation.markdown
index 00eeb6a0589..585abbc18af 100644
--- a/source/hassio/installation.markdown
+++ b/source/hassio/installation.markdown
@@ -9,4 +9,21 @@ sharing: true
 footer: true
 ---
 
-[Placeholder]
+Hass.io images are available for all available Raspberry Pi platforms. Download the appropriate image for your Raspberry Pi:
+
+ - [Raspberry Pi / Zero][pi1]
+ - [Raspberry Pi 2][pi2]
+ - [Raspberry Pi 3][pi3]
+
+Once downloaded, write it to an SD card using [Etcher]. Then put the SD card into your Raspberry Pi and turn it on. You will be able to reach your installation on [http://hassio.local][local].
+
+### {% linkable_title Alternative: install on generic Linux server %}
+
+For advanced users, it is also possible to try Hass.io on your Linux server or inside a VM. To do so, [follow these instructions][linux].
+
+[Etcher]: https://etcher.io/
+[pi1]: https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi.img.bz2
+[pi2]: https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi2.img.bz2
+[pi3]: https://github.com/home-assistant/hassio-build/releases/download/0.7/resinos-hassio-0.7-raspberrypi3.img.bz2
+[linux]: https://github.com/home-assistant/hassio-build/tree/master/install
+[local]: http://hassio.local
diff --git a/source/images/hassio/architecture.png b/source/images/hassio/architecture.png
new file mode 100644
index 00000000000..a89e208cdce
Binary files /dev/null and b/source/images/hassio/architecture.png differ