diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 152cc2f0850..87866cadcd3 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -26,8 +26,11 @@ pages:
 
 # Introduction:
 - ['index.md', 'About', 'Grafana']
-- ['install.md', 'Installation', 'Installation']
-- ['troubleshooting/index.md', 'Installation', 'Troubleshooting']
+- ['installation/installation.md', 'Installation', 'Install & Configure']
+- ['installation/provisioning.md', 'Installation', 'Provisioning']
+- ['installation/performance.md', 'Installation', 'Performance tips']
+- ['installation/troubleshooting.md', 'Installation', 'Troubleshooting']
+
 - ['features/intro.md', 'User Guides', 'Getting started']
 - ['features/graphs.md', 'User Guides', 'Graph options']
 - ['features/annotations.md', 'User Guides', 'Annotations']
@@ -37,10 +40,15 @@ pages:
 - ['features/scripted_dashboards.md', 'User Guides', 'Scripted dashboards']
 - ['features/playlist.md', 'User Guides', 'Playlist']
 - ['features/export_import.md', 'User Guides', 'Import & Export']
+- ['screencasts/index.md', 'User Guides', 'Screencasts']
 
 - ['features/graphite.md', 'Metric Queries', 'Graphite guide']
 - ['features/influxdb.md', 'Metric Queries', 'InfluxDB guide']
 - ['features/opentsdb.md', 'Metric Queries', 'OpenTSDB guide']
+
+- ['contributing/building_from_source.md', 'Contribute', 'Building from souce']
+- ['contributing/cla.html.slim', 'Contribute', 'Contributor License Agreement']
+
 - ['support/index.md', 'Support', 'Support']
 
 - ['jsearch.md', '**HIDDEN**']
diff --git a/docs/sources/install.md b/docs/sources/installation/installation.md
similarity index 100%
rename from docs/sources/install.md
rename to docs/sources/installation/installation.md
diff --git a/docs/sources/performance/index.md b/docs/sources/installation/performance.md
similarity index 78%
rename from docs/sources/performance/index.md
rename to docs/sources/installation/performance.md
index f34051b2c64..535cf72a228 100644
--- a/docs/sources/performance/index.md
+++ b/docs/sources/installation/performance.md
@@ -1,8 +1,12 @@
 ---
-title: Docs - Performance
+page_title: Performance Tips
+page_description: Grafana performance tips
+page_keywords: grafana, performance, documentation
 ---
 
-# Performance
+# Performance tips
+
+## Graphite
 
 Graphite 0.9.13 adds a much needed feature to the json rendering API that is very important for Grafana. If you are experiance slow
 load & rendering times for large time ranges then it is most likely caused by running Graphite 0.9.12 or lower. The latest version
diff --git a/docs/sources/provisioning/index.md b/docs/sources/installation/provisioning.md
similarity index 87%
rename from docs/sources/provisioning/index.md
rename to docs/sources/installation/provisioning.md
index ddbd359012c..b7324721e58 100644
--- a/docs/sources/provisioning/index.md
+++ b/docs/sources/installation/provisioning.md
@@ -1,5 +1,7 @@
 ---
-title: Docs - Install via provisioning
+page_title: Provisioning
+page_description: Grafana provisioning
+page_keywords: grafana, provisioning, documentation
 ---
 
 # Provisioning
@@ -7,23 +9,23 @@ title: Docs - Install via provisioning
 Here are links for how to install Grafana (and some include graphite or influxdb as well) via a provisioning
 system. These are not maintained by any core Grafana team member and might be out of date.
 
-### Puppet
+## Puppet
 
 * [forge.puppetlabs.com/bfraser/grafana](https://forge.puppetlabs.com/bfraser/grafana)
 
-### Ansible
+## Ansible
 
 * [github.com/bobrik/ansible-grafana](https://github.com/bobrik/ansible-grafana)
 * [github.com/bitmazk/ansible-digitalocean-influxdb-grafana](https://github.com/bitmazk/ansible-digitalocean-influxdb-grafana)
 
-### Docker
+## Docker
 
 * [github.com/kamon-io/docker-grafana-graphite](https://github.com/kamon-io/docker-grafana-graphite)
 * [github.com/kamon-io/docker-grafana-influxdb](https://github.com/kamon-io/docker-grafana-influxdb)
 * [github.com/tutumcloud/tutum-docker-grafana](https://github.com/tutumcloud/tutum-docker-grafana)
 * [github.com/mingfang/docker-grafana](https://github.com/mingfang/docker-grafana)
 
-### Chef
+## Chef
 
 * [github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)
 * [github.com/dzautner/grafana-cookbook](https://github.com/dzautner/grafana-cookbook)
diff --git a/docs/sources/troubleshooting/index.md b/docs/sources/installation/troubleshooting.md
similarity index 100%
rename from docs/sources/troubleshooting/index.md
rename to docs/sources/installation/troubleshooting.md
diff --git a/docs/sources/screencasts/index.md b/docs/sources/screencasts/index.md
index 2944d6b6886..07f9801e9f8 100644
--- a/docs/sources/screencasts/index.md
+++ b/docs/sources/screencasts/index.md
@@ -1,14 +1,14 @@
----
-title: Docs - Screencasts
----
+page_title: Screencasts
+page_description: Grafana screencasts
+page_keywords: grafana, screencasts, documentation, guides
 
 # Screencasts
 
-#### Grafana Screencasts - Episode 2 - Templated Graphite Queries
+## Grafana Screencasts - Episode 2 - Templated Graphite Queries
 <iframe width="561" height="315" src="//www.youtube.com/embed/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 
 <br>
-#### Grafana Screencasts - Episode 1 - Building Graphite Queries
+## Grafana Screencasts - Episode 1 - Building Graphite Queries
 <iframe width="560" height="315" src="//www.youtube.com/embed/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" frameborder="0" allowfullscreen></iframe>
 
 <br>
diff --git a/vendor/phantomjs/render.js b/vendor/phantomjs/render.js
index 4d365fd7bcb..b8f91e1c73b 100644
--- a/vendor/phantomjs/render.js
+++ b/vendor/phantomjs/render.js
@@ -31,7 +31,7 @@ page.open(params.url, function (status) {
       return $('canvas').length > 0;
     });
 
-    if (canvas || tries === 10) {
+    if (canvas || tries === 100) {
       page.render(params.png);
       phantom.exit();
     }