diff --git a/source/_components/alarm_control_panel.alarmdotcom.markdown b/source/_components/alarm_control_panel.alarmdotcom.markdown
index aa976170231..2d81393f770 100644
--- a/source/_components/alarm_control_panel.alarmdotcom.markdown
+++ b/source/_components/alarm_control_panel.alarmdotcom.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alarm.com Alarm Control Panel"
 description: "Instructions how to integrate Alarm.com into Home Assistant."
 date: 2016-01-14 22:00
diff --git a/source/_components/alarm_control_panel.manual.markdown b/source/_components/alarm_control_panel.manual.markdown
index 36b49399a78..c5ce1ff8353 100644
--- a/source/_components/alarm_control_panel.manual.markdown
+++ b/source/_components/alarm_control_panel.manual.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Manual Alarm Control Panel"
 description: "Instructions how to integrate manual alarms into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/alarm_control_panel.markdown b/source/_components/alarm_control_panel.markdown
index f3fc25736db..ba5f469915b 100644
--- a/source/_components/alarm_control_panel.markdown
+++ b/source/_components/alarm_control_panel.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alarm Control Panels"
 description: "Instructions how to integrate Alarm Control Panels into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/alarm_control_panel.mqtt.markdown b/source/_components/alarm_control_panel.mqtt.markdown
index 440d8209e4e..2d97a23fafe 100644
--- a/source/_components/alarm_control_panel.mqtt.markdown
+++ b/source/_components/alarm_control_panel.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Alarm Control Panel"
 description: "Instructions how to integrate MQTT capable Alarm Panels into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/alexa.markdown b/source/_components/alexa.markdown
index d66913e751d..9922762b632 100644
--- a/source/_components/alexa.markdown
+++ b/source/_components/alexa.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alexa / Amazon Echo"
 description: "Instructions how to connect Alexa/Amazon Echo to Home Assistant."
 date: 2015-12-13 13:02
diff --git a/source/_components/arduino.markdown b/source/_components/arduino.markdown
index 19c482136f7..e961ab15149 100644
--- a/source/_components/arduino.markdown
+++ b/source/_components/arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino"
 description: "Instructions how to setup an Arduino boards within Home Assistant."
 date: 2015-06-27 10:28
diff --git a/source/_components/automation.markdown b/source/_components/automation.markdown
index 50ddd5f4baf..3dcfbc47e6d 100644
--- a/source/_components/automation.markdown
+++ b/source/_components/automation.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Automation"
 description: "Instructions how to setup automation within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/binary_sensor.arest.markdown b/source/_components/binary_sensor.arest.markdown
index b14f1f8eccb..92ff60e49d3 100644
--- a/source/_components/binary_sensor.arest.markdown
+++ b/source/_components/binary_sensor.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Binary Sensor"
 description: "Instructions how to integrate aREST binary sensors within Home Assistant."
 date: 2015-11-20 18:15
diff --git a/source/_components/binary_sensor.command.markdown b/source/_components/binary_sensor.command.markdown
index d7305fd5d88..332a4df75a7 100644
--- a/source/_components/binary_sensor.command.markdown
+++ b/source/_components/binary_sensor.command.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Binary Sensor"
 description: "Instructions how to integrate Command binary sensors within Home Assistant."
 date: 2016-01-13 12:15
diff --git a/source/_components/binary_sensor.http.markdown b/source/_components/binary_sensor.http.markdown
index 8b7d19b096f..7e7dfe1e9a8 100644
--- a/source/_components/binary_sensor.http.markdown
+++ b/source/_components/binary_sensor.http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP Binary Sensor"
 description: "Instructions how to integrate HTTP binary sensors within Home Assistant."
 date: 2016-02-05 12:15
diff --git a/source/_components/binary_sensor.markdown b/source/_components/binary_sensor.markdown
index 477642ec958..f3bbd430190 100644
--- a/source/_components/binary_sensor.markdown
+++ b/source/_components/binary_sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Binary Sensor"
 description: "Instructions how to setup your binary sensors with Home Assistant."
 date: 2015-11-20 14:00
diff --git a/source/_components/binary_sensor.mqtt.markdown b/source/_components/binary_sensor.mqtt.markdown
index 9b397346891..43a3ab06a58 100644
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Binary Sensor"
 description: "Instructions how to integrate MQTT binary sensors within Home Assistant."
 date: 2015-05-30 23:21
diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
index 54796538425..06ed382f461 100644
--- a/source/_components/binary_sensor.nest.markdown
+++ b/source/_components/binary_sensor.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Binary Sensor"
 description: "Instructions how to integrate Nest binary sensors within Home Assistant."
 date: 2016-01-26 08:00
diff --git a/source/_components/binary_sensor.rest.markdown b/source/_components/binary_sensor.rest.markdown
index b3b64ae91ab..474a1565d49 100644
--- a/source/_components/binary_sensor.rest.markdown
+++ b/source/_components/binary_sensor.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Binary Sensor"
 description: "Instructions how to integrate REST binary sensors into Home Assistant."
 date: 2015-12-17 19:10
diff --git a/source/_components/binary_sensor.rpi_gpio.markdown b/source/_components/binary_sensor.rpi_gpio.markdown
index a94c65bc236..dc2c0b8888a 100644
--- a/source/_components/binary_sensor.rpi_gpio.markdown
+++ b/source/_components/binary_sensor.rpi_gpio.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Raspberry PI GPIO Binary Sensor"
 description: "Instructions how to integrate the GPIO sensor capability of a Raspberry PI into Home Assistant."
 date: 2015-08-30 19:00
diff --git a/source/_components/binary_sensor.zigbee.markdown b/source/_components/binary_sensor.zigbee.markdown
index df2cff5a4b5..d8731ac102b 100644
--- a/source/_components/binary_sensor.zigbee.markdown
+++ b/source/_components/binary_sensor.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee Binary Sensor"
 description: "Instructions on how to set up ZigBee binary sensors within Home Assistant."
 date: 2016-01-28 12:38
diff --git a/source/_components/browser.markdown b/source/_components/browser.markdown
index 273c3ae7e40..c7ce25dc61e 100644
--- a/source/_components/browser.markdown
+++ b/source/_components/browser.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Browser"
 description: "Instructions how to setup the browser component with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/camera.foscam.markdown b/source/_components/camera.foscam.markdown
index a911ca8b53e..ed4b4106d7d 100644
--- a/source/_components/camera.foscam.markdown
+++ b/source/_components/camera.foscam.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Foscam IP Camera"
 description: "Instructions how to integrate Foscam IP cameras within Home Assistant."
 date: 2015-09-17 08:01
diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown
index 065207f37b8..3d88569b683 100644
--- a/source/_components/camera.generic.markdown
+++ b/source/_components/camera.generic.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Generic IP Camera"
 description: "Instructions how to integrate IP cameras within Home Assistant."
 date: 2015-07-11 0:36
diff --git a/source/_components/camera.markdown b/source/_components/camera.markdown
index cfcc0393b24..e56503400c1 100644
--- a/source/_components/camera.markdown
+++ b/source/_components/camera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Camera"
 description: "Instructions how to integrate cameras within Home Assistant."
 date: 2015-11-09 08:36
diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown
index f646b39e380..4f166f044c4 100644
--- a/source/_components/camera.mjpeg.markdown
+++ b/source/_components/camera.mjpeg.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Generic MJPEG IP Camera"
 description: "Instructions how to integrate IP cameras within Home Assistant."
 date: 2015-11-09 08:36
diff --git a/source/_components/configurator.markdown b/source/_components/configurator.markdown
index d564089bc2c..44c594c9edb 100644
--- a/source/_components/configurator.markdown
+++ b/source/_components/configurator.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Configurator"
 description: "Instructions how to integrate the configurator in your components."
 date: 2015-03-15 00:51
diff --git a/source/_components/conversation.markdown b/source/_components/conversation.markdown
index 7851621520d..7ff3b348b78 100644
--- a/source/_components/conversation.markdown
+++ b/source/_components/conversation.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Conversation"
 description: "Instructions how to have conversations with your Home Assistant."
 date: 2015-03-15 00:39
