diff --git a/source/_includes/custom/welcome.html b/source/_includes/custom/welcome.html
index 980f40cd77f..916850037d5 100644
--- a/source/_includes/custom/welcome.html
+++ b/source/_includes/custom/welcome.html
@@ -4,7 +4,7 @@
 Home Assistant is an open-source home automation platform running on Python 3. Track and control all devices at home and automate control. Installation in less then a minute.
 </p>
 <p class='hero-buttons'>
-  <a href='{{ root_url }}/demo' target='_blank' class='btn'>View demo</a>
-  <a href='{{ root_url }}/getting-started' class='btn'>Get started</a>
+  <a href='{{ root_url }}/demo/' target='_blank' class='btn'>View demo</a>
+  <a href='{{ root_url }}/getting-started/' class='btn'>Get started</a>
   <a href='https://www.github.com/balloob/home-assistant' class='btn'>Browse code on GitHub</a>
 </p>
\ No newline at end of file
diff --git a/source/_includes/site/hero_unit.html b/source/_includes/site/hero_unit.html
index 8e5a57f8654..0a0654d67ac 100644
--- a/source/_includes/site/hero_unit.html
+++ b/source/_includes/site/hero_unit.html
@@ -2,7 +2,7 @@
   <div class="grid-wrapper">
     <div class="grid flex">
       <div class="grid__item flex__item two-fifths palm-one-whole">
-        <a href='{{ root_url }}screenshots/'>
+        <a href='{{ root_url }}/demo/' target='_blank'>
           <img src="{{ root_url }}/images/hero_screenshot.png" alt="Home Assistant screenshot">
         </a>
       </div>
diff --git a/source/images/screenshots/screenshot-devices.png b/source/images/screenshots/screenshot-devices.png
deleted file mode 100644
index 09dff77c894..00000000000
Binary files a/source/images/screenshots/screenshot-devices.png and /dev/null differ
diff --git a/source/screenshots/index.markdown b/source/screenshots/index.markdown
deleted file mode 100644
index dbe3825c855..00000000000
--- a/source/screenshots/index.markdown
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: page
-title: "Screenshots"
-date: 2014-12-21 13:27
-sidebar: false
-comments: true
-sharing: true
-footer: true
----
-
-<a href='{{root_url}}/images/screenshots/screenshot-devices.png'>
-    <img src='{{root_url}}/images/screenshots/screenshot-devices.png' />
-</a>
\ No newline at end of file