diff --git a/source/_components/device_sun_light_trigger.markdown b/source/_components/device_sun_light_trigger.markdown
index 1b8cbc18655..dd2b298b2e1 100644
--- a/source/_components/device_sun_light_trigger.markdown
+++ b/source/_components/device_sun_light_trigger.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Presence based lights"
 description: "Instructions how to automate your lights with Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/device_tracker.actiontec.markdown b/source/_components/device_tracker.actiontec.markdown
index d3d5f198740..774b7ec2823 100644
--- a/source/_components/device_tracker.actiontec.markdown
+++ b/source/_components/device_tracker.actiontec.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Actiontec"
 description: "Instructions how to integrate Actiontec routers into Home Assistant."
 date: 2015-08-30 19:00
diff --git a/source/_components/device_tracker.aruba.markdown b/source/_components/device_tracker.aruba.markdown
index 8a65953e5fe..4d76b30dd50 100644
--- a/source/_components/device_tracker.aruba.markdown
+++ b/source/_components/device_tracker.aruba.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Aruba"
 description: "Instructions how to integrate Aruba routers into Home Assistant."
 date: 2015-08-31 08:45
diff --git a/source/_components/device_tracker.asuswrt.markdown b/source/_components/device_tracker.asuswrt.markdown
index 4ca50a9ef3b..e1590a59c93 100644
--- a/source/_components/device_tracker.asuswrt.markdown
+++ b/source/_components/device_tracker.asuswrt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ASUSWRT"
 description: "Instructions how to integrate ASUSWRT based routers into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/device_tracker.ddwrt.markdown b/source/_components/device_tracker.ddwrt.markdown
index 741959d19e1..5eee59d85f2 100644
--- a/source/_components/device_tracker.ddwrt.markdown
+++ b/source/_components/device_tracker.ddwrt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "DD-WRT"
 description: "Instructions how to integrate DD-WRT based routers into Home Assistant."
 date: 2015-05-11 09:00
diff --git a/source/_components/device_tracker.fritz.markdown b/source/_components/device_tracker.fritz.markdown
index 5d8acb12e53..75d48a75b9f 100644
--- a/source/_components/device_tracker.fritz.markdown
+++ b/source/_components/device_tracker.fritz.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "FRITZ!Box"
 description: "Instructions how to integrate AVM FRITZ!Box based routers into Home Assistant."
 date: 2015-12-13 19:00
diff --git a/source/_components/device_tracker.icloud.markdown b/source/_components/device_tracker.icloud.markdown
index 39299c46308..169ba7974c0 100644
--- a/source/_components/device_tracker.icloud.markdown
+++ b/source/_components/device_tracker.icloud.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "iCloud"
 description: "Instructions how to use iCloud to track devices in Home Assistant."
 date: 2015-12-15 1000
diff --git a/source/_components/device_tracker.locative.markdown b/source/_components/device_tracker.locative.markdown
index 17df285ccfa..dd1d40fc169 100644
--- a/source/_components/device_tracker.locative.markdown
+++ b/source/_components/device_tracker.locative.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Locative"
 description: "Instructions how to use Locative to track devices in Home Assistant."
 date: 2015-10-13 19:00
diff --git a/source/_components/device_tracker.luci.markdown b/source/_components/device_tracker.luci.markdown
index 3db44706c83..81e60df206c 100644
--- a/source/_components/device_tracker.luci.markdown
+++ b/source/_components/device_tracker.luci.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWRT (luci)"
 description: "Instructions how to integrate OpenWRT routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.markdown b/source/_components/device_tracker.markdown
index bb36d19013d..f65447717db 100644
--- a/source/_components/device_tracker.markdown
+++ b/source/_components/device_tracker.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Device Tracker"
 description: "Instructions how to setup device tracking within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/device_tracker.mqtt.markdown b/source/_components/device_tracker.mqtt.markdown
index f7ed2156f56..7c0eed7d1d4 100644
--- a/source/_components/device_tracker.mqtt.markdown
+++ b/source/_components/device_tracker.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Device Tracker"
 description: "Instructions how to use MQTT to track devices in Home Assistant."
 date: 2015-09-19 20:41
diff --git a/source/_components/device_tracker.netgear.markdown b/source/_components/device_tracker.netgear.markdown
index a5a508ba4d4..67a37008ece 100644
--- a/source/_components/device_tracker.netgear.markdown
+++ b/source/_components/device_tracker.netgear.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Netgear"
 description: "Instructions how to integrate Netgear routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.nmap_scanner.markdown b/source/_components/device_tracker.nmap_scanner.markdown
index f5fb0f42685..e2fad493eaa 100644
--- a/source/_components/device_tracker.nmap_scanner.markdown
+++ b/source/_components/device_tracker.nmap_scanner.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nmap"
 description: "Instructions how to integrate Nmap into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.owntracks.markdown b/source/_components/device_tracker.owntracks.markdown
index 2160821844f..10a04326a4b 100644
--- a/source/_components/device_tracker.owntracks.markdown
+++ b/source/_components/device_tracker.owntracks.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Owntracks"
 description: "Instructions how to use Owntracks to track devices in Home Assistant."
 date: 2015-09-22 07:00
diff --git a/source/_components/device_tracker.snmp.markdown b/source/_components/device_tracker.snmp.markdown
index d5ef35f20fc..c33e605c692 100644
--- a/source/_components/device_tracker.snmp.markdown
+++ b/source/_components/device_tracker.snmp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SNMP"
 description: "Instructions how to integrate SNMP into Home Assistant."
 date: 2015-10-08 12:00
diff --git a/source/_components/device_tracker.thomson.markdown b/source/_components/device_tracker.thomson.markdown
index bb85bd340d0..8a81c40ad9e 100644
--- a/source/_components/device_tracker.thomson.markdown
+++ b/source/_components/device_tracker.thomson.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Thomson"
 description: "Instructions how to integrate Thomson routers into Home Assistant."
 date: 2015-08-30 19:00
diff --git a/source/_components/device_tracker.tomato.markdown b/source/_components/device_tracker.tomato.markdown
index ad55ca2938d..db77f188633 100644
--- a/source/_components/device_tracker.tomato.markdown
+++ b/source/_components/device_tracker.tomato.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Tomato"
 description: "Instructions how to integrate Tomato routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.tplink.markdown b/source/_components/device_tracker.tplink.markdown
index a95022d65a2..50dbf15802f 100644
--- a/source/_components/device_tracker.tplink.markdown
+++ b/source/_components/device_tracker.tplink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TP-Link"
 description: "Instructions how to integrate TP-Link routers into Home Assistant."
 date: 2015-06-22 10:30
diff --git a/source/_components/device_tracker.ubus.markdown b/source/_components/device_tracker.ubus.markdown
index 9ad16682b54..71a8c26db34 100644
--- a/source/_components/device_tracker.ubus.markdown
+++ b/source/_components/device_tracker.ubus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWRT (ubus)"
 description: "Instructions how to integrate OpenWRT routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/discovery.markdown b/source/_components/discovery.markdown
index 9f316298063..8633fba2c2e 100644
--- a/source/_components/discovery.markdown
+++ b/source/_components/discovery.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Discovery"
 description: "Instructions how to setup Home Assistant to discover new devices."
 date: 2015-01-24 14:39
diff --git a/source/_components/downloader.markdown b/source/_components/downloader.markdown
index 928d1b0da98..b347ad9ca7e 100644
--- a/source/_components/downloader.markdown
+++ b/source/_components/downloader.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Downloader"
 description: "Instructions how to setup the downloader component with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
index fc21f7042ec..69879ddab9a 100644
--- a/source/_components/ecobee.markdown
+++ b/source/_components/ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee"
 description: "Instructions for how to integrate Ecobee thermostats and sensors within Home Assistant."
 date: 2015-11-30 17:54
diff --git a/source/_components/group.markdown b/source/_components/group.markdown
index e28ac57bbd6..a33a3afd88a 100644
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Group"
 description: "Instructions how to setup groups within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/history.markdown b/source/_components/history.markdown
index 0fb6eb1fedc..90e5df451aa 100644
--- a/source/_components/history.markdown
+++ b/source/_components/history.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "History"
 description: "Instructions how to enable history support for Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/http.markdown b/source/_components/http.markdown
index f0a7f0d6e49..a05b058d1f7 100644
--- a/source/_components/http.markdown
+++ b/source/_components/http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP"
 description: "Offers a web framework to serve files."
 date: 2015-12-06 21:35
diff --git a/source/_components/ifttt.manything.markdown b/source/_components/ifttt.manything.markdown
index dd9b53751fa..c5535ef28c0 100644
--- a/source/_components/ifttt.manything.markdown
+++ b/source/_components/ifttt.manything.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ManyThing"
 description: "Instructions how to setup ManyThing support with IFTTT."
 date: 2015-09-07 18:00
diff --git a/source/_components/ifttt.markdown b/source/_components/ifttt.markdown
index 67d3dcb42e2..c5adde1b462 100644
--- a/source/_components/ifttt.markdown
+++ b/source/_components/ifttt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "IFTTT"
 description: "Instructions how to setup IFTTT within Home Assistant."
 date: 2015-09-07 18:00
diff --git a/source/_components/influxdb.markdown b/source/_components/influxdb.markdown
index 7f1973087ec..be64cc58dc2 100644
--- a/source/_components/influxdb.markdown
+++ b/source/_components/influxdb.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "InfluxDB"
 description: "Record events in InfluxDB."
 date: 2015-12-06 13:08
diff --git a/source/_components/input_boolean.markdown b/source/_components/input_boolean.markdown
index 4b874a236d6..2fcdedc64b4 100644
--- a/source/_components/input_boolean.markdown
+++ b/source/_components/input_boolean.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Input Boolean"
 description: "Instructions how to integrate the Input Boolean component into Home Assistant."
 date: 2016-01-17 16:58
diff --git a/source/_components/insteon_hub.markdown b/source/_components/insteon_hub.markdown
index 9a4750d59f2..7e6aa5f098b 100644
--- a/source/_components/insteon_hub.markdown
+++ b/source/_components/insteon_hub.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Insteon Hub"
 description: "Instructions how to setup the Insteon Hub within Home Assistant."
 date: 2016-01-27 08:00
diff --git a/source/_components/introduction.markdown b/source/_components/introduction.markdown
index dabfd1b4557..243e3b2c25a 100644
--- a/source/_components/introduction.markdown
+++ b/source/_components/introduction.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Introduction"
 description: "Details about the introduction within Home Assistant."
 date: 2015-10-25 15:15
diff --git a/source/_components/isy994.markdown b/source/_components/isy994.markdown
index 0bb77c922a0..eac00a8cc4c 100644
--- a/source/_components/isy994.markdown
+++ b/source/_components/isy994.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ISY994 Controller"
 description: "Instructions how to setup the ISY994 controller within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/keyboard.markdown b/source/_components/keyboard.markdown
index 4bf2672e14b..40f15421e00 100644
--- a/source/_components/keyboard.markdown
+++ b/source/_components/keyboard.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Keyboard"
 description: "Instructions how to simulate key presses with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/light.blinksticklight.markdown b/source/_components/light.blinksticklight.markdown
index 459676cf0ba..0d80ee2086e 100644
--- a/source/_components/light.blinksticklight.markdown
+++ b/source/_components/light.blinksticklight.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Blinkstick"
 description: "Instructions how to setup Blinkstick lights within Home Assistant."
 date: 2015-10-08 10:00
diff --git a/source/_components/light.hue.markdown b/source/_components/light.hue.markdown
index 8789a5d3322..501005a7f2a 100644
--- a/source/_components/light.hue.markdown
+++ b/source/_components/light.hue.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Philips Hue"
 description: "Instructions how to setup Philips Hue within Home Assistant."
 date: 2015-03-23 20:09
diff --git a/source/_components/light.hyperion.markdown b/source/_components/light.hyperion.markdown
index 1260dbc2c37..48889a36e83 100644
--- a/source/_components/light.hyperion.markdown
+++ b/source/_components/light.hyperion.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Hyperion"
 description: "Instructions how to integrate Hyperion into Home Assistant."
 date: 2015-10-25 22:43
diff --git a/source/_components/light.lifx.markdown b/source/_components/light.lifx.markdown
index f6456c04566..b164bb2f4d5 100644
--- a/source/_components/light.lifx.markdown
+++ b/source/_components/light.lifx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "LIFX"
 description: "Instructions how to integrate LIFX into Home Assistant."
 date: 2016-01-27 08:00
diff --git a/source/_components/light.limitlessled.markdown b/source/_components/light.limitlessled.markdown
index 892313be9f0..3a8ad99a4b5 100644
--- a/source/_components/light.limitlessled.markdown
+++ b/source/_components/light.limitlessled.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "LimitlessLED"
 description: "Instructions on how to setup LimitlessLED within Home Assistant."
 date: 2015-12-03 13:00
diff --git a/source/_components/light.markdown b/source/_components/light.markdown
index 51bf8111115..9cf467f247a 100644
--- a/source/_components/light.markdown
+++ b/source/_components/light.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Lights"
 description: "Instructions how to setup your lights with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/light.mqtt.markdown b/source/_components/light.mqtt.markdown
index a3712391b64..f0d4680a8a7 100644
--- a/source/_components/light.mqtt.markdown
+++ b/source/_components/light.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Light"
 description: "Instructions how to setup MQTT lights within Home Assistant."
 date: 2015-11-13 08:30
diff --git a/source/_components/light.rfxtrx.markdown b/source/_components/light.rfxtrx.markdown
index ee2f5813eb9..374df8887b8 100644
--- a/source/_components/light.rfxtrx.markdown
+++ b/source/_components/light.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Light"
 description: "Instructions how to integrate RFXtrx lights into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/light.tellstick.markdown b/source/_components/light.tellstick.markdown
index 8ebf9e8cb63..7326dc49345 100644
--- a/source/_components/light.tellstick.markdown
+++ b/source/_components/light.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Light"
 description: "Instructions how to integrate TellStick lights into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/light.vera.markdown b/source/_components/light.vera.markdown
index 3c4c08be05d..3ed552548a4 100644
--- a/source/_components/light.vera.markdown
+++ b/source/_components/light.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Light"
 description: "Instructions how to integrate Vera lights into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/light.wink.markdown b/source/_components/light.wink.markdown
index 62bdc4753da..3f019b5ca97 100644
--- a/source/_components/light.wink.markdown
+++ b/source/_components/light.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Light"
 description: "Instructions how to setup the Wink lights within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/light.zigbee.markdown b/source/_components/light.zigbee.markdown
index 0c71f8e4bfc..25832fedbd1 100644
--- a/source/_components/light.zigbee.markdown
+++ b/source/_components/light.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: ZigBee Light
 description: "Instructions on how to set up ZigBee lights within Home Assistant."
 date: 2016-01-28 12:38
diff --git a/source/_components/light.zwave.markdown b/source/_components/light.zwave.markdown
index 5c5d573a562..00b3c7b64d3 100644
--- a/source/_components/light.zwave.markdown
+++ b/source/_components/light.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Light"
 description: "Instructions how to setup the Z-Wave lights within Home Assistant."
 date: 2015-11-11 13:00
diff --git a/source/_components/lock.markdown b/source/_components/lock.markdown
index a905a990b9a..dcad2d30566 100644
--- a/source/_components/lock.markdown
+++ b/source/_components/lock.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Locks"
 description: "Instructions how to setup your locks with Home Assistant."
 date: 2015-11-21 08:10
diff --git a/source/_components/lock.wink.markdown b/source/_components/lock.wink.markdown
index 6e25951dd15..d9abf003f8a 100644
--- a/source/_components/lock.wink.markdown
+++ b/source/_components/lock.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Lock"
 description: "Instructions how to setup the Wink locks within Home Assistant."
 date: 2015-11-20 12:00
diff --git a/source/_components/logbook.markdown b/source/_components/logbook.markdown
index 7e3581788c3..f7b3c42be79 100644
--- a/source/_components/logbook.markdown
+++ b/source/_components/logbook.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logbook"
 description: "Instructions how to enable the logbook component for Home Assistant."
 date: 2015-04-25 9:23
diff --git a/source/_components/logger.markdown b/source/_components/logger.markdown
index e7a9935c9bd..66c521e09ea 100644
--- a/source/_components/logger.markdown
+++ b/source/_components/logger.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logger"
 description: "Instructions how to enable the logger component for Home Assistant."
 date: 2015-11-12 17:00
diff --git a/source/_components/media_player.cast.markdown b/source/_components/media_player.cast.markdown
index ad8048f4878..0ce3920e4ec 100644
--- a/source/_components/media_player.cast.markdown
+++ b/source/_components/media_player.cast.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Google Cast"
 description: "Instructions how to integrate Google Cast into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/media_player.denon.markdown b/source/_components/media_player.denon.markdown
index 382f154a631..6d53b6c7617 100644
--- a/source/_components/media_player.denon.markdown
+++ b/source/_components/media_player.denon.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Denon Network Receivers"
 description: "Instructions how to integrate Denon Network Receivers into Home Assistant."
 date: 2015-09-08 09:00
diff --git a/source/_components/media_player.firetv.markdown b/source/_components/media_player.firetv.markdown
index 0d1aefa7dce..7561b7bbe8d 100644
--- a/source/_components/media_player.firetv.markdown
+++ b/source/_components/media_player.firetv.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "FireTV"
 description: "Instructions how to integrate Music Player Daemon into Home Assistant."
 date: 2015-10-23 18:00
diff --git a/source/_components/media_player.itunes.markdown b/source/_components/media_player.itunes.markdown
index 5e5c890353a..3e77b6f862f 100644
--- a/source/_components/media_player.itunes.markdown
+++ b/source/_components/media_player.itunes.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "iTunes"
 description: "Instructions how to integrate iTunes into Home Assistant."
 date: 2015-06-22 11:00
diff --git a/source/_components/media_player.kodi.markdown b/source/_components/media_player.kodi.markdown
index 905d108b083..b2e95c22e75 100644
--- a/source/_components/media_player.kodi.markdown
+++ b/source/_components/media_player.kodi.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Kodi"
 description: "Instructions how to integrate Kodi into Home Assistant."
 date: 2015-06-22 11:00
diff --git a/source/_components/media_player.markdown b/source/_components/media_player.markdown
index 5a227781835..24d81c3b2e9 100644
--- a/source/_components/media_player.markdown
+++ b/source/_components/media_player.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Media Player"
 description: "Instructions how to setup your media players with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/media_player.mpd.markdown b/source/_components/media_player.mpd.markdown
index cd2a8e3f8a4..b600a2e4159 100644
--- a/source/_components/media_player.mpd.markdown
+++ b/source/_components/media_player.mpd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Music Player Daemon (MPD)"
 description: "Instructions how to integrate Music Player Daemon into Home Assistant."
 date: 2015-06-02 08:00
diff --git a/source/_components/media_player.plex.markdown b/source/_components/media_player.plex.markdown
index 4488e68fb87..72b4787d810 100644
--- a/source/_components/media_player.plex.markdown
+++ b/source/_components/media_player.plex.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Plex"
 description: "Instructions how to integrate Plex into Home Assistant."
 date: 2015-10-05 21:21
diff --git a/source/_components/media_player.sonos.markdown b/source/_components/media_player.sonos.markdown
index a080ae0f4b1..8b7dcc4e698 100644
--- a/source/_components/media_player.sonos.markdown
+++ b/source/_components/media_player.sonos.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sonos"
 description: "Instructions how to integrateSonos devices into Home Assistant."
 date: 2015-09-12 13:00
diff --git a/source/_components/media_player.squeezebox.markdown b/source/_components/media_player.squeezebox.markdown
index 5d1a11ce52a..ba31bd25503 100644
--- a/source/_components/media_player.squeezebox.markdown
+++ b/source/_components/media_player.squeezebox.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logitech Squeezebox"
 description: "Instructions on how to integrate a Logitech Squeezebox player into Home Assistant."
 date: 2015-08-09 11:00
diff --git a/source/_components/media_player.universal.markdown b/source/_components/media_player.universal.markdown
index f634f7bdb88..fd0267ffb52 100644
--- a/source/_components/media_player.universal.markdown
+++ b/source/_components/media_player.universal.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Universal"
 description: "Instructions how to create a universal media player in Home Assistant."
 date: 2016-01-12 22:00
diff --git a/source/_components/modbus.markdown b/source/_components/modbus.markdown
index f33ca58ca30..d8e4a36daaa 100644
--- a/source/_components/modbus.markdown
+++ b/source/_components/modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus"
 description: "Instructions how to integrate Modbus within Home Assistant."
 date: 2015-04-25 9:16
diff --git a/source/_components/mqtt.markdown b/source/_components/mqtt.markdown
index 2c0684ac9f1..cac78c44052 100644
--- a/source/_components/mqtt.markdown
+++ b/source/_components/mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT"
 description: "Instructions how to setup MQTT within Home Assistant."
 date: 2015-08-07 18:00
diff --git a/source/_components/mqtt_eventstream.markdown b/source/_components/mqtt_eventstream.markdown
index a208bdae3e7..75f0ab11067 100644
--- a/source/_components/mqtt_eventstream.markdown
+++ b/source/_components/mqtt_eventstream.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Eventstream"
 description: "Instructions how to setup MQTT eventstream within Home Assistant."
 date: 2016-01-13 08:00
diff --git a/source/_components/mysensors.markdown b/source/_components/mysensors.markdown
index 26214db8b51..e5a6c9a84e3 100644
--- a/source/_components/mysensors.markdown
+++ b/source/_components/mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
 date: 2015-05-14 21:57
diff --git a/source/_components/nest.markdown b/source/_components/nest.markdown
index b04bfb93c26..f8a4723fe8a 100644
--- a/source/_components/nest.markdown
+++ b/source/_components/nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest"
 description: "Instructions how to integrate Nest into Home Assistant."
 date: 2016-01-29 21:57
diff --git a/source/_components/notify.file.markdown b/source/_components/notify.file.markdown
index 042c088e806..afb14df7b83 100644
--- a/source/_components/notify.file.markdown
+++ b/source/_components/notify.file.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "File"
 description: "Instructions how to add file notifications to Home Assistant."
 date: 2015-06-22 10:00
diff --git a/source/_components/notify.free_mobile.markdown b/source/_components/notify.free_mobile.markdown
index a3d6c53f574..43ae84c090a 100644
--- a/source/_components/notify.free_mobile.markdown
+++ b/source/_components/notify.free_mobile.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Free Mobile"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2016-01-12 08:36
diff --git a/source/_components/notify.google_voice.markdown b/source/_components/notify.google_voice.markdown
index 677f8749d98..61044ffc40a 100644
--- a/source/_components/notify.google_voice.markdown
+++ b/source/_components/notify.google_voice.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Google Voice SMS"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2016-01-29
diff --git a/source/_components/notify.instapush.markdown b/source/_components/notify.instapush.markdown
index 77bd22b8844..5fc49341bfd 100644
--- a/source/_components/notify.instapush.markdown
+++ b/source/_components/notify.instapush.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Instapush"
 description: "Instructions how to add Instapush notifications to Home Assistant."
 date: 2015-05-01 18:00
diff --git a/source/_components/notify.markdown b/source/_components/notify.markdown
index ed8f64c4d7d..f6d4f7b5350 100644
--- a/source/_components/notify.markdown
+++ b/source/_components/notify.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Notifications"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.mqtt.markdown b/source/_components/notify.mqtt.markdown
index e87485a0b52..1f42e72e43d 100644
--- a/source/_components/notify.mqtt.markdown
+++ b/source/_components/notify.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Notifications"
 description: "Instructions how to add MQTT notifications to Home Assistant."
 date: 2016-02-01 08:00
diff --git a/source/_components/notify.nma.markdown b/source/_components/notify.nma.markdown
index ccd634f28c7..4545d619e59 100644
--- a/source/_components/notify.nma.markdown
+++ b/source/_components/notify.nma.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Notify My Android"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-05-01 18:00
diff --git a/source/_components/notify.pushbullet.markdown b/source/_components/notify.pushbullet.markdown
index c8877437343..5860998a158 100644
--- a/source/_components/notify.pushbullet.markdown
+++ b/source/_components/notify.pushbullet.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "PushBullet"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.pushetta.markdown b/source/_components/notify.pushetta.markdown
index 2690df81331..e3a6f049d9b 100644
--- a/source/_components/notify.pushetta.markdown
+++ b/source/_components/notify.pushetta.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Pushetta"
 description: "Instructions how to add Pushetta notifications to Home Assistant."
 date: 2015-11-10 18:00
diff --git a/source/_components/notify.pushover.markdown b/source/_components/notify.pushover.markdown
index 02aa891990a..9e7161e3619 100644
--- a/source/_components/notify.pushover.markdown
+++ b/source/_components/notify.pushover.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "PushOver"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.slack.markdown b/source/_components/notify.slack.markdown
index d3639631ce4..5f3c21735e6 100644
--- a/source/_components/notify.slack.markdown
+++ b/source/_components/notify.slack.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Slack"
 description: "Instructions how to add Slack notifications to Home Assistant."
 date: 2015-08-06 18:00
diff --git a/source/_components/notify.smtp.markdown b/source/_components/notify.smtp.markdown
index d56dcc00c0d..e76d3af83d0 100644
--- a/source/_components/notify.smtp.markdown
+++ b/source/_components/notify.smtp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SMTP"
 description: "Instructions how to add e-mail notifications to Home Assistant."
 date: 2015-06-03 18:00
diff --git a/source/_components/notify.syslog.markdown b/source/_components/notify.syslog.markdown
index b5e72bf4a4b..e556f6d108c 100644
--- a/source/_components/notify.syslog.markdown
+++ b/source/_components/notify.syslog.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Syslog"
 description: "Instructions how to add syslog notifications to Home Assistant."
 date: 2015-06-09 16:00
diff --git a/source/_components/notify.telegram.markdown b/source/_components/notify.telegram.markdown
index b804aa5bff7..b1d27f759fb 100644
--- a/source/_components/notify.telegram.markdown
+++ b/source/_components/notify.telegram.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telegram"
 description: "Instructions how to add Telegram notifications to Home Assistant."
 date: 2015-10-09 18:00
diff --git a/source/_components/notify.twitter.markdown b/source/_components/notify.twitter.markdown
index 97ea742ce19..49247e4cc51 100644
--- a/source/_components/notify.twitter.markdown
+++ b/source/_components/notify.twitter.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Twitter"
 description: "Instructions how to add Twitter notifications to Home Assistant."
 date: 2016-01-27 07:00
diff --git a/source/_components/notify.xmpp.markdown b/source/_components/notify.xmpp.markdown
index 4f9996c236a..f410411d006 100644
--- a/source/_components/notify.xmpp.markdown
+++ b/source/_components/notify.xmpp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Jabber (XMPP)"
 description: "Instructions how to add Jabber (XMPP) notifications to Home Assistant."
 date: 2015-05-08 18:00
diff --git a/source/_components/rfxtrx.markdown b/source/_components/rfxtrx.markdown
index 8dccdf26c99..18e44c582a9 100644
--- a/source/_components/rfxtrx.markdown
+++ b/source/_components/rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx"
 description: "Instructions how to integrate RFXtrx into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/rollershutter.markdown b/source/_components/rollershutter.markdown
index 34f479fae51..1fe740d433c 100644
--- a/source/_components/rollershutter.markdown
+++ b/source/_components/rollershutter.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Rollershutters"
 description: "Instructions how to integrate rollershutters into Home Assistant."
 date: 2015-12-01 12:00
diff --git a/source/_components/rollershutter.mqtt.markdown b/source/_components/rollershutter.mqtt.markdown
index a9b92398d6e..7ed69de4085 100644
--- a/source/_components/rollershutter.mqtt.markdown
+++ b/source/_components/rollershutter.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Rollershutter"
 description: "Instructions how to integrate MQTT motorized devices into Home Assistant."
 date: 2015-12-01 12:00
diff --git a/source/_components/scene.markdown b/source/_components/scene.markdown
index 083bd0c0a34..3ba280133dc 100644
--- a/source/_components/scene.markdown
+++ b/source/_components/scene.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Scenes"
 description: "Instructions how to setup scenes within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/script.markdown b/source/_components/script.markdown
index 5a9f6d285f9..119ec629330 100644
--- a/source/_components/script.markdown
+++ b/source/_components/script.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Scripts"
 description: "Instructions how to setup scripts within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.arduino.markdown b/source/_components/sensor.arduino.markdown
index 0db13205738..f893a4ada08 100644
--- a/source/_components/sensor.arduino.markdown
+++ b/source/_components/sensor.arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino Sensor"
 description: "Instructions how to integrate Arduino boards pins as sensors within Home Assistant."
 date: 2015-09-14 18:28
diff --git a/source/_components/sensor.arest.markdown b/source/_components/sensor.arest.markdown
index c75bc22b603..ea63c52baea 100644
--- a/source/_components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Sensor"
 description: "Instructions how to integrate aREST sensors within Home Assistant."
 date: 2015-09-07 18:15
diff --git a/source/_components/sensor.bitcoin.markdown b/source/_components/sensor.bitcoin.markdown
index da6cd72b01d..56145a9d814 100644
--- a/source/_components/sensor.bitcoin.markdown
+++ b/source/_components/sensor.bitcoin.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Bitcoin"
 description: "Instructions how to integrate Bitcoin data within Home Assistant."
 date: 2015-05-08 17:15
diff --git a/source/_components/sensor.command_sensor.markdown b/source/_components/sensor.command_sensor.markdown
index 06dc43d64b5..9c0c8adfac5 100644
--- a/source/_components/sensor.command_sensor.markdown
+++ b/source/_components/sensor.command_sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Sensor"
 description: "Instructions how to integrate command line sensors into Home Assistant."
 date: 2015-09-13 10:10
diff --git a/source/_components/sensor.cpuspeed.markdown b/source/_components/sensor.cpuspeed.markdown
index a8b43142bb7..ec2c229d7b3 100644
--- a/source/_components/sensor.cpuspeed.markdown
+++ b/source/_components/sensor.cpuspeed.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "CPU speed"
 description: "Instructions how to integrate CPU speed within Home Assistant."
 date: 2015-10-15 11:00
diff --git a/source/_components/sensor.dht.markdown b/source/_components/sensor.dht.markdown
index 6718cab67fe..6b535d2cf67 100644
--- a/source/_components/sensor.dht.markdown
+++ b/source/_components/sensor.dht.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "DHT Sensor"
 description: "Instructions how to integrate DHTxx sensors within Home Assistant."
 date: 2015-08-30 19:15
diff --git a/source/_components/sensor.dweet.markdown b/source/_components/sensor.dweet.markdown
index eec0d5d6f84..304fcffa282 100644
--- a/source/_components/sensor.dweet.markdown
+++ b/source/_components/sensor.dweet.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Dweet.io"
 description: "Instructions how to integrate Dweet.io sensors within Home Assistant."
 date: 2015-12-10 10:15
diff --git a/source/_components/sensor.ecobee.markdown b/source/_components/sensor.ecobee.markdown
index e729c466192..ebd63bb6acc 100644
--- a/source/_components/sensor.ecobee.markdown
+++ b/source/_components/sensor.ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee Sensor"
 description: "Instructions how to setup the Ecobee sensors within Home Assistant."
 date: 2015-11-30 18:00
diff --git a/source/_components/sensor.efergy.markdown b/source/_components/sensor.efergy.markdown
index 8a61b44a3f2..15dc7f7fb7d 100644
--- a/source/_components/sensor.efergy.markdown
+++ b/source/_components/sensor.efergy.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Efergy"
 description: "Instructions how to integrate Efergy devices within Home Assistant."
 date: 2015-07-11 0:15
diff --git a/source/_components/sensor.eliqonline.markdown b/source/_components/sensor.eliqonline.markdown
index e8e767b3b17..44f3214b2d6 100644
--- a/source/_components/sensor.eliqonline.markdown
+++ b/source/_components/sensor.eliqonline.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Eliqonline"
 description: "Instructions how to integrate Eliqonline devices within Home Assistant."
 date: 2015-07-11 0:15
diff --git a/source/_components/sensor.forecast.markdown b/source/_components/sensor.forecast.markdown
index a28b1428931..47ce6814d5c 100644
--- a/source/_components/sensor.forecast.markdown
+++ b/source/_components/sensor.forecast.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Forecast.io"
 description: "Instructions how to integrate Forecast.io within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.glances.markdown b/source/_components/sensor.glances.markdown
index 700320445cd..485c94a3032 100644
--- a/source/_components/sensor.glances.markdown
+++ b/source/_components/sensor.glances.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Glances"
 description: "Instructions how to integrate Glances sensors into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/sensor.http.markdown b/source/_components/sensor.http.markdown
index 8681aca6d23..7d7bcb63eb5 100644
--- a/source/_components/sensor.http.markdown
+++ b/source/_components/sensor.http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP Sensor"
 description: "Instructions how to integrate HTTP sensors within Home Assistant."
 date: 2016-02-05 12:15
diff --git a/source/_components/sensor.markdown b/source/_components/sensor.markdown
index 215246234ef..fc8a35d9269 100644
--- a/source/_components/sensor.markdown
+++ b/source/_components/sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sensor"
 description: "Instructions how to setup your sensors with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/sensor.modbus.markdown b/source/_components/sensor.modbus.markdown
index e4f331eb605..99f85d03cc3 100644
--- a/source/_components/sensor.modbus.markdown
+++ b/source/_components/sensor.modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus Sensor"
 description: "Instructions how to integrate Modbus sensors into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
index 11bb2a10983..770ff862e15 100644
--- a/source/_components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Sensor"
 description: "Instructions how to integrate MQTT sensors within Home Assistant."
 date: 2015-05-30 23:21
diff --git a/source/_components/sensor.mysensors.markdown b/source/_components/sensor.mysensors.markdown
index 5c2125230b8..4fce2117198 100644
--- a/source/_components/sensor.mysensors.markdown
+++ b/source/_components/sensor.mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors Sensor"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/sensor.nest.markdown b/source/_components/sensor.nest.markdown
index 75342dd4727..b85a2344e08 100644
--- a/source/_components/sensor.nest.markdown
+++ b/source/_components/sensor.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Sensor"
 description: "Instructions how to integrate Nest sensors within Home Assistant."
 date: 2016-01-13 19:59
diff --git a/source/_components/sensor.netatmo.markdown b/source/_components/sensor.netatmo.markdown
index 119cfad3f9c..ad196eda243 100644
--- a/source/_components/sensor.netatmo.markdown
+++ b/source/_components/sensor.netatmo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Netatmo Sensor"
 description: "Instructions how to integrate Netatmo sensors into Home Assistant."
 date: 2016-01-14 08:10
diff --git a/source/_components/sensor.onewire.markdown b/source/_components/sensor.onewire.markdown
index e6652b4b842..15fb06ec854 100644
--- a/source/_components/sensor.onewire.markdown
+++ b/source/_components/sensor.onewire.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "One wire Sensor"
 description: "Instructions how to integrate One wire (1-wire) sensors into Home Assistant."
 date: 2016-01-17 07:15
diff --git a/source/_components/sensor.openweathermap.markdown b/source/_components/sensor.openweathermap.markdown
index df7e0b8c2a6..66e5e4f3d89 100644
--- a/source/_components/sensor.openweathermap.markdown
+++ b/source/_components/sensor.openweathermap.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWeatherMap"
 description: "Instructions how to integrate OpenWeatherMap within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.rest.markdown b/source/_components/sensor.rest.markdown
index 6cdf092461f..c75a216dac7 100644
--- a/source/_components/sensor.rest.markdown
+++ b/source/_components/sensor.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Sensor"
 description: "Instructions how to integrate REST sensors into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/sensor.rfxtrx.markdown b/source/_components/sensor.rfxtrx.markdown
index 0c0f9a4f30d..1f9ce224c85 100644
--- a/source/_components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Sensor"
 description: "Instructions how to integrate RFXtrx sensors into Home Assistant."
 date: 2015-08-06 17:15
diff --git a/source/_components/sensor.sabnzbd.markdown b/source/_components/sensor.sabnzbd.markdown
index a86d2ce4e80..984143da7fc 100644
--- a/source/_components/sensor.sabnzbd.markdown
+++ b/source/_components/sensor.sabnzbd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SABnzbd"
 description: "Instructions how to integrate SABnzbd within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.swiss_public_transport.markdown b/source/_components/sensor.swiss_public_transport.markdown
index 8f17ad5a488..47239742921 100644
--- a/source/_components/sensor.swiss_public_transport.markdown
+++ b/source/_components/sensor.swiss_public_transport.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Swiss Public Transport"
 description: "Instructions how to integrate timetable data for travelling in Switzerland within Home Assistant."
 date: 2015-06-02 21:45
diff --git a/source/_components/sensor.systemmonitor.markdown b/source/_components/sensor.systemmonitor.markdown
index 5915533cd48..e1fb58cd46a 100644
--- a/source/_components/sensor.systemmonitor.markdown
+++ b/source/_components/sensor.systemmonitor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "System Monitor"
 description: "Instructions how to monitor the Home Assistant host."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.tellduslive.markdown b/source/_components/sensor.tellduslive.markdown
index d7e3ae398b4..43fffd40249 100644
--- a/source/_components/sensor.tellduslive.markdown
+++ b/source/_components/sensor.tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live sensor"
 description: "Instructions how to integrate Telldus Live sensors into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/sensor.tellstick.markdown b/source/_components/sensor.tellstick.markdown
index 1051222cdcd..8c7a244ebe6 100644
--- a/source/_components/sensor.tellstick.markdown
+++ b/source/_components/sensor.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Sensor"
 description: "Instructions how to integrate TellStick sensors into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/sensor.temper.markdown b/source/_components/sensor.temper.markdown
index b1533e21d07..d204cf7fd4a 100644
--- a/source/_components/sensor.temper.markdown
+++ b/source/_components/sensor.temper.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TEMPer Sensor"
 description: "Instructions how to integrate TEMPer sensors into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/sensor.template.markdown b/source/_components/sensor.template.markdown
index 533221a100c..da6ec606d69 100644
--- a/source/_components/sensor.template.markdown
+++ b/source/_components/sensor.template.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Template Sensor"
 description: "Instructions how to integrate Template sensors into Home Assistant."
 date: 2016-01-27 07:00
diff --git a/source/_components/sensor.time_date.markdown b/source/_components/sensor.time_date.markdown
index 82f287e0ca2..2a945fb8b59 100644
--- a/source/_components/sensor.time_date.markdown
+++ b/source/_components/sensor.time_date.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Time & Date"
 description: "Instructions how to integrate the time and the date within Home Assistant."
 date: 2015-05-08 17:15
diff --git a/source/_components/sensor.torque.markdown b/source/_components/sensor.torque.markdown
index f7287899d91..f8911e5fada 100644
--- a/source/_components/sensor.torque.markdown
+++ b/source/_components/sensor.torque.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Torque (OBD2)"
 description: "Instructions how to integrate Torque sensors into Home Assistant."
 date: 2015-12-20 18:00
diff --git a/source/_components/sensor.transmission.markdown b/source/_components/sensor.transmission.markdown
index cc7952fa5e9..e484da70f1e 100644
--- a/source/_components/sensor.transmission.markdown
+++ b/source/_components/sensor.transmission.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Transmission Sensor"
 description: "Instructions how to integrate Transmission sensors within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.twitch.markdown b/source/_components/sensor.twitch.markdown
index 56c5dff9331..b1b81299ca6 100644
--- a/source/_components/sensor.twitch.markdown
+++ b/source/_components/sensor.twitch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Twitch"
 description: "Instructions how to integrate Twitch sensors into Home Assistant."
 date: 2015-12-19 09:00
diff --git a/source/_components/sensor.vera.markdown b/source/_components/sensor.vera.markdown
index 93fd9fbe8f7..eb634bf280a 100644
--- a/source/_components/sensor.vera.markdown
+++ b/source/_components/sensor.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Sensor"
 description: "Instructions how to integrate Vera sensors into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/sensor.wink.markdown b/source/_components/sensor.wink.markdown
index ab4f49f758b..f8aa03fa560 100644
--- a/source/_components/sensor.wink.markdown
+++ b/source/_components/sensor.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Sensor"
 description: "Instructions how to setup the Wink sensors within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/sensor.worldclock.markdown b/source/_components/sensor.worldclock.markdown
index 77989ab332b..a438ea034bd 100644
--- a/source/_components/sensor.worldclock.markdown
+++ b/source/_components/sensor.worldclock.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Worldclock"
 description: "Instructions how to integrate a Worldclock within Home Assistant."
 date: 2015-10-02 11:15
diff --git a/source/_components/sensor.yr.markdown b/source/_components/sensor.yr.markdown
index b64d2005941..3c0072da258 100644
--- a/source/_components/sensor.yr.markdown
+++ b/source/_components/sensor.yr.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "YR"
 description: "Instructions how to integrate Yr.no within Home Assistant."
 date: 2016-01-04 14:00
diff --git a/source/_components/sensor.zigbee.markdown b/source/_components/sensor.zigbee.markdown
index db03ea55bcf..45a58641aca 100644
--- a/source/_components/sensor.zigbee.markdown
+++ b/source/_components/sensor.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: ZigBee Sensor
 description: "Instructions on how to set up ZigBee sensors within Home Assistant."
 date: 2016-01-28 10:08
diff --git a/source/_components/sensor.zwave.markdown b/source/_components/sensor.zwave.markdown
index f26050bd784..0b4641935a9 100644
--- a/source/_components/sensor.zwave.markdown
+++ b/source/_components/sensor.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Sensor"
 description: "Instructions how to setup the Z-Wave sensors within Home Assistant."
 date: 2015-11-15 13:00
diff --git a/source/_components/shell_command.markdown b/source/_components/shell_command.markdown
index 5e99dc73854..00551f9b65c 100644
--- a/source/_components/shell_command.markdown
+++ b/source/_components/shell_command.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Shell command"
 description: "Instructions how to integrate Shell commands into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/simple_alarm.markdown b/source/_components/simple_alarm.markdown
index f158203cec4..d0e8f14a98d 100644
--- a/source/_components/simple_alarm.markdown
+++ b/source/_components/simple_alarm.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Intruder Alerts"
 description: "Instructions how to receive intruder alerts from Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/statsd.markdown b/source/_components/statsd.markdown
index fbaa914b3ef..80a473c4456 100644
--- a/source/_components/statsd.markdown
+++ b/source/_components/statsd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "StatsD"
 description: "Record events in StatsD."
 date: 2016-01-25 08:00
diff --git a/source/_components/sun.markdown b/source/_components/sun.markdown
index 3d5c3268b97..81fac12dc5c 100644
--- a/source/_components/sun.markdown
+++ b/source/_components/sun.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sun"
 description: "Instructions how to track the sun within Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/switch.arduino.markdown b/source/_components/switch.arduino.markdown
index 27d25a6194c..b2a1b7ef5cd 100644
--- a/source/_components/switch.arduino.markdown
+++ b/source/_components/switch.arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino Switch"
 description: "Instructions how to integrate Arduino boards pins as switches within Home Assistant."
 date: 2015-09-14 18:28
diff --git a/source/_components/switch.arest.markdown b/source/_components/switch.arest.markdown
index e9e815fdb3c..a68fa5e5cc8 100644
--- a/source/_components/switch.arest.markdown
+++ b/source/_components/switch.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Switch"
 description: "Instructions how to integrate aREST switches within Home Assistant."
 date: 2015-09-11 23:15
diff --git a/source/_components/switch.command_switch.markdown b/source/_components/switch.command_switch.markdown
index 5850ad1dede..ea1dc0b7119 100644
--- a/source/_components/switch.command_switch.markdown
+++ b/source/_components/switch.command_switch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Switch"
 description: "Instructions how to have switches call command line commands."
 date: 2015-06-10 22:41
diff --git a/source/_components/switch.edimax.markdown b/source/_components/switch.edimax.markdown
index 70220e148a2..b0078775a0c 100644
--- a/source/_components/switch.edimax.markdown
+++ b/source/_components/switch.edimax.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Edimax Switch"
 description: "Instructions how to integrate Edimax switches into Home Assistant."
 date: 2015-06-10 22:54
diff --git a/source/_components/switch.hikvision.markdown b/source/_components/switch.hikvision.markdown
index 5dd60b46798..1887dd389fc 100644
--- a/source/_components/switch.hikvision.markdown
+++ b/source/_components/switch.hikvision.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Hikvision Camera Switch"
 description: "Instructions how to integrate Hikvision camera's into Home Assistant."
 date: 2015-06-10 22:54
diff --git a/source/_components/switch.markdown b/source/_components/switch.markdown
index c42f4760403..162d9c8c79a 100644
--- a/source/_components/switch.markdown
+++ b/source/_components/switch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Switches"
 description: "Instructions how to setup your switches with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/switch.modbus.markdown b/source/_components/switch.modbus.markdown
index fe3f8e7c90f..667b5a3dc78 100644
--- a/source/_components/switch.modbus.markdown
+++ b/source/_components/switch.modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus Switch"
 description: "Instructions how to integrate Modbus switches into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/switch.mqtt.markdown b/source/_components/switch.mqtt.markdown
index 6dd0904fb18..6c609991110 100644
--- a/source/_components/switch.mqtt.markdown
+++ b/source/_components/switch.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Switch"
 description: "Instructions how to integrate MQTT switches into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/switch.mysensors.markdown b/source/_components/switch.mysensors.markdown
index 314418a1bfa..7b3fb6f1a31 100644
--- a/source/_components/switch.mysensors.markdown
+++ b/source/_components/switch.mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors Switch"
 description: "Instructions how to integrate MySensors switches into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/switch.mystrom.markdown b/source/_components/switch.mystrom.markdown
index 3a586900820..e5bdac5b17d 100644
--- a/source/_components/switch.mystrom.markdown
+++ b/source/_components/switch.mystrom.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "myStrom Switch"
 description: "Instructions how to integrate myStrom switches into Home Assistant."
 date: 2015-11-25 22:00
diff --git a/source/_components/switch.orvibo.markdown b/source/_components/switch.orvibo.markdown
index 37af0826e43..b365802102a 100644
--- a/source/_components/switch.orvibo.markdown
+++ b/source/_components/switch.orvibo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Orvibo Switch"
 description: "Instructions how to integrate Orvibo switches within Home Assistant."
 date: 2015-11-15 18:15
diff --git a/source/_components/switch.rest.markdown b/source/_components/switch.rest.markdown
index a33edb2e162..3d56ca231b3 100644
--- a/source/_components/switch.rest.markdown
+++ b/source/_components/switch.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Switch"
 description: "Instructions how to integrate REST switches into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/switch.rfxtrx.markdown b/source/_components/switch.rfxtrx.markdown
index e8d0d9654e8..215eb43af36 100644
--- a/source/_components/switch.rfxtrx.markdown
+++ b/source/_components/switch.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Switch"
 description: "Instructions how to integrate RFXtrx switches into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/switch.rpi_gpio.markdown b/source/_components/switch.rpi_gpio.markdown
index cc4f86a3e60..608ca7aa1ab 100644
--- a/source/_components/switch.rpi_gpio.markdown
+++ b/source/_components/switch.rpi_gpio.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Raspberry PI GPIO Switch"
 description: "Instructions how to integrate the GPIO of a Raspberry PI into Home Assistant as a switch."
 date: 2015-08-07 14:00
diff --git a/source/_components/switch.tellduslive.markdown b/source/_components/switch.tellduslive.markdown
index 18252be830a..eb2002814ab 100644
--- a/source/_components/switch.tellduslive.markdown
+++ b/source/_components/switch.tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live Switch"
 description: "Instructions how to integrate Telldus Live switches into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/switch.tellstick.markdown b/source/_components/switch.tellstick.markdown
index 62495288f93..e9f3baf21e4 100644
--- a/source/_components/switch.tellstick.markdown
+++ b/source/_components/switch.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Switch"
 description: "Instructions how to integrate TellStick switches into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/switch.transmission.markdown b/source/_components/switch.transmission.markdown
index b7120d44c00..e5a1e435127 100644
--- a/source/_components/switch.transmission.markdown
+++ b/source/_components/switch.transmission.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Transmission Switch"
 description: "Instructions how to integrate Transmission within Home Assistant."
 date: 2015-06-02 09:00
diff --git a/source/_components/switch.vera.markdown b/source/_components/switch.vera.markdown
index 25e9b439fe1..07bad9bea28 100644
--- a/source/_components/switch.vera.markdown
+++ b/source/_components/switch.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Switch"
 description: "Instructions how to integrate Vera switches into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/switch.wemo.markdown b/source/_components/switch.wemo.markdown
index 2528d8cbc11..1e9560f77ee 100644
--- a/source/_components/switch.wemo.markdown
+++ b/source/_components/switch.wemo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Belkin WeMo Switch"
 description: "Instructions how to integrate Belkin WeMo switches into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/switch.wink.markdown b/source/_components/switch.wink.markdown
index a3067d45937..6dda470f287 100644
--- a/source/_components/switch.wink.markdown
+++ b/source/_components/switch.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Switch"
 description: "Instructions how to setup the Wink switches within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/switch.zigbee.markdown b/source/_components/switch.zigbee.markdown
index 83f8b267286..41097f32e68 100644
--- a/source/_components/switch.zigbee.markdown
+++ b/source/_components/switch.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee Switch"
 description: "Instructions on how to set up ZigBee switches within Home Assistant."
 date: 2016-01-28 11:52
diff --git a/source/_components/switch.zwave.markdown b/source/_components/switch.zwave.markdown
index 270690b276d..3b9f072fa12 100644
--- a/source/_components/switch.zwave.markdown
+++ b/source/_components/switch.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Switch"
 description: "Instructions how to setup the Z-Wave switches within Home Assistant."
 date: 2015-11-15 13:00
diff --git a/source/_components/tellduslive.markdown b/source/_components/tellduslive.markdown
index ad514f3f872..3898d4d89bb 100644
--- a/source/_components/tellduslive.markdown
+++ b/source/_components/tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live"
 description: "Instructions how to integrate Telldus Live into Home Assistant."
 date: 2016-01-17 16:00
diff --git a/source/_components/tellstick.markdown b/source/_components/tellstick.markdown
index 3b50d202bd8..13124b11046 100644
--- a/source/_components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick"
 description: "Instructions how to integrate your TellStick into Home Assistant."
 date: 2015-03-28 13:06
diff --git a/source/_components/thermostat.ecobee.markdown b/source/_components/thermostat.ecobee.markdown
index 35cf51563ca..d209c458a0f 100644
--- a/source/_components/thermostat.ecobee.markdown
+++ b/source/_components/thermostat.ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee Thermostat"
 description: "Instructions how to setup the Ecobee thermostats within Home Assistant."
 date: 2015-11-30 18:00
diff --git a/source/_components/thermostat.heat_control.markdown b/source/_components/thermostat.heat_control.markdown
index d27bb3993bb..5f754334261 100644
--- a/source/_components/thermostat.heat_control.markdown
+++ b/source/_components/thermostat.heat_control.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Heat control"
 description: "Turn Home Assistant into a thermostat"
 date: 2015-03-23 19:59
diff --git a/source/_components/thermostat.heatmiser.markdown b/source/_components/thermostat.heatmiser.markdown
index c98b78d78b7..49529fb0eb2 100644
--- a/source/_components/thermostat.heatmiser.markdown
+++ b/source/_components/thermostat.heatmiser.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Heatmiser Thermostat"
 description: "Instructions how to integrate Heatmiser thermostats within Home Assistant."
 date: 2015-12-11 12:35
diff --git a/source/_components/thermostat.homematic.markdown b/source/_components/thermostat.homematic.markdown
index a887fd51464..dc206f5a7ab 100644
--- a/source/_components/thermostat.homematic.markdown
+++ b/source/_components/thermostat.homematic.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Homematic Thermostat"
 description: "Instructions how to integrate Homematic thermostats within Home Assistant."
 date: 2015-11-25 08:00
diff --git a/source/_components/thermostat.honeywell.markdown b/source/_components/thermostat.honeywell.markdown
index 3c2e5bf7170..554b224734d 100644
--- a/source/_components/thermostat.honeywell.markdown
+++ b/source/_components/thermostat.honeywell.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Honeywell Thermostat"
 description: "Instructions how to integrate Honeywell thermostats within Home Assistant."
 date: 2015-11-09 17:15
diff --git a/source/_components/thermostat.markdown b/source/_components/thermostat.markdown
index d47b2728c4a..d003e41cfa5 100644
--- a/source/_components/thermostat.markdown
+++ b/source/_components/thermostat.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Thermostats"
 description: "Instructions how to setup thermostats tracking within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/thermostat.nest.markdown b/source/_components/thermostat.nest.markdown
index b139e671eb8..30c1b8c9005 100644
--- a/source/_components/thermostat.nest.markdown
+++ b/source/_components/thermostat.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Thermostat"
 description: "Instructions how to integrate Nest thermostats within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/thermostat.proliphix.markdown b/source/_components/thermostat.proliphix.markdown
index 3efb55e43ef..c9c13f91d13 100644
--- a/source/_components/thermostat.proliphix.markdown
+++ b/source/_components/thermostat.proliphix.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Proliphix Thermostat"
 description: "Instructions how to integrate Proliphix thermostats within Home Assistant."
 date: 2016-01-15 08:00
diff --git a/source/_components/thermostat.radiotherm.markdown b/source/_components/thermostat.radiotherm.markdown
index 0c93089cb4b..fc409933030 100644
--- a/source/_components/thermostat.radiotherm.markdown
+++ b/source/_components/thermostat.radiotherm.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Radiotherm Thermostat"
 description: "Instructions how to integrate Radiotherm thermostats within Home Assistant."
 date: 2015-10-18 17:15
diff --git a/source/_components/updater.markdown b/source/_components/updater.markdown
index 44d270b7b1e..8f857c78089 100644
--- a/source/_components/updater.markdown
+++ b/source/_components/updater.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Updater"
 description: "Detecting when Home Assistant updates are available."
 date: 2015-11-15 20:40
diff --git a/source/_components/vera.markdown b/source/_components/vera.markdown
index 4ceee75d400..782ca02cb7d 100644
--- a/source/_components/vera.markdown
+++ b/source/_components/vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera"
 description: "Instructions how to setup Vera hubs within Home Assistant."
 date: 2015-03-23 20:04
diff --git a/source/_components/verisure.markdown b/source/_components/verisure.markdown
index 06c635ecb31..8730ec8382f 100644
--- a/source/_components/verisure.markdown
+++ b/source/_components/verisure.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Verisure"
 description: "Instructions how to setup Verisure devices within Home Assistant."
 date: 2015-08-17 20:28
diff --git a/source/_components/wink.markdown b/source/_components/wink.markdown
index bebe9368ac2..4cd2283687b 100644
--- a/source/_components/wink.markdown
+++ b/source/_components/wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink"
 description: "Instructions how to setup the Wink hub within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/zigbee.markdown b/source/_components/zigbee.markdown
index 51ae3f4fae0..01770a49e11 100644
--- a/source/_components/zigbee.markdown
+++ b/source/_components/zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee"
 description: "Instructions on how to integrate a ZigBee network with Home Assistant."
 date: 2016-01-27 17:10
diff --git a/source/_components/zone.markdown b/source/_components/zone.markdown
index a0bd59ad1a2..bcb5980a1c1 100644
--- a/source/_components/zone.markdown
+++ b/source/_components/zone.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Zone"
 description: "Instructions how to setup zones within Home Assistant."
 date: 2015-10-04 09:23
diff --git a/source/_components/zwave.markdown b/source/_components/zwave.markdown
index 1ec9fad3d4f..88a54ac9b73 100644
--- a/source/_components/zwave.markdown
+++ b/source/_components/zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave"
 description: "Instructions how to integrate your existing Z-Wave within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_layouts/component.html b/source/_layouts/component.html
deleted file mode 100644
index 3f387fde493..00000000000
--- a/source/_layouts/component.html
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
----
-
-<article class="page">
-  <header>
-    <h1 class="title indent">
-      {{ page.title }}
-    </h1>
-  </header>
-  <hr class="divider">
-
-  {{ content }}
-</article>
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index c4f667776a0..9701938066a 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -3,8 +3,10 @@ layout: default
 ---
 
 <article class="page">
-
-  {% include edit_github.html %}
+  {% assign url_parts = page.url | split: '/' %}
+  {% if url_parts[1] != 'components' and url_parts[1] != 'cookbook' %}
+    {% include edit_github.html %}
+  {% endif %}
 
   {% if page.title and page.show_title != false %}
   <header>