diff --git a/.eslintrc b/.eslintrc
index 6a291608cdf50..080d8cff32fc5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -30,6 +30,7 @@ rules:
   no-bitwise: 0
   no-caller: 2
   no-cond-assign: 0
+  no-const-assign: 2
   no-debugger: 2
   no-empty: 2
   no-eval: 2
diff --git a/.gitignore b/.gitignore
index 56b859e0c6c38..80ed93f76b628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .aws-config.json
+.signing-config.json
 .DS_Store
 .node_binaries
 node_modules
@@ -10,7 +11,8 @@ target
 .idea
 *.iml
 *.log
-/test/output
+/test/screenshots/failure/*.png
+/test/screenshots/session/*.png
 /esvm
 .htpasswd
 .eslintcache
diff --git a/.node-version b/.node-version
index e2e3067ddc5fd..c966188e11ada 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-0.12.7
+4.4.7
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58903624be8e8..7288710afc8c0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -111,32 +111,43 @@ The standard `npm run test` task runs several sub tasks and can take several min
 
 #### Running tests using npm task:
 
-*The Selenium server that is started currently only runs the tests in Firefox*
+*The ChromeDriver that is started currently only runs the tests in Chrome browser*
 
-To runt the functional UI tests, execute the following command:
+To run the functional UI tests, execute the following command:
 
 `npm run test:ui`
 
 The task above takes a little time to start the servers.  You can also start the servers and leave them running, and then run the tests separately:
 
-`npm run test:ui:server` will start the server required to run the selenium tests, leave this open
+`npm run test:ui:server` will start the server required to run the UI tests, leave this open
 
 `npm run test:ui:runner` will run the frontend tests and close when complete
 
-#### Running tests locally with your existing (and already running) ElasticSearch, Kibana, and Selenium Server:
-
-Set your es and kibana ports in `test/intern.js` to 9220 and 5620, respecitively. You can configure your Selenium server to run the tests on Chrome,IE, or other browsers here.
-
-Once you've got the services running, execute the following:
-
-`npm run test:ui:runner`
-
 #### General notes:
 
 - Using Page Objects pattern (https://theintern.github.io/intern/#writing-functional-test)
-- At least the initial tests for the Settings, Discover, and Visualize tabs all depend on a very specific set of logstash-type data (generated with makelogs).  Since that is a static set of data, all the Discover and Visualize tests use a specific Absolute time range.  This gaurantees the same results each run.
+- At least the initial tests for the Settings, Discover, and Visualize tabs all depend on a very specific set of logstash-type data (generated with makelogs).  Since that is a static set of data, all the Discover and Visualize tests use a specific Absolute time range.  This guarantees the same results each run.
 - These tests have been developed and tested with Chrome and Firefox browser.  In theory, they should work on all browsers (that's the benefit of Intern using Leadfoot).
 - These tests should also work with an external testing service like https://saucelabs.com/ or https://www.browserstack.com/ but that has not been tested.
+- https://theintern.github.io/
+- https://theintern.github.io/leadfoot/module-leadfoot_Element.html
+
+#### Building OS packages
+
+Packages are built using fpm, pleaserun, dpkg, and rpm.  fpm and pleaserun can be installed using gem.  Package building has only been tested on Linux and is not supported on any other platform.
+```sh
+apt-get install ruby-dev rpm
+gem install fpm -v 1.5.0 # required by pleaserun 0.0.16
+gem install pleaserun -v 0.0.16 # higher versions fail at the moment
+npm run build:ospackages
+```
+
+To specify a package to build you can add `rpm` or `deb` as an argument.
+```sh
+npm run build:ospackages -- --rpm
+```
+
+Distributable packages can be found in `target/` after the build completes.
 
 ### Submit a pull request
 
diff --git a/Gruntfile.js b/Gruntfile.js
index a7867384a6faf..9c694db149b21 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -67,7 +67,7 @@ module.exports = function (grunt) {
 
   grunt.config.merge(config);
 
-  config.userScriptsDir = __dirname + '/build/userScripts';
+  config.packageScriptsDir = __dirname + '/tasks/build/package_scripts';
   // ensure that these run first, other configs need them
   config.services = require('./tasks/config/services')(grunt);
   config.platforms = require('./tasks/config/platforms')(grunt);
diff --git a/README.md b/README.md
index ac077c92a2eb9..1111d4d207427 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Kibana 4.4.0-snapshot
+# Kibana 4.6.0-snapshot
 
 [![Build Status](https://travis-ci.org/elastic/kibana.svg?branch=master)](https://travis-ci.org/elastic/kibana?branch=master)
 
@@ -6,15 +6,23 @@ Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/bl
 
 ## Requirements
 
-- Elasticsearch version 2.1.0 or later
+- Elasticsearch version 2.4.0 or later
 - Kibana binary package
 
 ## Installation
 
 * Download: [http://www.elastic.co/downloads/kibana](http://www.elastic.co/downloads/kibana)
+* Extract the files
 * Run `bin/kibana` on unix, or `bin\kibana.bat` on Windows.
 * Visit [http://localhost:5601](http://localhost:5601)
 
+
+## Upgrade from previous version
+
+* Move any custom configurations in your old kibana.yml to your new one
+* Reinstall plugins
+* Start or restart Kibana
+
 ## Quick Start
 
 You're up and running! Fantastic! Kibana is now running on port 5601, so point your browser at http://YOURDOMAIN.com:5601.
@@ -35,9 +43,9 @@ Visit [Elastic.co](http://www.elastic.co/guide/en/kibana/current/index.html) for
 
 For the daring, snapshot builds are available. These builds are created after each commit to the master branch, and therefore are not something you should run in production.
 
-| platform |  |  |
-| --- | --- | --- |
-| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-darwin-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-darwin-x64.zip) |
-| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-linux-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-linux-x64.zip) |
-| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-linux-x86.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-linux-x86.zip) |
-| Windows | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-windows.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.4.0-snapshot-windows.zip) |
+| platform |  |  |  |  |
+| --- | --- | --- | --- | --- |
+| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-darwin-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-darwin-x64.zip) |  |  |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x64.zip) | [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_4.6.0-snapshot_amd64.deb)| [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0_snapshot-1.x86_64.rpm) |
+| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x86.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x86.zip) | [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_4.6.0-snapshot_i386.deb) | [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0_snapshot-1.i386.rpm) |
+| Windows | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-windows.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-windows.zip) |  |  |
diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 010de8e419b5c..00e24cf71407d 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -586,7 +586,7 @@ Use slashes for both single line and multi line comments. Try to write
 comments that explain higher level mechanisms or clarify difficult
 segments of your code. **Don't use comments to restate trivial things**.
 
-***Exception:*** Comment blocks describing a function and it's arguments (docblock) should start with `/**`, contain a single `*` at the begining of each line, and end with `*/`.
+***Exception:*** Comment blocks describing a function and its arguments (docblock) should start with `/**`, contain a single `*` at the beginning of each line, and end with `*/`.
 
 *Right:*
 
@@ -656,7 +656,7 @@ function ClassName() {
 var ClassName = function () {};
 ```
 
-### Inhertiance should be done with a utility
+### Inheritance should be done with a utility
 
 While you can do it with pure JS, a utility will remove a lot of boilerplate, and be more readable and functional.
 
@@ -685,7 +685,7 @@ Square.prototype = Object.create(Shape);
 
 ### Keep Constructors Small
 
-It is often the case that there are properties that can't be defined on the prototype, or work that needs to be done to completely create an object (like call it's Super class). This is all that should be done within constructors.
+It is often the case that there are properties that can't be defined on the prototype, or work that needs to be done to completely create an object (like call its Super class). This is all that should be done within constructors.
 
 Try to follow the [Write small functions](#write-small-functions) rule here too.
 
@@ -775,7 +775,7 @@ Several already exist, and can be found in `src/kibana/utils/_mixins.js`
 
 ## Filenames
 
-All filenames should use `snake_case` and *can* start with an underscore if the module is not intended to be used outside of it's containing module.
+All filenames should use `snake_case` and *can* start with an underscore if the module is not intended to be used outside of its containing module.
 
 *Right:*
   - `src/kibana/index_patterns/index_pattern.js`
@@ -856,7 +856,7 @@ app.service('CustomService', function(Promise, otherDeps) {
 
 ### Routes
 
-Angular routes are defined using a custom require modules named `routes` that remove much of the required boilerplate.
+Angular routes are defined using a custom require module named `routes` that remove much of the required boilerplate.
 
 ```js
 require('ui/routes')
@@ -869,7 +869,7 @@ require('ui/routes')
 
 ## Multiple attribute values
 
-When a node has multiple attributes that would cause it to exceed the line character limit, each attribute including the first should be on its own line with a single indent. Also, when a node that is styled in this way has child nodes, there should be a blank line between the openening parent tag and the first child tag.
+When a node has multiple attributes that would cause it to exceed the line character limit, each attribute including the first should be on its own line with a single indent. Also, when a node that is styled in this way has child nodes, there should be a blank line between the opening parent tag and the first child tag.
 
 ```
 <ul
diff --git a/bin/kibana b/bin/kibana
index 5f2a124b801e8..1606ad2813025 100755
--- a/bin/kibana
+++ b/bin/kibana
@@ -21,5 +21,4 @@ if [ ! -x "$NODE" ]; then
   exit 1
 fi
 
-exec "${NODE}" "${DIR}/src/cli" ${@}
-
+exec "${NODE}" $NODE_OPTIONS "${DIR}/src/cli" ${@}
diff --git a/bin/kibana.bat b/bin/kibana.bat
index 53a0df663b9e6..2c39d080bf0ad 100644
--- a/bin/kibana.bat
+++ b/bin/kibana.bat
@@ -6,11 +6,15 @@ set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set DIR=%%~dpfI
 
 set NODE=%DIR%\node\node.exe
-for /f "delims=" %%i in ('WHERE node') do set SYS_NODE=%%i
+
+WHERE /Q node
+IF %ERRORLEVEL% EQU 0 (
+  for /f "delims=" %%i in ('WHERE node') do set SYS_NODE=%%i
+)
 
 If Not Exist "%NODE%" (
   IF Exist "%SYS_NODE%" (
-    set NODE=%SYS_NODE%
+    set "NODE=%SYS_NODE%"
   ) else (
     Echo unable to find usable node.js executable.
     Exit /B 1
@@ -18,7 +22,7 @@ If Not Exist "%NODE%" (
 )
 
 TITLE Kibana Server
-"%NODE%" "%DIR%\src\cli" %*
+"%NODE%" %NODE_OPTIONS% "%DIR%\src\cli" %*
 
 :finally
 
diff --git a/config/kibana.yml b/config/kibana.yml
index 9f50057cb2f35..b464964c1df4f 100644
--- a/config/kibana.yml
+++ b/config/kibana.yml
@@ -4,14 +4,13 @@
 # The host to bind the server to.
 # server.host: "0.0.0.0"
 
-# A value to use as a XSRF token. This token is sent back to the server on each request
-# and required if you want to execute requests from other clients (like curl).
-# server.xsrf.token: ""
-
 # If you are running kibana behind a proxy, and want to mount it at a path,
 # specify that path here. The basePath can't end in a slash.
 # server.basePath: ""
 
+# The maximum payload size in bytes on incoming server requests.
+# server.maxPayloadBytes: 1048576
+
 # The Elasticsearch instance to use for all your queries.
 # elasticsearch.url: "http://localhost:9200"
 
@@ -55,7 +54,7 @@
 
 # Time in milliseconds to wait for responses from the back end or elasticsearch.
 # This must be > 0
-# elasticsearch.requestTimeout: 300000
+# elasticsearch.requestTimeout: 30000
 
 # Time in milliseconds for Elasticsearch to wait for responses from shards.
 # Set to 0 to disable.
diff --git a/docs/area.asciidoc b/docs/area.asciidoc
index 799f6794ade3e..5b6419ca76a51 100644
--- a/docs/area.asciidoc
+++ b/docs/area.asciidoc
@@ -31,6 +31,8 @@ For example, a chart of dates with incident counts can display dates in chronolo
 priority of the incident-reporting aggregation to show the most active dates first. The chronological order might show 
 a time-dependent pattern in incident count, and sorting by active dates can reveal particular outliers in your data.
 
+include::color-picker.asciidoc[]
+
 You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation:
 
 *Exclude Pattern*:: Specify a pattern in this field to exclude from the results.
diff --git a/docs/color-picker.asciidoc b/docs/color-picker.asciidoc
new file mode 100644
index 0000000000000..5c3bf129d58f7
--- /dev/null
+++ b/docs/color-picker.asciidoc
@@ -0,0 +1,4 @@
+You can customize the colors of your visualization by clicking the color dot next to each label to display the 
+_color picker_.
+
+image::images/color-picker.png[An array of color dots that users can select]
diff --git a/docs/dashboard.asciidoc b/docs/dashboard.asciidoc
index f2c603345e47a..1a53742bdf9d7 100644
--- a/docs/dashboard.asciidoc
+++ b/docs/dashboard.asciidoc
@@ -71,8 +71,13 @@ in your Web page.
 
 NOTE: A user must have Kibana access in order to view embedded dashboards.
 
-Click the *Share* button to display HTML code to embed the dashboard in another Web page, along with a direct link to 
-the dashboard. You can select the text in either option to copy the code or the link to your clipboard.
+To share a dashboard, click the *Share* button image:images/share-dashboard.png[] to display the _Sharing_ panel.
+
+image:images/sharing-panel.png[]
+
+Click the *Copy to Clipboard* button image:images/share-link.png[] to copy the native URL or embed HTML to the clipboard.
+Click the *Generate short URL* button image:images/share-short-link.png[] to create a shortened URL for sharing or 
+embedding.
 
 [float]
 [[embedding-dashboards]]
diff --git a/docs/getting-started.asciidoc b/docs/getting-started.asciidoc
index 0d787a66dbd9a..fb058fd4699a5 100644
--- a/docs/getting-started.asciidoc
+++ b/docs/getting-started.asciidoc
@@ -195,7 +195,8 @@ yellow open   logstash-2015.05.20   5   1       4750            0     16.4mb
 [[tutorial-define-index]]
 === Defining Your Index Patterns
 
-Each set of data loaded to Elasticsearch has an <<settings-create-pattern,index pattern>>. In the previous section, the Shakespeare data set has an index named `shakespeare`, and the accounts 
+Each set of data loaded to Elasticsearch has an <<settings-create-pattern,index pattern>>. In the previous section, the 
+Shakespeare data set has an index named `shakespeare`, and the accounts 
 data set has an index named `bank`. An _index pattern_ is a string with optional wildcards that can match multiple 
 indices. For example, in the common logging use case, a typical index name contains the date in MM-DD-YYYY 
 format, and an index pattern for May would look something like `logstash-2015.05*`.
@@ -211,6 +212,9 @@ The Logstash data set does contain time-series data, so after clicking *Add New*
 set, make sure the *Index contains time-based events* box is checked and select the `@timestamp` field from the 
 *Time-field name* drop-down.
 
+NOTE: When you define an index pattern, indices that match that pattern must exist in Elasticsearch. Those indices must 
+contain data.
+
 [float]
 [[tutorial-discovering]]
 === Discovering Your Data
@@ -288,8 +292,10 @@ This shows you what proportion of the 1000 accounts fall in these balance ranges
 we're going to add another bucket aggregation. We can break down each of the balance ranges further by the account 
 holder's age.
 
-Click *Add sub-buckets* at the bottom, then select *Split Slices*. Choose the *Terms* aggregation and the *age* field from the drop-downs. 
-Click the green *Apply changes* button image:images/apply-changes-button.png[] to add an external ring with the new results.
+Click *Add sub-buckets* at the bottom, then select *Split Slices*. Choose the *Terms* aggregation and the *age* field from 
+the drop-downs. 
+Click the green *Apply changes* button image:images/apply-changes-button.png[] to add an external ring with the new 
+results.
 
 image::images/tutorial-visualize-pie-3.png[]
 
@@ -321,7 +327,8 @@ as well as change many other options for your visualizations, by clicking the *O
 Now that you have a list of the smallest casts for Shakespeare plays, you might also be curious to see which of these 
 plays makes the greatest demands on an individual actor by showing the maximum number of speeches for a given part. Add 
 a Y-axis aggregation with the *Add metrics* button, then choose the *Max* aggregation for the *speech_number* field. In 
-the *Options* tab, change the *Bar Mode* drop-down to *grouped*, then click the green *Apply changes* button image:images/apply-changes-button.png[]. Your 
+the *Options* tab, change the *Bar Mode* drop-down to *grouped*, then click the green *Apply changes* button 
+image:images/apply-changes-button.png[]. Your 
 chart should now look like this:
 
 image::images/tutorial-visualize-bar-3.png[]
@@ -371,7 +378,8 @@ Write the following text in the field:
 The Markdown widget uses **markdown** syntax.
 > Blockquotes in Markdown use the > character.
 
-Click the green *Apply changes* button image:images/apply-changes-button.png[] to display the rendered Markdown in the preview pane:
+Click the green *Apply changes* button image:images/apply-changes-button.png[] to display the rendered Markdown in the 
+preview pane:
 
 image::images/tutorial-visualize-md-2.png[]
 
diff --git a/docs/images/color-picker.png b/docs/images/color-picker.png
new file mode 100644
index 0000000000000..a1148d3f4b1df
Binary files /dev/null and b/docs/images/color-picker.png differ
diff --git a/docs/images/share-dashboard.png b/docs/images/share-dashboard.png
new file mode 100644
index 0000000000000..0c1d4c9bd46d6
Binary files /dev/null and b/docs/images/share-dashboard.png differ
diff --git a/docs/images/share-link.png b/docs/images/share-link.png
new file mode 100644
index 0000000000000..68894c16a5444
Binary files /dev/null and b/docs/images/share-link.png differ
diff --git a/docs/images/share-short-link.png b/docs/images/share-short-link.png
new file mode 100644
index 0000000000000..230b7c151e7f6
Binary files /dev/null and b/docs/images/share-short-link.png differ
diff --git a/docs/images/sharing-panel.png b/docs/images/sharing-panel.png
new file mode 100644
index 0000000000000..43abf920a8e07
Binary files /dev/null and b/docs/images/sharing-panel.png differ
diff --git a/docs/kibana-repositories.asciidoc b/docs/kibana-repositories.asciidoc
index ff67335323bf8..b482de80a7d28 100644
--- a/docs/kibana-repositories.asciidoc
+++ b/docs/kibana-repositories.asciidoc
@@ -1,12 +1,12 @@
 [[setup-repositories]]
 === Kibana Repositories
 
-Binary packages for Kibana are available for Unix distributions that support the `apt` and `yum` tools.We also have 
-repositories available for APT and YUM based distributions. 
+Binary packages for Kibana are available for Unix distributions that support the `apt` and `yum` tools.We also have
+repositories available for APT and YUM based distributions.
 
 NOTE: Since the packages are created as part of the Kibana build, source packages are not available.
 
-Packages are signed with the PGP key http://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4], which 
+Packages are signed with the PGP key http://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4], which
 has the following fingerprint:
 
     4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4
@@ -22,22 +22,22 @@ has the following fingerprint:
 wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
 --------------------------------------------------
 +
-. Add the repository definition to your `/etc/apt/sources.list` file:
+. Add the repository definition to your `/etc/apt/sources.list.d/kibana.list` file:
 +
 [source, sh]
 --------------------------------------------------
-echo "deb http://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list
+echo "deb https://packages.elastic.co/kibana/{branch}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
 --------------------------------------------------
 +
 [WARNING]
 ==================================================
-Use the `echo` method described above to add the Kibana repository.  Do not use `add-apt-repository`, as that command 
+Use the `echo` method described above to add the Kibana repository.  Do not use `add-apt-repository`, as that command
 adds a `deb-src` entry with no corresponding source package.
 When the `deb-src` entry, is present, the commands in this procedure generate an error similar to the following:
 
     Unable to find expected entry 'main/source/Sources' in Release file (Wrong sources.list entry or malformed file)
 
-Delete the `deb-src` entry from the `/etc/apt/sources.list` file to clear the error.
+Delete the `deb-src` entry from the `/etc/apt/sources.list.d/kibana.list` file to clear the error.
 ==================================================
 +
 . Run `apt-get update` and the repository is ready for use. Install Kibana with the following command:
@@ -47,7 +47,7 @@ Delete the `deb-src` entry from the `/etc/apt/sources.list` file to clear the er
 sudo apt-get update && sudo apt-get install kibana
 --------------------------------------------------
 +
-. Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`, 
+. Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`,
 run the following command:
 +
 [source,sh]
@@ -67,7 +67,7 @@ sudo /bin/systemctl enable kibana.service
 [[kibana-yum]]
 ===== Installing Kibana with yum
 
-WARNING: The repositories set up in this procedure are not compatible with distributions using version 3 of `rpm`, such 
+WARNING: The repositories set up in this procedure are not compatible with distributions using version 3 of `rpm`, such
 as CentOS version 5.
 
 . Download and install the public signing key:
@@ -83,9 +83,9 @@ rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
 --------------------------------------------------
 [kibana-{branch}]
 name=Kibana repository for {branch}.x packages
-baseurl=http://packages.elastic.co/kibana/{branch}/centos
+baseurl=https://packages.elastic.co/kibana/{branch}/centos
 gpgcheck=1
-gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
+gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
 enabled=1
 --------------------------------------------------
 +
@@ -96,8 +96,8 @@ enabled=1
 yum install kibana
 --------------------------------------------------
 +
-Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`, 
-run the following command:
+Configure Kibana to automatically start during bootup. If your distribution is using the System V version of `init`
+(check with `ps -p 1`), run the following command:
 +
 [source,sh]
 --------------------------------------------------
diff --git a/docs/line.asciidoc b/docs/line.asciidoc
index 3ab261c43260c..c4639d36e17ee 100644
--- a/docs/line.asciidoc
+++ b/docs/line.asciidoc
@@ -11,6 +11,8 @@ if the splits are displayed in a row or a column by clicking the *Rows | Columns
 
 include::x-axis-aggs.asciidoc[]
 
+include::color-picker.asciidoc[]
+
 You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation:
 
 *Exclude Pattern*:: Specify a pattern in this field to exclude from the results.
diff --git a/docs/pie.asciidoc b/docs/pie.asciidoc
index 5ad500f4ee435..6c2b5a32be979 100644
--- a/docs/pie.asciidoc
+++ b/docs/pie.asciidoc
@@ -55,6 +55,8 @@ types.
 When multiple aggregations are defined on a chart's axis, you can use the up or down arrows to the right of the 
 aggregation's type to change the aggregation's priority.
 
+include::color-picker.asciidoc[]
+
 You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation:
 
 *Exclude Pattern*:: Specify a pattern in this field to exclude from the results.
diff --git a/docs/plugins.asciidoc b/docs/plugins.asciidoc
index 47e2ad15b0656..b4ff08e6d1d5a 100644
--- a/docs/plugins.asciidoc
+++ b/docs/plugins.asciidoc
@@ -21,22 +21,6 @@ bin/kibana plugin -i elasticsearch/marvel/latest
 Because the organization given is `elasticsearch`, the plugin management tool automatically downloads the 
 plugin from `download.elastic.co`.
 
-[float]
-=== Installing Plugins from Github
-
-When the specified plugin is not found at `download.elastic.co`, the plugin management tool parses the element 
-as a Github user name, as in the following example:
-
-[source,shell]
-bin/kibana plugin --install github-user/sample-plugin
-Installing sample-plugin
-Attempting to extract from https://download.elastic.co/github-user/sample-plugin/sample-plugin-latest.tar.gz
-Attempting to extract from https://github.com/github-user/sample-plugin/archive/master.tar.gz
-Downloading <some number> bytes....................
-Extraction complete
-Optimizing and caching browser bundles...
-Plugin installation complete
-
 [float]
 === Installing Plugins from an Arbitrary URL
 
diff --git a/docs/releasenotes.asciidoc b/docs/releasenotes.asciidoc
index 0e7065d0c749f..630e42e74ba03 100644
--- a/docs/releasenotes.asciidoc
+++ b/docs/releasenotes.asciidoc
@@ -1,27 +1,44 @@
 [[releasenotes]]
-== Kibana 4.3 Release Notes
+== Kibana 4.4 Release Notes
 
-The 4.3 release of Kibana requires Elasticsearch 2.1 or later.
+The 4.4 release of Kibana requires Elasticsearch 2.2 or later.
 
-Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality will be 
-removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that Kibana 
-uses to determine date information, removing the need to specify dates in the index pattern name.
+Using event times to create index names is no longer supported as of this release. Current versions of Elasticsearch  
+include sophisticated date parsing APIs that Kibana uses to determine date information, removing the need to specify dates 
+in the index pattern name.
 
 [float]
 [[enhancements]]
 == Enhancements
 
-* {k4issue}5109[Issue 5109]: Adds custom JSON and filter alias naming for filters.
-* {k4issue}1726[Issue 1726]: Adds a color field formatter for value ranges in numeric fields.
-* {k4issue}4342[Issue 4342]: Increased performance for wildcard indices.
-* {k4issue}1600[Issue 1600]: Support for global time zones.
-* {k4pull}5275[Pull Request 5275]: Highlighting values in Discover can now be disabled.
-* {k4issue}5212[Issue 5212]: Adds support for multiple certificate authorities.
-* {k4issue}2716[Issue 2716]: The open/closed position of the spy panel now persists across UI state changes.
+* {k4issue}5897[Issue 5897]: Embedding links now include navigation and search bars.
+* {k4issue}1362[Issue 1362]: Color palette selector added.
+* {k4issue}1553[Issue 1553]: Kibana can shorten URLs for shared or embedded items.
+* {k4issue}5733[Issue 5733]: Time-based index pattern expansion can be set at index pattern creation time.
+* {k4issue}5775[Issue 5775]: Adds a configuration option to change the maximum payload size sent to the server.
+* {k4issue}4966[Issue 4966]: Logo is now in SVG format.
+* {k4issue}3625[Issue 3625]: Downloaded visualizations now use the visualization name as the filename.
+* {k4issue}5279[Issue 5279]: Large strings are truncated with an ellipsis (`...`).
+* {k4issue}5241[Issue 5241]: Truncated visualization names are displayed in full as tooltips.
 
 [float]
 [[bugfixes]]
 == Bug Fixes
 
-* {k4issue}5165[Issue 5165]: Resolves a display error in embedded views.
-* {k4issue}5021[Issue 5021]: Improves visualization dimming for dashboards with auto-refresh.
+* {k4issue}5896[Issue 5896]: Bookmarked URLs to saved filtered searches from a previous version of Kibana display 
+correctly.
+* {k4issue}5191[Issue 5191]: Timepicker is now available for dashboards that contain a chart based on an index that is not 
+time-based.
+* {k4issue}5744[Issue 5744]: Fixes bug that caused incorrect display of "No results found" in some cases.
+* {k4issue}5824[Issue 5284]: Corrects a fatal error when Kibana starts with node x86 on Windows x64 systems.
+
+[float]
+[[plugin-system]]
+== Plugin System Changes
+
+* {k4issue}5226[Issue 5226]: Plugins are explicit when they start to route.
+* {k4pull}5725[Pull Request 5725]: Plugins can extend Chrome navigation.
+* {k4issue}4720[Issue 4720]: Adds support for zip compression.
+* {k4pull}5704[Pull Request 5704]: Removes Github shortcuts from the plugin installer.
+* {k4issue}5661[Issue 5661]: Fixes the plugin optimization path.
+* {k4pull}5538[Pull Request 5538]: Apps can use empty export types.
diff --git a/docs/settings.asciidoc b/docs/settings.asciidoc
index 4a89fc38fa514..b1e94fad186f1 100644
--- a/docs/settings.asciidoc
+++ b/docs/settings.asciidoc
@@ -35,11 +35,17 @@ list.
 contains time-based events* option and select the index field that contains the timestamp. Kibana reads the index 
 mapping to list all of the fields that contain a timestamp.
 
+. By default, Kibana restricts wildcard expansion of time-based index patterns to indices with data within the currently 
+selected time range. Click *Do not expand index pattern when search* to disable this behavior.
+
 . Click *Create* to add the index pattern. 
 
 . To designate the new pattern as the default pattern to load when you view the Discover tab, click the *favorite* 
 button. 
 
+NOTE: When you define an index pattern, indices that match that pattern must exist in Elasticsearch. Those indices must 
+contain data.
+
 To use an event time in an index name, enclose the static text in the pattern and specify the date format using the 
 tokens described in the following table.
 
@@ -195,6 +201,8 @@ Scripted fields compute data on the fly from the data in your Elasticsearch indi
 the Discover tab as part of the document data, and you can use scripted fields in your visualizations.
 Scripted field values are computed at query time so they aren't indexed and cannot be searched.
 
+NOTE: Kibana cannot query scripted fields.
+
 WARNING: Computing data on the fly with scripted fields can be very resource intensive and can have a direct impact on 
 Kibana's performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are 
 buggy, you'll get exceptions whenever you try to view the dynamically generated data.
@@ -398,6 +406,10 @@ you are using a self-signed certificate so the certificate can be verified. Disa
 +
 *alias*: `log_file` deprecated[4.2]
 
+`status.allowAnonymous`:: If authentication is enabled, setting this to `true` allows unauthenticated users to access the Kibana server status API and status page.
++
+*default*: `false`
+
 [[managing-saved-objects]]
 === Managing Saved Searches, Visualizations, and Dashboards 
 
@@ -447,10 +459,12 @@ To export a set of objects:
 . Click the selection box for the objects you want to export, or click the *Select All* box.
 . Click *Export* to select a location to write the exported JSON.
 
+WARNING: Exported dashboards do not include their associated index patterns. Re-create the index patterns manually before 
+importing saved dashboards to a Kibana instance running on another Elasticsearch cluster.
+
 To import a set of objects:
 
 . Go to *Settings > Objects*.
 . Click *Import* to navigate to the JSON file representing the set of objects to import.
 . Click *Open* after selecting the JSON file.
 . If any objects in the set would overwrite objects already present in Kibana, confirm the overwrite.
-
diff --git a/docs/setup.asciidoc b/docs/setup.asciidoc
index 60a3124640bc9..f46d62b9b9b15 100644
--- a/docs/setup.asciidoc
+++ b/docs/setup.asciidoc
@@ -3,7 +3,7 @@
 You can set up Kibana and start exploring your Elasticsearch indices in minutes.
 All you need is:
 
-* Elasticsearch 2.1 or later
+* Elasticsearch 2.2 or later
 * A modern web browser - http://www.elastic.co/subscriptions/matrix#matrix_browsers[Supported Browsers].
 * Information about your Elasticsearch installation:
 ** URL of the Elasticsearch instance you want to connect to.
@@ -21,11 +21,11 @@ To get Kibana up and running:
 . Download the https://www.elastic.co/downloads/kibana[Kibana 4 binary package] for your platform.
 . Extract the `.zip` or `tar.gz` archive file.
 
-// On Unix, you can instead run the package manager suited for your distribution.
-//
-// [float]
-// include::kibana-repositories.asciidoc[]
-//
+On Unix, you can instead run the package manager suited for your distribution.
+
+[float]
+include::kibana-repositories.asciidoc[]
+
 After installing, run Kibana from the install directory: `bin/kibana` (Linux/MacOSX) or `bin\kibana.bat` (Windows).
 
 That's it! Kibana is now running on port 5601.
@@ -82,8 +82,8 @@ simply be the name of a single index.
 reads the index mapping to list all of the fields that contain a timestamp. If your index doesn't have time-based data,
 disable the *Index contains time-based events* option.
 +
-WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality 
-will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that 
+WARNING: Using event times to create index names is *deprecated* in this release of Kibana. Support for this functionality
+will be removed entirely in the next major Kibana release. Elasticsearch 2.1 includes sophisticated date parsing APIs that
 Kibana uses to determine date information, removing the need to specify dates in the index pattern name.
 +
 . Click *Create* to add the index pattern. This first pattern is automatically configured as the default.
diff --git a/docs/vertbar.asciidoc b/docs/vertbar.asciidoc
index d14b31fbff99d..201b87843452d 100644
--- a/docs/vertbar.asciidoc
+++ b/docs/vertbar.asciidoc
@@ -34,6 +34,8 @@ if the splits are displayed in a row or a column by clicking the *Rows | Columns
 
 include::x-axis-aggs.asciidoc[]
 
+include::color-picker.asciidoc[]
+
 You can click the *Advanced* link to display more customization options for your metrics or bucket aggregation:
 
 *Exclude Pattern*:: Specify a pattern in this field to exclude from the results.
diff --git a/docs/x-axis-aggs.asciidoc b/docs/x-axis-aggs.asciidoc
index a39eb8a48a20b..ef25586ae0f08 100644
--- a/docs/x-axis-aggs.asciidoc
+++ b/docs/x-axis-aggs.asciidoc
@@ -28,7 +28,7 @@ remove a range.
 or bottom _n_ elements of a  given field to display, ordered by count or a custom metric.
 *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. 
 You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to 
-add another filter. Click the images:labelbutton.png[] *label* button to open the label field, where you can type in a 
+add another filter. Click the image:images/labelbutton.png[Label button icon] *label* button to open the label field, where you can type in a 
 name to display on the visualization.
 *Significant Terms*:: Displays the results of the experimental 
 {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation.
diff --git a/installedPlugins/.empty b/installedPlugins/.data/.empty
similarity index 100%
rename from installedPlugins/.empty
rename to installedPlugins/.data/.empty
diff --git a/package.json b/package.json
index 82d78b0300578..b019ae1508b6e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "dashboarding"
   ],
   "private": false,
-  "version": "4.4.0-snapshot",
+  "version": "4.6.0-snapshot",
   "build": {
     "number": 8467,
     "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9"
@@ -31,6 +31,7 @@
     "Court Ewing <court@elastic.co>",
     "Joe Fleming <joe.fleming@elastic.co>",
     "Khalah Jones-Golden <khalah.jones@elastic.co>",
+    "Lee Drengenberg <lee.drengenberg@elastic.co>",
     "Lukas Olson <lukas.olson@elastic.co>",
     "Juan Thomassie <juan.thomassie@elastic.co>",
     "Shelby Sturgis <shelby@elastic.co>",
@@ -48,23 +49,27 @@
     "test:server": "grunt test:server",
     "test:coverage": "grunt test:coverage",
     "build": "grunt build",
+    "build:ospackages": "grunt build --os-packages",
     "start": "./bin/kibana --dev",
-    "precommit": "grunt lintStagedFiles",
+    "precommit": "grunt precommit",
     "karma": "karma start",
     "elasticsearch": "grunt esvm:dev:keepalive",
     "lint": "grunt eslint:source",
-    "lintroller": "grunt eslint:fixSource"
+    "lintroller": "grunt eslint:fixSource",
+    "makelogs": "makelogs"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
+    "@bigfunger/decompress-zip": "0.2.0-stripfix2",
     "@spalger/angular-bootstrap": "0.12.1",
     "@spalger/filesaver": "1.1.2",
     "@spalger/leaflet-draw": "0.2.3",
     "@spalger/leaflet-heat": "0.1.3",
     "@spalger/numeral": "^2.0.0",
+    "@spalger/test-subj-selector": "0.2.1",
     "@spalger/ui-ace": "0.2.3",
     "angular": "1.4.7",
     "angular-bootstrap-colorpicker": "3.0.19",
@@ -81,7 +86,8 @@
     "boom": "2.8.0",
     "bootstrap": "3.3.5",
     "brace": "0.5.1",
-    "bunyan": "1.4.0",
+    "bunyan": "1.7.1",
+    "clipboard": "1.5.5",
     "commander": "2.8.1",
     "css-loader": "0.17.0",
     "d3": "3.5.6",
@@ -109,6 +115,7 @@
     "leaflet": "0.7.5",
     "less": "2.5.1",
     "less-loader": "2.2.0",
+    "loader-utils": "0.2.11",
     "lodash": "3.10.1",
     "marked": "0.3.3",
     "minimatch": "2.0.10",
@@ -127,14 +134,16 @@
     "url-loader": "0.5.6",
     "webpack": "1.12.1",
     "webpack-directory-name-as-main": "1.0.0",
-    "whatwg-fetch": "0.9.0"
+    "whatwg-fetch": "0.9.0",
+    "wreck": "6.2.0"
   },
   "devDependencies": {
     "Nonsense": "0.1.2",
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
-    "babel-eslint": "4.1.3",
+    "babel-eslint": "4.1.7",
     "chokidar": "1.0.5",
+    "chromedriver": "2.21.2",
     "eslint": "1.5.1",
     "eslint-plugin-mocha": "1.0.0",
     "expect.js": "0.3.1",
@@ -145,7 +154,7 @@
     "grunt-cli": "0.1.13",
     "grunt-contrib-clean": "0.6.0",
     "grunt-contrib-copy": "0.8.1",
-    "grunt-esvm": "1.1.8",
+    "grunt-esvm": "3.0.4",
     "grunt-karma": "0.12.0",
     "grunt-run": "0.5.0",
     "grunt-s3": "0.2.0-alpha.3",
@@ -153,31 +162,30 @@
     "gruntify-eslint": "1.0.1",
     "html-entities": "1.1.3",
     "husky": "0.8.1",
-    "intern": "3.0.1",
+    "intern": "3.2.3",
     "istanbul-instrumenter-loader": "0.1.3",
     "karma": "0.13.9",
     "karma-chrome-launcher": "0.2.0",
     "karma-coverage": "0.5.1",
     "karma-firefox-launcher": "0.1.6",
-    "karma-growl-reporter": "0.1.1",
     "karma-ie-launcher": "0.2.0",
     "karma-mocha": "0.2.0",
     "karma-safari-launcher": "0.1.1",
-    "libesvm": "1.0.7",
+    "libesvm": "3.2.0",
     "license-checker": "3.1.0",
     "load-grunt-config": "0.7.2",
+    "makelogs": "2.0.0",
     "marked-text-renderer": "0.1.0",
     "mocha": "2.3.0",
     "nock": "2.10.0",
-    "npm": "2.11.0",
+    "npm": "2.15.8",
     "portscanner": "1.0.0",
     "simple-git": "1.8.0",
     "sinon": "1.17.2",
-    "source-map": "0.4.4",
-    "wreck": "6.2.0"
+    "source-map": "0.4.4"
   },
   "engines": {
-    "node": "0.12",
-    "npm": "2.14.3"
+    "node": "4.4.7",
+    "npm": "2.15.8"
   }
 }
diff --git a/src/cli/Command.js b/src/cli/Command.js
index 6f1e6b98952e1..e7bfafa1c177f 100644
--- a/src/cli/Command.js
+++ b/src/cli/Command.js
@@ -82,7 +82,7 @@ Command.prototype.parseOptions = _.wrap(Command.prototype.parseOptions, function
 
 Command.prototype.action = _.wrap(Command.prototype.action, function (action, fn) {
   return action.call(this, function (...args) {
-    var ret = fn.apply(this, args);
+    let ret = fn.apply(this, args);
     if (ret && typeof ret.then === 'function') {
       ret.then(null, function (e) {
         console.log('FATAL CLI ERROR', e.stack);
diff --git a/src/cli/cli.js b/src/cli/cli.js
index 25cbf536b8bc6..1fb65dd490d67 100644
--- a/src/cli/cli.js
+++ b/src/cli/cli.js
@@ -22,7 +22,7 @@ program
 .command('help <command>')
 .description('Get the help for a specific command')
 .action(function (cmdName) {
-  var cmd = _.find(program.commands, { _name: cmdName });
+  let cmd = _.find(program.commands, { _name: cmdName });
   if (!cmd) return this.error(`unknown command ${cmdName}`);
   cmd.help();
 });
@@ -34,7 +34,7 @@ program
 });
 
 // check for no command name
-var subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
+let subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
 
 if (!subCommand) {
   if (_.intersection(argv.slice(2), ['-h', '--help']).length) {
diff --git a/src/cli/cluster/ClusterManager.js b/src/cli/cluster/ClusterManager.js
index 5bce6a5832c66..1532fd51143c2 100644
--- a/src/cli/cluster/ClusterManager.js
+++ b/src/cli/cluster/ClusterManager.js
@@ -3,7 +3,7 @@ let { join } = require('path');
 let { debounce, compact, invoke, bindAll, once } = require('lodash');
 
 let Log = require('../Log');
-let Worker = require('./Worker');
+let Worker = require('./worker');
 
 module.exports = class ClusterManager {
   constructor(opts) {
@@ -51,7 +51,7 @@ module.exports = class ClusterManager {
   }
 
   setupWatching() {
-    var chokidar = require('chokidar');
+    let chokidar = require('chokidar');
     let utils = require('requirefrom')('src/utils');
     let fromRoot = utils('fromRoot');
 
diff --git a/src/cli/cluster/Worker.js b/src/cli/cluster/worker.js
similarity index 100%
rename from src/cli/cluster/Worker.js
rename to src/cli/cluster/worker.js
diff --git a/src/cli/color.js b/src/cli/color.js
index ae53be757154e..0f8bddd34ec91 100644
--- a/src/cli/color.js
+++ b/src/cli/color.js
@@ -1,6 +1,6 @@
 
-var _ = require('lodash');
-var ansicolors = require('ansicolors');
+let _ = require('lodash');
+let ansicolors = require('ansicolors');
 
 exports.green = _.flow(ansicolors.black, ansicolors.bgGreen);
 exports.red = _.flow(ansicolors.white, ansicolors.bgRed);
diff --git a/src/cli/help.js b/src/cli/help.js
index 59b9548eefccd..1869295fef80d 100644
--- a/src/cli/help.js
+++ b/src/cli/help.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = function (command, spaces) {
   if (!_.size(command.commands)) {
@@ -69,6 +69,6 @@ ${indent(cmd.optionHelp(), 2)}
 }
 
 function humanReadableArgName(arg) {
-  var nameOutput = arg.name + (arg.variadic === true ? '...' : '');
+  let nameOutput = arg.name + (arg.variadic === true ? '...' : '');
   return arg.required ? '<' + nameOutput + '>' : '[' + nameOutput + ']';
 }
diff --git a/src/cli/plugin/__tests__/file_type.js b/src/cli/plugin/__tests__/file_type.js
new file mode 100644
index 0000000000000..e21a9bbe25edd
--- /dev/null
+++ b/src/cli/plugin/__tests__/file_type.js
@@ -0,0 +1,31 @@
+import expect from 'expect.js';
+import fileType, { ZIP, TAR } from '../file_type';
+
+describe('kibana cli', function () {
+  describe('file_type', function () {
+    it('returns ZIP for .zip filename', function () {
+      const type = fileType('wat.zip');
+      expect(type).to.equal(ZIP);
+    });
+    it('returns TAR for .tar.gz filename', function () {
+      const type = fileType('wat.tar.gz');
+      expect(type).to.equal(TAR);
+    });
+    it('returns TAR for .tgz filename', function () {
+      const type = fileType('wat.tgz');
+      expect(type).to.equal(TAR);
+    });
+    it('returns undefined for unknown file type', function () {
+      const type = fileType('wat.unknown');
+      expect(type).to.equal(undefined);
+    });
+    it('accepts paths', function () {
+      const type = fileType('/some/path/to/wat.zip');
+      expect(type).to.equal(ZIP);
+    });
+    it('accepts urls', function () {
+      const type = fileType('http://example.com/wat.zip');
+      expect(type).to.equal(ZIP);
+    });
+  });
+});
diff --git a/src/cli/plugin/__tests__/plugin.js b/src/cli/plugin/__tests__/plugin.js
index 1a53ce3b61158..9c776d3918395 100644
--- a/src/cli/plugin/__tests__/plugin.js
+++ b/src/cli/plugin/__tests__/plugin.js
@@ -1,10 +1,6 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-
-var plugin = require('../plugin');
-var installer = require('../pluginInstaller');
-var remover = require('../pluginRemover');
-var settingParser = require('../settingParser');
+const expect = require('expect.js');
+const sinon = require('sinon');
+const plugin = require('../plugin');
 
 describe('kibana cli', function () {
 
@@ -12,7 +8,7 @@ describe('kibana cli', function () {
 
     describe('commander options', function () {
 
-      var program = {
+      let program = {
         command: function () { return program; },
         description: function () { return program; },
         option: function () { return program; },
@@ -38,9 +34,9 @@ describe('kibana cli', function () {
       });
 
       it('should define the command line options', function () {
-        var spy = sinon.spy(program, 'option');
+        const spy = sinon.spy(program, 'option');
 
-        var options = [
+        const options = [
           /-i/,
           /-r/,
           /-s/,
@@ -50,10 +46,10 @@ describe('kibana cli', function () {
 
         plugin(program);
 
-        for (var i = 0; i < spy.callCount; i++) {
-          var call = spy.getCall(i);
-          for (var o = 0; o < options.length; o++) {
-            var option = options[o];
+        for (let i = 0; i < spy.callCount; i++) {
+          const call = spy.getCall(i);
+          for (let o = 0; o < options.length; o++) {
+            const option = options[o];
             if (call.args[0].match(option)) {
               options.splice(o, 1);
               break;
diff --git a/src/cli/plugin/__tests__/pluginDownloader.js b/src/cli/plugin/__tests__/pluginDownloader.js
deleted file mode 100644
index 93a6fdfcd4226..0000000000000
--- a/src/cli/plugin/__tests__/pluginDownloader.js
+++ /dev/null
@@ -1,249 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var nock = require('nock');
-var glob = require('glob');
-var rimraf = require('rimraf');
-var { join } = require('path');
-
-var pluginLogger = require('../pluginLogger');
-var pluginDownloader = require('../pluginDownloader');
-
-describe('kibana cli', function () {
-
-  describe('plugin downloader', function () {
-
-    var testWorkingPath = join(__dirname, '.test.data');
-    var logger;
-    var downloader;
-
-    beforeEach(function () {
-      logger = pluginLogger(false);
-      sinon.stub(logger, 'log');
-      sinon.stub(logger, 'error');
-      rimraf.sync(testWorkingPath);
-    });
-
-    afterEach(function () {
-      logger.log.restore();
-      logger.error.restore();
-      rimraf.sync(testWorkingPath);
-    });
-
-    describe('_downloadSingle', function () {
-
-      beforeEach(function () {
-        downloader = pluginDownloader({}, logger);
-      });
-
-      afterEach(function () {
-      });
-
-      it.skip('should throw an ENOTFOUND error for a 404 error', function () {
-        var couchdb = nock('http://www.files.com')
-                .get('/plugin.tar.gz')
-                .reply(404);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        var errorStub = sinon.stub();
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-          expect(errorStub.lastCall.args[0].message).to.match(/ENOTFOUND/);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-      it.skip('should download and extract a valid plugin', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/plugin.tar.gz')
-        .replyWithFile(200, filename);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .then(function (data) {
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it('should abort the download and extraction for a corrupt archive.', function () {
-        var filename = join(__dirname, 'replies/corrupt.tar.gz');
-        var couchdb = nock('http://www.files.com')
-        .get('/plugin.tar.gz')
-        .replyWithFile(200, filename);
-
-        var source = 'http://www.files.com/plugin.tar.gz';
-
-        var errorStub = sinon.stub();
-        return downloader._downloadSingle(source, testWorkingPath, 0, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-    });
-
-    describe('download', function () {
-
-      beforeEach(function () {});
-
-      afterEach(function () {});
-
-      it.skip('should loop through bad urls until it finds a good one.', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'I am a bad uri',
-            'http://www.files.com/goodfile.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/goodfile.tar.gz')
-        .replyWithFile(200, filename);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(false);
-
-          expect(logger.log.getCall(0).args[0]).to.match(/badfile1.tar.gz/);
-          expect(logger.log.getCall(1).args[0]).to.match(/badfile2.tar.gz/);
-          expect(logger.log.getCall(2).args[0]).to.match(/I am a bad uri/);
-          expect(logger.log.getCall(3).args[0]).to.match(/goodfile.tar.gz/);
-          expect(logger.log.lastCall.args[0]).to.match(/complete/i);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it.skip('should stop looping through urls when it finds a good one.', function () {
-        var filename = join(__dirname, 'replies/test-plugin-master.tar.gz');
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'http://www.files.com/goodfile.tar.gz',
-            'http://www.files.com/badfile3.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/goodfile.tar.gz')
-        .replyWithFile(200, filename)
-        .get('/badfile3.tar.gz')
-        .reply(404);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(false);
-
-          for (var i = 0; i < logger.log.callCount; i++) {
-            expect(logger.log.getCall(i).args[0]).to.not.match(/badfile3.tar.gz/);
-          }
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          var expected = [
-            'README.md',
-            'index.js',
-            'package.json',
-            'public',
-            'public/app.js'
-          ];
-          expect(files.sort()).to.eql(expected.sort());
-        });
-      });
-
-      it.skip('should throw an error when it doesn\'t find a good url.', function () {
-        var settings = {
-          urls: [
-            'http://www.files.com/badfile1.tar.gz',
-            'http://www.files.com/badfile2.tar.gz',
-            'http://www.files.com/badfile3.tar.gz'
-          ],
-          workingPath: testWorkingPath,
-          timeout: 0
-        };
-        downloader = pluginDownloader(settings, logger);
-
-        var couchdb = nock('http://www.files.com')
-        .defaultReplyHeaders({
-          'content-length': '10'
-        })
-        .get('/badfile1.tar.gz')
-        .reply(404)
-        .get('/badfile2.tar.gz')
-        .reply(404)
-        .get('/badfile3.tar.gz')
-        .reply(404);
-
-        var errorStub = sinon.stub();
-        return downloader.download(settings, logger)
-        .catch(errorStub)
-        .then(function (data) {
-          expect(errorStub.called).to.be(true);
-          expect(errorStub.lastCall.args[0].message).to.match(/not a valid/i);
-
-          var files = glob.sync('**/*', { cwd: testWorkingPath });
-          expect(files).to.eql([]);
-        });
-      });
-
-    });
-
-  });
-
-});
diff --git a/src/cli/plugin/__tests__/pluginCleaner.js b/src/cli/plugin/__tests__/plugin_cleaner.js
similarity index 87%
rename from src/cli/plugin/__tests__/pluginCleaner.js
rename to src/cli/plugin/__tests__/plugin_cleaner.js
index cbd28aa322efd..1df391ac91446 100644
--- a/src/cli/plugin/__tests__/pluginCleaner.js
+++ b/src/cli/plugin/__tests__/plugin_cleaner.js
@@ -1,28 +1,26 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var fs = require('fs');
-var rimraf = require('rimraf');
+const expect = require('expect.js');
+const sinon = require('sinon');
+const fs = require('fs');
+const rimraf = require('rimraf');
 
-var pluginCleaner = require('../pluginCleaner');
-var pluginLogger = require('../pluginLogger');
+const pluginCleaner = require('../plugin_cleaner');
+const pluginLogger = require('../plugin_logger');
 
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
 
     describe('pluginCleaner', function () {
-
-      var settings = {
+      const settings = {
         workingPath: 'dummy'
       };
 
       describe('cleanPrevious', function () {
-
-        var cleaner;
-        var errorStub;
-        var logger;
-        var progress;
-        var request;
+        let cleaner;
+        let errorStub;
+        let logger;
+        let progress;
+        let request;
 
         beforeEach(function () {
           errorStub = sinon.stub();
@@ -46,7 +44,7 @@ describe('kibana cli', function () {
         it('should resolve if the working path does not exist', function () {
           sinon.stub(rimraf, 'sync');
           sinon.stub(fs, 'statSync', function () {
-            var error = new Error('ENOENT');
+            const error = new Error('ENOENT');
             error.code = 'ENOENT';
             throw error;
           });
@@ -61,7 +59,7 @@ describe('kibana cli', function () {
         it('should rethrow any exception except ENOENT from fs.statSync', function () {
           sinon.stub(rimraf, 'sync');
           sinon.stub(fs, 'statSync', function () {
-            var error = new Error('An Unhandled Error');
+            const error = new Error('An Unhandled Error');
             throw error;
           });
 
@@ -112,8 +110,9 @@ describe('kibana cli', function () {
       });
 
       describe('cleanError', function () {
-        var cleaner;
-        var logger;
+        let cleaner;
+        let logger;
+
         beforeEach(function () {
           logger = pluginLogger(false);
           cleaner = pluginCleaner(settings, logger);
diff --git a/src/cli/plugin/__tests__/plugin_downloader.js b/src/cli/plugin/__tests__/plugin_downloader.js
new file mode 100644
index 0000000000000..a87478e402709
--- /dev/null
+++ b/src/cli/plugin/__tests__/plugin_downloader.js
@@ -0,0 +1,335 @@
+const expect = require('expect.js');
+const sinon = require('sinon');
+const nock = require('nock');
+const glob = require('glob');
+const rimraf = require('rimraf');
+const { join } = require('path');
+const mkdirp = require('mkdirp');
+const pluginLogger = require('../plugin_logger');
+const pluginDownloader = require('../plugin_downloader');
+
+describe('kibana cli', function () {
+
+  describe('plugin downloader', function () {
+    const testWorkingPath = join(__dirname, '.test.data');
+    const tempArchiveFilePath = join(testWorkingPath, 'archive.part');
+    let logger;
+    let downloader;
+
+    function expectWorkingPathEmpty() {
+      const files = glob.sync('**/*', { cwd: testWorkingPath });
+      expect(files).to.eql([]);
+    }
+
+    function expectWorkingPathNotEmpty() {
+      const files = glob.sync('**/*', { cwd: testWorkingPath });
+      const expected = [
+        'archive.part'
+      ];
+
+      expect(files.sort()).to.eql(expected.sort());
+    }
+
+    function shouldReject() {
+      throw new Error('expected the promise to reject');
+    }
+
+    beforeEach(function () {
+      logger = pluginLogger(false);
+      sinon.stub(logger, 'log');
+      sinon.stub(logger, 'error');
+      rimraf.sync(testWorkingPath);
+      mkdirp.sync(testWorkingPath);
+    });
+
+    afterEach(function () {
+      logger.log.restore();
+      logger.error.restore();
+      rimraf.sync(testWorkingPath);
+    });
+
+    describe('_downloadSingle', function () {
+
+      beforeEach(function () {
+        const settings = {
+          urls: [],
+          workingPath: testWorkingPath,
+          tempArchiveFile: tempArchiveFilePath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+      });
+
+      describe('http downloader', function () {
+
+        it('should download an unsupported file type, but return undefined for archiveType', function () {
+          const filePath = join(__dirname, 'replies/banana.jpg');
+          const couchdb = nock('http://www.files.com')
+            .defaultReplyHeaders({
+              'content-length': '10',
+              'content-type': 'image/jpeg'
+            })
+            .get('/banana.jpg')
+            .replyWithFile(200, filePath);
+
+          const sourceUrl = 'http://www.files.com/banana.jpg';
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be(undefined);
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+        it('should throw an ENOTFOUND error for a http ulr that returns 404', function () {
+          const couchdb = nock('http://www.files.com')
+            .get('/plugin.tar.gz')
+            .reply(404);
+
+          const sourceUrl = 'http://www.files.com/plugin.tar.gz';
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(shouldReject, function (err) {
+            expect(err.message).to.match(/ENOTFOUND/);
+            expectWorkingPathEmpty();
+          });
+        });
+
+        it('should throw an ENOTFOUND error for an invalid url', function () {
+          const sourceUrl = 'i am an invalid url';
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(shouldReject, function (err) {
+            expect(err.message).to.match(/ENOTFOUND/);
+            expectWorkingPathEmpty();
+          });
+        });
+
+        it('should download a tarball from a valid http url', function () {
+          const filePath = join(__dirname, 'replies/test_plugin_master.tar.gz');
+
+          const couchdb = nock('http://www.files.com')
+            .defaultReplyHeaders({
+              'content-length': '10',
+              'content-type': 'application/x-gzip'
+            })
+            .get('/plugin.tar.gz')
+            .replyWithFile(200, filePath);
+
+          const sourceUrl = 'http://www.files.com/plugin.tar.gz';
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be('.tar.gz');
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+        it('should consider .tgz files as archive type .tar.gz', function () {
+          const filePath = join(__dirname, 'replies/test_plugin_master.tar.gz');
+
+          const couchdb = nock('http://www.files.com')
+            .defaultReplyHeaders({
+              'content-length': '10'
+            })
+            .get('/plugin.tgz')
+            .replyWithFile(200, filePath);
+
+          const sourceUrl = 'http://www.files.com/plugin.tgz';
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be('.tar.gz');
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+        it('should download a zip from a valid http url', function () {
+          const filePath = join(__dirname, 'replies/test_plugin_master.zip');
+
+          const couchdb = nock('http://www.files.com')
+            .defaultReplyHeaders({
+              'content-length': '341965',
+              'content-type': 'application/zip'
+            })
+            .get('/plugin.zip')
+            .replyWithFile(200, filePath);
+
+          const sourceUrl = 'http://www.files.com/plugin.zip';
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be('.zip');
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+      });
+
+      describe('local file downloader', function () {
+
+        it('should copy an unsupported file type, but return undefined for archiveType', function () {
+          const filePath = join(__dirname, 'replies/banana.jpg');
+          const sourceUrl = 'file://' + filePath.replace(/\\/g, '/');
+
+          const couchdb = nock('http://www.files.com')
+            .defaultReplyHeaders({
+              'content-length': '10',
+              'content-type': 'image/jpeg'
+            })
+            .get('/banana.jpg')
+            .replyWithFile(200, filePath);
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be(undefined);
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+        it('should throw an ENOTFOUND error for an invalid local file', function () {
+          const filePath = join(__dirname, 'replies/i-am-not-there.tar.gz');
+          const sourceUrl = 'file://' + filePath.replace(/\\/g, '/');
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(shouldReject, function (err) {
+            expect(err.message).to.match(/ENOTFOUND/);
+            expectWorkingPathEmpty();
+          });
+        });
+
+        it('should copy a tarball from a valid local file', function () {
+          const filePath = join(__dirname, 'replies/test_plugin_master.tar.gz');
+          const sourceUrl = 'file://' + filePath.replace(/\\/g, '/');
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be('.tar.gz');
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+        it('should copy a zip from a valid local file', function () {
+          const filePath = join(__dirname, 'replies/test_plugin_master.zip');
+          const sourceUrl = 'file://' + filePath.replace(/\\/g, '/');
+
+          return downloader._downloadSingle(sourceUrl)
+          .then(function (data) {
+            expect(data.archiveType).to.be('.zip');
+            expectWorkingPathNotEmpty();
+          });
+        });
+
+      });
+
+    });
+
+    describe('download', function () {
+      it('should loop through bad urls until it finds a good one.', function () {
+        const filePath = join(__dirname, 'replies/test_plugin_master.tar.gz');
+        const settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'I am a bad uri',
+            'http://www.files.com/goodfile.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          tempArchiveFile: tempArchiveFilePath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        const couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/goodfile.tar.gz')
+        .replyWithFile(200, filePath);
+
+        return downloader.download(settings, logger)
+        .then(function (data) {
+          expect(logger.log.getCall(0).args[0]).to.match(/badfile1.tar.gz/);
+          expect(logger.log.getCall(1).args[0]).to.match(/badfile2.tar.gz/);
+          expect(logger.log.getCall(2).args[0]).to.match(/I am a bad uri/);
+          expect(logger.log.getCall(3).args[0]).to.match(/goodfile.tar.gz/);
+          expectWorkingPathNotEmpty();
+        });
+      });
+
+      it('should stop looping through urls when it finds a good one.', function () {
+        const filePath = join(__dirname, 'replies/test_plugin_master.tar.gz');
+        const settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'http://www.files.com/goodfile.tar.gz',
+            'http://www.files.com/badfile3.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          tempArchiveFile: tempArchiveFilePath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        const couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/goodfile.tar.gz')
+        .replyWithFile(200, filePath)
+        .get('/badfile3.tar.gz')
+        .reply(404);
+
+        return downloader.download(settings, logger)
+        .then(function (data) {
+          for (let i = 0; i < logger.log.callCount; i++) {
+            expect(logger.log.getCall(i).args[0]).to.not.match(/badfile3.tar.gz/);
+          }
+          expectWorkingPathNotEmpty();
+        });
+      });
+
+      it('should throw an error when it doesn\'t find a good url.', function () {
+        const settings = {
+          urls: [
+            'http://www.files.com/badfile1.tar.gz',
+            'http://www.files.com/badfile2.tar.gz',
+            'http://www.files.com/badfile3.tar.gz'
+          ],
+          workingPath: testWorkingPath,
+          tempArchiveFile: tempArchiveFilePath,
+          timeout: 0
+        };
+        downloader = pluginDownloader(settings, logger);
+
+        const couchdb = nock('http://www.files.com')
+        .defaultReplyHeaders({
+          'content-length': '10'
+        })
+        .get('/badfile1.tar.gz')
+        .reply(404)
+        .get('/badfile2.tar.gz')
+        .reply(404)
+        .get('/badfile3.tar.gz')
+        .reply(404);
+
+        return downloader.download(settings, logger)
+        .then(shouldReject, function (err) {
+          expect(err.message).to.match(/no valid url specified/i);
+          expectWorkingPathEmpty();
+        });
+      });
+
+    });
+
+  });
+
+});
diff --git a/src/cli/plugin/__tests__/plugin_extractor.js b/src/cli/plugin/__tests__/plugin_extractor.js
new file mode 100644
index 0000000000000..6a58fa1d75dec
--- /dev/null
+++ b/src/cli/plugin/__tests__/plugin_extractor.js
@@ -0,0 +1,131 @@
+const expect = require('expect.js');
+const sinon = require('sinon');
+const glob = require('glob');
+const rimraf = require('rimraf');
+const { join } = require('path');
+const mkdirp = require('mkdirp');
+
+const pluginLogger = require('../plugin_logger');
+const extract = require('../plugin_extractor');
+const pluginDownloader = require('../plugin_downloader');
+
+describe('kibana cli', function () {
+
+  describe('plugin extractor', function () {
+
+    const testWorkingPath = join(__dirname, '.test.data');
+    const tempArchiveFilePath = join(testWorkingPath, 'archive.part');
+    let logger;
+    let downloader;
+
+    const settings = {
+      workingPath: testWorkingPath,
+      tempArchiveFile: tempArchiveFilePath
+    };
+
+    function shouldReject() {
+      throw new Error('expected the promise to reject');
+    }
+
+    beforeEach(function () {
+      logger = pluginLogger(false);
+      sinon.stub(logger, 'log');
+      sinon.stub(logger, 'error');
+      rimraf.sync(testWorkingPath);
+      mkdirp.sync(testWorkingPath);
+      downloader = pluginDownloader(settings, logger);
+    });
+
+    afterEach(function () {
+      logger.log.restore();
+      logger.error.restore();
+      rimraf.sync(testWorkingPath);
+    });
+
+    function copyReplyFile(filename) {
+      const filePath = join(__dirname, 'replies', filename);
+      const sourceUrl = 'file://' + filePath.replace(/\\/g, '/');
+
+      return downloader._downloadSingle(sourceUrl);
+    }
+
+    function shouldReject() {
+      throw new Error('expected the promise to reject');
+    }
+
+    describe('extractArchive', function () {
+
+      it('successfully extract a valid tarball', function () {
+        return copyReplyFile('test_plugin_master.tar.gz')
+        .then((data) => {
+          return extract(settings, logger, data.archiveType);
+        })
+        .then(() => {
+          const files = glob.sync('**/*', { cwd: testWorkingPath });
+          const expected = [
+            'archive.part',
+            'README.md',
+            'index.js',
+            'package.json',
+            'public',
+            'public/app.js'
+          ];
+          expect(files.sort()).to.eql(expected.sort());
+        });
+      });
+
+      it('successfully extract a valid zip', function () {
+        return copyReplyFile('test_plugin_master.zip')
+        .then((data) => {
+          return extract(settings, logger, data.archiveType);
+        })
+        .then(() => {
+          const files = glob.sync('**/*', { cwd: testWorkingPath });
+          const expected = [
+            'archive.part',
+            'README.md',
+            'index.js',
+            'package.json',
+            'public',
+            'public/app.js',
+            'extra file only in zip.txt'
+          ];
+          expect(files.sort()).to.eql(expected.sort());
+        });
+      });
+
+      it('throw an error when extracting a corrupt zip', function () {
+        return copyReplyFile('corrupt.zip')
+        .then((data) => {
+          return extract(settings, logger, data.archiveType);
+        })
+        .then(shouldReject, (err) => {
+          expect(err.message).to.match(/error extracting/i);
+        });
+      });
+
+      it('throw an error when extracting a corrupt tarball', function () {
+        return copyReplyFile('corrupt.tar.gz')
+        .then((data) => {
+          return extract(settings, logger, data.archiveType);
+        })
+        .then(shouldReject, (err) => {
+          expect(err.message).to.match(/error extracting/i);
+        });
+      });
+
+      it('throw an error when passed an unknown archive type', function () {
+        return copyReplyFile('banana.jpg')
+        .then((data) => {
+          return extract(settings, logger, data.archiveType);
+        })
+        .then(shouldReject, (err) => {
+          expect(err.message).to.match(/unsupported archive format/i);
+        });
+      });
+
+    });
+
+  });
+
+});
diff --git a/src/cli/plugin/__tests__/pluginInstaller.js b/src/cli/plugin/__tests__/plugin_installer.js
similarity index 52%
rename from src/cli/plugin/__tests__/pluginInstaller.js
rename to src/cli/plugin/__tests__/plugin_installer.js
index c563b066d2e1a..4872a1386bd7e 100644
--- a/src/cli/plugin/__tests__/pluginInstaller.js
+++ b/src/cli/plugin/__tests__/plugin_installer.js
@@ -1,27 +1,22 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var nock = require('nock');
-var rimraf = require('rimraf');
-var fs = require('fs');
-var { join } = require('path');
-var Promise = require('bluebird');
-
-var pluginLogger = require('../pluginLogger');
-var pluginInstaller = require('../pluginInstaller');
+const expect = require('expect.js');
+const sinon = require('sinon');
+const rimraf = require('rimraf');
+const { mkdirSync } = require('fs');
+const { join } = require('path');
+const pluginLogger = require('../plugin_logger');
+const pluginInstaller = require('../plugin_installer');
 
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
 
     describe('pluginInstaller', function () {
+      let logger;
+      let testWorkingPath;
+      let processExitStub;
 
-      var logger;
-      var testWorkingPath;
-      var processExitStub;
-      var statSyncStub;
       beforeEach(function () {
         processExitStub = undefined;
-        statSyncStub = undefined;
         logger = pluginLogger(false);
         testWorkingPath = join(__dirname, '.test.data');
         rimraf.sync(testWorkingPath);
@@ -31,7 +26,6 @@ describe('kibana cli', function () {
 
       afterEach(function () {
         if (processExitStub) processExitStub.restore();
-        if (statSyncStub) statSyncStub.restore();
         logger.log.restore();
         logger.error.restore();
         rimraf.sync(testWorkingPath);
@@ -39,13 +33,13 @@ describe('kibana cli', function () {
 
       it('should throw an error if the workingPath already exists.', function () {
         processExitStub = sinon.stub(process, 'exit');
-        fs.mkdirSync(testWorkingPath);
+        mkdirSync(testWorkingPath);
 
-        var settings = {
+        let settings = {
           pluginPath: testWorkingPath
         };
 
-        var errorStub = sinon.stub();
+        let errorStub = sinon.stub();
         return pluginInstaller.install(settings, logger)
         .catch(errorStub)
         .then(function (data) {
@@ -54,18 +48,6 @@ describe('kibana cli', function () {
         });
       });
 
-      it('should rethrow any non "ENOENT" error from fs.', function () {
-        statSyncStub = sinon.stub(fs, 'statSync', function () {
-          throw new Error('This is unexpected.');
-        });
-
-        var settings = {
-          pluginPath: testWorkingPath
-        };
-
-        expect(pluginInstaller.install).withArgs(settings, logger).to.throwException(/this is unexpected/i);
-      });
-
     });
 
   });
diff --git a/src/cli/plugin/__tests__/pluginLogger.js b/src/cli/plugin/__tests__/plugin_logger.js
similarity index 85%
rename from src/cli/plugin/__tests__/pluginLogger.js
rename to src/cli/plugin/__tests__/plugin_logger.js
index 9390c46089c04..faf923586869b 100644
--- a/src/cli/plugin/__tests__/pluginLogger.js
+++ b/src/cli/plugin/__tests__/plugin_logger.js
@@ -1,15 +1,13 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-
-var pluginLogger = require('../pluginLogger');
+const expect = require('expect.js');
+const sinon = require('sinon');
+const pluginLogger = require('../plugin_logger');
 
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
 
     describe('logger', function () {
-
-      var logger;
+      let logger;
 
       describe('logger.log', function () {
 
@@ -23,18 +21,18 @@ describe('kibana cli', function () {
 
         it('should log messages to the console and append a new line', function () {
           logger = pluginLogger({ silent: false, quiet: false });
-          var message = 'this is my message';
+          const message = 'this is my message';
 
           logger.log(message);
 
-          var callCount = process.stdout.write.callCount;
+          const callCount = process.stdout.write.callCount;
           expect(process.stdout.write.getCall(callCount - 2).args[0]).to.be(message);
           expect(process.stdout.write.getCall(callCount - 1).args[0]).to.be('\n');
         });
 
         it('should log messages to the console and append not append a new line', function () {
           logger = pluginLogger({ silent: false, quiet: false });
-          for (var i = 0; i < 10; i++) {
+          for (let i = 0; i < 10; i++) {
             logger.log('.', true);
           }
           logger.log('Done!');
@@ -58,10 +56,10 @@ describe('kibana cli', function () {
         it('should not log any messages when quiet is set', function () {
           logger = pluginLogger({ silent: false, quiet: true });
 
-          var message = 'this is my message';
+          const message = 'this is my message';
           logger.log(message);
 
-          for (var i = 0; i < 10; i++) {
+          for (let i = 0; i < 10; i++) {
             logger.log('.', true);
           }
           logger.log('Done!');
@@ -72,10 +70,10 @@ describe('kibana cli', function () {
         it('should not log any messages when silent is set', function () {
           logger = pluginLogger({ silent: true, quiet: false });
 
-          var message = 'this is my message';
+          const message = 'this is my message';
           logger.log(message);
 
-          for (var i = 0; i < 10; i++) {
+          for (let i = 0; i < 10; i++) {
             logger.log('.', true);
           }
           logger.log('Done!');
@@ -97,7 +95,7 @@ describe('kibana cli', function () {
 
         it('should log error messages to the console and append a new line', function () {
           logger = pluginLogger({ silent: false, quiet: false });
-          var message = 'this is my error';
+          const message = 'this is my error';
 
           logger.error(message);
           expect(process.stderr.write.calledWith(message + '\n')).to.be(true);
@@ -105,7 +103,7 @@ describe('kibana cli', function () {
 
         it('should log error messages to the console when quiet is set', function () {
           logger = pluginLogger({ silent: false, quiet: true });
-          var message = 'this is my error';
+          const message = 'this is my error';
 
           logger.error(message);
           expect(process.stderr.write.calledWith(message + '\n')).to.be(true);
@@ -113,7 +111,7 @@ describe('kibana cli', function () {
 
         it('should not log any error messages when silent is set', function () {
           logger = pluginLogger({ silent: true, quiet: false });
-          var message = 'this is my error';
+          const message = 'this is my error';
 
           logger.error(message);
           expect(process.stderr.write.callCount).to.be(0);
diff --git a/src/cli/plugin/__tests__/progressReporter.js b/src/cli/plugin/__tests__/progressReporter.js
deleted file mode 100644
index d943a45ffc12c..0000000000000
--- a/src/cli/plugin/__tests__/progressReporter.js
+++ /dev/null
@@ -1,301 +0,0 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var progressReporter = require('../progressReporter');
-var pluginLogger = require('../pluginLogger');
-
-describe('kibana cli', function () {
-
-  describe('plugin installer', function () {
-
-    describe('progressReporter', function () {
-
-      var logger;
-      var progress;
-      var request;
-      beforeEach(function () {
-        logger = pluginLogger(false);
-        sinon.stub(logger, 'log');
-        sinon.stub(logger, 'error');
-        request = {
-          abort: sinon.stub(),
-          emit: sinon.stub()
-        };
-        progress = progressReporter(logger, request);
-      });
-
-      afterEach(function () {
-        logger.log.restore();
-        logger.error.restore();
-      });
-
-      describe('handleResponse', function () {
-
-        describe('bad response codes', function () {
-
-          function testErrorResponse(element, index, array) {
-            it('should set the state to error for response code = ' + element, function () {
-              progress.handleResponse({ statusCode: element });
-
-              var errorStub = sinon.stub();
-              return progress.promise
-              .catch(errorStub)
-              .then(function (data) {
-                expect(errorStub.called).to.be(true);
-                expect(errorStub.lastCall.args[0].message).to.match(/ENOTFOUND/);
-              });
-            });
-          }
-
-          var badCodes = [
-            '400', '401', '402', '403', '404', '405', '406', '407', '408', '409', '410',
-            '411', '412', '413', '414', '415', '416', '417', '500', '501', '502', '503',
-            '504', '505'
-          ];
-
-          badCodes.forEach(testErrorResponse);
-        });
-
-        describe('good response codes', function () {
-
-          function testSuccessResponse(statusCode, index, array) {
-            it('should set the state to success for response code = ' + statusCode, function () {
-              progress.handleResponse({ statusCode: statusCode, headers: { 'content-length': 1000 } });
-              progress.handleEnd();
-
-              var errorStub = sinon.stub();
-              return progress.promise
-              .catch(errorStub)
-              .then(function (data) {
-                expect(errorStub.called).to.be(false);
-                expect(logger.log.getCall(logger.log.callCount - 2).args[0]).to.match(/1000/);
-              });
-            });
-          }
-
-
-          function testUnknownNumber(statusCode, index, array) {
-            it('should log "unknown number of" for response code = ' + statusCode + ' without content-length header', function () {
-              progress.handleResponse({ statusCode: statusCode, headers: {} });
-              progress.handleEnd();
-
-              var errorStub = sinon.stub();
-              return progress.promise
-              .catch(errorStub)
-              .then(function (data) {
-                expect(errorStub.called).to.be(false);
-                expect(logger.log.getCall(logger.log.callCount - 2).args[0]).to.match(/unknown number/);
-              });
-            });
-          }
-
-          var goodCodes = [
-            '200', '201', '202', '203', '204', '205', '206', '300', '301', '302', '303',
-            '304', '305', '306', '307'
-          ];
-
-          goodCodes.forEach(testSuccessResponse);
-          goodCodes.forEach(testUnknownNumber);
-
-        });
-
-      });
-
-      describe('handleData', function () {
-
-        it('should do nothing if the reporter is in an error state', function () {
-          progress.handleResponse({ statusCode: 400 });
-          progress.handleData({ length: 100 });
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(progress.hasError()).to.be(true);
-            expect(request.abort.called).to.be(true);
-            expect(logger.log.callCount).to.be(0);
-          });
-        });
-
-        it('should do nothing if handleResponse hasn\'t successfully executed yet', function () {
-          progress.handleData({ length: 100 });
-          progress.handleEnd();
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(logger.log.callCount).to.be(1);
-            expect(logger.log.lastCall.args[0]).to.match(/complete/i);
-          });
-        });
-
-        it('should do nothing if handleResponse was called without a content-length header', function () {
-          progress.handleResponse({ statusCode: 200, headers: {} });
-          progress.handleData({ length: 100 });
-          progress.handleEnd();
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(logger.log.callCount).to.be(2);
-            expect(logger.log.getCall(0).args[0]).to.match(/downloading/i);
-            expect(logger.log.getCall(1).args[0]).to.match(/complete/i);
-          });
-        });
-
-        it('should show a max of 20 dots for full prgress', function () {
-          progress.handleResponse({ statusCode: 200, headers: { 'content-length': 1000 } });
-          progress.handleData({ length: 1000 });
-          progress.handleEnd();
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(logger.log.callCount).to.be(22);
-            expect(logger.log.getCall(0).args[0]).to.match(/downloading/i);
-            expect(logger.log.getCall(1).args[0]).to.be('.');
-            expect(logger.log.getCall(2).args[0]).to.be('.');
-            expect(logger.log.getCall(3).args[0]).to.be('.');
-            expect(logger.log.getCall(4).args[0]).to.be('.');
-            expect(logger.log.getCall(5).args[0]).to.be('.');
-            expect(logger.log.getCall(6).args[0]).to.be('.');
-            expect(logger.log.getCall(7).args[0]).to.be('.');
-            expect(logger.log.getCall(8).args[0]).to.be('.');
-            expect(logger.log.getCall(9).args[0]).to.be('.');
-            expect(logger.log.getCall(10).args[0]).to.be('.');
-            expect(logger.log.getCall(11).args[0]).to.be('.');
-            expect(logger.log.getCall(12).args[0]).to.be('.');
-            expect(logger.log.getCall(13).args[0]).to.be('.');
-            expect(logger.log.getCall(14).args[0]).to.be('.');
-            expect(logger.log.getCall(15).args[0]).to.be('.');
-            expect(logger.log.getCall(16).args[0]).to.be('.');
-            expect(logger.log.getCall(17).args[0]).to.be('.');
-            expect(logger.log.getCall(18).args[0]).to.be('.');
-            expect(logger.log.getCall(19).args[0]).to.be('.');
-            expect(logger.log.getCall(20).args[0]).to.be('.');
-            expect(logger.log.getCall(21).args[0]).to.match(/complete/i);
-          });
-
-        });
-
-        it('should show dot for each 5% of completion', function () {
-          progress.handleResponse({ statusCode: 200, headers: { 'content-length': 1000 } });
-          expect(logger.log.callCount).to.be(1);
-
-          progress.handleData({ length: 50 });  //5%
-          expect(logger.log.callCount).to.be(2);
-
-          progress.handleData({ length: 100 }); //15%
-          expect(logger.log.callCount).to.be(4);
-
-          progress.handleData({ length: 200 }); //25%
-          expect(logger.log.callCount).to.be(8);
-
-          progress.handleData({ length: 590 }); //94%
-          expect(logger.log.callCount).to.be(20);
-
-          progress.handleData({ length: 60 });  //100%
-          expect(logger.log.callCount).to.be(21);
-
-          //Any progress over 100% should be ignored.
-          progress.handleData({ length: 9999 });
-          expect(logger.log.callCount).to.be(21);
-
-          progress.handleEnd();
-          expect(logger.log.callCount).to.be(22);
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(errorStub.called).to.be(false);
-            expect(logger.log.getCall(0).args[0]).to.match(/downloading/i);
-            expect(logger.log.getCall(21).args[0]).to.match(/complete/i);
-          });
-        });
-
-      });
-
-      describe('handleEnd', function () {
-
-        it('should reject the deferred with a ENOTFOUND error if the reporter is in an error state', function () {
-          progress.handleResponse({ statusCode: 400 });
-
-          progress.handleEnd();
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(errorStub.firstCall.args[0].message).to.match(/ENOTFOUND/);
-            expect(errorStub.called).to.be(true);
-          });
-        });
-
-        it('should resolve if the reporter is not in an error state', function () {
-          progress.handleResponse({ statusCode: 307, headers: { 'content-length': 1000 } });
-
-          progress.handleEnd();
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(errorStub.called).to.be(false);
-            expect(logger.log.lastCall.args[0]).to.match(/complete/i);
-          });
-        });
-
-      });
-
-      describe('handleError', function () {
-
-        it('should log any errors', function () {
-          progress.handleError('ERRORMESSAGE', new Error('oops!'));
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(errorStub.called).to.be(true);
-            expect(logger.error.callCount).to.be(1);
-            expect(logger.error.lastCall.args[0]).to.match(/oops!/);
-          });
-        });
-
-        it('should set the error state of the reporter', function () {
-          progress.handleError('ERRORMESSAGE', new Error('oops!'));
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(progress.hasError()).to.be(true);
-          });
-        });
-
-        it('should ignore all errors except the first.', function () {
-          progress.handleError('ERRORMESSAGE', new Error('oops!'));
-          progress.handleError('ERRORMESSAGE', new Error('second error!'));
-          progress.handleError('ERRORMESSAGE', new Error('third error!'));
-          progress.handleError('ERRORMESSAGE', new Error('fourth error!'));
-
-          var errorStub = sinon.stub();
-          return progress.promise
-          .catch(errorStub)
-          .then(function (data) {
-            expect(errorStub.called).to.be(true);
-            expect(logger.error.callCount).to.be(1);
-            expect(logger.error.lastCall.args[0]).to.match(/oops!/);
-          });
-        });
-
-      });
-
-    });
-
-  });
-
-});
diff --git a/src/cli/plugin/__tests__/progress_reporter.js b/src/cli/plugin/__tests__/progress_reporter.js
new file mode 100644
index 0000000000000..8d2beb54e190f
--- /dev/null
+++ b/src/cli/plugin/__tests__/progress_reporter.js
@@ -0,0 +1,96 @@
+const expect = require('expect.js');
+const sinon = require('sinon');
+const progressReporter = require('../progress_reporter');
+const pluginLogger = require('../plugin_logger');
+
+describe('kibana cli', function () {
+
+  describe('plugin installer', function () {
+
+    describe('progressReporter', function () {
+
+      let logger;
+      let progress;
+      let request;
+
+      beforeEach(function () {
+        logger = pluginLogger({ silent: false, quiet: false });
+        sinon.stub(logger, 'log');
+        sinon.stub(logger, 'error');
+        progress = progressReporter(logger);
+      });
+
+      afterEach(function () {
+        logger.log.restore();
+        logger.error.restore();
+      });
+
+      describe('handleData', function () {
+
+        it('should show a max of 20 dots for full progress', function () {
+          progress.init(1000);
+          progress.progress(1000);
+          progress.complete();
+
+          expect(logger.log.callCount).to.be(22);
+          expect(logger.log.getCall(0).args[0]).to.match(/transfer/i);
+          expect(logger.log.getCall(1).args[0]).to.be('.');
+          expect(logger.log.getCall(2).args[0]).to.be('.');
+          expect(logger.log.getCall(3).args[0]).to.be('.');
+          expect(logger.log.getCall(4).args[0]).to.be('.');
+          expect(logger.log.getCall(5).args[0]).to.be('.');
+          expect(logger.log.getCall(6).args[0]).to.be('.');
+          expect(logger.log.getCall(7).args[0]).to.be('.');
+          expect(logger.log.getCall(8).args[0]).to.be('.');
+          expect(logger.log.getCall(9).args[0]).to.be('.');
+          expect(logger.log.getCall(10).args[0]).to.be('.');
+          expect(logger.log.getCall(11).args[0]).to.be('.');
+          expect(logger.log.getCall(12).args[0]).to.be('.');
+          expect(logger.log.getCall(13).args[0]).to.be('.');
+          expect(logger.log.getCall(14).args[0]).to.be('.');
+          expect(logger.log.getCall(15).args[0]).to.be('.');
+          expect(logger.log.getCall(16).args[0]).to.be('.');
+          expect(logger.log.getCall(17).args[0]).to.be('.');
+          expect(logger.log.getCall(18).args[0]).to.be('.');
+          expect(logger.log.getCall(19).args[0]).to.be('.');
+          expect(logger.log.getCall(20).args[0]).to.be('.');
+          expect(logger.log.getCall(21).args[0]).to.match(/complete/i);
+        });
+
+        it('should show dot for each 5% of completion', function () {
+          progress.init(1000);
+          expect(logger.log.callCount).to.be(1);
+
+          progress.progress(50);  //5%
+          expect(logger.log.callCount).to.be(2);
+
+          progress.progress(100); //15%
+          expect(logger.log.callCount).to.be(4);
+
+          progress.progress(200); //25%
+          expect(logger.log.callCount).to.be(8);
+
+          progress.progress(590); //94%
+          expect(logger.log.callCount).to.be(20);
+
+          progress.progress(60);  //100%
+          expect(logger.log.callCount).to.be(21);
+
+          //Any progress over 100% should be ignored.
+          progress.progress(9999);
+          expect(logger.log.callCount).to.be(21);
+
+          progress.complete();
+          expect(logger.log.callCount).to.be(22);
+
+          expect(logger.log.getCall(0).args[0]).to.match(/transfer/i);
+          expect(logger.log.getCall(21).args[0]).to.match(/complete/i);
+        });
+
+      });
+
+    });
+
+  });
+
+});
diff --git a/src/cli/plugin/__tests__/replies/banana.jpg b/src/cli/plugin/__tests__/replies/banana.jpg
new file mode 100644
index 0000000000000..a5b15a5fc1e92
Binary files /dev/null and b/src/cli/plugin/__tests__/replies/banana.jpg differ
diff --git a/src/cli/plugin/__tests__/replies/corrupt.zip b/src/cli/plugin/__tests__/replies/corrupt.zip
new file mode 100644
index 0000000000000..7fbdeef66dc3e
--- /dev/null
+++ b/src/cli/plugin/__tests__/replies/corrupt.zip
@@ -0,0 +1,97 @@
+504b 0304 1400 0000 0000 d575 7147 0000
+0000 0000 0000 0000 0000 1300 0000 7465
+7374 2d70 6c75 6769 6e2d 6d61 7374 6572
+2f50 4b03 040a 0000 0000 00f2 63d8 46a5
+06bf 880c 0000 000c 0000 001d 0000 0074
+6573 742d 706c 7567 696e 2d6d 6173 7465
+722f 2e67 6974 6967 6e6f 7265 6e6f 6465
+5f6d 6f64 756c 6573 504b 0304 1400 0000
+0800 f263 d846 38c6 e53d 9d00 0000 ee00
+0000 1b00 0000 7465 7374 2d70 6c75 6769
+6e2d 6d61 7374 6572 2f69 6e64 6578 2e6a
+733d 8cc1 0e82 3010 44ef 7cc5 de80 4469
+133d 413c f807 1efc 8182 ab36 96ed 06b6
+d1c4 f0ef 16a8 cc61 9399 7d33 bdbf 0587
+157e d80f 32c2 09ee 813a b19e a078 d9d6
+9029 e19b 010c 2861 2020 7cc3 1a57 1717
+1e96 8af8 8c4a f57a 6617 19e6 c524 8915
+8735 e457 1c05 d626 9c99 f3dd 46d8 ce53
+049e 225c 2bc5 ce74 d89a 9855 84a2 8e5a
+ab83 d611 dff8 ded8 99e7 656b 5412 87f7
+ab51 260e 276e cafe 772a 9b6c 6a7e 504b
+0304 1400 0000 0800 f263 d846 5c85 06c2
+0901 0000 dc01 0000 1f00 0000 7465 7374
+2d70 6c75 6769 6e2d 6d61 7374 6572 2f70
+6163 6b61 6765 2e6a 736f 6e5d 90cd 6ec3
+2010 84ef 790a ea4b 5a29 218e dd46 6a6e
+7d8f a812 c62b 1b97 0262 975a 5695 772f
+60e7 a7e1 c67c bb33 03bf 2bc6 0a23 bea1
+38b2 8200 69eb 74e8 9429 3609 fc80 4765
+4d62 7b5e f272 565b 40e9 95a3 850c 0189
+0996 96d9 fdb2 0767 5191 f553 9c4a 3951
+a3c9 e5a4 4e51 1cca 52f0 3a29 3d91 3bee
+7623 3471 0778 1a88 fc9c 9de6 38bc d944
+6352 0649 e8bc 6b6c 0b6c 0b6c 2dad 41ab
+816b db3d 9f8a 78eb bca0 a045 aa8a 1b36
+d9c0 466b 9efe 9f53 f1b2 ce59 cbe3 1c98
+168c 5470 17d8 e800 8df2 6d4a fbac f83b
+afcb 4b7f d022 9691 7cc0 0cf7 bce2 8f0c
+4178 d967 fcc6 cb1b 1eac cae2 81bf f2fa
+226a db0a 9c87 eb18 74d5 470f f26b f138
+448f 6b63 ad24 18cc dffa e184 ec61 5b25
+7c5e fd01 504b 0304 1400 0000 0000 d575
+7147 0000 0000 0000 0000 0000 0000 1a00
+0000 7465 7374 2d70 6c75 6769 6e2d 6d61
+7374 6572 2f70 7562 6c69 632f 504b 0304
+1400 0000 0800 f263 d846 674a 6865 4a00
+0000 4e00 0000 2000 0000 7465 7374 2d70
+6c75 6769 6e2d 6d61 7374 6572 2f70 7562
+6c69 632f 6170 702e 6a73 05c1 c10d 8020
+1004 c0bf 55ac 2fa1 062b f169 6091 4bc8
+a178 e7c7 d8bb 3399 4594 a1b8 2693 ae08
+8397 cb60 c43b 017b e3b0 b06c dd51 f787
+104d cd33 33ac 12c6 db70 363f 44e7 25ae
+d317 d71f 504b 0304 0a00 0000 0000 f263
+d846 ac2f 0f2b 1200 0000 1200 0000 1c00
+0000 7465 7374 2d70 6c75 6769 6e2d 6d61
+7374 6572 2f52 4541 444d 452e 6d64 4920
+616d 2061 2074 6573 7420 706c 7567 696e
+504b 0304 1400 0000 0000 4b7e 7147 0000
+0000 0000 0000 0000 0000 2d00 0000 7465
+7374 2d70 6c75 6769 6e2d 6d61 7374 6572
+2f65 7874 7261 2066 696c 6520 6f6e 6c79
+2069 6e20 7a69 702e 7478 7450 4b01 0214
+0014 0000 0000 00d5 7571 4700 0000 0000
+0000 0000 0000 0013 0024 0000 0000 0000
+0010 0000 0000 0000 0074 6573 742d 706c
+7567 696e 2d6d 6173 7465 722f 0a00 2000
+0000 0000 0100 1800 4634 e20f 7921 d101
+4634 e20f 7921 d101 d449 e10f 7921 d101
+504b 0102 1400 0a00 0000 0000 f263 d846
+a506 bf88 0c00 0000 0c00 0000 1d00 2400
+0000 0000 0000 2000 0000 3100 0000 7465
+7374 2d70 6c75 6769 6e2d 6d61 7374 6572
+2f2e 6769 7469 676e 6f72 650a 0020 0000
+0000 0001 0018 0000 f483 00ac aed0 0179
+98e1 0f79 21d1 017
+0000 0008 00f2 63d8 4667 4a68 654a 0000
+004e 0000 0020 0024 0000 0000 0000 0020
+0000 00cc 0200 0074 6573 742d 706c 7567
+696e 2d6d 6173 7465 722f 7075 626c 6963
+2f61 7070 2e6a 730a 0020 0000 0000 0001
+0018 0000 f483 00ac aed0 015b 5be2 0f79
+21d1 015b 5be2 0f79 21d1 0150 4b01 0214
+000a 0000 0000 00f2 63d8 46ac 2f0f 2b12
+0000 0012 0000 001c 0024 0000 0000 0000
+0020 0000 0054 0300 0074 6573 742d 706c
+7567 696e 2d6d 6173 7465 722f 5245 4144
+4d45 2e6d 640a 0020 0000 0000 0001 0018
+0000 f483 00ac aed0 014e 0de2 0f79 21d1
+014e 0de2 0f79 21d1 0150 4b01 0214 0014
+0000 0000 004b 7e71 4700 0000 0000 0000
+0000 0000 002d 0000 0000 0000 0000 0020
+0000 00a0 0300 0074 6573 742d 706c 7567
+696e 2d6d 6173 7465 722f 6578 7472 6120
+6669 6c65 206f 6e6c 7920 696e 207a 6970
+2e74 7874 504b 0506 0000 0000 0800 0800
+5903 0000 eb03 0000 0000
diff --git a/src/cli/plugin/__tests__/replies/package.json b/src/cli/plugin/__tests__/replies/package.json
deleted file mode 100644
index 0ee5897991d7d..0000000000000
--- a/src/cli/plugin/__tests__/replies/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "test-plugin",
-  "version": "1.0.0",
-  "description": "just a test plugin",
-  "repository": {
-    "type": "git",
-    "url": "http://website.git"
-  },
-  "dependencies": {
-    "bluebird": "2.9.30"
-  },
-  "license": "Apache-2.0"
-}
\ No newline at end of file
diff --git a/src/cli/plugin/__tests__/replies/plugin-no-package.gz b/src/cli/plugin/__tests__/replies/plugin_no_package.gz
similarity index 100%
rename from src/cli/plugin/__tests__/replies/plugin-no-package.gz
rename to src/cli/plugin/__tests__/replies/plugin_no_package.gz
diff --git a/src/cli/plugin/__tests__/replies/test-plugin-master.tar.gz b/src/cli/plugin/__tests__/replies/test_plugin_master.tar.gz
similarity index 100%
rename from src/cli/plugin/__tests__/replies/test-plugin-master.tar.gz
rename to src/cli/plugin/__tests__/replies/test_plugin_master.tar.gz
diff --git a/src/cli/plugin/__tests__/replies/test_plugin_master.zip b/src/cli/plugin/__tests__/replies/test_plugin_master.zip
new file mode 100644
index 0000000000000..ead5be66e92fd
Binary files /dev/null and b/src/cli/plugin/__tests__/replies/test_plugin_master.zip differ
diff --git a/src/cli/plugin/__tests__/settingParser.js b/src/cli/plugin/__tests__/setting_parser.js
similarity index 66%
rename from src/cli/plugin/__tests__/settingParser.js
rename to src/cli/plugin/__tests__/setting_parser.js
index afb499a794d59..7dfbf7b30b54b 100644
--- a/src/cli/plugin/__tests__/settingParser.js
+++ b/src/cli/plugin/__tests__/setting_parser.js
@@ -1,9 +1,9 @@
-var path = require('path');
-var expect = require('expect.js');
+let path = require('path');
+let expect = require('expect.js');
 
-var utils = require('requirefrom')('src/utils');
-var fromRoot = utils('fromRoot');
-var settingParser = require('../settingParser');
+let utils = require('requirefrom')('src/utils');
+let fromRoot = utils('fromRoot');
+let settingParser = require('../setting_parser');
 
 describe('kibana cli', function () {
 
@@ -13,23 +13,23 @@ describe('kibana cli', function () {
 
       describe('parseMilliseconds function', function () {
 
-        var parser = settingParser();
+        let parser = settingParser();
 
         it('should return 0 for an empty string', function () {
-          var value = '';
+          let value = '';
 
-          var result = parser.parseMilliseconds(value);
+          let result = parser.parseMilliseconds(value);
 
           expect(result).to.be(0);
         });
 
         it('should return 0 for a number with an invalid unit of measure', function () {
-          var result = parser.parseMilliseconds('1gigablasts');
+          let result = parser.parseMilliseconds('1gigablasts');
           expect(result).to.be(0);
         });
 
         it('should assume a number with no unit of measure is specified as milliseconds', function () {
-          var result = parser.parseMilliseconds(1);
+          let result = parser.parseMilliseconds(1);
           expect(result).to.be(1);
 
           result = parser.parseMilliseconds('1');
@@ -37,32 +37,32 @@ describe('kibana cli', function () {
         });
 
         it('should interpret a number with "s" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5s');
+          let result = parser.parseMilliseconds('5s');
           expect(result).to.be(5 * 1000);
         });
 
         it('should interpret a number with "second" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5second');
+          let result = parser.parseMilliseconds('5second');
           expect(result).to.be(5 * 1000);
         });
 
         it('should interpret a number with "seconds" as the unit of measure as seconds', function () {
-          var result = parser.parseMilliseconds('5seconds');
+          let result = parser.parseMilliseconds('5seconds');
           expect(result).to.be(5 * 1000);
         });
 
         it('should interpret a number with "m" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9m');
+          let result = parser.parseMilliseconds('9m');
           expect(result).to.be(9 * 1000 * 60);
         });
 
         it('should interpret a number with "minute" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9minute');
+          let result = parser.parseMilliseconds('9minute');
           expect(result).to.be(9 * 1000 * 60);
         });
 
         it('should interpret a number with "minutes" as the unit of measure as minutes', function () {
-          var result = parser.parseMilliseconds('9minutes');
+          let result = parser.parseMilliseconds('9minutes');
           expect(result).to.be(9 * 1000 * 60);
         });
 
@@ -70,17 +70,17 @@ describe('kibana cli', function () {
 
       describe('parse function', function () {
 
-        var options;
-        var parser;
+        let options;
+        let parser;
         beforeEach(function () {
           options = { install: 'dummy/dummy', pluginDir: fromRoot('installedPlugins') };
         });
 
-        it('should require the user to specify either install and remove', function () {
+        it('should require the user to specify either install, remove, or list', function () {
           options.install = null;
           parser = settingParser(options);
 
-          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install, --remove, or --list./);
         });
 
         it('should not allow the user to specify both install and remove', function () {
@@ -88,14 +88,39 @@ describe('kibana cli', function () {
           options.install = 'org/package/version';
           parser = settingParser(options);
 
-          expect(parser.parse).withArgs().to.throwError(/Please specify either --install or --remove./);
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install, --remove, or --list./);
+        });
+
+        it('should not allow the user to specify both install and list', function () {
+          options.list = true;
+          options.install = 'org/package/version';
+          parser = settingParser(options);
+
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install, --remove, or --list./);
+        });
+
+        it('should not allow the user to specify both remove and list', function () {
+          options.list = true;
+          options.remove = 'package';
+          parser = settingParser(options);
+
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install, --remove, or --list./);
+        });
+
+        it('should not allow the user to specify install, remove, and list', function () {
+          options.list = true;
+          options.install = 'org/package/version';
+          options.remove = 'package';
+          parser = settingParser(options);
+
+          expect(parser.parse).withArgs().to.throwError(/Please specify either --install, --remove, or --list./);
         });
 
         describe('quiet option', function () {
 
           it('should default to false', function () {
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings.quiet).to.be(false);
           });
@@ -103,7 +128,7 @@ describe('kibana cli', function () {
           it('should set settings.quiet property to true', function () {
             options.parent = { quiet: true };
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings.quiet).to.be(true);
           });
@@ -114,7 +139,7 @@ describe('kibana cli', function () {
 
           it('should default to false', function () {
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('silent', false);
           });
@@ -122,7 +147,7 @@ describe('kibana cli', function () {
           it('should set settings.silent property to true', function () {
             options.silent = true;
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('silent', true);
           });
@@ -134,7 +159,7 @@ describe('kibana cli', function () {
 
           it('should default to 0 (milliseconds)', function () {
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('timeout', 0);
           });
@@ -142,7 +167,7 @@ describe('kibana cli', function () {
           it('should set settings.timeout property to specified value', function () {
             options.timeout = 1234;
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('timeout', 1234);
           });
@@ -154,7 +179,7 @@ describe('kibana cli', function () {
           it('should set settings.action property to "install"', function () {
             options.install = 'org/package/version';
             parser = settingParser(options);
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('action', 'install');
           });
@@ -165,7 +190,7 @@ describe('kibana cli', function () {
 
             expect(parser.parse).withArgs().to.not.throwError();
 
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('organization', 'kibana');
             expect(settings).to.have.property('package', 'test-plugin');
@@ -178,7 +203,7 @@ describe('kibana cli', function () {
 
             expect(parser.parse).withArgs().to.not.throwError();
 
-            var settings = parser.parse(options);
+            let settings = parser.parse(options);
 
             expect(settings).to.have.property('organization', 'kibana');
             expect(settings).to.have.property('package', 'test-plugin');
@@ -203,34 +228,52 @@ describe('kibana cli', function () {
             options.install = 'kibana/test-plugin';
             parser = settingParser(options);
 
-            var settings = parser.parse();
+            let settings = parser.parse();
 
-            expect(settings.urls).to.have.property('length', 2);
+            expect(settings.urls).to.have.property('length', 1);
             expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-latest.tar.gz');
-            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/master.tar.gz');
           });
 
           it('should populate the urls collection properly version specified', function () {
             options.install = 'kibana/test-plugin/v1.1.1';
             parser = settingParser(options);
 
-            var settings = parser.parse();
+            let settings = parser.parse();
 
-            expect(settings.urls).to.have.property('length', 2);
+            expect(settings.urls).to.have.property('length', 1);
             expect(settings.urls).to.contain('https://download.elastic.co/kibana/test-plugin/test-plugin-v1.1.1.tar.gz');
-            expect(settings.urls).to.contain('https://github.com/kibana/test-plugin/archive/v1.1.1.tar.gz');
           });
 
           it('should populate the pluginPath', function () {
             options.install = 'kibana/test-plugin';
             parser = settingParser(options);
 
-            var settings = parser.parse();
-            var expected = fromRoot('installedPlugins/test-plugin');
+            let settings = parser.parse();
+            let expected = fromRoot('installedPlugins/test-plugin');
 
             expect(settings).to.have.property('pluginPath', expected);
           });
 
+          it('should populate the workingPath', function () {
+            options.install = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            let settings = parser.parse();
+            let expected = fromRoot('installedPlugins/.plugin.installing');
+
+            expect(settings).to.have.property('workingPath', expected);
+          });
+
+          it('should populate the tempArchiveFile', function () {
+            options.install = 'kibana/test-plugin';
+            parser = settingParser(options);
+
+            let settings = parser.parse();
+            let expected = fromRoot('installedPlugins/.plugin.installing/archive.part');
+
+            expect(settings).to.have.property('tempArchiveFile', expected);
+          });
+
           describe('with url option', function () {
 
             it('should allow one part to the install parameter', function () {
@@ -240,7 +283,7 @@ describe('kibana cli', function () {
 
               expect(parser.parse).withArgs().to.not.throwError();
 
-              var settings = parser.parse();
+              let settings = parser.parse();
 
               expect(settings).to.have.property('package', 'test-plugin');
             });
@@ -255,12 +298,12 @@ describe('kibana cli', function () {
             });
 
             it('should result in only the specified url in urls collection', function () {
-              var url = 'http://www.google.com/plugin.tar.gz';
+              let url = 'http://www.google.com/plugin.tar.gz';
               options.install = 'test-plugin';
               options.url = url;
               parser = settingParser(options);
 
-              var settings = parser.parse();
+              let settings = parser.parse();
 
               expect(settings).to.have.property('urls');
               expect(settings.urls).to.be.an('array');
@@ -275,27 +318,27 @@ describe('kibana cli', function () {
         describe('remove option', function () {
 
           it('should set settings.action property to "remove"', function () {
-            options.install = null;
+            delete options.install;
             options.remove = 'package';
             parser = settingParser(options);
 
-            var settings = parser.parse();
+            let settings = parser.parse();
 
             expect(settings).to.have.property('action', 'remove');
           });
 
           it('should allow one part to the remove parameter', function () {
-            options.install = null;
+            delete options.install;
             options.remove = 'test-plugin';
             parser = settingParser(options);
 
-            var settings = parser.parse();
+            let settings = parser.parse();
 
             expect(settings).to.have.property('package', 'test-plugin');
           });
 
-          it('should not allow more than one part to the install parameter', function () {
-            options.install = null;
+          it('should not allow more than one part to the remove parameter', function () {
+            delete options.install;
             options.remove = 'kibana/test-plugin';
             parser = settingParser(options);
 
@@ -304,18 +347,33 @@ describe('kibana cli', function () {
           });
 
           it('should populate the pluginPath', function () {
-            options.install = null;
+            delete options.install;
             options.remove = 'test-plugin';
             parser = settingParser(options);
 
-            var settings = parser.parse();
-            var expected = fromRoot('installedPlugins/test-plugin');
+            let settings = parser.parse();
+            let expected = fromRoot('installedPlugins/test-plugin');
 
             expect(settings).to.have.property('pluginPath', expected);
           });
 
         });
 
+        describe('list option', function () {
+
+          it('should set settings.action property to "list"', function () {
+            delete options.install;
+            delete options.remove;
+            options.list = true;
+            parser = settingParser(options);
+
+            let settings = parser.parse();
+
+            expect(settings).to.have.property('action', 'list');
+          });
+
+        });
+
       });
 
     });
diff --git a/src/cli/plugin/downloaders/file.js b/src/cli/plugin/downloaders/file.js
new file mode 100644
index 0000000000000..8444bbf624411
--- /dev/null
+++ b/src/cli/plugin/downloaders/file.js
@@ -0,0 +1,68 @@
+const { createWriteStream, createReadStream, unlinkSync, statSync } = require('fs');
+const getProgressReporter = require('../progress_reporter');
+import fileType from '../file_type';
+
+function openSourceFile({ sourcePath }) {
+  try {
+    let fileInfo = statSync(sourcePath);
+
+    const readStream = createReadStream(sourcePath);
+
+    return { readStream, fileInfo };
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      throw new Error('ENOTFOUND');
+    }
+
+    throw err;
+  }
+}
+
+async function copyFile({ readStream, writeStream, progressReporter }) {
+  await new Promise((resolve, reject) => {
+    // if either stream errors, fail quickly
+    readStream.on('error', reject);
+    writeStream.on('error', reject);
+
+    // report progress as we transfer
+    readStream.on('data', (chunk) => {
+      progressReporter.progress(chunk.length);
+    });
+
+    // write the download to the file system
+    readStream.pipe(writeStream);
+
+    // when the write is done, we are done
+    writeStream.on('finish', resolve);
+  });
+}
+
+/*
+// Responsible for managing local file transfers
+*/
+export default async function copyLocalFile(logger, sourcePath, targetPath) {
+  try {
+    const { readStream, fileInfo } = openSourceFile({ sourcePath });
+    const writeStream = createWriteStream(targetPath);
+
+    try {
+      const progressReporter = getProgressReporter(logger);
+      progressReporter.init(fileInfo.size);
+
+      await copyFile({ readStream, writeStream, progressReporter });
+
+      progressReporter.complete();
+    } catch (err) {
+      readStream.close();
+      writeStream.close();
+      throw err;
+    }
+
+    // all is well, return our archive type
+    const archiveType = fileType(sourcePath);
+    return { archiveType };
+  } catch (err) {
+    logger.error(err);
+    throw err;
+  }
+};
diff --git a/src/cli/plugin/downloaders/http.js b/src/cli/plugin/downloaders/http.js
new file mode 100644
index 0000000000000..4341929065d05
--- /dev/null
+++ b/src/cli/plugin/downloaders/http.js
@@ -0,0 +1,91 @@
+const { fromNode: fn } = require('bluebird');
+const { createWriteStream, unlinkSync } = require('fs');
+const Wreck = require('wreck');
+const getProgressReporter = require('../progress_reporter');
+import fileType, { ZIP, TAR } from '../file_type';
+
+function sendRequest({ sourceUrl, timeout }) {
+  const maxRedirects = 11; //Because this one goes to 11.
+  return fn(cb => {
+    const req = Wreck.request('GET', sourceUrl, { timeout, redirects: maxRedirects }, (err, resp) => {
+      if (err) {
+        if (err.code === 'ECONNREFUSED') {
+          err = new Error('ENOTFOUND');
+        }
+
+        return cb(err);
+      }
+
+      if (resp.statusCode >= 400) {
+        return cb(new Error('ENOTFOUND'));
+      }
+
+      cb(null, { req, resp });
+    });
+  });
+}
+
+function downloadResponse({ resp, targetPath, progressReporter }) {
+  return new Promise((resolve, reject) => {
+    const writeStream = createWriteStream(targetPath);
+
+    // if either stream errors, fail quickly
+    resp.on('error', reject);
+    writeStream.on('error', reject);
+
+    // report progress as we download
+    resp.on('data', (chunk) => {
+      progressReporter.progress(chunk.length);
+    });
+
+    // write the download to the file system
+    resp.pipe(writeStream);
+
+    // when the write is done, we are done
+    writeStream.on('finish', resolve);
+  });
+}
+
+function getArchiveTypeFromResponse(resp, sourceUrl) {
+  const contentType = (resp.headers['content-type'] || '');
+
+  switch (contentType.toLowerCase()) {
+    case 'application/zip': return ZIP;
+    case 'application/x-gzip': return TAR;
+    default:
+      //If we can't infer the archive type from the content-type header,
+      //fall back to checking the extension in the url
+      return fileType(sourceUrl);
+  }
+}
+
+/*
+Responsible for managing http transfers
+*/
+export default async function downloadUrl(logger, sourceUrl, targetPath, timeout) {
+  try {
+    const { req, resp } = await sendRequest({ sourceUrl, timeout });
+
+    try {
+      let totalSize = parseFloat(resp.headers['content-length']) || 0;
+      const progressReporter = getProgressReporter(logger);
+      progressReporter.init(totalSize);
+
+      await downloadResponse({ resp, targetPath, progressReporter });
+
+      progressReporter.complete();
+    } catch (err) {
+      req.abort();
+      throw err;
+    }
+
+    // all is well, return our archive type
+    const archiveType = getArchiveTypeFromResponse(resp, sourceUrl);
+    return { archiveType };
+  } catch (err) {
+    if (err.message !== 'ENOTFOUND') {
+      logger.error(err);
+    }
+    throw err;
+  }
+};
diff --git a/src/cli/plugin/extractors/tar_gz.js b/src/cli/plugin/extractors/tar_gz.js
new file mode 100644
index 0000000000000..7e97ffebbb7c6
--- /dev/null
+++ b/src/cli/plugin/extractors/tar_gz.js
@@ -0,0 +1,34 @@
+const zlib = require('zlib');
+const fs = require('fs');
+const tar = require('tar');
+
+async function extractArchive(settings) {
+  await new Promise((resolve, reject) => {
+    const gunzip = zlib.createGunzip();
+    const tarExtract = new tar.Extract({ path: settings.workingPath, strip: 1 });
+    const readStream = fs.createReadStream(settings.tempArchiveFile);
+
+    readStream.on('error', reject);
+    gunzip.on('error', reject);
+    tarExtract.on('error', reject);
+
+    readStream
+    .pipe(gunzip)
+    .pipe(tarExtract);
+
+    tarExtract.on('finish', resolve);
+  });
+}
+
+export default async function extractTarball(settings, logger) {
+  try {
+    logger.log('Extracting plugin archive');
+
+    await extractArchive(settings);
+
+    logger.log('Extraction complete');
+  } catch (err) {
+    logger.error(err);
+    throw new Error('Error extracting plugin archive');
+  }
+};
diff --git a/src/cli/plugin/extractors/zip.js b/src/cli/plugin/extractors/zip.js
new file mode 100644
index 0000000000000..f38f8847f9e3a
--- /dev/null
+++ b/src/cli/plugin/extractors/zip.js
@@ -0,0 +1,32 @@
+const DecompressZip = require('@bigfunger/decompress-zip');
+
+async function extractArchive(settings) {
+  await new Promise((resolve, reject) => {
+    const unzipper = new DecompressZip(settings.tempArchiveFile);
+
+    unzipper.on('error', reject);
+
+    unzipper.extract({
+      path: settings.workingPath,
+      strip: 1,
+      filter(file) {
+        return file.type !== 'SymbolicLink';
+      }
+    });
+
+    unzipper.on('extract', resolve);
+  });
+}
+
+export default async function extractZip(settings, logger) {
+  try {
+    logger.log('Extracting plugin archive');
+
+    await extractArchive(settings);
+
+    logger.log('Extraction complete');
+  } catch (err) {
+    logger.error(err);
+    throw new Error('Error extracting plugin archive');
+  }
+};
diff --git a/src/cli/plugin/file_type.js b/src/cli/plugin/file_type.js
new file mode 100644
index 0000000000000..78c76d8eee913
--- /dev/null
+++ b/src/cli/plugin/file_type.js
@@ -0,0 +1,14 @@
+export const TAR = '.tar.gz';
+export const ZIP = '.zip';
+
+export default function fileType(filename) {
+  if (/\.zip$/i.test(filename)) {
+    return ZIP;
+  }
+  if (/\.tar\.gz$/i.test(filename)) {
+    return TAR;
+  }
+  if (/\.tgz$/i.test(filename)) {
+    return TAR;
+  }
+}
diff --git a/src/cli/plugin/plugin.js b/src/cli/plugin/plugin.js
index ac5a7996784b8..4f2cdae726e3b 100644
--- a/src/cli/plugin/plugin.js
+++ b/src/cli/plugin/plugin.js
@@ -1,14 +1,15 @@
-var utils = require('requirefrom')('src/utils');
-var fromRoot = utils('fromRoot');
+const utils = require('requirefrom')('src/utils');
+const fromRoot = utils('fromRoot');
+const settingParser = require('./setting_parser');
+const installer = require('./plugin_installer');
+const remover = require('./plugin_remover');
+const lister = require('./plugin_lister');
+const pluginLogger = require('./plugin_logger');
+const getConfig = require('../../server/path').getConfig;
 
-var settingParser = require('./settingParser');
-var installer = require('./pluginInstaller');
-var remover = require('./pluginRemover');
-var pluginLogger = require('./pluginLogger');
-
-module.exports = function (program) {
+export default function pluginCli(program) {
   function processCommand(command, options) {
-    var settings;
+    let settings;
     try {
       settings = settingParser(command).parse();
     } catch (ex) {
@@ -17,13 +18,18 @@ module.exports = function (program) {
       process.exit(64); // eslint-disable-line no-process-exit
     }
 
-    var logger = pluginLogger(settings);
+    const logger = pluginLogger(settings);
 
-    if (settings.action === 'install') {
-      installer.install(settings, logger);
-    }
-    if (settings.action === 'remove') {
-      remover.remove(settings, logger);
+    switch (settings.action) {
+      case 'install':
+        installer.install(settings, logger);
+        break;
+      case 'remove':
+        remover.remove(settings, logger);
+        break;
+      case 'list':
+        lister.list(settings, logger);
+        break;
     }
   }
 
@@ -31,13 +37,14 @@ module.exports = function (program) {
     .command('plugin')
     .option('-i, --install <org>/<plugin>/<version>', 'The plugin to install')
     .option('-r, --remove <plugin>', 'The plugin to remove')
+    .option('-l, --list', 'List installed plugins')
     .option('-q, --quiet', 'Disable all process messaging except errors')
     .option('-s, --silent', 'Disable all process messaging')
     .option('-u, --url <url>', 'Specify download url')
     .option(
       '-c, --config <path>',
       'Path to the config file',
-      fromRoot('config/kibana.yml')
+      getConfig()
     )
     .option(
       '-t, --timeout <duration>',
@@ -54,14 +61,12 @@ module.exports = function (program) {
 `
   Common examples:
     -i username/sample
-      attempts to download the latest version from the following urls:
+      attempts to download the latest version from the following url:
         https://download.elastic.co/username/sample/sample-latest.tar.gz
-        https://github.com/username/sample/archive/master.tar.gz
 
     -i username/sample/v1.1.1
-      attempts to download version v1.1.1 from the following urls:
+      attempts to download version v1.1.1 from the following url:
         https://download.elastic.co/username/sample/sample-v1.1.1.tar.gz
-        https://github.com/username/sample/archive/v1.1.1.tar.gz
 
     -i sample -u http://www.example.com/other_name.tar.gz
       attempts to download from the specified url,
diff --git a/src/cli/plugin/pluginDownloader.js b/src/cli/plugin/pluginDownloader.js
deleted file mode 100644
index f9d4b4afc9bb2..0000000000000
--- a/src/cli/plugin/pluginDownloader.js
+++ /dev/null
@@ -1,98 +0,0 @@
-var _ = require('lodash');
-var zlib = require('zlib');
-var Promise = require('bluebird');
-var url = require('url');
-var fs = require('fs');
-var request = require('request');
-var tar = require('tar');
-var progressReporter = require('./progressReporter');
-
-module.exports = function (settings, logger) {
-
-  //Attempts to download each url in turn until one is successful
-  function download() {
-    var urls = settings.urls;
-
-    function tryNext() {
-      var sourceUrl = urls.shift();
-      if (!sourceUrl) {
-        throw new Error('Not a valid url.');
-      }
-
-      logger.log('Attempting to extract from ' + sourceUrl);
-
-      return Promise.try(function () {
-        return downloadSingle(sourceUrl, settings.workingPath, settings.timeout, logger)
-        .catch(function (err) {
-          if (err.message === 'ENOTFOUND') {
-            return tryNext();
-          }
-          if (err.message === 'EEXTRACT') {
-            throw (new Error('Error extracting the plugin archive... is this a valid tar.gz file?'));
-          }
-          throw (err);
-        });
-      })
-      .catch(function (err) {
-        //Special case for when request.get throws an exception
-        if (err.message.match(/invalid uri/i)) {
-          return tryNext();
-        }
-        throw (err);
-      });
-    }
-
-    return tryNext();
-  }
-
-  //Attempts to download a single url
-  function downloadSingle(source, dest, timeout) {
-    var gunzip = zlib.createGunzip();
-    var tarExtract = new tar.Extract({ path: dest, strip: 1 });
-
-    var requestOptions = { url: source };
-    if (timeout !== 0) {
-      requestOptions.timeout = timeout;
-    }
-
-    return wrappedRequest(requestOptions)
-    .then(function (fileStream) {
-      var reporter = progressReporter(logger, fileStream);
-
-      fileStream
-      .on('response', reporter.handleResponse)
-      .on('data', reporter.handleData)
-      .on('error', _.partial(reporter.handleError, 'ENOTFOUND'))
-      .pipe(gunzip)
-      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
-      .pipe(tarExtract)
-      .on('error', _.partial(reporter.handleError, 'EEXTRACT'))
-      .on('end', reporter.handleEnd);
-
-      return reporter.promise;
-    });
-  }
-
-  function wrappedRequest(requestOptions) {
-    return Promise.try(function () {
-      let urlInfo = url.parse(requestOptions.url);
-      if (/^file/.test(urlInfo.protocol)) {
-        return fs.createReadStream(urlInfo.path);
-      } else {
-        return request.get(requestOptions);
-      }
-    })
-    .catch(function (err) {
-      if (err.message.match(/invalid uri/i)) {
-        throw new Error('ENOTFOUND');
-      }
-      throw err;
-    });
-  }
-
-
-  return {
-    download: download,
-    _downloadSingle: downloadSingle
-  };
-};
diff --git a/src/cli/plugin/pluginInstaller.js b/src/cli/plugin/pluginInstaller.js
deleted file mode 100644
index f92ade8446a3f..0000000000000
--- a/src/cli/plugin/pluginInstaller.js
+++ /dev/null
@@ -1,71 +0,0 @@
-let _ = require('lodash');
-var utils = require('requirefrom')('src/utils');
-var fromRoot = utils('fromRoot');
-var pluginDownloader = require('./pluginDownloader');
-var pluginCleaner = require('./pluginCleaner');
-var KbnServer = require('../../server/KbnServer');
-var readYamlConfig = require('../serve/readYamlConfig');
-var fs = require('fs');
-
-module.exports = {
-  install: install
-};
-
-function install(settings, logger) {
-  logger.log(`Installing ${settings.package}`);
-
-  try {
-    fs.statSync(settings.pluginPath);
-
-    logger.error(`Plugin ${settings.package} already exists, please remove before installing a new version`);
-    process.exit(70); // eslint-disable-line no-process-exit
-  } catch (e) {
-    if (e.code !== 'ENOENT') throw e;
-  }
-
-  var cleaner = pluginCleaner(settings, logger);
-  var downloader = pluginDownloader(settings, logger);
-
-  return cleaner.cleanPrevious()
-  .then(function () {
-    return downloader.download();
-  })
-  .then(async function() {
-    logger.log('Optimizing and caching browser bundles...');
-    let serverConfig = _.merge(
-      readYamlConfig(settings.config),
-      {
-        env: 'production',
-        logging: {
-          silent: settings.silent,
-          quiet: !settings.silent,
-          verbose: false
-        },
-        optimize: {
-          useBundleCache: false
-        },
-        server: {
-          autoListen: false
-        },
-        plugins: {
-          initialize: false,
-          scanDirs: [settings.pluginDir, fromRoot('src/plugins')],
-          paths: [settings.workingPath]
-        }
-      }
-    );
-
-    let kbnServer = new KbnServer(serverConfig);
-    await kbnServer.ready();
-    await kbnServer.close();
-  })
-  .then(function () {
-    fs.renameSync(settings.workingPath, settings.pluginPath);
-    logger.log('Plugin installation complete');
-  })
-  .catch(function (e) {
-    logger.error(`Plugin installation was unsuccessful due to error "${e.message}"`);
-    cleaner.cleanError();
-    process.exit(70); // eslint-disable-line no-process-exit
-  });
-}
diff --git a/src/cli/plugin/pluginCleaner.js b/src/cli/plugin/plugin_cleaner.js
similarity index 76%
rename from src/cli/plugin/pluginCleaner.js
rename to src/cli/plugin/plugin_cleaner.js
index 7cbb91fd60878..ca246c97b98be 100644
--- a/src/cli/plugin/pluginCleaner.js
+++ b/src/cli/plugin/plugin_cleaner.js
@@ -1,9 +1,7 @@
-var rimraf = require('rimraf');
-var fs = require('fs');
-var Promise = require('bluebird');
-
-module.exports = function (settings, logger) {
+const rimraf = require('rimraf');
+const fs = require('fs');
 
+export default function createPluginCleaner(settings, logger) {
   function cleanPrevious() {
     return new Promise(function (resolve, reject) {
       try {
@@ -27,8 +25,10 @@ module.exports = function (settings, logger) {
   function cleanError() {
     // delete the working directory.
     // At this point we're bailing, so swallow any errors on delete.
-
-    try { rimraf.sync(settings.workingPath); }
+    try {
+      rimraf.sync(settings.workingPath);
+      rimraf.sync(settings.pluginPath);
+    }
     catch (e) {} // eslint-disable-line no-empty
   }
 
diff --git a/src/cli/plugin/plugin_downloader.js b/src/cli/plugin/plugin_downloader.js
new file mode 100644
index 0000000000000..c757f933edbcb
--- /dev/null
+++ b/src/cli/plugin/plugin_downloader.js
@@ -0,0 +1,51 @@
+const _ = require('lodash');
+const urlParse = require('url').parse;
+const downloadHttpFile = require('./downloaders/http');
+const downloadLocalFile = require('./downloaders/file');
+
+export default function createPluginDownloader(settings, logger) {
+  let archiveType;
+  let sourceType;
+
+  //Attempts to download each url in turn until one is successful
+  function download() {
+    const urls = settings.urls.slice(0);
+
+    function tryNext() {
+      const sourceUrl = urls.shift();
+      if (!sourceUrl) {
+        throw new Error('No valid url specified.');
+      }
+
+      logger.log(`Attempting to transfer from ${sourceUrl}`);
+
+      return downloadSingle(sourceUrl)
+      .catch((err) => {
+        if (err.message === 'ENOTFOUND') {
+          return tryNext();
+        }
+        throw (err);
+      });
+    }
+
+    return tryNext();
+  }
+
+  function downloadSingle(sourceUrl) {
+    const urlInfo = urlParse(sourceUrl);
+    let downloadPromise;
+
+    if (/^file/.test(urlInfo.protocol)) {
+      downloadPromise = downloadLocalFile(logger, urlInfo.path, settings.tempArchiveFile);
+    } else {
+      downloadPromise = downloadHttpFile(logger, sourceUrl, settings.tempArchiveFile, settings.timeout);
+    }
+
+    return downloadPromise;
+  }
+
+  return {
+    download: download,
+    _downloadSingle: downloadSingle
+  };
+};
diff --git a/src/cli/plugin/plugin_extractor.js b/src/cli/plugin/plugin_extractor.js
new file mode 100644
index 0000000000000..d4825abf97cda
--- /dev/null
+++ b/src/cli/plugin/plugin_extractor.js
@@ -0,0 +1,16 @@
+const zipExtract = require('./extractors/zip');
+const tarGzExtract = require('./extractors/tar_gz');
+import { ZIP, TAR } from './file_type';
+
+export default function extractArchive(settings, logger, archiveType) {
+  switch (archiveType) {
+    case ZIP:
+      return zipExtract(settings, logger);
+      break;
+    case TAR:
+      return tarGzExtract(settings, logger);
+      break;
+    default:
+      throw new Error('Unsupported archive format.');
+  }
+};
diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js
new file mode 100644
index 0000000000000..98fb0631e5385
--- /dev/null
+++ b/src/cli/plugin/plugin_installer.js
@@ -0,0 +1,87 @@
+const _ = require('lodash');
+const utils = require('requirefrom')('src/utils');
+const fromRoot = utils('fromRoot');
+const pluginDownloader = require('./plugin_downloader');
+const pluginCleaner = require('./plugin_cleaner');
+const pluginExtractor = require('./plugin_extractor');
+const KbnServer = require('../../server/KbnServer');
+const readYamlConfig = require('../serve/read_yaml_config');
+const { statSync, renameSync } = require('fs');
+const Promise = require('bluebird');
+const rimrafSync = require('rimraf').sync;
+const mkdirp = Promise.promisify(require('mkdirp'));
+
+export default {
+  install: install
+};
+
+function checkForExistingInstall(settings, logger) {
+  try {
+    statSync(settings.pluginPath);
+
+    logger.error(`Plugin ${settings.package} already exists, please remove before installing a new version`);
+    process.exit(70); // eslint-disable-line no-process-exit
+  } catch (e) {
+    if (e.code !== 'ENOENT') throw e;
+  }
+}
+
+async function rebuildKibanaCache(settings, logger) {
+  logger.log('Optimizing and caching browser bundles...');
+  const serverConfig = _.merge(
+    readYamlConfig(settings.config),
+    {
+      env: 'production',
+      logging: {
+        silent: settings.silent,
+        quiet: !settings.silent,
+        verbose: false
+      },
+      optimize: {
+        useBundleCache: false
+      },
+      server: {
+        autoListen: false
+      },
+      plugins: {
+        initialize: false,
+        scanDirs: [settings.pluginDir, fromRoot('src/plugins')]
+      }
+    }
+  );
+
+  const kbnServer = new KbnServer(serverConfig);
+  await kbnServer.ready();
+  await kbnServer.close();
+}
+
+async function install(settings, logger) {
+  logger.log(`Installing ${settings.package}`);
+
+  const cleaner = pluginCleaner(settings, logger);
+
+  try {
+    checkForExistingInstall(settings, logger);
+
+    await cleaner.cleanPrevious();
+
+    await mkdirp(settings.workingPath);
+
+    const downloader = pluginDownloader(settings, logger);
+    const { archiveType } = await downloader.download();
+
+    await pluginExtractor (settings, logger, archiveType);
+
+    rimrafSync(settings.tempArchiveFile);
+
+    renameSync(settings.workingPath, settings.pluginPath);
+
+    await rebuildKibanaCache(settings, logger);
+
+    logger.log('Plugin installation complete');
+  } catch (err) {
+    logger.error(`Plugin installation was unsuccessful due to error "${err.message}"`);
+    cleaner.cleanError();
+    process.exit(70); // eslint-disable-line no-process-exit
+  }
+}
diff --git a/src/cli/plugin/plugin_lister.js b/src/cli/plugin/plugin_lister.js
new file mode 100644
index 0000000000000..8351c3a96a0b0
--- /dev/null
+++ b/src/cli/plugin/plugin_lister.js
@@ -0,0 +1,8 @@
+const fs = require('fs');
+
+export function list(settings, logger) {
+  fs.readdirSync(settings.pluginDir)
+  .forEach(function (pluginFile) {
+    logger.log(pluginFile);
+  });
+}
diff --git a/src/cli/plugin/pluginLogger.js b/src/cli/plugin/plugin_logger.js
similarity index 78%
rename from src/cli/plugin/pluginLogger.js
rename to src/cli/plugin/plugin_logger.js
index 99b5a33976851..489bec040df1e 100644
--- a/src/cli/plugin/pluginLogger.js
+++ b/src/cli/plugin/plugin_logger.js
@@ -1,7 +1,7 @@
-module.exports = function (settings) {
-  var previousLineEnded = true;
-  var silent = !!settings.silent;
-  var quiet = !!settings.quiet;
+export default function createPluginLogger(settings) {
+  let previousLineEnded = true;
+  const silent = !!settings.silent;
+  const quiet = !!settings.quiet;
 
   function log(data, sameLine) {
     if (silent || quiet) return;
@@ -33,7 +33,7 @@ module.exports = function (settings) {
       data.pipe(process.stderr);
       return;
     }
-    process.stderr.write(data + '\n');
+    process.stderr.write(`${data}\n`);
     previousLineEnded = true;
   }
 
diff --git a/src/cli/plugin/pluginRemover.js b/src/cli/plugin/plugin_remover.js
similarity index 89%
rename from src/cli/plugin/pluginRemover.js
rename to src/cli/plugin/plugin_remover.js
index 2beb128819f89..791be701197d6 100644
--- a/src/cli/plugin/pluginRemover.js
+++ b/src/cli/plugin/plugin_remover.js
@@ -1,5 +1,5 @@
-var fs = require('fs');
-var rimraf = require('rimraf');
+const fs = require('fs');
+const rimraf = require('rimraf');
 
 module.exports = {
   remove: remove
diff --git a/src/cli/plugin/progressReporter.js b/src/cli/plugin/progressReporter.js
deleted file mode 100644
index 84962d20c62a5..0000000000000
--- a/src/cli/plugin/progressReporter.js
+++ /dev/null
@@ -1,71 +0,0 @@
-var Promise = require('bluebird');
-
-/*
-Responsible for reporting the progress of the file stream
-*/
-module.exports = function (logger, stream) {
-  var oldDotCount = 0;
-  var runningTotal = 0;
-  var totalSize = 0;
-  var hasError = false;
-  var _resolve;
-  var _reject;
-  var _resp;
-
-  var promise = new Promise(function (resolve, reject) {
-    _resolve = resolve;
-    _reject = reject;
-  });
-
-  function handleError(errorMessage, err) {
-    if (hasError) return;
-
-    if (err) logger.error(err);
-    hasError = true;
-    if (stream.abort) stream.abort();
-    _reject(new Error(errorMessage));
-  }
-
-  function handleResponse(resp) {
-    _resp = resp;
-    if (resp.statusCode >= 400) {
-      handleError('ENOTFOUND', null);
-    } else {
-      totalSize = parseInt(resp.headers['content-length'], 10) || 0;
-      var totalDesc = totalSize || 'unknown number of';
-
-      logger.log('Downloading ' + totalDesc + ' bytes', true);
-    }
-  }
-
-  //Should log a dot for every 5% of progress
-  //Note: no progress is logged if the plugin is downloaded in a single packet
-  function handleData(buffer) {
-    if (hasError) return;
-    if (!totalSize) return;
-
-    runningTotal += buffer.length;
-    var dotCount = Math.round(runningTotal / totalSize * 100 / 5);
-    if (dotCount > 20) dotCount = 20;
-    for (var i = 0; i < (dotCount - oldDotCount); i++) {
-      logger.log('.', true);
-    }
-    oldDotCount = dotCount;
-  }
-
-  function handleEnd() {
-    if (hasError) return;
-
-    logger.log('Extraction complete');
-    _resolve();
-  }
-
-  return {
-    promise: promise,
-    handleResponse: handleResponse,
-    handleError: handleError,
-    handleData: handleData,
-    handleEnd: handleEnd,
-    hasError: function () { return hasError; }
-  };
-};
diff --git a/src/cli/plugin/progress_reporter.js b/src/cli/plugin/progress_reporter.js
new file mode 100644
index 0000000000000..6de7d987adf50
--- /dev/null
+++ b/src/cli/plugin/progress_reporter.js
@@ -0,0 +1,38 @@
+/*
+Generates file transfer progress messages
+*/
+export default function createProgressReporter(logger) {
+  let dotCount = 0;
+  let runningTotal = 0;
+  let totalSize = 0;
+
+  function init(size) {
+    totalSize = size;
+    let totalDesc = totalSize || 'unknown number of';
+
+    logger.log(`Transferring ${totalDesc} bytes`, true);
+  }
+
+  //Should log a dot for every 5% of progress
+  function progress(size) {
+    if (!totalSize) return;
+
+    runningTotal += size;
+    let newDotCount = Math.round(runningTotal / totalSize * 100 / 5);
+    if (newDotCount > 20) newDotCount = 20;
+    for (let i = 0; i < (newDotCount - dotCount); i++) {
+      logger.log('.', true);
+    }
+    dotCount = newDotCount;
+  }
+
+  function complete() {
+    logger.log(`Transfer complete`, false);
+  }
+
+  return {
+    init: init,
+    progress: progress,
+    complete: complete
+  };
+};
diff --git a/src/cli/plugin/settingParser.js b/src/cli/plugin/setting_parser.js
similarity index 72%
rename from src/cli/plugin/settingParser.js
rename to src/cli/plugin/setting_parser.js
index 8272b2ea126b6..b18b894b9fc43 100644
--- a/src/cli/plugin/settingParser.js
+++ b/src/cli/plugin/setting_parser.js
@@ -1,12 +1,13 @@
-var { resolve } = require('path');
-var expiry = require('expiry-js');
+const { resolve } = require('path');
+const expiry = require('expiry-js');
+import { intersection } from 'lodash';
 
-module.exports = function (options) {
+export default function createSettingParser(options) {
   function parseMilliseconds(val) {
-    var result;
+    let result;
 
     try {
-      var timeVal = expiry(val);
+      let timeVal = expiry(val);
       result = timeVal.asMilliseconds();
     } catch (ex) {
       result = 0;
@@ -16,22 +17,19 @@ module.exports = function (options) {
   }
 
   function generateDownloadUrl(settings) {
-    var version = (settings.version) || 'latest';
-    var filename = settings.package + '-' + version + '.tar.gz';
+    const version = (settings.version) || 'latest';
+    const filename = settings.package + '-' + version + '.tar.gz';
 
     return 'https://download.elastic.co/' + settings.organization + '/' + settings.package + '/' + filename;
   }
 
-  function generateGithubUrl(settings) {
-    var version = (settings.version) || 'master';
-    var filename = version + '.tar.gz';
-
-    return 'https://github.com/' + settings.organization + '/' + settings.package + '/archive/' + filename;
+  function areMultipleOptionsChosen(options, choices) {
+    return intersection(Object.keys(options), choices).length > 1;
   }
 
   function parse() {
-    var parts;
-    var settings = {
+    let parts;
+    let settings = {
       timeout: 0,
       silent: false,
       quiet: false,
@@ -78,7 +76,6 @@ module.exports = function (options) {
         settings.version = parts.shift();
 
         settings.urls.push(generateDownloadUrl(settings));
-        settings.urls.push(generateGithubUrl(settings));
       }
     }
 
@@ -92,14 +89,19 @@ module.exports = function (options) {
       settings.package = parts.shift();
     }
 
-    if (!settings.action || (options.install && options.remove)) {
-      throw new Error('Please specify either --install or --remove.');
+    if (options.list) {
+      settings.action = 'list';
+    }
+
+    if (!settings.action || areMultipleOptionsChosen(options, [ 'install', 'remove', 'list' ])) {
+      throw new Error('Please specify either --install, --remove, or --list.');
     }
 
     settings.pluginDir = options.pluginDir;
     if (settings.package) {
       settings.pluginPath = resolve(settings.pluginDir, settings.package);
       settings.workingPath = resolve(settings.pluginDir, '.plugin.installing');
+      settings.tempArchiveFile = resolve(settings.workingPath, 'archive.part');
     }
 
     return settings;
diff --git a/src/cli/serve/readYamlConfig.js b/src/cli/serve/read_yaml_config.js
similarity index 79%
rename from src/cli/serve/readYamlConfig.js
rename to src/cli/serve/read_yaml_config.js
index 2bad080edd59e..3387b20c2aa80 100644
--- a/src/cli/serve/readYamlConfig.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -35,6 +35,10 @@ let legacySettingMap = {
   verify_ssl: 'elasticsearch.ssl.verify',
 };
 
+const deprecatedSettings = {
+  'server.xsrf.token': 'server.xsrf.token is deprecated. It is no longer used when providing xsrf protection.'
+};
+
 module.exports = function (path) {
   if (!path) return {};
 
@@ -45,11 +49,22 @@ module.exports = function (path) {
       _.forOwn(val, function (subVal, subKey) {
         apply(config, subVal, key + '.' + subKey);
       });
-    } else {
+    }
+    else if (_.isArray(val)) {
+      config[key] = [];
+      val.forEach((subVal, i) => {
+        apply(config, subVal, key + '.' + i);
+      });
+    }
+    else {
       _.set(config, key, val);
     }
   }
 
+  _.each(deprecatedSettings, function (message, setting) {
+    if (_.has(file, setting)) console.error(message);
+  });
+
   // transform legeacy options into new namespaced versions
   return _.transform(file, function (config, val, key) {
     if (legacySettingMap.hasOwnProperty(key)) {
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index d6d3834bd4d0d..683a530117861 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -5,6 +5,7 @@ let { resolve } = require('path');
 let cwd = process.cwd();
 let src = require('requirefrom')('src');
 let fromRoot = src('utils/fromRoot');
+const getConfig = require('../../server/path').getConfig;
 
 let canCluster;
 try {
@@ -35,7 +36,7 @@ module.exports = function (program) {
   .option(
     '-c, --config <path>',
     'Path to the config file, can be changed with the CONFIG_PATH environment variable as well',
-    process.env.CONFIG_PATH || fromRoot('config/kibana.yml'))
+    getConfig())
   .option('-p, --port <port>', 'The port to bind to', parseInt)
   .option('-q, --quiet', 'Prevent all logging except errors')
   .option('-Q, --silent', 'Prevent all logging')
@@ -76,7 +77,7 @@ module.exports = function (program) {
       return;
     }
 
-    let readYamlConfig = require('./readYamlConfig');
+    let readYamlConfig = require('./read_yaml_config');
     let KbnServer = src('server/KbnServer');
 
     let settings = readYamlConfig(opts.config);
diff --git a/src/fixtures/agg_resp/geohash_grid.js b/src/fixtures/agg_resp/geohash_grid.js
index df9b6513de6b9..0126ef50f3648 100644
--- a/src/fixtures/agg_resp/geohash_grid.js
+++ b/src/fixtures/agg_resp/geohash_grid.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function GeoHashGridAggResponseFixture() {
 
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     // for vis:
     //
@@ -18,23 +18,23 @@ define(function (require) {
     //   },
     // });
 
-    var geoHashCharts = _.union(
+    let geoHashCharts = _.union(
       _.range(48, 57), // 0-9
       _.range(65, 90), // A-Z
       _.range(97, 122) // a-z
     );
 
-    var totalDocCount = 0;
+    let totalDocCount = 0;
 
-    var tags = _.times(_.random(4, 20), function (i) {
+    let tags = _.times(_.random(4, 20), function (i) {
       // random number of tags
-      var docCount = 0;
-      var buckets = _.times(_.random(40, 200), function () {
+      let docCount = 0;
+      let buckets = _.times(_.random(40, 200), function () {
         return _.sample(geoHashCharts, 3).join('');
       })
       .sort()
       .map(function (geoHash) {
-        var count = _.random(1, 5000);
+        let count = _.random(1, 5000);
 
         totalDocCount += count;
         docCount += count;
diff --git a/src/fixtures/fake_chart_events.js b/src/fixtures/fake_chart_events.js
index f011fbade44f9..1d3dffc93824c 100644
--- a/src/fixtures/fake_chart_events.js
+++ b/src/fixtures/fake_chart_events.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var results = {};
+  let results = {};
 
   results.timeSeries = {
     data: {
diff --git a/src/fixtures/fake_hierarchical_data.js b/src/fixtures/fake_hierarchical_data.js
index 36797d0773e50..6cf46f53982e6 100644
--- a/src/fixtures/fake_hierarchical_data.js
+++ b/src/fixtures/fake_hierarchical_data.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var data = {  };
+  let data = {  };
 
   data.metricOnly = {
     hits: { total: 1000, hits: [], max_score: 0 },
diff --git a/src/fixtures/fake_row.js b/src/fixtures/fake_row.js
index 855d6bd7e50af..62098e0779438 100644
--- a/src/fixtures/fake_row.js
+++ b/src/fixtures/fake_row.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var longString = Array(200).join('_');
+  let _ = require('lodash');
+  let longString = Array(200).join('_');
 
   return function (id, mapping) {
     function fakeVals(type) {
diff --git a/src/fixtures/hits.js b/src/fixtures/hits.js
index 92665b504bbea..074d48b28212d 100644
--- a/src/fixtures/hits.js
+++ b/src/fixtures/hits.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function fitsFixture() {
     return _.map([
       {_source: {'@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo'}},
diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js
index ec6a36e33d7b1..630c34d4a98bd 100644
--- a/src/fixtures/logstash_fields.js
+++ b/src/fixtures/logstash_fields.js
@@ -1,6 +1,6 @@
 define(function (require) {
   function stubbedLogstashFields() {
-    var sourceData = [
+    let sourceData = [
       { name: 'bytes',              type: 'number',     indexed: true,  analyzed: true, sortable:  true,  filterable: true,   count: 10 },
       { name: 'ssl',                type: 'boolean',    indexed: true,  analyzed: true, sortable:  true,  filterable: true,   count: 20 },
       { name: '@timestamp',         type: 'date',       indexed: true,  analyzed: true, sortable:  true,  filterable: true,   count: 30 },
diff --git a/src/fixtures/mock_courier.js b/src/fixtures/mock_courier.js
index 07e6de0091f62..63a34994819a4 100644
--- a/src/fixtures/mock_courier.js
+++ b/src/fixtures/mock_courier.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
 
   return function (Private, Promise) {
-    var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    var getIndexPatternStub = sinon.stub();
+    let indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    let getIndexPatternStub = sinon.stub();
     getIndexPatternStub.returns(Promise.resolve(indexPatterns));
 
-    var courier = {
+    let courier = {
       indexPatterns: { get: getIndexPatternStub },
       getStub: getIndexPatternStub
     };
diff --git a/src/fixtures/mock_state.js b/src/fixtures/mock_state.js
index 1346b8386ec02..466c46a7a8af2 100644
--- a/src/fixtures/mock_state.js
+++ b/src/fixtures/mock_state.js
@@ -1,11 +1,12 @@
 define(function (require) {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
 
   function MockState(defaults) {
     this.on = _.noop;
     this.off = _.noop;
     this.save = sinon.stub();
+    this.replace = sinon.stub();
     _.assign(this, defaults);
   }
 
diff --git a/src/fixtures/mock_ui_state.js b/src/fixtures/mock_ui_state.js
new file mode 100644
index 0000000000000..f132b19f72c46
--- /dev/null
+++ b/src/fixtures/mock_ui_state.js
@@ -0,0 +1,15 @@
+define(function (require) {
+  let _ = require('lodash');
+  let keys = {};
+  return {
+    get: function (path, def) {
+      return keys[path] == null ? def : keys[path];
+    },
+    set: function (path, val) {
+      keys[path] = val;
+      return val;
+    },
+    on: _.noop,
+    off: _.noop
+  }
+})
\ No newline at end of file
diff --git a/src/fixtures/search_response.js b/src/fixtures/search_response.js
index 3c0b495da06a4..9f0d6b8f0763f 100644
--- a/src/fixtures/search_response.js
+++ b/src/fixtures/search_response.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var hits = require('fixtures/real_hits');
+  let hits = require('fixtures/real_hits');
 
   return {
     took: 73,
diff --git a/src/fixtures/stubbed_doc_source_response.js b/src/fixtures/stubbed_doc_source_response.js
index a26f73c1f7786..36b6baf8fdf46 100644
--- a/src/fixtures/stubbed_doc_source_response.js
+++ b/src/fixtures/stubbed_doc_source_response.js
@@ -1,6 +1,6 @@
 define(function (require) {
   function stubbedDocSourceResponse(Private) {
-    var mockLogstashFields = Private(require('fixtures/logstash_fields'));
+    let mockLogstashFields = Private(require('fixtures/logstash_fields'));
 
     return function (id, index) {
       index = index || '.kibana';
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index 2b114919a81e5..3d84c98b464d2 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -1,21 +1,21 @@
 define(function (require) {
   return function stubbedLogstashIndexPatternService(Private) {
-    var StubIndexPattern = Private(require('testUtils/stubIndexPattern'));
-    var fieldTypes = Private(require('ui/index_patterns/_field_types'));
-    var mockLogstashFields = Private(require('fixtures/logstash_fields'));
+    let StubIndexPattern = Private(require('testUtils/stub_index_pattern'));
+    let fieldTypes = Private(require('ui/index_patterns/_field_types'));
+    let mockLogstashFields = Private(require('fixtures/logstash_fields'));
 
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var fields = mockLogstashFields.map(function (field) {
+    let fields = mockLogstashFields.map(function (field) {
       field.displayName = field.name;
-      var type = fieldTypes.byName[field.type];
+      let type = fieldTypes.byName[field.type];
       if (!type) throw new TypeError('unknown type ' + field.type);
       if (!_.has(field, 'sortable')) field.sortable = type.sortable;
       if (!_.has(field, 'filterable')) field.filterable = type.filterable;
       return field;
     });
 
-    var indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
+    let indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
     indexPattern.id = 'logstash-*';
 
     return indexPattern;
diff --git a/src/fixtures/stubbed_search_source.js b/src/fixtures/stubbed_search_source.js
index d80e52c6cf5c3..d3c47b4705de0 100644
--- a/src/fixtures/stubbed_search_source.js
+++ b/src/fixtures/stubbed_search_source.js
@@ -1,9 +1,10 @@
 define(function (require) {
-  var sinon = require('auto-release-sinon');
-  var searchResponse = require('fixtures/search_response');
+  let sinon = require('auto-release-sinon');
+  let searchResponse = require('fixtures/search_response');
 
-  return function stubSearchSource(Private, $q) {
-    var deferedResult = $q.defer();
+  return function stubSearchSource(Private, $q, Promise) {
+    let deferedResult = $q.defer();
+    let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
     return {
       sort: sinon.spy(),
@@ -13,7 +14,7 @@ define(function (require) {
       get: function (param) {
         switch (param) {
           case 'index':
-            return Private(require('fixtures/stubbed_logstash_index_pattern'));
+            return indexPattern;
           default:
             throw new Error('Param "' + param + '" is not implemented in the stubbed search source');
         }
@@ -29,7 +30,9 @@ define(function (require) {
         return deferedResult.promise;
       },
       onError: function () { return $q.defer().promise; },
-
+      _flatten: function () {
+        return Promise.resolve({ index: indexPattern, body: {} });
+      }
     };
 
   };
diff --git a/src/fixtures/tilemap_map.js b/src/fixtures/tilemap_map.js
index 5d07de8349212..d81fedd9b2094 100644
--- a/src/fixtures/tilemap_map.js
+++ b/src/fixtures/tilemap_map.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var sinon = require('auto-release-sinon');
+  let sinon = require('auto-release-sinon');
 
   function MockMap(container, chartData, params) {
     this.container = container;
diff --git a/src/fixtures/vislib/_vis_fixture.js b/src/fixtures/vislib/_vis_fixture.js
index d7e74a634f3c0..b1815ba64d282 100644
--- a/src/fixtures/vislib/_vis_fixture.js
+++ b/src/fixtures/vislib/_vis_fixture.js
@@ -1,9 +1,9 @@
-var $ = require('jquery');
-var _ = require('lodash');
+let $ = require('jquery');
+let _ = require('lodash');
 
-var $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
-var count = 0;
-var visHeight = $visCanvas.height();
+let $visCanvas = $('<div>').attr('id', 'vislib-vis-fixtures').appendTo('body');
+let count = 0;
+let visHeight = $visCanvas.height();
 
 $visCanvas.new = function () {
   count += 1;
@@ -19,7 +19,7 @@ afterEach(function () {
 
 module.exports = function VislibFixtures(Private) {
   return function (visLibParams) {
-    var Vis = Private(require('ui/vislib/vis'));
+    let Vis = Private(require('ui/vislib/vis'));
     return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
       shareYAxis: true,
       addTooltip: true,
@@ -27,7 +27,8 @@ module.exports = function VislibFixtures(Private) {
       defaultYExtents: false,
       setYExtents: false,
       yAxis: {},
-      type: 'histogram'
+      type: 'histogram',
+      hasTimeField: true
     }));
   };
 };
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_columns.js b/src/fixtures/vislib/mock_data/date_histogram/_columns.js
index 6fa4d1ee8aad2..81cc1eb1e3f50 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_columns.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_columns.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'columns': [
@@ -20,6 +20,7 @@ module.exports = {
       },
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 1415826600000,
@@ -167,6 +168,7 @@ module.exports = {
       },
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 1415826630000,
@@ -222,6 +224,7 @@ module.exports = {
       },
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 1415826660000,
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_rows.js b/src/fixtures/vislib/mock_data/date_histogram/_rows.js
index c2ff7a40de5f5..f9caadb2de93e 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_rows.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_rows.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'rows': [
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series.js b/src/fixtures/vislib/mock_data/date_histogram/_series.js
index 7c126c41eb9d3..35870fb6772b9 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_series.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'label': '',
@@ -12,6 +12,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 1411761450000,
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
index a514c0000efcf..cf800dfc30ce8 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'label': '',
@@ -12,6 +12,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 1411761450000,
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
index f7345c1e10c8a..12a91cbf2ce9a 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'label': '',
@@ -12,6 +12,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 1411761450000,
diff --git a/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
index e124703fda690..3cb020769408b 100644
--- a/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
+++ b/src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'label': '',
diff --git a/src/fixtures/vislib/mock_data/filters/_columns.js b/src/fixtures/vislib/mock_data/filters/_columns.js
index ea5ab1b097070..b05a3d88e725c 100644
--- a/src/fixtures/vislib/mock_data/filters/_columns.js
+++ b/src/fixtures/vislib/mock_data/filters/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'columns': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
@@ -41,6 +42,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
@@ -74,6 +76,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
diff --git a/src/fixtures/vislib/mock_data/filters/_rows.js b/src/fixtures/vislib/mock_data/filters/_rows.js
index d3c27ed491b50..1e90856693ff6 100644
--- a/src/fixtures/vislib/mock_data/filters/_rows.js
+++ b/src/fixtures/vislib/mock_data/filters/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
@@ -41,6 +42,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
@@ -74,6 +76,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'css',
diff --git a/src/fixtures/vislib/mock_data/filters/_series.js b/src/fixtures/vislib/mock_data/filters/_series.js
index 46cdbbc3794a4..badaffae93a5b 100644
--- a/src/fixtures/vislib/mock_data/filters/_series.js
+++ b/src/fixtures/vislib/mock_data/filters/_series.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -6,6 +6,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 'css',
diff --git a/src/fixtures/vislib/mock_data/geohash/_columns.js b/src/fixtures/vislib/mock_data/geohash/_columns.js
index 2f39a449c9551..c036ddfc32c51 100644
--- a/src/fixtures/vislib/mock_data/geohash/_columns.js
+++ b/src/fixtures/vislib/mock_data/geohash/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 module.exports = {
   'columns': [
       {
diff --git a/src/fixtures/vislib/mock_data/geohash/_geo_json.js b/src/fixtures/vislib/mock_data/geohash/_geo_json.js
index ac84284a1a78a..6ed3e8eee3e49 100644
--- a/src/fixtures/vislib/mock_data/geohash/_geo_json.js
+++ b/src/fixtures/vislib/mock_data/geohash/_geo_json.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'valueFormatter': _.identity,
diff --git a/src/fixtures/vislib/mock_data/geohash/_rows.js b/src/fixtures/vislib/mock_data/geohash/_rows.js
index e0e1e6e7560c1..0815eb8e5f69d 100644
--- a/src/fixtures/vislib/mock_data/geohash/_rows.js
+++ b/src/fixtures/vislib/mock_data/geohash/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
diff --git a/src/fixtures/vislib/mock_data/histogram/_columns.js b/src/fixtures/vislib/mock_data/histogram/_columns.js
index aa022fefa2a05..ebc8b7155eec1 100644
--- a/src/fixtures/vislib/mock_data/histogram/_columns.js
+++ b/src/fixtures/vislib/mock_data/histogram/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'columns': [
@@ -11,6 +11,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 2147483600,
@@ -124,6 +125,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 2147483600,
@@ -237,6 +239,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 2147483600,
diff --git a/src/fixtures/vislib/mock_data/histogram/_rows.js b/src/fixtures/vislib/mock_data/histogram/_rows.js
index bf15c31b9ceb5..87e0c5819016c 100644
--- a/src/fixtures/vislib/mock_data/histogram/_rows.js
+++ b/src/fixtures/vislib/mock_data/histogram/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
@@ -11,6 +11,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 2147483600,
@@ -59,6 +60,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 3221225400,
@@ -159,6 +161,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 10737418200,
diff --git a/src/fixtures/vislib/mock_data/histogram/_series.js b/src/fixtures/vislib/mock_data/histogram/_series.js
index 6eb3d10b12b21..1d17558b3e404 100644
--- a/src/fixtures/vislib/mock_data/histogram/_series.js
+++ b/src/fixtures/vislib/mock_data/histogram/_series.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -9,6 +9,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 3221225400,
diff --git a/src/fixtures/vislib/mock_data/histogram/_slices.js b/src/fixtures/vislib/mock_data/histogram/_slices.js
index 0d280cad11bec..834287b487e7c 100644
--- a/src/fixtures/vislib/mock_data/histogram/_slices.js
+++ b/src/fixtures/vislib/mock_data/histogram/_slices.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
diff --git a/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js b/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
index c08ba4444e37a..9954fb6e1a103 100644
--- a/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
+++ b/src/fixtures/vislib/mock_data/not_enough_data/_one_point.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -6,6 +6,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': '_all',
diff --git a/src/fixtures/vislib/mock_data/range/_columns.js b/src/fixtures/vislib/mock_data/range/_columns.js
index 1ac57060f323d..49924adb0d0c7 100644
--- a/src/fixtures/vislib/mock_data/range/_columns.js
+++ b/src/fixtures/vislib/mock_data/range/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'columns': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': '0.0-1000.0',
@@ -27,6 +28,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': '0.0-1000.0',
diff --git a/src/fixtures/vislib/mock_data/range/_rows.js b/src/fixtures/vislib/mock_data/range/_rows.js
index 3868b0ff9b27b..f67951d85d6c8 100644
--- a/src/fixtures/vislib/mock_data/range/_rows.js
+++ b/src/fixtures/vislib/mock_data/range/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': '0.0-1000.0',
@@ -29,6 +30,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': '0.0-1000.0',
@@ -50,6 +52,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': '0.0-1000.0',
diff --git a/src/fixtures/vislib/mock_data/range/_series.js b/src/fixtures/vislib/mock_data/range/_series.js
index 4b5e8f6181695..77bfebdd11edd 100644
--- a/src/fixtures/vislib/mock_data/range/_series.js
+++ b/src/fixtures/vislib/mock_data/range/_series.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -6,6 +6,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': '0.0-1000.0',
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_columns.js b/src/fixtures/vislib/mock_data/significant_terms/_columns.js
index 3bdaa0dc3954a..caaff223993b9 100644
--- a/src/fixtures/vislib/mock_data/significant_terms/_columns.js
+++ b/src/fixtures/vislib/mock_data/significant_terms/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'columns': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -53,6 +54,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -98,6 +100,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -143,6 +146,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -188,6 +192,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_rows.js b/src/fixtures/vislib/mock_data/significant_terms/_rows.js
index b7d07251b5ca8..22e28a57a5070 100644
--- a/src/fixtures/vislib/mock_data/significant_terms/_rows.js
+++ b/src/fixtures/vislib/mock_data/significant_terms/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -53,6 +54,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -98,6 +100,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -143,6 +146,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
@@ -188,6 +192,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'success',
diff --git a/src/fixtures/vislib/mock_data/significant_terms/_series.js b/src/fixtures/vislib/mock_data/significant_terms/_series.js
index c4feebaef9d4d..4c934b2a1e58c 100644
--- a/src/fixtures/vislib/mock_data/significant_terms/_series.js
+++ b/src/fixtures/vislib/mock_data/significant_terms/_series.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -6,6 +6,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 'success',
diff --git a/src/fixtures/vislib/mock_data/stacked/_stacked.js b/src/fixtures/vislib/mock_data/stacked/_stacked.js
index 2df6f83a68307..548a6c172200d 100644
--- a/src/fixtures/vislib/mock_data/stacked/_stacked.js
+++ b/src/fixtures/vislib/mock_data/stacked/_stacked.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+let moment = require('moment');
 
 module.exports = {
   'label': '',
diff --git a/src/fixtures/vislib/mock_data/terms/_columns.js b/src/fixtures/vislib/mock_data/terms/_columns.js
index 5ddb10819f5dd..cbefc453bf5e9 100644
--- a/src/fixtures/vislib/mock_data/terms/_columns.js
+++ b/src/fixtures/vislib/mock_data/terms/_columns.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'columns': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'jpg',
@@ -53,6 +54,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'jpg',
@@ -98,6 +100,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'jpg',
diff --git a/src/fixtures/vislib/mock_data/terms/_rows.js b/src/fixtures/vislib/mock_data/terms/_rows.js
index 46e06d57f2e4c..e4b68c6dd621f 100644
--- a/src/fixtures/vislib/mock_data/terms/_rows.js
+++ b/src/fixtures/vislib/mock_data/terms/_rows.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'rows': [
@@ -8,6 +8,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'jpg',
@@ -53,6 +54,7 @@ module.exports = {
       'yAxisLabel': 'Count of documents',
       'series': [
         {
+          'label': 'Count',
           'values': [
             {
               'x': 'jpg',
diff --git a/src/fixtures/vislib/mock_data/terms/_series.js b/src/fixtures/vislib/mock_data/terms/_series.js
index f3732f6061764..d01b8afdcf973 100644
--- a/src/fixtures/vislib/mock_data/terms/_series.js
+++ b/src/fixtures/vislib/mock_data/terms/_series.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = {
   'label': '',
@@ -6,6 +6,7 @@ module.exports = {
   'yAxisLabel': 'Count of documents',
   'series': [
     {
+      'label': 'Count',
       'values': [
         {
           'x': 'jpg',
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 9ca708ab04fd9..c877bb414daa6 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -3,10 +3,10 @@ let { defaults } = require('lodash');
 let { resolve } = require('path');
 let { writeFile } = require('fs');
 let webpack = require('webpack');
-var Boom = require('boom');
+let Boom = require('boom');
 let DirectoryNameAsMain = require('webpack-directory-name-as-main');
 let ExtractTextPlugin = require('extract-text-webpack-plugin');
-var CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
+let CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
 
 let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');
diff --git a/src/optimize/babelOptions.build.js b/src/optimize/babelOptions.build.js
index 7ac1172141b08..c4c771c5e012c 100644
--- a/src/optimize/babelOptions.build.js
+++ b/src/optimize/babelOptions.build.js
@@ -1,5 +1,5 @@
-var cloneDeep = require('lodash').cloneDeep;
-var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
+let cloneDeep = require('lodash').cloneDeep;
+let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
 
 if (!process.env.BABEL_CACHE_PATH) {
   process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
diff --git a/src/optimize/babelOptions.js b/src/optimize/babelOptions.js
index 3fcdc01514562..f9274a615ebd1 100644
--- a/src/optimize/babelOptions.js
+++ b/src/optimize/babelOptions.js
@@ -1,5 +1,8 @@
-var cloneDeep = require('lodash').cloneDeep;
-var fromRoot = require('path').resolve.bind(null, __dirname, '../../');
+// this file is not transpiled
+'use strict'; // eslint-disable-line strict
+
+let cloneDeep = require('lodash').cloneDeep;
+let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
 
 if (!process.env.BABEL_CACHE_PATH) {
   process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
diff --git a/src/plugins/devMode/public/ngMock.js b/src/plugins/devMode/public/ngMock.js
index 1b884163e85a9..edfa8f8345287 100644
--- a/src/plugins/devMode/public/ngMock.js
+++ b/src/plugins/devMode/public/ngMock.js
@@ -1,4 +1,4 @@
-var angular = require('angular');
+const angular = require('angular');
 if (angular.mocks) {
   throw new Error(
     'Don\'t require angular-mocks directly or the tests ' +
diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js
index cdfdc1b3d3230..8b6ae18c53523 100644
--- a/src/plugins/elasticsearch/index.js
+++ b/src/plugins/elasticsearch/index.js
@@ -1,35 +1,50 @@
-module.exports = function (kibana) {
-  var healthCheck = require('./lib/health_check');
-  var exposeClient = require('./lib/expose_client');
-  var createProxy = require('./lib/create_proxy');
+import { trim, trimRight } from 'lodash';
+import { methodNotAllowed } from 'boom';
 
-  return new kibana.Plugin({
+import healthCheck from './lib/health_check';
+import exposeClient from './lib/expose_client';
+import createProxy, { createPath } from './lib/create_proxy';
+
+module.exports = function ({ Plugin }) {
+  return new Plugin({
     require: ['kibana'],
 
-    config: function (Joi) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        url: Joi.string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'),
-        preserveHost: Joi.boolean().default(true),
-        username: Joi.string(),
-        password: Joi.string(),
-        shardTimeout: Joi.number().default(0),
-        requestTimeout: Joi.number().default(30000),
-        pingTimeout: Joi.number().default(30000),
-        startupTimeout: Joi.number().default(5000),
-        ssl: Joi.object({
-          verify: Joi.boolean().default(true),
-          ca: Joi.array().single().items(Joi.string()),
-          cert: Joi.string(),
-          key: Joi.string()
+    config(Joi) {
+      const { array, boolean, number, object, string } = Joi;
+
+      return object({
+        enabled: boolean().default(true),
+        url: string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'),
+        preserveHost: boolean().default(true),
+        username: string(),
+        password: string(),
+        shardTimeout: number().default(0),
+        requestTimeout: number().default(30000),
+        pingTimeout: number().default(30000),
+        startupTimeout: number().default(5000),
+        ssl: object({
+          verify: boolean().default(true),
+          ca: array().single().items(string()),
+          cert: string(),
+          key: string()
         }).default(),
-        apiVersion: Joi.string().default('2.0'),
-        minimumVerison: Joi.string().default('2.1.0')
+        apiVersion: string().default('2.0'),
+        engineVersion: string().valid('^2.4.0').default('^2.4.0')
       }).default();
     },
 
-    init: function (server, options) {
-      var config = server.config();
+    uiExports: {
+      injectDefaultVars(server, options) {
+        return {
+          esRequestTimeout: options.requestTimeout,
+          esShardTimeout: options.shardTimeout,
+          esApiVersion: options.apiVersion,
+        };
+      }
+    },
+
+    init(server, options) {
+      const kibanaIndex = server.config().get('kibana.index');
 
       // Expose the client to the server
       exposeClient(server);
@@ -38,9 +53,10 @@ module.exports = function (kibana) {
       createProxy(server, 'POST', '/{index}/_search');
       createProxy(server, 'POST', '/{index}/_field_stats');
       createProxy(server, 'POST', '/_msearch');
+      createProxy(server, 'POST', '/_search/scroll');
 
-      function noBulkCheck(request, reply) {
-        if (/\/_bulk/.test(request.path)) {
+      function noBulkCheck({ path }, reply) {
+        if (/\/_bulk/.test(path)) {
           return reply({
             error: 'You can not send _bulk requests to this interface.'
           }).code(400).takeover();
@@ -48,17 +64,35 @@ module.exports = function (kibana) {
         return reply.continue();
       }
 
+      function noDirectIndex({ path }, reply) {
+        const requestPath = trimRight(trim(path), '/');
+        const matchPath = createPath(kibanaIndex);
+
+        if (requestPath === matchPath) {
+          return reply(methodNotAllowed('You cannot modify the primary kibana index through this interface.'));
+        }
+
+        reply.continue();
+      }
+
+      // These routes are actually used to deal with things such as managing
+      // index patterns and advanced settings, but since hapi treats route
+      // wildcards as zero-or-more, the routes also match the kibana index
+      // itself. The client-side kibana code does not deal with creating nor
+      // destroying the kibana index, so we limit that ability here.
       createProxy(
         server,
         ['PUT', 'POST', 'DELETE'],
-        '/' + config.get('kibana.index') + '/{paths*}',
+        `/${kibanaIndex}/{paths*}`,
         {
-          pre: [ noBulkCheck ]
+          pre: [ noDirectIndex, noBulkCheck ]
         }
       );
 
       // Set up the health check service and start it.
-      healthCheck(this, server).start();
+      const { start, waitUntilReady } = healthCheck(this, server);
+      server.expose('waitUntilReady', waitUntilReady);
+      start();
     }
   });
 
diff --git a/src/plugins/elasticsearch/lib/__tests__/call_with_request.js b/src/plugins/elasticsearch/lib/__tests__/call_with_request.js
new file mode 100644
index 0000000000000..7373f2ed21c3a
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/call_with_request.js
@@ -0,0 +1,30 @@
+import expect from 'expect.js';
+import { omit } from 'lodash';
+import callWithRequest from '../call_with_request';
+
+describe('call_with_request', () => {
+  let mockClient;
+
+  beforeEach(() => {
+    mockClient = {
+      search(params) {
+        this.params = params;
+        return Promise.resolve(this);
+      }
+    };
+  });
+
+  it ('passes through all headers except content-length', () => {
+    const mockRequest = {
+      headers: {
+        authorization: 'Basic QWxhZGRpbjpPcGVuU2VzYW1l',
+        'kbn-version': '4.6.0',
+        'content-length': 44
+      }
+    };
+    return callWithRequest(mockClient)(mockRequest, 'search')
+    .then(() => {
+      expect(mockClient.params.headers).to.eql(omit(mockRequest.headers, 'content-length'));
+    });
+  });
+});
diff --git a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js
index 25d529f77d86a..4af5dc0b4422d 100644
--- a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js
+++ b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js
@@ -1,17 +1,17 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var sinon = require('sinon');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const sinon = require('sinon');
 
-var checkEsVersion = require('../check_es_version');
+const checkEsVersion = require('../check_es_version');
 
 describe('plugins/elasticsearch', function () {
   describe('lib/check_es_version', function () {
-    var server;
-    var plugin;
+    let server;
+    let plugin;
 
     beforeEach(function () {
-      var get = sinon.stub().withArgs('elasticserach.minimumVerison').returns('1.4.3');
-      var config = function () { return { get: get }; };
+      const get = sinon.stub().withArgs('elasticsearch.engineVersion').returns('^1.4.3');
+      const config = function () { return { get: get }; };
       server = {
         log: _.noop,
         config: config,
@@ -22,22 +22,23 @@ describe('plugins/elasticsearch', function () {
             },
             status: {
               red: sinon.stub()
-            }
+            },
+            url: 'http://localhost:9210'
           }
         }
       };
     });
 
     function setNodes(/* ...versions */) {
-      var versions = _.shuffle(arguments);
-      var nodes = {};
-      var i = 0;
+      const versions = _.shuffle(arguments);
+      const nodes = {};
+      let i = 0;
 
       while (versions.length) {
-        var name = 'node-' + (++i);
-        var version = versions.shift();
+        const name = 'node-' + (++i);
+        const version = versions.shift();
 
-        var node = {
+        const node = {
           version: version,
           http_address: 'http_address',
           ip: 'ip'
@@ -47,7 +48,7 @@ describe('plugins/elasticsearch', function () {
         nodes[name] = node;
       }
 
-      var client = server.plugins.elasticsearch.client;
+      const client = server.plugins.elasticsearch.client;
       client.nodes.info = sinon.stub().returns(Promise.resolve({ nodes: nodes }));
 
     }
diff --git a/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
index a79877b62eaa7..18d0061282312 100644
--- a/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
+++ b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js
@@ -1,21 +1,21 @@
-var _ = require('lodash');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var Promise = require('bluebird');
+const _ = require('lodash');
+const sinon = require('sinon');
+const expect = require('expect.js');
+const Promise = require('bluebird');
 
-var createKibanaIndex = require('../create_kibana_index');
-var SetupError = require('../setup_error');
+const createKibanaIndex = require('../create_kibana_index');
+const SetupError = require('../setup_error');
 
 describe('plugins/elasticsearch', function () {
   describe('lib/create_kibana_index', function () {
 
-    var server;
-    var client;
+    let server;
+    let client;
     beforeEach(function () {
       server = {};
       client = {};
-      var config = { kibana: { index: '.my-kibana' } };
-      var get = sinon.stub();
+      let config = { kibana: { index: '.my-kibana' } };
+      const get = sinon.stub();
       get.returns(config);
       get.withArgs('kibana.index').returns(config.kibana.index);
       config = function () { return { get: get }; };
@@ -33,16 +33,16 @@ describe('plugins/elasticsearch', function () {
       });
 
       it('should check cluster.health upon successful index creation', function () {
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.then(function () {
           sinon.assert.calledOnce(client.cluster.health);
         });
       });
 
       it('should be created with mappings for config.buildNum', function () {
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.then(function () {
-          var params = client.indices.create.args[0][0];
+          const params = client.indices.create.args[0][0];
           expect(params)
             .to.have.property('body');
           expect(params.body)
@@ -60,10 +60,10 @@ describe('plugins/elasticsearch', function () {
         });
       });
 
-      it('should be created with 1 shard and 1 replica', function () {
-        var fn = createKibanaIndex(server);
+      it('should be created with 1 shard and default replica', function () {
+        const fn = createKibanaIndex(server);
         return fn.then(function () {
-          var params = client.indices.create.args[0][0];
+          const params = client.indices.create.args[0][0];
           expect(params)
             .to.have.property('body');
           expect(params.body)
@@ -71,29 +71,14 @@ describe('plugins/elasticsearch', function () {
           expect(params.body.settings)
             .to.have.property('number_of_shards', 1);
           expect(params.body.settings)
-            .to.have.property('number_of_replicas', 1);
-        });
-      });
-
-      it('should be created with 1 shard and 1 replica', function () {
-        var fn = createKibanaIndex(server);
-        return fn.then(function () {
-          var params = client.indices.create.args[0][0];
-          expect(params)
-            .to.have.property('body');
-          expect(params.body)
-            .to.have.property('settings');
-          expect(params.body.settings)
-            .to.have.property('number_of_shards', 1);
-          expect(params.body.settings)
-            .to.have.property('number_of_replicas', 1);
+            .to.not.have.property('number_of_replicas');
         });
       });
 
       it('should be created with index name set in the config', function () {
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.then(function () {
-          var params = client.indices.create.args[0][0];
+          const params = client.indices.create.args[0][0];
           expect(params)
             .to.have.property('index', '.my-kibana');
         });
@@ -104,18 +89,18 @@ describe('plugins/elasticsearch', function () {
 
     describe('failure requests', function () {
       it('should reject with a SetupError', function () {
-        var error = new Error('Oops!');
+        const error = new Error('Oops!');
         client.indices.create.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.catch(function (err) {
           expect(err).to.be.a(SetupError);
         });
       });
 
       it('should reject with an error if index creation fails', function () {
-        var error = new Error('Oops!');
+        const error = new Error('Oops!');
         client.indices.create.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.catch(function (err) {
           expect(err.message).to.be('Unable to create Kibana index ".my-kibana"');
           expect(err).to.have.property('origError', error);
@@ -124,10 +109,10 @@ describe('plugins/elasticsearch', function () {
 
 
       it('should reject with an error if health check fails', function () {
-        var error = new Error('Oops!');
+        const error = new Error('Oops!');
         client.indices.create.returns(Promise.resolve());
         client.cluster.health.returns(Promise.reject(error));
-        var fn = createKibanaIndex(server);
+        const fn = createKibanaIndex(server);
         return fn.catch(function (err) {
           expect(err.message).to.be('Waiting for Kibana index ".my-kibana" to come online failed.');
           expect(err).to.have.property('origError', error);
@@ -137,4 +122,3 @@ describe('plugins/elasticsearch', function () {
 
   });
 });
-
diff --git a/src/plugins/elasticsearch/lib/__tests__/create_proxy.js b/src/plugins/elasticsearch/lib/__tests__/create_proxy.js
new file mode 100644
index 0000000000000..895afbae3f424
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/create_proxy.js
@@ -0,0 +1,22 @@
+const expect = require('expect.js');
+const createProxy = require('../create_proxy');
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/create_proxy', function () {
+
+    describe('#createPath', function () {
+      it('prepends /elasticsearch to route', function () {
+        const path = createProxy.createPath('/wat');
+        expect(path).to.equal('/elasticsearch/wat');
+      });
+
+      context('when arg does not start with a slash', function () {
+        it('adds slash anyway', function () {
+          const path = createProxy.createPath('wat');
+          expect(path).to.equal('/elasticsearch/wat');
+        });
+      });
+    });
+
+  });
+});
diff --git a/src/plugins/elasticsearch/lib/__tests__/findPort.js b/src/plugins/elasticsearch/lib/__tests__/findPort.js
index 1448058586e68..b346ac805aeac 100644
--- a/src/plugins/elasticsearch/lib/__tests__/findPort.js
+++ b/src/plugins/elasticsearch/lib/__tests__/findPort.js
@@ -1,5 +1,5 @@
-var Promise = require('bluebird');
-var portscanner = require('portscanner');
+const Promise = require('bluebird');
+const portscanner = require('portscanner');
 
 module.exports = function findPort(start, end, host) {
   host = host || 'localhost';
diff --git a/src/plugins/elasticsearch/lib/__tests__/health_check.js b/src/plugins/elasticsearch/lib/__tests__/health_check.js
index 4394ebda2da10..da66b836832df 100644
--- a/src/plugins/elasticsearch/lib/__tests__/health_check.js
+++ b/src/plugins/elasticsearch/lib/__tests__/health_check.js
@@ -1,18 +1,18 @@
-var Promise = require('bluebird');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var NoConnections = require('elasticsearch').errors.NoConnections;
+const Promise = require('bluebird');
+const sinon = require('sinon');
+const expect = require('expect.js');
+const NoConnections = require('elasticsearch').errors.NoConnections;
 
-var healthCheck = require('../health_check');
+const healthCheck = require('../health_check');
 
 describe('plugins/elasticsearch', function () {
   describe('lib/health_check', function () {
 
-    var health;
-    var plugin;
-    var server;
-    var get;
-    var client;
+    let health;
+    let plugin;
+    let server;
+    let get;
+    let client;
 
     beforeEach(function () {
       // setup the plugin stub
@@ -39,7 +39,7 @@ describe('plugins/elasticsearch', function () {
         nodes: {
           'node-01': {
             version: '1.5.0',
-            http_address: 'inet[/127.0.0.1:9200]',
+            http_address: 'inet[/127.0.0.1:9210]',
             ip: '127.0.0.1'
           }
         }
@@ -55,7 +55,7 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should set the cluster green if everything is ready', function () {
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('elasticsearch.engineVersion').returns('^1.4.4');
       get.withArgs('kibana.index').returns('.my-kibana');
       client.ping.returns(Promise.resolve());
       client.cluster.health.returns(Promise.resolve({ timed_out: false, status: 'green' }));
@@ -73,8 +73,8 @@ describe('plugins/elasticsearch', function () {
 
     it('should set the cluster red if the ping fails, then to green', function () {
 
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('elasticsearch.url').returns('http://localhost:9210');
+      get.withArgs('elasticsearch.engineVersion').returns('^1.4.4');
       get.withArgs('kibana.index').returns('.my-kibana');
       client.ping.onCall(0).returns(Promise.reject(new NoConnections()));
       client.ping.onCall(1).returns(Promise.resolve());
@@ -85,7 +85,7 @@ describe('plugins/elasticsearch', function () {
           expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
           sinon.assert.calledOnce(plugin.status.red);
           expect(plugin.status.red.args[0][0]).to.be(
-            'Unable to connect to Elasticsearch at http://localhost:9200. Retrying in 2.5 seconds.'
+            'Unable to connect to Elasticsearch at http://localhost:9210.'
           );
           sinon.assert.calledTwice(client.ping);
           sinon.assert.calledOnce(client.nodes.info);
@@ -97,8 +97,8 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should set the cluster red if the health check status is red, then to green', function () {
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('elasticsearch.url').returns('http://localhost:9210');
+      get.withArgs('elasticsearch.engineVersion').returns('^1.4.4');
       get.withArgs('kibana.index').returns('.my-kibana');
       client.ping.returns(Promise.resolve());
       client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: false, status: 'red' }));
@@ -109,7 +109,7 @@ describe('plugins/elasticsearch', function () {
           expect(plugin.status.yellow.args[0][0]).to.be('Waiting for Elasticsearch');
           sinon.assert.calledOnce(plugin.status.red);
           expect(plugin.status.red.args[0][0]).to.be(
-            'Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.'
+            'Elasticsearch is still initializing the kibana index.'
           );
           sinon.assert.calledOnce(client.ping);
           sinon.assert.calledOnce(client.nodes.info);
@@ -120,8 +120,8 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should set the cluster yellow if the health check timed_out and create index', function () {
-      get.withArgs('elasticsearch.url').returns('http://localhost:9200');
-      get.withArgs('elasticsearch.minimumVerison').returns('1.4.4');
+      get.withArgs('elasticsearch.url').returns('http://localhost:9210');
+      get.withArgs('elasticsearch.engineVersion').returns('^1.4.4');
       get.withArgs('kibana.index').returns('.my-kibana');
       client.ping.returns(Promise.resolve());
       client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: true, status: 'red' }));
@@ -139,5 +139,16 @@ describe('plugins/elasticsearch', function () {
         });
     });
 
+    describe('#waitUntilReady', function () {
+      it('polls health until index is ready', function () {
+        client.cluster.health.onCall(0).returns(Promise.resolve({ timed_out: true })); // no index
+        client.cluster.health.onCall(1).returns(Promise.resolve({ status: 'red' }));   // initializing
+        client.cluster.health.onCall(2).returns(Promise.resolve({ status: 'green' })); // ready
+
+        return health.waitUntilReady().then(function () {
+          sinon.assert.calledThrice(client.cluster.health);
+        });
+      });
+    });
   });
 });
diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js
index 204ff1603a4ee..ff681438623e5 100644
--- a/src/plugins/elasticsearch/lib/__tests__/routes.js
+++ b/src/plugins/elasticsearch/lib/__tests__/routes.js
@@ -1,36 +1,25 @@
-var src = require('requirefrom')('src');
-var expect = require('expect.js');
-var util = require('util');
-var format = util.format;
-
-var KbnServer = src('server/KbnServer');
-var fromRoot = src('utils/fromRoot');
+const expect = require('expect.js');
+const { format } = require('util');
+const kbnTestServer = require('../../../../../test/utils/kbn_server');
+const fromRoot = require('../../../../utils/fromRoot');
 
 describe('plugins/elasticsearch', function () {
   describe('routes', function () {
 
-    var kbnServer;
+    let kbnServer;
 
     before(function () {
-      kbnServer = new KbnServer({
-        server: {
-          autoListen: false,
-          xsrf: {
-            disableProtection: true
-          }
-        },
-        logging: { quiet: true },
+      this.timeout(15000); // sometimes waiting for server takes longer than 10
+
+      kbnServer = kbnTestServer.createServer({
         plugins: {
           scanDirs: [
             fromRoot('src/plugins')
           ]
-        },
-        optimize: {
-          enabled: false
         }
       });
-
-      return kbnServer.ready();
+      return kbnServer.ready()
+      .then(() => kbnServer.server.plugins.elasticsearch.waitUntilReady());
     });
 
 
@@ -44,10 +33,10 @@ describe('plugins/elasticsearch', function () {
         options.payload = JSON.stringify(options.payload);
       }
 
-      var statusCode = options.statusCode || 200;
+      const statusCode = options.statusCode || 200;
       describe(format('%s %s', options.method, options.url), function () {
         it('should should return ' + statusCode, function (done) {
-          kbnServer.server.inject(options, function (res) {
+          kbnTestServer.makeRequest(kbnServer, options, function (res) {
             try {
               expect(res.statusCode).to.be(statusCode);
               done();
@@ -73,8 +62,19 @@ describe('plugins/elasticsearch', function () {
     testRoute({
       method: 'POST',
       url: '/elasticsearch/.kibana',
-      payload: {settings: { number_of_shards: 1, number_of_replicas: 1 }},
-      statusCode: 200
+      statusCode: 405
+    });
+
+    testRoute({
+      method: 'PUT',
+      url: '/elasticsearch/.kibana',
+      statusCode: 405
+    });
+
+    testRoute({
+      method: 'DELETE',
+      url: '/elasticsearch/.kibana',
+      statusCode: 405
     });
 
     testRoute({
diff --git a/src/plugins/elasticsearch/lib/__tests__/setup_error.js b/src/plugins/elasticsearch/lib/__tests__/setup_error.js
index 15f8f73129dc7..2047d93893108 100644
--- a/src/plugins/elasticsearch/lib/__tests__/setup_error.js
+++ b/src/plugins/elasticsearch/lib/__tests__/setup_error.js
@@ -1,10 +1,10 @@
-var SetupError = require('../setup_error');
-var expect = require('expect.js');
+const SetupError = require('../setup_error');
+const expect = require('expect.js');
 
 describe('plugins/elasticsearch', function () {
   describe('lib/setup_error', function () {
 
-    var server = {
+    const server = {
       config: function () {
         return {
           get: function () {
@@ -14,7 +14,7 @@ describe('plugins/elasticsearch', function () {
       }
     };
 
-    var err = new SetupError(server, 'Oops! <%= kibana.index %>');
+    const err = new SetupError(server, 'Oops! <%= kibana.index %>');
 
     it('should allow config values in the message template', function () {
       expect(err).to.have.property('message', 'Oops! .my-kibana');
@@ -30,19 +30,19 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should return the passed error if it is a SetupError', function () {
-      var error = new SetupError(server, 'Oh Boy!', err);
+      const error = new SetupError(server, 'Oh Boy!', err);
       expect(error).to.have.property('message', 'Oops! .my-kibana');
     });
 
     it('should store the original error', function () {
-      var origError = new Error('Boom!');
-      var error = new SetupError(server, 'Oh Boy!', origError);
+      const origError = new Error('Boom!');
+      const error = new SetupError(server, 'Oh Boy!', origError);
       expect(error).to.have.property('origError', origError);
     });
 
     it('should copy the stack from the origError', function () {
-      var origError = new Error('Boom!');
-      var error = new SetupError(server, 'Oh Boy!', origError);
+      const origError = new Error('Boom!');
+      const error = new SetupError(server, 'Oh Boy!', origError);
       expect(error).to.have.property('stack', origError.stack);
     });
 
diff --git a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
index fcd5903c0c631..debe242ee8919 100644
--- a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
+++ b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
@@ -1,17 +1,17 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var sinon = require('sinon');
-var expect = require('expect.js');
+const _ = require('lodash');
+const Promise = require('bluebird');
+const sinon = require('sinon');
+const expect = require('expect.js');
 
-var upgradeConfig = require('../upgrade_config');
+const upgradeConfig = require('../upgrade_config');
 
 describe('plugins/elasticsearch', function () {
   describe('lib/upgrade_config', function () {
-    var get;
-    var server;
-    var client;
-    var config;
-    var upgrade;
+    let get;
+    let server;
+    let client;
+    let config;
+    let upgrade;
 
     beforeEach(function () {
       get = sinon.stub();
@@ -32,7 +32,7 @@ describe('plugins/elasticsearch', function () {
     });
 
     describe('nothing is found', function () {
-      var response = { hits: { hits:[] } };
+      const response = { hits: { hits:[] } };
 
       beforeEach(function () {
         client.create.returns(Promise.resolve());
@@ -48,14 +48,14 @@ describe('plugins/elasticsearch', function () {
         it('should resolve buildNum to pkg.buildNum config', function () {
           return upgrade(response).then(function (resp) {
             sinon.assert.calledOnce(client.create);
-            var params = client.create.args[0][0];
+            const params = client.create.args[0][0];
             expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
           });
         });
 
         it('should resolve version to pkg.version config', function () {
           return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
+            const params = client.create.args[0][0];
             expect(params).to.have.property('id', get('pkg.version'));
           });
         });
@@ -70,14 +70,14 @@ describe('plugins/elasticsearch', function () {
 
         it('should resolve buildNum to pkg.buildNum config', function () {
           return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
+            const params = client.create.args[0][0];
             expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
           });
         });
 
         it('should resolve version to pkg.version config', function () {
           return upgrade(response).then(function (resp) {
-            var params = client.create.args[0][0];
+            const params = client.create.args[0][0];
             expect(params).to.have.property('id', get('pkg.version'));
           });
         });
@@ -85,14 +85,14 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should resolve with undefined if the current version is found', function () {
-      var response = { hits: { hits: [ { _id: '4.0.1' } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.1' } ] } };
       return upgrade(response).then(function (resp) {
         expect(resp).to.be(undefined);
       });
     });
 
     it('should resolve with undefined if the nothing is upgradeable', function () {
-      var response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
       return upgrade(response).then(function (resp) {
         expect(resp).to.be(undefined);
       });
@@ -101,10 +101,10 @@ describe('plugins/elasticsearch', function () {
     it('should update the build number on the new config', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
       return upgrade(response).then(function (resp) {
         sinon.assert.calledOnce(client.create);
-        var params = client.create.args[0][0];
+        const params = client.create.args[0][0];
         expect(params).to.have.property('body');
         expect(params.body).to.have.property('buildNum', 5801);
         expect(params).to.have.property('index', '.my-kibana');
@@ -116,11 +116,11 @@ describe('plugins/elasticsearch', function () {
     it('should log a message for upgrades', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
       return upgrade(response).then(function (resp) {
         sinon.assert.calledOnce(server.log);
         expect(server.log.args[0][0]).to.eql(['plugin', 'elasticsearch']);
-        var msg = server.log.args[0][1];
+        const msg = server.log.args[0][1];
         expect(msg).to.have.property('prevVersion', '4.0.0');
         expect(msg).to.have.property('newVersion', '4.0.1');
         expect(msg.tmpl).to.contain('Upgrade');
@@ -130,10 +130,10 @@ describe('plugins/elasticsearch', function () {
     it('should copy attributes from old config', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
-      var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } };
       return upgrade(response).then(function (resp) {
         sinon.assert.calledOnce(client.create);
-        var params = client.create.args[0][0];
+        const params = client.create.args[0][0];
         expect(params).to.have.property('body');
         expect(params.body).to.have.property('defaultIndex', 'logstash-*');
       });
diff --git a/src/plugins/elasticsearch/lib/__tests__/validate.js b/src/plugins/elasticsearch/lib/__tests__/validate.js
deleted file mode 100644
index e2cb6e2b6ca09..0000000000000
--- a/src/plugins/elasticsearch/lib/__tests__/validate.js
+++ /dev/null
@@ -1,222 +0,0 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var src = require('requirefrom')('src');
-
-var fromRoot = src('utils/fromRoot');
-var KbnServer = src('server/KbnServer');
-var validateRequest = require('../validate');
-
-
-describe('plugins/elasticsearch', function () {
-  var kbnServer;
-  var server;
-  var config;
-
-  before(function () {
-    kbnServer = new KbnServer({
-      server: { autoListen: false },
-      plugins: { scanDirs: [ fromRoot('src/plugins') ] },
-      logging: { quiet: true },
-      optimize: { enabled: false }
-    });
-
-    return kbnServer.ready()
-    .then(function () {
-      server = kbnServer.server;
-      config = kbnServer.config;
-    });
-  });
-
-  after(function () {
-    return kbnServer.close();
-  });
-
-  describe('lib/validate', function () {
-
-    function del(path, body, valid) {
-      run('delEte', path, body, valid);
-      run('delete', path, body, valid);
-    }
-
-    function send(path, body, valid) {
-      run('POST', path, body, valid);
-      run('post', path, body, valid);
-      run('PUT', path, body, valid);
-      run('put', path, body, valid);
-    }
-
-    function run(method, path, body, valid) {
-      if (typeof body === 'boolean') {
-        valid = body;
-        body = null;
-      }
-
-      if (_.isArray(body)) body = body.map(JSON.stringify).join('\n') + '\n';
-      if (_.isObject(body)) body = JSON.stringify(body);
-
-      var pass = false;
-      try {
-        validateRequest(server, {
-          method: method.toLowerCase(),
-          path: path,
-          payload: body
-        });
-        pass = true;
-      } catch (e) {} // eslint-disable-line no-empty
-
-      if (pass !== Boolean(valid)) {
-        var msg = 'Expected ' + method + ' ' +
-          path + ' ' + (body ? 'with body ' : '') +
-          'to ' + (!valid ? 'not ' : '') + 'validate';
-
-        if (body) {
-          msg += ' – ' + body;
-        }
-
-        throw new Error(msg);
-      }
-    }
-
-    describe('index management', function () {
-      it('allows creating kibana index', function () {
-        send('/' + config.get('kibana.index'), true);
-      });
-
-      it('allows deleting the kibana index', function () {
-        del('/' + config.get('kibana.index'), true);
-      });
-
-      it('blocks creating a non-kibana index', function () {
-        send('/app-index', false);
-      });
-
-      it('blocks deleting a non-kibana indices', function () {
-        del('/app-data', false);
-      });
-    });
-
-    describe('doc management', function () {
-      it('allows indexing to the kibana index', function () {
-        send('/' + config.get('kibana.index'), true);
-        send('/' + config.get('kibana.index') + '/index-patterns', true);
-        send('/' + config.get('kibana.index') + '/index-patterns/pattern-id', true);
-      });
-
-      it('allows deleting kibana documents', function () {
-        del('/' + config.get('kibana.index') + '/index-patterns', true);
-        del('/' + config.get('kibana.index') + '/index-patterns/pattern-id', true);
-      });
-    });
-
-    describe('allows any destructive non-bulk requests against kibana index', function () {
-      it('refresh', function () {
-        send('/' + config.get('kibana.index') + '/_refresh', true);
-      });
-
-      it('delete', function () {
-        del('/' + config.get('kibana.index') + '/pasta/lasagna', true);
-      });
-    });
-
-    describe('assorted methods that are non-destructive', function () {
-      it('validate', function () {
-        run('GET', '/_search?search_type=count', true);
-        run('GET', '/index/type/id', true);
-        run('GET', '/index/type/_mapping/field/field1', true);
-        run('GET', '/_aliases', true);
-        run('GET', '/_nodes/', true);
-        run('HEAD', '/', true);
-        run('HEAD', '/' + config.get('kibana.index'), true);
-        run('HEAD', '/other-index', true);
-        run('GET', '/_cluster/health', true);
-        run('POST', '/' + config.get('kibana.index') + '/__notRealIndex__/_validate/query?q=foo:bar', true);
-        run('POST', '/_validate', true);
-        run('POST', '/_search', true);
-      });
-    });
-
-    describe('bulk indexing', function () {
-      it('valid', function () {
-        send('/_bulk', [
-          { create: { _index: config.get('kibana.index'), _type: 'index-pattern' } },
-          { fields: [] },
-          { create: { _index: config.get('kibana.index'), _type: 'vis' } },
-          { aggs: [] }
-        ], true);
-
-        send('/' + config.get('kibana.index') + '/_bulk', [
-          // implicit index
-          { create: { _type: 'index-pattern' } },
-          { fields: [] },
-
-          // explicit index
-          { create: { _index: config.get('kibana.index'), _type: 'vis' } },
-          { aggs: [] }
-
-        ], true);
-      });
-
-      it('rejects bulks including even one other index', function () {
-        send('/' + config.get('kibana.index') + '/_bulk', [
-          // implicit index
-          { create: { _type: 'index-pattern' } },
-          { fields: [] },
-          // explicit index
-          { create: { _index: 'app-data', _type: 'vis' } },
-          { aggs: [] }
-        ], false);
-      });
-
-      it('rejects malformed bulk bodies', function () {
-        send('/_bulk', '{}\n{ "_index": "john" }\n', false);
-        send('/_bulk', '{}\n{}\n', false);
-        send('/_bulk', '{ "field": "value" }', false);
-        send('/_bulk', '{ "field": "v', false);
-      });
-    });
-
-    describe('msearch', function () {
-      it('requires a bulk-formatted body', function () {
-        send('/_msearch', false);
-        send('/_msearch', '{}', false);
-        send('/_msearch', '{}\n{}\n', true);
-        send('/_msearch', '{}\n{}\n{}\n', false);
-      });
-
-      it('allows searching any index', function () {
-        send('/app-index/_msearch', [
-          {},
-          { query: { match_all: {} } }
-        ], true);
-
-        send('/app-index/data-type/_msearch', [
-          {},
-          { query: { match_all: {} } }
-        ], true);
-
-        send('/_msearch', [
-          { _index: 'app-index', _type: 'data-type' },
-          { query: { match_all: {} } },
-          { _index: 'IT-index', _type: 'logs' },
-          { query: { match_all: {} } },
-          { _index: 'L33t', _type: '?' },
-          { query: { match_all: {} } },
-        ], true);
-      });
-    });
-
-    describe('mget', function () {
-      it('requires a valid json body', function () {
-        send('/_mget', false);
-        send('/_mget', '{}', true);
-        send('/_mget', '{}\n{}\n', false);
-      });
-
-      it('allows reading from any index', function () {
-        send('/app-index/_mget', { docs: { match_all: {} } }, true);
-        send('/app-index/data-type/_mget', { docs: [ {} ] }, true);
-      });
-    });
-
-  });
-});
diff --git a/src/plugins/elasticsearch/lib/__tests__/version_math.js b/src/plugins/elasticsearch/lib/__tests__/version_math.js
deleted file mode 100644
index cd6be46b3b1e3..0000000000000
--- a/src/plugins/elasticsearch/lib/__tests__/version_math.js
+++ /dev/null
@@ -1,134 +0,0 @@
-var _ = require('lodash');
-var versionMath = require('../version_math');
-var expect = require('expect.js');
-var versions = [
-  '1.1.12',
-  '1.1.12',
-  '1.1.12',
-  '1.1.12',
-  '0.90.0',
-  '0.90.1',
-  '1.0.0',
-  '1.0',
-  '1.2.3',
-  '2.0.0',
-  '2.0.1',
-  '2.3.1'
-];
-
-describe('plugins/elasticsearch', function () {
-  describe('lib/version_math', function () {
-    describe('version math (0.90.0 - 2.3.1)', function () {
-      var methods = 'max,min,eq,is,lt,lte,gt,gte'.split(',');
-      describe('methods', function () {
-        it('should have ' + methods.join(', ') + ' methods', function () {
-          _.each(methods, function (method) {
-            expect(versionMath[method]).to.be.a(Function);
-          });
-        });
-      });
-
-      describe('min & max', function () {
-        it('has a max of 2.3.1', function () {
-          expect(versionMath.max(versions)).to.be('2.3.1');
-        });
-
-        it('has a min of 0.90.0', function () {
-          expect(versionMath.min(versions)).to.be('0.90.0');
-        });
-      });
-
-      describe('eq / lowest version', function () {
-        it('should be true for  0.90.0', function () {
-          expect(versionMath.eq('0.90.0', versions)).to.be(true);
-        });
-
-        it('should be false for 1.0', function () {
-          expect(versionMath.eq('1.0', versions)).to.be(false);
-        });
-      });
-
-      describe('gt / lowest version', function () {
-        it('is > 0.20.3', function () {
-          expect(versionMath.gt('0.20.3', versions)).to.be(true);
-        });
-
-        it('is not > 0.90.0', function () {
-          expect(versionMath.gt('0.90.0', versions)).to.be(false);
-        });
-
-        it('is not > 1.0.0', function () {
-          expect(versionMath.gt('1.0.0', versions)).to.be(false);
-        });
-      });
-
-      describe('gte / lowest version', function () {
-        it('is >= 0.20.3', function () {
-          expect(versionMath.gte('0.20.3', versions)).to.be(true);
-        });
-
-        it('is >= 0.90.0', function () {
-          expect(versionMath.gte('0.90.0', versions)).to.be(true);
-        });
-
-        it('is not >= 1.0.0', function () {
-          expect(versionMath.gte('1.0.0', versions)).to.be(false);
-        });
-      });
-
-      describe('lt / highest version', function () {
-        it('is not < 0.20.3', function () {
-          expect(versionMath.lt('0.20.3', versions)).to.be(false);
-        });
-
-        it('is not < 2.3.1', function () {
-          expect(versionMath.lt('2.3.1', versions)).to.be(false);
-        });
-
-        it('is < 2.5', function () {
-          expect(versionMath.lt('2.5', versions)).to.be(true);
-        });
-      });
-
-      describe('lte / highest version', function () {
-        it('is not =< 0.20.3', function () {
-          expect(versionMath.lte('0.20.3', versions)).to.be(false);
-        });
-
-        it('is =< 2.3.1', function () {
-          expect(versionMath.lte('2.3.1', versions)).to.be(true);
-        });
-
-        it('is =< 2.5', function () {
-          expect(versionMath.lte('2.5', versions)).to.be(true);
-        });
-      });
-
-      describe('is', function () {
-        it('exactly, <, <=, >, >=', function () {
-          expect(versionMath.is('0.90.0', versions)).to.be(true);
-          expect(versionMath.is('0.20.0', versions)).to.be(false);
-
-          expect(versionMath.is('>0.20.0', versions)).to.be(true);
-          expect(versionMath.is('>0.90.0', versions)).to.be(false);
-          expect(versionMath.is('>0.90.1', versions)).to.be(false);
-
-          expect(versionMath.is('>=0.20.0', versions)).to.be(true);
-          expect(versionMath.is('>=0.90.0', versions)).to.be(true);
-          expect(versionMath.is('>=0.90.1', versions)).to.be(false);
-
-          expect(versionMath.is('<2.5', versions)).to.be(true);
-          expect(versionMath.is('<2.3.1', versions)).to.be(false);
-          expect(versionMath.is('<0.90.1', versions)).to.be(false);
-
-          expect(versionMath.is('<=2.5', versions)).to.be(true);
-          expect(versionMath.is('<=2.3.1', versions)).to.be(true);
-          expect(versionMath.is('<=0.90.1', versions)).to.be(false);
-        });
-      });
-
-    });
-  });
-});
-
-
diff --git a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
new file mode 100644
index 0000000000000..20438a445d887
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
@@ -0,0 +1,45 @@
+const versionSatisfies = require('../version_satisfies');
+const expect = require('expect.js');
+
+const versionChecks = [
+  // order is: ['actual version', 'match expression', satisfied (true/false)]
+  ['0.90.0', '>=0.90.0', true],
+  ['1.2.0', '>=1.2.1 <2.0.0', false],
+  ['1.2.1', '>=1.2.1 <2.0.0', true],
+  ['1.4.4', '>=1.2.1 <2.0.0', true],
+  ['1.7.4', '>=1.3.1 <2.0.0', true],
+  ['2.0.0', '>=1.3.1 <2.0.0', false],
+  ['1.4.3', '^1.4.3', true],
+  ['1.4.3-Beta1', '^1.4.3', true],
+  ['1.4.4', '^1.4.3', true],
+  ['1.1.12', '^1.0.0', true],
+  ['1.1.12', '~1.0.0', false],
+  ['1.6.1-SNAPSHOT', '1.6.1', true],
+  ['1.6.1-SNAPSHOT', '1.6.2', false],
+  ['1.7.1-SNAPSHOT', '^1.3.1', true],
+  ['1.3.4', '^1.4.0', false],
+  ['2.0.1', '^2.0.0', true],
+  ['2.1.1', '^2.1.0', true],
+  ['2.2.0', '^2.1.0', true],
+  ['3.0.0-snapshot', '^2.1.0', false],
+  ['3.0.0', '^2.1.0', false],
+  ['2.10.20-snapshot', '^2.10.20', true],
+  ['2.10.999', '^2.10.20', true],
+];
+
+describe('plugins/elasticsearch', function () {
+  describe('lib/version_satisfies', function () {
+    versionChecks.forEach(function (spec) {
+      const actual = spec[0];
+      const match = spec[1];
+      const satisfied = spec[2];
+      const desc = actual + ' satisfies ' + match;
+
+      describe(desc, function () {
+        it('should be ' + satisfied, function () {
+          expect(versionSatisfies(actual, match)).to.be(satisfied);
+        });
+      });
+    });
+  });
+});
diff --git a/src/plugins/elasticsearch/lib/call_with_request.js b/src/plugins/elasticsearch/lib/call_with_request.js
index 1bd818296c736..b019cf18f903e 100644
--- a/src/plugins/elasticsearch/lib/call_with_request.js
+++ b/src/plugins/elasticsearch/lib/call_with_request.js
@@ -2,15 +2,21 @@ const _ = require('lodash');
 const Promise = require('bluebird');
 const Boom = require('boom');
 const getBasicAuthRealm = require('./get_basic_auth_realm');
+const toPath = require('lodash/internal/toPath');
+
+const PASSTHRU_HEADERS_BLACKLIST = [ 'content-length' ];
 
 module.exports = (client) => {
   return (req, endpoint, params = {}) => {
-    if (req.headers.authorization) {
-      _.set(params, 'headers.authorization', req.headers.authorization);
+    _.set(params, 'headers', _.omit(req.headers, PASSTHRU_HEADERS_BLACKLIST));
+    const path = toPath(endpoint);
+    const api = _.get(client, path);
+    let apiContext = _.get(client, path.slice(0, -1));
+    if (_.isEmpty(apiContext)) {
+      apiContext = client;
     }
-    const api = _.get(client, endpoint);
     if (!api) throw new Error(`callWithRequest called with an invalid endpoint: ${endpoint}`);
-    return api.call(client, params)
+    return api.call(apiContext, params)
       .catch((err) => {
         if (err.status === 401) {
           // TODO: The err.message is temporary until we have support for getting headers in the client.
diff --git a/src/plugins/elasticsearch/lib/check_es_version.js b/src/plugins/elasticsearch/lib/check_es_version.js
index 969ac62c535d2..c06c5e4c34cba 100644
--- a/src/plugins/elasticsearch/lib/check_es_version.js
+++ b/src/plugins/elasticsearch/lib/check_es_version.js
@@ -1,36 +1,35 @@
-var _ = require('lodash');
-var esBool = require('./es_bool');
-var versionMath = require('./version_math');
-var SetupError = require('./setup_error');
+const _ = require('lodash');
+const esBool = require('./es_bool');
+const versionSatisfies = require('./version_satisfies');
+const SetupError = require('./setup_error');
 
 module.exports = function (server) {
   server.log(['plugin', 'debug'], 'Checking Elasticsearch version');
 
-  var client = server.plugins.elasticsearch.client;
-  var minimumElasticsearchVersion = server.config().get('elasticsearch.minimumVerison');
+  const client = server.plugins.elasticsearch.client;
+  const engineVersion = server.config().get('elasticsearch.engineVersion');
 
   return client.nodes.info()
   .then(function (info) {
-    var badNodes = _.filter(info.nodes, function (node) {
+    const badNodes = _.filter(info.nodes, function (node) {
       // remove client nodes (Logstash)
-      var isClient = _.get(node, 'attributes.client');
+      const isClient = _.get(node, 'attributes.client');
       if (isClient != null && esBool(isClient) === true) {
         return false;
       }
 
-      // remove nodes that are gte the min version
-      var v = node.version.split('-')[0];
-      return !versionMath.gte(minimumElasticsearchVersion, v);
+      // remove nodes that satify required engine version
+      return !versionSatisfies(node.version, engineVersion);
     });
 
     if (!badNodes.length) return true;
 
-    var badNodeNames = badNodes.map(function (node) {
+    const badNodeNames = badNodes.map(function (node) {
       return 'Elasticsearch v' + node.version + ' @ ' + node.http_address + ' (' + node.ip + ')';
     });
 
-    var message = `This version of Kibana requires Elasticsearch ` +
-    `${minimumElasticsearchVersion} or higher on all nodes. I found ` +
+    const message = `This version of Kibana requires Elasticsearch ` +
+    `${engineVersion} on all nodes. I found ` +
     `the following incompatible nodes in your cluster: ${badNodeNames.join(',')}`;
 
     throw new SetupError(server, message);
diff --git a/src/plugins/elasticsearch/lib/create_agent.js b/src/plugins/elasticsearch/lib/create_agent.js
index 5fd7afc56be24..a7fc8c2b6b448 100644
--- a/src/plugins/elasticsearch/lib/create_agent.js
+++ b/src/plugins/elasticsearch/lib/create_agent.js
@@ -1,16 +1,16 @@
-var url = require('url');
-var _ = require('lodash');
-var readFile = (file) => require('fs').readFileSync(file, 'utf8');
-var http = require('http');
-var https = require('https');
+const url = require('url');
+const _ = require('lodash');
+const readFile = (file) => require('fs').readFileSync(file, 'utf8');
+const http = require('http');
+const https = require('https');
 
 module.exports = _.memoize(function (server) {
-  var config = server.config();
-  var target = url.parse(config.get('elasticsearch.url'));
+  const config = server.config();
+  const target = url.parse(config.get('elasticsearch.url'));
 
   if (!/^https/.test(target.protocol)) return new http.Agent();
 
-  var agentOptions = {
+  const agentOptions = {
     rejectUnauthorized: config.get('elasticsearch.ssl.verify')
   };
 
diff --git a/src/plugins/elasticsearch/lib/create_kibana_index.js b/src/plugins/elasticsearch/lib/create_kibana_index.js
index f8640f2fdc3ea..3d18eecf38490 100644
--- a/src/plugins/elasticsearch/lib/create_kibana_index.js
+++ b/src/plugins/elasticsearch/lib/create_kibana_index.js
@@ -1,8 +1,8 @@
-var SetupError = require('./setup_error');
-var format = require('util').format;
+const SetupError = require('./setup_error');
+const format = require('util').format;
 module.exports = function (server) {
-  var client = server.plugins.elasticsearch.client;
-  var index = server.config().get('kibana.index');
+  const client = server.plugins.elasticsearch.client;
+  const index = server.config().get('kibana.index');
 
   function handleError(message) {
     return function (err) {
@@ -14,8 +14,7 @@ module.exports = function (server) {
     index: index,
     body: {
       settings: {
-        number_of_shards: 1,
-        number_of_replicas: 1
+        number_of_shards: 1
       },
       mappings: {
         config: {
diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js
index d13f5b8a7a053..e54c6d95d8e67 100644
--- a/src/plugins/elasticsearch/lib/create_proxy.js
+++ b/src/plugins/elasticsearch/lib/create_proxy.js
@@ -1,26 +1,38 @@
-var createAgent = require('./create_agent');
-var mapUri = require('./map_uri');
-var { resolve } = require('url');
-module.exports = function createProxy(server, method, route, config) {
+const createAgent = require('./create_agent');
+const mapUri = require('./map_uri');
+const { resolve } = require('url');
+const { assign } = require('lodash');
 
-  var pre = '/elasticsearch';
-  var sep = route[0] === '/' ? '' : '/';
-  var path = `${pre}${sep}${route}`;
-  var options = {
+function createProxy(server, method, route, config) {
+
+  const options = {
     method: method,
-    path: path,
+    path: createProxy.createPath(route),
+    config: {
+      timeout: {
+        socket: server.config().get('elasticsearch.requestTimeout')
+      }
+    },
     handler: {
       proxy: {
         mapUri: mapUri(server),
         passThrough: true,
         agent: createAgent(server),
-        xforward: true
+        xforward: true,
+        timeout: server.config().get('elasticsearch.requestTimeout')
       }
     },
   };
 
-  if (config) options.config = config;
+  assign(options.config, config);
 
   server.route(options);
 };
 
+createProxy.createPath = function createPath(path) {
+  const pre = '/elasticsearch';
+  const sep = path[0] === '/' ? '' : '/';
+  return `${pre}${sep}${path}`;
+};
+
+module.exports = createProxy;
diff --git a/src/plugins/elasticsearch/lib/es_bool.js b/src/plugins/elasticsearch/lib/es_bool.js
index 4d9b679a69a6a..353520f3fea32 100644
--- a/src/plugins/elasticsearch/lib/es_bool.js
+++ b/src/plugins/elasticsearch/lib/es_bool.js
@@ -1,4 +1,4 @@
-var map = {
+const map = {
   'false': false,
   'off': false,
   'no': false,
@@ -9,7 +9,7 @@ var map = {
   '1': true
 };
 module.exports = function (str) {
-  var bool = map[String(str)];
+  const bool = map[String(str)];
   if (typeof bool !== 'boolean') {
     throw new TypeError('"' + str + '" does not map to an esBool');
   }
diff --git a/src/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js
index 8a3d8fba8cd57..167419be5314e 100644
--- a/src/plugins/elasticsearch/lib/expose_client.js
+++ b/src/plugins/elasticsearch/lib/expose_client.js
@@ -1,12 +1,12 @@
-var elasticsearch = require('elasticsearch');
-var _ = require('lodash');
-var readFile = (file) => require('fs').readFileSync(file, 'utf8');
-var util = require('util');
-var url = require('url');
-var callWithRequest = require('./call_with_request');
+const elasticsearch = require('elasticsearch');
+const _ = require('lodash');
+const readFile = (file) => require('fs').readFileSync(file, 'utf8');
+const util = require('util');
+const url = require('url');
+const callWithRequest = require('./call_with_request');
 
 module.exports = function (server) {
-  var config = server.config();
+  const config = server.config();
 
   function createClient(options) {
     options = _.defaults(options || {}, {
@@ -18,18 +18,20 @@ module.exports = function (server) {
       clientKey: config.get('elasticsearch.ssl.key'),
       ca: config.get('elasticsearch.ssl.ca'),
       apiVersion: config.get('elasticsearch.apiVersion'),
+      pingTimeout: config.get('elasticsearch.pingTimeout'),
+      requestTimeout: config.get('elasticsearch.requestTimeout'),
       keepAlive: true,
       auth: true
     });
 
-    var uri = url.parse(options.url);
+    const uri = url.parse(options.url);
 
-    var authorization;
+    let authorization;
     if (options.auth && options.username && options.password) {
       uri.auth = util.format('%s:%s', options.username, options.password);
     }
 
-    var ssl = { rejectUnauthorized: options.verifySsl };
+    const ssl = { rejectUnauthorized: options.verifySsl };
     if (options.clientCrt && options.clientKey) {
       ssl.cert = readFile(options.clientCrt);
       ssl.key = readFile(options.clientKey);
@@ -41,8 +43,11 @@ module.exports = function (server) {
     return new elasticsearch.Client({
       host: url.format(uri),
       ssl: ssl,
+      plugins: options.plugins,
       apiVersion: options.apiVersion,
       keepAlive: options.keepAlive,
+      pingTimeout: options.pingTimeout,
+      requestTimeout: options.requestTimeout,
       log: function () {
         this.error = function (err) {
           server.log(['error', 'elasticsearch'], err);
@@ -58,15 +63,17 @@ module.exports = function (server) {
     });
   }
 
-  var client = createClient();
+  const client = createClient();
   server.on('close', _.bindKey(client, 'close'));
 
-  var noAuthClient = createClient({ auth: false });
+  const noAuthClient = createClient({ auth: false });
   server.on('close', _.bindKey(noAuthClient, 'close'));
 
   server.expose('client', client);
   server.expose('createClient', createClient);
+  server.expose('callWithRequestFactory', callWithRequest);
   server.expose('callWithRequest', callWithRequest(noAuthClient));
+  server.expose('errors', elasticsearch.errors);
 
   return client;
 
diff --git a/src/plugins/elasticsearch/lib/health_check.js b/src/plugins/elasticsearch/lib/health_check.js
index 654f89ae0cbe2..ac11fe6950d9c 100644
--- a/src/plugins/elasticsearch/lib/health_check.js
+++ b/src/plugins/elasticsearch/lib/health_check.js
@@ -1,31 +1,38 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
-var elasticsearch = require('elasticsearch');
-var exposeClient = require('./expose_client');
-var migrateConfig = require('./migrate_config');
-var createKibanaIndex = require('./create_kibana_index');
-var checkEsVersion = require('./check_es_version');
-var NoConnections = elasticsearch.errors.NoConnections;
-var util = require('util');
-var format = util.format;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const elasticsearch = require('elasticsearch');
+const exposeClient = require('./expose_client');
+const migrateConfig = require('./migrate_config');
+const createKibanaIndex = require('./create_kibana_index');
+const checkEsVersion = require('./check_es_version');
+const NoConnections = elasticsearch.errors.NoConnections;
+const util = require('util');
+const format = util.format;
+
+const NO_INDEX = 'no_index';
+const INITIALIZING = 'initializing';
+const READY = 'ready';
+
+const REQUEST_DELAY = 2500;
 
 module.exports = function (plugin, server) {
-  var config = server.config();
-  var client = server.plugins.elasticsearch.client;
+  const config = server.config();
+  const client = server.plugins.elasticsearch.client;
 
   plugin.status.yellow('Waiting for Elasticsearch');
 
   function waitForPong() {
-    return client.ping({ requestTimeout: 1500 }).catch(function (err) {
+    return client.ping().catch(function (err) {
       if (!(err instanceof NoConnections)) throw err;
 
-      plugin.status.red(format('Unable to connect to Elasticsearch at %s. Retrying in 2.5 seconds.', config.get('elasticsearch.url')));
+      plugin.status.red(format('Unable to connect to Elasticsearch at %s.', config.get('elasticsearch.url')));
 
-      return Promise.delay(2500).then(waitForPong);
+      return Promise.delay(REQUEST_DELAY).then(waitForPong);
     });
   }
 
-  function waitForShards() {
+  // just figure out the current "health" of the es setup
+  function getHealth() {
     return client.cluster.health({
       timeout: '5s', // tells es to not sit around and wait forever
       index: config.get('kibana.index'),
@@ -35,15 +42,39 @@ module.exports = function (plugin, server) {
       // if "timed_out" === true then elasticsearch could not
       // find any idices matching our filter within 5 seconds
       if (!resp || resp.timed_out) {
-        plugin.status.yellow('No existing Kibana index found');
-        return createKibanaIndex(server);
+        return NO_INDEX;
       }
 
       // If status === "red" that means that index(es) were found
       // but the shards are not ready for queries
       if (resp.status === 'red') {
-        plugin.status.red('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
-        return Promise.delay(2500).then(waitForShards);
+        return INITIALIZING;
+      }
+
+      return READY;
+    });
+  }
+
+  function waitUntilReady() {
+    return getHealth()
+    .then(function (health) {
+      if (health !== READY) {
+        return Promise.delay(REQUEST_DELAY).then(waitUntilReady);
+      }
+    });
+  }
+
+  function waitForShards() {
+    return getHealth()
+    .then(function (health) {
+      if (health === NO_INDEX) {
+        plugin.status.yellow('No existing Kibana index found');
+        return createKibanaIndex(server);
+      }
+
+      if (health === INITIALIZING) {
+        plugin.status.red('Elasticsearch is still initializing the kibana index.');
+        return Promise.delay(REQUEST_DELAY).then(waitForShards);
       }
 
       // otherwise we are g2g
@@ -59,12 +90,12 @@ module.exports = function (plugin, server) {
     .catch(err => plugin.status.red(err));
   }
 
-  var timeoutId = null;
+  let timeoutId = null;
 
   function scheduleCheck(ms) {
     if (timeoutId) return;
 
-    var myId = setTimeout(function () {
+    const myId = setTimeout(function () {
       check().finally(function () {
         if (timeoutId === myId) startorRestartChecking();
       });
@@ -74,7 +105,7 @@ module.exports = function (plugin, server) {
   }
 
   function startorRestartChecking() {
-    scheduleCheck(stopChecking() ? 2500 : 1);
+    scheduleCheck(stopChecking() ? REQUEST_DELAY : 1);
   }
 
   function stopChecking() {
@@ -85,6 +116,7 @@ module.exports = function (plugin, server) {
   }
 
   return {
+    waitUntilReady: waitUntilReady,
     run: check,
     start: startorRestartChecking,
     stop: stopChecking,
diff --git a/src/plugins/elasticsearch/lib/is_upgradeable.js b/src/plugins/elasticsearch/lib/is_upgradeable.js
index 3629faaa0b4ca..bb43aac87169d 100644
--- a/src/plugins/elasticsearch/lib/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/is_upgradeable.js
@@ -1,19 +1,19 @@
-var semver = require('semver');
-var utils = require('requirefrom')('src/utils');
-var rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
+const semver = require('semver');
+const utils = require('requirefrom')('src/utils');
+const rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
 
 module.exports = function (server, doc) {
-  var config = server.config();
+  const config = server.config();
   if (/beta|snapshot/i.test(doc._id)) return false;
   if (!doc._id) return false;
   if (doc._id === config.get('pkg.version')) return false;
 
-  var packageRcRelease = Infinity;
-  var rcRelease = Infinity;
-  var packageVersion = config.get('pkg.version');
-  var version = doc._id;
-  var matches = doc._id.match(rcVersionRegex);
-  var packageMatches = config.get('pkg.version').match(rcVersionRegex);
+  let packageRcRelease = Infinity;
+  let rcRelease = Infinity;
+  let packageVersion = config.get('pkg.version');
+  let version = doc._id;
+  const matches = doc._id.match(rcVersionRegex);
+  const packageMatches = config.get('pkg.version').match(rcVersionRegex);
 
   if (matches) {
     version = matches[1];
diff --git a/src/plugins/elasticsearch/lib/map_uri.js b/src/plugins/elasticsearch/lib/map_uri.js
index de78529c05638..f7b1b327ee59e 100644
--- a/src/plugins/elasticsearch/lib/map_uri.js
+++ b/src/plugins/elasticsearch/lib/map_uri.js
@@ -1,15 +1,15 @@
-var querystring = require('querystring');
-var resolve = require('url').resolve;
+const querystring = require('querystring');
+const resolve = require('url').resolve;
 module.exports = function mapUri(server, prefix) {
-  var config = server.config();
+  const config = server.config();
   return function (request, done) {
-    var path = request.path.replace('/elasticsearch', '');
-    var url = config.get('elasticsearch.url');
+    const path = request.path.replace('/elasticsearch', '');
+    let url = config.get('elasticsearch.url');
     if (path) {
       if (/\/$/.test(url)) url = url.substring(0, url.length - 1);
       url += path;
     }
-    var query = querystring.stringify(request.query);
+    const query = querystring.stringify(request.query);
     if (query) url += '?' + query;
     done(null, url);
   };
diff --git a/src/plugins/elasticsearch/lib/migrate_config.js b/src/plugins/elasticsearch/lib/migrate_config.js
index 3d32bb2137908..632c7e69166c6 100644
--- a/src/plugins/elasticsearch/lib/migrate_config.js
+++ b/src/plugins/elasticsearch/lib/migrate_config.js
@@ -1,9 +1,9 @@
-var upgrade = require('./upgrade_config');
+const upgrade = require('./upgrade_config');
 
 module.exports = function (server) {
-  var config = server.config();
-  var client = server.plugins.elasticsearch.client;
-  var options =  {
+  const config = server.config();
+  const client = server.plugins.elasticsearch.client;
+  const options =  {
     index: config.get('kibana.index'),
     type: 'config',
     body: {
diff --git a/src/plugins/elasticsearch/lib/setup_error.js b/src/plugins/elasticsearch/lib/setup_error.js
index 25c93badd3964..483b592c7a592 100644
--- a/src/plugins/elasticsearch/lib/setup_error.js
+++ b/src/plugins/elasticsearch/lib/setup_error.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
-var util = require('util');
+const _ = require('lodash');
+const util = require('util');
 
 function SetupError(server, template, err) {
-  var config = server.config().get();
+  const config = server.config().get();
   // don't override other setup errors
   if (err && err instanceof SetupError) return err;
   Error.captureStackTrace(this, this.constructor);
diff --git a/src/plugins/elasticsearch/lib/upgrade_config.js b/src/plugins/elasticsearch/lib/upgrade_config.js
index 4defb84589da5..f8ff58334de3a 100644
--- a/src/plugins/elasticsearch/lib/upgrade_config.js
+++ b/src/plugins/elasticsearch/lib/upgrade_config.js
@@ -1,18 +1,18 @@
-var Promise = require('bluebird');
-var isUpgradeable = require('./is_upgradeable');
-var _ = require('lodash');
-var format = require('util').format;
+const Promise = require('bluebird');
+const isUpgradeable = require('./is_upgradeable');
+const _ = require('lodash');
+const format = require('util').format;
 
-var utils = require('requirefrom')('src/utils');
+const utils = require('requirefrom')('src/utils');
 
 module.exports = function (server) {
-  var MAX_INTEGER = Math.pow(2, 53) - 1;
+  const MAX_INTEGER = Math.pow(2, 53) - 1;
 
-  var client = server.plugins.elasticsearch.client;
-  var config = server.config();
+  const client = server.plugins.elasticsearch.client;
+  const config = server.config();
 
   return function (response) {
-    var newConfig = {};
+    const newConfig = {};
 
     // Check to see if there are any doc. If not then we set the build number and id
     if (response.hits.hits.length === 0) {
@@ -25,7 +25,7 @@ module.exports = function (server) {
     }
 
     // if we already have a the current version in the index then we need to stop
-    var devConfig = _.find(response.hits.hits, function currentVersion(hit) {
+    const devConfig = _.find(response.hits.hits, function currentVersion(hit) {
       return hit._id !== '@@version' && hit._id === config.get('pkg.version');
     });
 
@@ -33,7 +33,7 @@ module.exports = function (server) {
 
     // Look for upgradeable configs. If none of them are upgradeable
     // then resolve with null.
-    var body = _.find(response.hits.hits, isUpgradeable.bind(null, server));
+    const body = _.find(response.hits.hits, isUpgradeable.bind(null, server));
     if (!body) return Promise.resolve();
 
     // if the build number is still the template string (which it wil be in development)
diff --git a/src/plugins/elasticsearch/lib/validate.js b/src/plugins/elasticsearch/lib/validate.js
deleted file mode 100644
index 1da275b2e8ca9..0000000000000
--- a/src/plugins/elasticsearch/lib/validate.js
+++ /dev/null
@@ -1,112 +0,0 @@
-var _ = require('lodash');
-var parse = require('url').parse;
-
-validate.Fail = function (index) {
-  this.message = 'Kibana only support modifying the "' + index +
-  '" index. Requests that might modify other indicies are not sent to elasticsearch.';
-};
-
-validate.BadIndex = function (index) {
-  validate.Fail.call(this, index);
-  this.message = 'Bad index "' + index + '" in request. ' + this.message;
-};
-
-function validate(server, req) {
-  var config = server.config();
-  var method = req.method.toUpperCase();
-  if (method === 'GET' || method === 'HEAD') return true;
-
-  var segments = _.compact(parse(req.path).pathname.split('/'));
-  var maybeIndex = _.first(segments);
-  var maybeMethod = _.last(segments);
-
-  var add = (method === 'POST' || method === 'PUT');
-  var rem = (method === 'DELETE');
-
-  // everything below this point assumes a destructive request of some sort
-  if (!add && !rem) throw new validate.Fail(config.get('kibana.index'));
-
-  var bodyStr = String(req.payload);
-  var jsonBody = bodyStr && parseJson(bodyStr);
-  var bulkBody = bodyStr && parseBulk(bodyStr);
-
-  // methods that accept standard json bodies
-  var maybeMGet = ('_mget' === maybeMethod && add && jsonBody);
-  var maybeSearch = ('_search' === maybeMethod && add);
-  var maybeValidate = ('_validate' === maybeMethod && add);
-
-  // methods that accept bulk bodies
-  var maybeBulk = ('_bulk' === maybeMethod && add && bulkBody);
-  var maybeMsearch = ('_msearch' === maybeMethod && add && bulkBody);
-
-  // indication that this request is against kibana
-  var maybeKibanaIndex = (maybeIndex === config.get('kibana.index'));
-
-  if (!maybeBulk) validateNonBulkDestructive();
-  else validateBulkBody(bulkBody);
-
-  return true;
-
-  function parseJson(str) {
-    try {
-      return JSON.parse(str);
-    } catch (e) {
-      return;
-    }
-  }
-
-  function parseBulk(str) {
-    var parts = str.split(/\r?\n/);
-
-    var finalLine = parts.pop();
-    var evenJsons = (parts.length % 2 === 0);
-
-    if (finalLine !== '' || !evenJsons) return;
-
-    var body = new Array(parts.length);
-    for (var i = 0; i < parts.length; i++) {
-      var part = parseJson(parts[i]);
-      if (!part) throw new validate.Fail(config.get('kibana.index'));
-
-      body[i] = part;
-    }
-    return body;
-  }
-
-  function stringifyBulk(body) {
-    return body.map(JSON.stringify).join('\n') + '\n';
-  }
-
-  function validateNonBulkDestructive() {
-    // allow any destructive request against the kibana index
-    if (maybeKibanaIndex) return;
-
-    // allow json bodies sent to _mget _search and _validate
-    if (maybeMGet || maybeSearch || maybeValidate) return;
-
-    // allow bulk bodies sent to _msearch
-    if (maybeMsearch) return;
-
-    throw new validate.Fail(config.get('kibana.index'));
-  }
-
-  function validateBulkBody(toValidate) {
-    while (toValidate.length) {
-      let header = toValidate.shift();
-      let body = toValidate.shift();
-
-      let op = _.keys(header).join('');
-      let meta = header[op];
-
-      if (!meta) throw new validate.Fail(config.get('kibana.index'));
-
-      let index = meta._index || maybeIndex;
-      if (index !== config.get('kibana.index')) {
-        throw new validate.BadIndex(index);
-      }
-    }
-  }
-}
-
-module.exports = validate;
-
diff --git a/src/plugins/elasticsearch/lib/version_math.js b/src/plugins/elasticsearch/lib/version_math.js
deleted file mode 100644
index 7c131aab5a42b..0000000000000
--- a/src/plugins/elasticsearch/lib/version_math.js
+++ /dev/null
@@ -1,139 +0,0 @@
-var _ = require('lodash');
-
-function VersionMathException(message) {
-  this.message = message;
-  this.name = 'VersionMathException';
-}
-
-// Determine if a specific version meets the minimum requirement
-var compare = function (required, installed) {
-  if (_.isUndefined(installed)) {
-    return;
-  }
-
-  if (!required || !installed) {
-    return undefined;
-  }
-
-  var a = installed.split('.');
-  var b = required.split('.');
-  var i;
-
-  // leave suffixes as is ("RC1 or -SNAPSHOT")
-  for (i = 0; i < Math.min(a.length, 3); ++i) {
-    a[i] = Number(a[i]);
-  }
-  for (i = 0; i < Math.min(b.length, 3); ++i) {
-    b[i] = Number(b[i]);
-  }
-  if (a.length === 2) {
-    a[2] = 0;
-  }
-
-  if (a[0] > b[0]) { return true; }
-  if (a[0] < b[0]) { return false; }
-
-  if (a[1] > b[1]) { return true; }
-  if (a[1] < b[1]) { return false; }
-
-  if (a[2] > b[2]) { return true; }
-  if (a[2] < b[2]) { return false; }
-
-  if (a.length > 3) {
-    // rc/beta suffix
-    if (b.length <= 3) {
-      return false;
-    } // no suffix on b -> a<b
-    return a[3] >= b[3];
-  }
-  if (b.length > 3) {
-    // b has a suffix but a not -> a>b
-    return true;
-  }
-
-  return true;
-};
-
-// Sort versions from lowest to highest
-var sortVersions = function (versions) {
-  if (!_.isArray(versions)) versions = [versions];
-
-  return _.uniq(versions).sort(function (a, b) {
-    return compare(a, b) ? -1 : 1;
-  });
-};
-
-// Get the max version in this cluster
-var max = function (versions) {
-  return sortVersions(versions).pop();
-};
-
-// Return the lowest version in the cluster
-var min = function (versions) {
-  return sortVersions(versions).shift();
-};
-
-// Check if the lowest version in the cluster is >= to `version`
-var gte = function (version, versions) {
-  var _versions = sortVersions(versions);
-  return compare(version, min(_versions));
-};
-
-// Check if the highest version in the cluster is <= to `version`
-var lte = function (version, versions) {
-  var _versions = sortVersions(versions);
-  return compare(max(_versions), version);
-};
-
-// check if lowest version in cluster = `version`
-var eq = function (version, versions) {
-  var _versions = sortVersions(versions);
-  return version === min(_versions) ? true : false;
-};
-
-// version > lowest version in cluster?
-var gt = function (version, versions) {
-  var _versions = sortVersions(versions);
-  return version === min(_versions) ? false : gte(version, _versions);
-};
-
-// version < highest version in cluster?
-var lt = function (version, versions) {
-  var _versions = sortVersions(versions);
-  return version === max(_versions) ? false : lte(version, _versions);
-};
-
-/*
-  Takes a version string with one of the following optional comparison prefixes: >,>=,<.<=
-  and evaluates if the cluster meets the requirement. If the prefix is omitted exact match
-  is assumed
-*/
-var is = function (equation, versions) {
-  var _versions = sortVersions(versions);
-  var _v = equation;
-  var _cf;
-
-  if (_v.charAt(0) === '>') {
-    _cf = _v.charAt(1) === '=' ? gte(_v.slice(2), _versions) : gt(_v.slice(1), _versions);
-  } else if (_v.charAt(0) === '<') {
-    _cf = _v.charAt(1) === '=' ? lte(_v.slice(2), _versions) : lt(_v.slice(1), _versions);
-  } else {
-    _cf = eq(_v, _versions);
-  }
-
-  return _cf;
-};
-
-
-
-module.exports = {
-  min: min,
-  max: max,
-  is: is,
-  eq: eq,
-  gt: gt,
-  gte: gte,
-  lt: lt,
-  lte: lte
-};
-
diff --git a/src/plugins/elasticsearch/lib/version_satisfies.js b/src/plugins/elasticsearch/lib/version_satisfies.js
new file mode 100644
index 0000000000000..eac84e2942c1c
--- /dev/null
+++ b/src/plugins/elasticsearch/lib/version_satisfies.js
@@ -0,0 +1,16 @@
+const semver = require('semver');
+
+module.exports = function (actual, expected) {
+  try {
+    const ver = cleanVersion(actual);
+    return semver.satisfies(ver, expected);
+  } catch (err) {
+    return false;
+  }
+
+  function cleanVersion(version) {
+    const match = version.match(/\d+\.\d+\.\d+/);
+    if (!match) return version;
+    return match[0];
+  }
+};
diff --git a/src/plugins/kbn_vislib_vis_types/public/area.js b/src/plugins/kbn_vislib_vis_types/public/area.js
index 9f94093e45627..e12b1b72ccafd 100644
--- a/src/plugins/kbn_vislib_vis_types/public/area.js
+++ b/src/plugins/kbn_vislib_vis_types/public/area.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'area',
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
index 23aac4bdaaf63..b9ee57748263e 100644
--- a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('ui/modules').get('kibana');
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const module = require('ui/modules').get('kibana');
 
   module.directive('lineInterpolationOption', function ($parse, $compile) {
     return {
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
index 8fac50be538ca..b0d6e337fbc7b 100644
--- a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('ui/modules').get('kibana');
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const module = require('ui/modules').get('kibana');
   require('ui/directives/inequality');
 
   module.directive('pointSeriesOptions', function ($parse, $compile) {
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html
index 5a694765f77e5..cfc12aae2631f 100644
--- a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html
@@ -5,10 +5,4 @@
       Show Tooltip
     </label>
   </div>
-  <div class="vis-option-item">
-    <label>
-      <input type="checkbox" ng-model="vis.params.addLegend">
-      Show Legend
-    </label>
-  </div>
 </div>
diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
index 1d7b9d6d06d97..92c0cca39413d 100644
--- a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
+++ b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var module = require('ui/modules').get('kibana');
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const module = require('ui/modules').get('kibana');
 
   module.directive('vislibBasicOptions', function ($parse, $compile) {
     return {
diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js
index aeb01ef7d7990..46b646daa33d9 100644
--- a/src/plugins/kbn_vislib_vis_types/public/histogram.js
+++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'histogram',
       title: 'Vertical bar chart',
       icon: 'fa-bar-chart',
       description: 'The goto chart for oh-so-many needs. Great for time and non-time data. Stacked or grouped, ' +
-      'exact numbers or percentages. If you are not sure which chart your need, you could do worse than to start here.',
+      'exact numbers or percentages. If you are not sure which chart you need, you could do worse than to start here.',
       params: {
         defaults: {
           shareYAxis: true,
diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
index 6aa4e07a0230f..a1712742393ef 100644
--- a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
+++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var visTypes = require('ui/registry/vis_types');
+  const visTypes = require('ui/registry/vis_types');
   visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
   visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
   visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
diff --git a/src/plugins/kbn_vislib_vis_types/public/line.js b/src/plugins/kbn_vislib_vis_types/public/line.js
index dbc9fdc8dc2da..bab825dfb0874 100644
--- a/src/plugins/kbn_vislib_vis_types/public/line.js
+++ b/src/plugins/kbn_vislib_vis_types/public/line.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'line',
diff --git a/src/plugins/kbn_vislib_vis_types/public/pie.js b/src/plugins/kbn_vislib_vis_types/public/pie.js
index 04714ef260ee9..c69ed934af61a 100644
--- a/src/plugins/kbn_vislib_vis_types/public/pie.js
+++ b/src/plugins/kbn_vislib_vis_types/public/pie.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function HistogramVisType(Private) {
-    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     return new VislibVisType({
       name: 'pie',
diff --git a/src/plugins/kbn_vislib_vis_types/public/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tileMap.js
index 0b7860a5147ca..668ee2320ce2a 100644
--- a/src/plugins/kbn_vislib_vis_types/public/tileMap.js
+++ b/src/plugins/kbn_vislib_vis_types/public/tileMap.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function TileMapVisType(Private, getAppState, courier, config) {
-    var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
-    var geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json'));
-    var _ = require('lodash');
-    var supports = require('ui/utils/supports');
+    const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
+    const geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json'));
+    const _ = require('lodash');
+    const supports = require('ui/utils/supports');
 
     return new VislibVisType({
       name: 'tile_map',
@@ -30,41 +30,41 @@ define(function (require) {
       },
       listeners: {
         rectangle: function (event) {
-          var agg = _.get(event, 'chart.geohashGridAgg');
+          const agg = _.get(event, 'chart.geohashGridAgg');
           if (!agg) return;
 
-          var pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState());
-          var indexPatternName = agg.vis.indexPattern.id;
-          var field = agg.fieldName();
-          var filter = {geo_bounding_box: {}};
+          const pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState());
+          const indexPatternName = agg.vis.indexPattern.id;
+          const field = agg.fieldName();
+          const filter = {geo_bounding_box: {}};
           filter.geo_bounding_box[field] = event.bounds;
 
           pushFilter(filter, false, indexPatternName);
         },
         mapMoveEnd: function (event) {
-          var agg = _.get(event, 'chart.geohashGridAgg');
+          const agg = _.get(event, 'chart.geohashGridAgg');
           if (!agg) return;
 
           agg.params.mapZoom = event.zoom;
           agg.params.mapCenter = [event.center.lat, event.center.lng];
 
-          var editableVis = agg.vis.getEditableVis();
+          const editableVis = agg.vis.getEditableVis();
           if (!editableVis) return;
 
-          var editableAgg = editableVis.aggs.byId[agg.id];
+          const editableAgg = editableVis.aggs.byId[agg.id];
           if (editableAgg) {
             editableAgg.params.mapZoom = event.zoom;
             editableAgg.params.mapCenter = [event.center.lat, event.center.lng];
           }
         },
         mapZoomEnd: function (event) {
-          var agg = _.get(event, 'chart.geohashGridAgg');
+          const agg = _.get(event, 'chart.geohashGridAgg');
           if (!agg || !agg.params.autoPrecision) return;
 
           // zoomPrecision maps event.zoom to a geohash precision value
           // event.limit is the configurable max geohash precision
           // default max precision is 7, configurable up to 12
-          var zoomPrecision = {
+          const zoomPrecision = {
             1: 2,
             2: 2,
             3: 2,
@@ -85,7 +85,7 @@ define(function (require) {
             18: 12
           };
 
-          var precision = config.get('visualization:tileMap:maxPrecision');
+          const precision = config.get('visualization:tileMap:maxPrecision');
           agg.params.precision = Math.min(zoomPrecision[event.zoom], precision);
 
           courier.fetch();
diff --git a/src/plugins/kibana/index.js b/src/plugins/kibana/index.js
index fa9504f9d339e..358c04c9b5f3f 100644
--- a/src/plugins/kibana/index.js
+++ b/src/plugins/kibana/index.js
@@ -17,7 +17,9 @@ module.exports = function (kibana) {
         main: 'plugins/kibana/kibana',
         uses: [
           'visTypes',
-          'spyModes'
+          'spyModes',
+          'navbarExtensions',
+          'settingsSections',
         ],
 
         autoload: kibana.autoload.require.concat(
@@ -25,9 +27,7 @@ module.exports = function (kibana) {
           'plugins/kibana/visualize',
           'plugins/kibana/dashboard',
           'plugins/kibana/settings',
-          'plugins/kibana/settings/sections',
           'plugins/kibana/doc',
-          'plugins/kibana/settings/sections',
           'ui/vislib',
           'ui/agg_response',
           'ui/agg_types',
@@ -41,7 +41,13 @@ module.exports = function (kibana) {
             kbnDefaultAppId: config.get('kibana.defaultAppId')
           };
         }
-      }
+      },
+
+      injectDefaultVars(server, options) {
+        return {
+          kbnIndex: options.index
+        };
+      },
     }
   });
 
diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
index b7d7b42554be2..b954c88fea005 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   return function loadPanelFunction(Private) { // Inject services here
     return function (panel, $scope) { // Function parameters here
-      var panelTypes = {
+      const panelTypes = {
         visualization: Private(require('plugins/kibana/dashboard/components/panel/lib/visualization')),
         search: Private(require('plugins/kibana/dashboard/components/panel/lib/search'))
       };
diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
index e811f18f2dfd9..2e4415f42b7cc 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function visualizationLoader(savedVisualizations, Private) { // Inject services here
-    var brushEvent = Private(require('ui/utils/brush_event'));
-    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
+    const brushEvent = Private(require('ui/utils/brush_event'));
+    const filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
 
     return function (panel, $scope) { // Function parameters here
       return savedVisualizations.get(panel.id)
diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.html b/src/plugins/kibana/public/dashboard/components/panel/panel.html
index 15f1aee7b5553..d44a3fd6241b8 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/panel.html
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.html
@@ -1,16 +1,16 @@
 <div class="panel panel-default" ng-switch on="panel.type" ng-if="savedObj || error">
   <div class="panel-heading">
-    <span class="panel-title">
+    <span class="panel-title" title="{{::savedObj.title}}">
       <i
         class="fa"
         ng-class="savedObj.vis.type.icon"
-        aria-label="{{savedObj.vis.type.title}} Icon"
-        title="{{savedObj.vis.type.title}}">
+        aria-label="{{::savedObj.vis.type.title}} Icon"
+        title="{{::savedObj.vis.type.title}}">
       </i>
-      {{savedObj.title}}
+      {{::savedObj.title}}
     </span>
     <div class="btn-group">
-      <a aria-label="Edit" ng-show="chrome.getVisible() && editUrl" ng-href="{{editUrl}}">
+      <a aria-label="Edit" ng-show="chrome.getVisible() && editUrl" ng-href="{{::editUrl}}">
         <i aria-hidden="true" class="fa fa-pencil"></i>
       </a>
       <a aria-label="Remove" ng-show="chrome.getVisible()" ng-click="remove()">
@@ -25,7 +25,8 @@
     <span ng-bind="error"></span>
   </div>
 
-  <visualize ng-switch-when="visualization"
+  <visualize
+    ng-switch-when="visualization"
     vis="savedObj.vis"
     search-source="savedObj.searchSource"
     show-spy-panel="chrome.getVisible()"
diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.js b/src/plugins/kibana/public/dashboard/components/panel/panel.js
index 9ec79dcc244c1..9dce83395c8ae 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/panel.js
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var moment = require('moment');
-  var $ = require('jquery');
+  const moment = require('moment');
+  const $ = require('jquery');
   require('ui/modules')
   .get('app/dashboard')
   .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
-    var _ = require('lodash');
-    var loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
-    var filterManager = Private(require('ui/filter_manager'));
-    var notify = new Notifier();
+    const _ = require('lodash');
+    const loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel'));
+    const filterManager = Private(require('ui/filter_manager'));
+    const notify = new Notifier();
 
-    var services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
-      var service = $injector.get(serviceObj.service);
+    const services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
+      const service = $injector.get(serviceObj.service);
       return {
         type: service.type,
         name: serviceObj.service
@@ -20,9 +20,9 @@ define(function (require) {
     require('ui/visualize');
     require('ui/doc_table');
 
-    var brushEvent = Private(require('ui/utils/brush_event'));
+    const brushEvent = Private(require('ui/utils/brush_event'));
 
-    var getPanelId = function (panel) {
+    const getPanelId = function (panel) {
       return ['P', panel.panelIndex].join('-');
     };
 
@@ -32,7 +32,7 @@ define(function (require) {
       requires: '^dashboardGrid',
       link: function ($scope, $el) {
         // using $scope inheritance, panels are available in AppState
-        var $state = $scope.state;
+        const $state = $scope.state;
 
         // receives $scope.panel from the dashboard grid directive, seems like should be isolate?
         $scope.$watch('id', function () {
@@ -49,11 +49,11 @@ define(function (require) {
             });
 
             // create child ui state from the savedObj
-            var uiState = panelConfig.uiState || {};
+            const uiState = panelConfig.uiState || {};
             $scope.uiState = $scope.parentUiState.createChild(getPanelId(panelConfig.panel), uiState, true);
 
             $scope.filter = function (field, value, operator) {
-              var index = $scope.savedObj.searchSource.get('index').id;
+              const index = $scope.savedObj.searchSource.get('index').id;
               filterManager.add(field, value, operator, index);
             };
           })
@@ -63,12 +63,12 @@ define(function (require) {
             // If the savedObjectType matches the panel type, this means the object itself has been deleted,
             // so we shouldn't even have an edit link. If they don't match, it means something else is wrong
             // with the object (but the object still exists), so we link to the object editor instead.
-            var objectItselfDeleted = e.savedObjectType === $scope.panel.type;
+            const objectItselfDeleted = e.savedObjectType === $scope.panel.type;
             if (objectItselfDeleted) return;
 
-            var type = $scope.panel.type;
-            var id = $scope.panel.id;
-            var service = _.find(services, { type: type });
+            const type = $scope.panel.type;
+            const id = $scope.panel.id;
+            const service = _.find(services, { type: type });
             if (!service) return;
 
             $scope.editUrl = '#settings/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType;
diff --git a/src/plugins/kibana/public/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js
index c66d7af5b9576..da93a5b5a271a 100644
--- a/src/plugins/kibana/public/dashboard/directives/grid.js
+++ b/src/plugins/kibana/public/dashboard/directives/grid.js
@@ -1,38 +1,38 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var Binder = require('ui/Binder');
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const Binder = require('ui/Binder');
   require('gridster');
 
-  var app = require('ui/modules').get('app/dashboard');
+  const app = require('ui/modules').get('app/dashboard');
 
   app.directive('dashboardGrid', function ($compile, Notifier) {
     return {
       restrict: 'E',
       require: '^dashboardApp', // must inherit from the dashboardApp
       link: function ($scope, $el) {
-        var notify = new Notifier();
-        var $container = $el;
+        const notify = new Notifier();
+        const $container = $el;
         $el = $('<ul>').appendTo($container);
 
-        var $window = $(window);
-        var $body = $(document.body);
-        var binder = new Binder($scope);
+        const $window = $(window);
+        const $body = $(document.body);
+        const binder = new Binder($scope);
 
         // appState from controller
-        var $state = $scope.state;
+        const $state = $scope.state;
 
-        var gridster; // defined in init()
+        let gridster; // defined in init()
 
         // number of columns to render
-        var COLS = 12;
+        const COLS = 12;
         // number of pixed between each column/row
-        var SPACER = 10;
+        const SPACER = 10;
         // pixels used by all of the spacers (gridster puts have a spacer on the ends)
-        var spacerSize = SPACER * COLS;
+        const spacerSize = SPACER * COLS;
 
         // debounced layout function is safe to call as much as possible
-        var safeLayout = _.debounce(layout, 200);
+        const safeLayout = _.debounce(layout, 200);
 
         function init() {
           $el.addClass('gridster');
@@ -61,15 +61,15 @@ define(function (require) {
           });
 
           $scope.$watchCollection('state.panels', function (panels) {
-            var currentPanels = gridster.$widgets.toArray().map(function (el) {
+            const currentPanels = gridster.$widgets.toArray().map(function (el) {
               return getPanelFor(el);
             });
 
             // panels that are now missing from the panels array
-            var removed = _.difference(currentPanels, panels);
+            const removed = _.difference(currentPanels, panels);
 
             // panels that have been added
-            var added = _.difference(panels, currentPanels);
+            const added = _.difference(panels, currentPanels);
 
             if (removed.length) removed.forEach(removePanel);
             if (added.length) added.forEach(addPanel);
@@ -87,7 +87,7 @@ define(function (require) {
 
             if (!gridster) return;
             gridster.$widgets.each(function (i, el) {
-              var panel = getPanelFor(el);
+              const panel = getPanelFor(el);
               removePanel(panel);
               // stop any animations
               panel.$el.stop();
@@ -107,8 +107,8 @@ define(function (require) {
         // ALWAYS CALL makePanelSerializeable AFTER YOU ARE DONE WITH IT
         // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         function getPanelFor(el) {
-          var $panel = el.jquery ? el : $(el);
-          var panel = $panel.data('panel');
+          const $panel = el.jquery ? el : $(el);
+          const panel = $panel.data('panel');
 
           panel.$el = $panel;
           panel.$scope = $panel.data('$scope');
@@ -174,7 +174,7 @@ define(function (require) {
 
         // ensure that the panel object has the latest size/pos info
         function refreshPanelStats(panel) {
-          var data = panel.$el.coords().grid;
+          const data = panel.$el.coords().grid;
           panel.size_x = data.size_x;
           panel.size_y = data.size_y;
           panel.col = data.col;
@@ -185,7 +185,7 @@ define(function (require) {
         function readGridsterChangeHandler(e, ui, $widget) {
           // ensure that our panel objects keep their size in sync
           gridster.$widgets.each(function (i, el) {
-            var panel = getPanelFor(el);
+            const panel = getPanelFor(el);
             refreshPanelStats(panel);
             panel.$scope.$broadcast('resize');
             makePanelSerializeable(panel);
@@ -198,14 +198,14 @@ define(function (require) {
         // we may need to consider using a different library
         function reflowGridster() {
           // https://github.com/gcphost/gridster-responsive/blob/97fe43d4b312b409696b1d702e1afb6fbd3bba71/jquery.gridster.js#L1208-L1235
-          var g = gridster;
+          const g = gridster;
 
           g.options.widget_margins = [SPACER / 2, SPACER / 2];
           g.options.widget_base_dimensions = [($container.width() - spacerSize) / COLS, 100];
           g.min_widget_width  = (g.options.widget_margins[0] * 2) + g.options.widget_base_dimensions[0];
           g.min_widget_height = (g.options.widget_margins[1] * 2) + g.options.widget_base_dimensions[1];
 
-          // var serializedGrid = g.serialize();
+          // const serializedGrid = g.serialize();
           g.$widgets.each(function (i, widget) {
             g.resize_widget($(widget));
           });
@@ -222,7 +222,7 @@ define(function (require) {
         }
 
         function layout() {
-          var complete = notify.event('reflow dashboard');
+          const complete = notify.event('reflow dashboard');
           reflowGridster();
           readGridsterChangeHandler();
           complete();
diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html
index d2a2688c801c3..9a3f94fa3832e 100644
--- a/src/plugins/kibana/public/dashboard/index.html
+++ b/src/plugins/kibana/public/dashboard/index.html
@@ -1,5 +1,5 @@
 <div dashboard-app class="app-container dashboard-container">
-  <navbar ng-show="chrome.getVisible()">
+  <navbar ng-show="chrome.getVisible()" name="dashboard">
     <span class="name" ng-if="dash.id" ng-bind="::dash.title" tooltip="{{::dash.title}}"></span>
 
     <form name="queryInput"
diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
index 45e247b498755..d0f9da568a276 100644
--- a/src/plugins/kibana/public/dashboard/index.js
+++ b/src/plugins/kibana/public/dashboard/index.js
@@ -1,15 +1,17 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var angular = require('angular');
-  var ConfigTemplate = require('ui/ConfigTemplate');
-  var chrome = require('ui/chrome');
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const angular = require('angular');
+  const ConfigTemplate = require('ui/ConfigTemplate');
+  const chrome = require('ui/chrome');
 
   require('ui/directives/config');
   require('ui/courier');
   require('ui/config');
   require('ui/notify');
   require('ui/typeahead');
+  require('ui/navbar');
+  require('ui/share');
 
   require('plugins/kibana/dashboard/directives/grid');
   require('plugins/kibana/dashboard/components/panel/panel');
@@ -19,7 +21,7 @@ define(function (require) {
   require('ui/saved_objects/saved_object_registry').register(require('plugins/kibana/dashboard/services/saved_dashboard_register'));
 
 
-  var app = require('ui/modules').get('app/dashboard', [
+  const app = require('ui/modules').get('app/dashboard', [
     'elasticsearch',
     'ngRoute',
     'kibana/courier',
@@ -53,13 +55,13 @@ define(function (require) {
     return {
       controller: function ($scope, $rootScope, $route, $routeParams, $location, Private, getAppState) {
 
-        var queryFilter = Private(require('ui/filter_bar/query_filter'));
+        const queryFilter = Private(require('ui/filter_bar/query_filter'));
 
-        var notify = new Notifier({
+        const notify = new Notifier({
           location: 'Dashboard'
         });
 
-        var dash = $scope.dash = $route.current.locals.dash;
+        const dash = $scope.dash = $route.current.locals.dash;
 
         if (dash.timeRestore && dash.timeTo && dash.timeFrom && !getAppState.previouslyStored()) {
           timefilter.time.to = dash.timeTo;
@@ -68,16 +70,16 @@ define(function (require) {
 
         $scope.$on('$destroy', dash.destroy);
 
-        var matchQueryFilter = function (filter) {
+        const matchQueryFilter = function (filter) {
           return filter.query && filter.query.query_string && !filter.meta;
         };
 
-        var extractQueryFromFilters = function (filters) {
-          var filter = _.find(filters, matchQueryFilter);
+        const extractQueryFromFilters = function (filters) {
+          const filter = _.find(filters, matchQueryFilter);
           if (filter) return filter.query;
         };
 
-        var stateDefaults = {
+        const stateDefaults = {
           title: dash.title,
           panels: dash.panelsJSON ? JSON.parse(dash.panelsJSON) : [],
           options: dash.optionsJSON ? JSON.parse(dash.optionsJSON) : {},
@@ -86,8 +88,8 @@ define(function (require) {
           filters: _.reject(dash.searchSource.getOwn('filter'), matchQueryFilter),
         };
 
-        var $state = $scope.state = new AppState(stateDefaults);
-        var $uiState = $scope.uiState = $state.makeStateful('uiState');
+        const $state = $scope.state = new AppState(stateDefaults);
+        const $uiState = $scope.uiState = $state.makeStateful('uiState');
 
         $scope.$watchCollection('state.options', function (newVal, oldVal) {
           if (!angular.equals(newVal, oldVal)) $state.save();
@@ -113,7 +115,7 @@ define(function (require) {
         function init() {
           updateQueryOnRootSource();
 
-          var docTitle = Private(require('ui/doc_title'));
+          const docTitle = Private(require('ui/doc_title'));
           if (dash.id) {
             docTitle.change(dash.title);
           }
@@ -124,7 +126,7 @@ define(function (require) {
 
         function initPanelIndices() {
           // find the largest panelIndex in all the panels
-          var maxIndex = getMaxPanelIndex();
+          let maxIndex = getMaxPanelIndex();
 
           // ensure that all panels have a panelIndex
           $scope.state.panels.forEach(function (panel) {
@@ -135,7 +137,7 @@ define(function (require) {
         }
 
         function getMaxPanelIndex() {
-          var index = $scope.state.panels.reduce(function (idx, panel) {
+          let index = $scope.state.panels.reduce(function (idx, panel) {
             // if panel is missing an index, add one and increment the index
             return Math.max(idx, panel.panelIndex || idx);
           }, 0);
@@ -143,7 +145,7 @@ define(function (require) {
         }
 
         function updateQueryOnRootSource() {
-          var filters = queryFilter.getFilters();
+          const filters = queryFilter.getFilters();
           if ($state.query) {
             dash.searchSource.set('filter', _.union(filters, [{
               query: $state.query
@@ -154,7 +156,7 @@ define(function (require) {
         }
 
         function setDarkTheme(enabled) {
-          var theme = Boolean(enabled) ? 'theme-dark' : 'theme-light';
+          const theme = Boolean(enabled) ? 'theme-dark' : 'theme-light';
           chrome.removeApplicationClass(['theme-dark', 'theme-light']);
           chrome.addApplicationClass(theme);
         }
@@ -201,7 +203,7 @@ define(function (require) {
           .catch(notify.fatal);
         };
 
-        var pendingVis = _.size($state.panels);
+        let pendingVis = _.size($state.panels);
         $scope.$on('ready:vis', function () {
           if (pendingVis) pendingVis--;
           if (pendingVis === 0) {
@@ -233,15 +235,7 @@ define(function (require) {
           ui: $state.options,
           save: $scope.save,
           addVis: $scope.addVis,
-          addSearch: $scope.addSearch,
-          shareData: function () {
-            return {
-              link: $location.absUrl(),
-              // This sucks, but seems like the cleanest way. Uhg.
-              embed: '<iframe src="' + $location.absUrl().replace('?', '?embed&') +
-                '" height="600" width="800"></iframe>'
-            };
-          }
+          addSearch: $scope.addSearch
         };
 
         init();
diff --git a/src/plugins/kibana/public/dashboard/partials/share.html b/src/plugins/kibana/public/dashboard/partials/share.html
index bf34366604db1..046acbb5c95b8 100644
--- a/src/plugins/kibana/public/dashboard/partials/share.html
+++ b/src/plugins/kibana/public/dashboard/partials/share.html
@@ -1,21 +1,4 @@
-<form role="form" class="vis-share">
-
-  <p>
-    <div class="input-group">
-      <label>
-        Embed this dashboard
-        <small>Add to your html source. Note all clients must still be able to access kibana</small>
-      </label>
-      <div class="form-control" disabled>{{opts.shareData().embed}}</div>
-    </div>
-  </p>
-
-  <p>
-    <div class="input-group">
-      <label>
-        Share a link
-      </label>
-      <div class="form-control" disabled>{{opts.shareData().link}}</div>
-    </div>
-  </p>
-</form>
\ No newline at end of file
+<share
+  object-type="dashboard"
+  object-id="{{opts.dashboard.id}}">
+</share>
diff --git a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
index d7115a9bcfca4..100b0e652ce9d 100644
--- a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
+++ b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var module = require('ui/modules').get('app/dashboard');
-  var angular = require('angular');
-  var _ = require('lodash');
-  var moment = require('moment');
+  const module = require('ui/modules').get('app/dashboard');
+  const angular = require('angular');
+  const _ = require('lodash');
+  const moment = require('moment');
 
   // Used only by the savedDashboards service, usually no reason to change this
   module.factory('SavedDashboard', function (courier, config) {
diff --git a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
index a9a2f74b558e4..513a30b04e582 100644
--- a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
+++ b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
@@ -1,6 +1,8 @@
 define(function (require) {
-  var module = require('ui/modules').get('app/dashboard');
-  var _ = require('lodash');
+  const module = require('ui/modules').get('app/dashboard');
+  const _ = require('lodash');
+  const Scanner = require('ui/utils/scanner');
+
   // bring in the factory
   require('plugins/kibana/dashboard/services/_saved_dashboard');
 
@@ -14,6 +16,11 @@ define(function (require) {
 
   // This is the only thing that gets injected into controllers
   module.service('savedDashboards', function (Promise, SavedDashboard, kbnIndex, es, kbnUrl) {
+    const scanner = new Scanner(es, {
+      index: kbnIndex,
+      type: 'dashboard'
+    });
+
     this.type = SavedDashboard.type;
     this.Class = SavedDashboard;
 
@@ -41,9 +48,22 @@ define(function (require) {
       });
     };
 
+    this.scanAll = function (queryString, pageSize = 1000) {
+      return scanner.scanAndMap(queryString, {
+        pageSize,
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
+    };
+
+    this.mapHits = function (hit) {
+      const source = hit._source;
+      source.id = hit._id;
+      source.url = this.urlFor(hit._id);
+      return source;
+    };
+
     this.find = function (searchString, size = 100) {
-      var self = this;
-      var body;
+      let body;
       if (searchString) {
         body = {
           query: {
@@ -64,15 +84,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: resp.hits.hits.map(function (hit) {
-            var source = hit._source;
-            source.id = hit._id;
-            source.url = self.urlFor(hit._id);
-            return source;
-          })
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
index 48ce5a5e3f3de..aa690b4855482 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
@@ -1,19 +1,19 @@
 
-var angular = require('angular');
-var $ = require('jquery');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+const angular = require('angular');
+const $ = require('jquery');
+const _ = require('lodash');
+const sinon = require('auto-release-sinon');
+const ngMock = require('ngMock');
+const expect = require('expect.js');
 
 // Load the kibana app dependencies.
 require('ui/private');
 require('plugins/kibana/discover/components/field_chooser/discover_field');
 
 describe('discoverField', function () {
-  var $scope;
-  var indexPattern;
-  var $elem;
+  let $scope;
+  let indexPattern;
+  let $elem;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $rootScope, $compile) {
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
index e8b4a5c07aaae..6cd5c35579a4d 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
@@ -1,13 +1,13 @@
 
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
-var expect = require('expect.js');
+const _ = require('lodash');
+const ngMock = require('ngMock');
+const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
+const expect = require('expect.js');
 
 // Load the kibana app dependencies.
 require('ui/private');
 
-var indexPattern;
+let indexPattern;
 
 describe('fieldCalculator', function () {
   beforeEach(ngMock.module('kibana'));
@@ -17,14 +17,14 @@ describe('fieldCalculator', function () {
 
 
   it('should have a _countMissing that counts nulls & undefineds in an array', function () {
-    var values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
+    const values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
     expect(fieldCalculator._countMissing(values)).to.be(5);
   });
 
   describe('_groupValues', function () {
-    var groups;
-    var params;
-    var values;
+    let groups;
+    let params;
+    let values;
     beforeEach(function () {
       values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined];
       params = {};
@@ -78,21 +78,21 @@ describe('fieldCalculator', function () {
   });
 
   describe('getFieldValues', function () {
-    var hits;
+    let hits;
 
     beforeEach(function () {
       hits = _.each(require('fixtures/real_hits.js'), indexPattern.flattenHit);
     });
 
     it('Should return an array of values for _source fields', function () {
-      var extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension);
+      const extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension);
       expect(extensions).to.be.an(Array);
       expect(_.filter(extensions, function (v) { return v === 'html'; }).length).to.be(8);
       expect(_.uniq(_.clone(extensions)).sort()).to.eql(['gif', 'html', 'php', 'png']);
     });
 
     it('Should return an array of values for core meta fields', function () {
-      var types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type);
+      const types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type);
       expect(types).to.be.an(Array);
       expect(_.filter(types, function (v) { return v === 'apache'; }).length).to.be(18);
       expect(_.uniq(_.clone(types)).sort()).to.eql(['apache', 'nginx']);
@@ -101,7 +101,7 @@ describe('fieldCalculator', function () {
 
 
   describe('getFieldValueCounts', function () {
-    var params;
+    let params;
     beforeEach(function () {
       params = {
         hits: require('fixtures/real_hits.js'),
@@ -111,7 +111,7 @@ describe('fieldCalculator', function () {
     });
 
     it('counts the top 3 values', function () {
-      var extensions = fieldCalculator.getFieldValueCounts(params);
+      const extensions = fieldCalculator.getFieldValueCounts(params);
       expect(extensions).to.be.an(Object);
       expect(extensions.buckets).to.be.an(Array);
       expect(extensions.buckets.length).to.be(3);
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
index d1e4328c471a1..8d4143a27e77b 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
@@ -1,24 +1,24 @@
 
-var angular = require('angular');
-var ngMock = require('ngMock');
-var $ = require('jquery');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
+const angular = require('angular');
+const ngMock = require('ngMock');
+const $ = require('jquery');
+const _ = require('lodash');
+const sinon = require('auto-release-sinon');
+const expect = require('expect.js');
 
 // Load the kibana app dependencies.
 require('ui/private');
 require('plugins/kibana/discover/components/field_chooser/field_chooser');
 
-var $parentScope;
-var $scope;
-var config;
-var hits;
-var indexPattern;
-var indexPatternList;
+let $parentScope;
+let $scope;
+let config;
+let hits;
+let indexPattern;
+let indexPatternList;
 
 // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
-var init = function ($elem, props) {
+const init = function ($elem, props) {
   ngMock.inject(function ($rootScope, $compile, $timeout, _config_) {
     config = _config_;
     $parentScope = $rootScope;
@@ -34,13 +34,13 @@ var init = function ($elem, props) {
   });
 };
 
-var destroy = function () {
+const destroy = function () {
   $scope.$destroy();
   $parentScope.$destroy();
 };
 
 describe('discover field chooser directives', function () {
-  var $elem = angular.element(
+  const $elem = angular.element(
     '<disc-field-chooser' +
     '  columns="columns"' +
     '  toggle="toggle"' +
@@ -59,7 +59,7 @@ describe('discover field chooser directives', function () {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     indexPatternList = [ 'b', 'a', 'c' ];
 
-    var fieldCounts = _.transform(hits, function (counts, hit) {
+    const fieldCounts = _.transform(hits, function (counts, hit) {
       _.keys(indexPattern.flattenHit(hit)).forEach(function (key) {
         counts[key] = (counts[key] || 0) + 1;
       });
@@ -82,7 +82,7 @@ describe('discover field chooser directives', function () {
     destroy();
   });
 
-  var getSections = function (ctx) {
+  const getSections = function (ctx) {
     return {
       selected: $('.discover-selected-fields', ctx),
       popular: $('.discover-popular-fields', ctx),
@@ -99,13 +99,13 @@ describe('discover field chooser directives', function () {
 
   describe('Field listing', function () {
     it('should have Selected Fields, Fields and Popular Fields sections', function (done) {
-      var headers = $elem.find('.sidebar-list-header');
+      const headers = $elem.find('.sidebar-list-header');
       expect(headers.length).to.be(3);
       done();
     });
 
     it('should have 2 popular fields, 1 unpopular field and no selected fields', function (done) {
-      var section = getSections($elem);
+      const section = getSections($elem);
 
       expect(section.selected.find('li').length).to.be(0);
 
@@ -121,7 +121,7 @@ describe('discover field chooser directives', function () {
 
 
     it('should show the popular fields header if there are popular fields', function (done) {
-      var section = getSections($elem);
+      const section = getSections($elem);
       expect(section.popular.hasClass('ng-hide')).to.be(false);
       expect(section.popular.find('li:not(.sidebar-list-header)').length).to.be.above(0);
       done();
@@ -141,7 +141,7 @@ describe('discover field chooser directives', function () {
         indexPattern: indexPattern
       });
 
-      var section = getSections($elem);
+      const section = getSections($elem);
 
       $scope.$digest();
       expect(section.popular.hasClass('ng-hide')).to.be(true);
@@ -150,7 +150,7 @@ describe('discover field chooser directives', function () {
     });
 
     it('should move the field into selected when it is added to the columns array', function (done) {
-      var section = getSections($elem);
+      const section = getSections($elem);
       $scope.columns.push('bytes');
       $scope.$digest();
 
@@ -169,7 +169,7 @@ describe('discover field chooser directives', function () {
   });
 
   describe('details processing', function () {
-    var field;
+    let field;
     function getField() { return _.find($scope.fields, { name: 'bytes' }); }
 
     beforeEach(function () {
diff --git a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
index 3380732b02b59..e807d22566586 100644
--- a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
+++ b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
@@ -1,10 +1,10 @@
 
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+const _ = require('lodash');
+const ngMock = require('ngMock');
+const expect = require('expect.js');
 
 describe('hit sort function', function () {
-  var createHitSortFn;
+  let createHitSortFn;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -12,17 +12,17 @@ describe('hit sort function', function () {
   }));
 
 
-  var runSortTest = function (dir, sortOpts) {
-    var groupSize = _.random(10, 30);
-    var total = sortOpts.length * groupSize;
+  const runSortTest = function (dir, sortOpts) {
+    const groupSize = _.random(10, 30);
+    const total = sortOpts.length * groupSize;
 
     sortOpts = sortOpts.map(function (opt) {
       if (_.isArray(opt)) return opt;
       else return [opt];
     });
-    var sortOptLength = sortOpts.length;
+    const sortOptLength = sortOpts.length;
 
-    var hits = _.times(total, function (i) {
+    const hits = _.times(total, function (i) {
       return {
         _source: {},
         sort: sortOpts[i % sortOptLength]
@@ -31,7 +31,7 @@ describe('hit sort function', function () {
 
     hits.sort(createHitSortFn(dir))
     .forEach(function (hit, i) {
-      var group = Math.floor(i / groupSize);
+      const group = Math.floor(i / groupSize);
       expect(hit.sort).to.eql(sortOpts[group]);
     });
   };
diff --git a/src/plugins/kibana/public/discover/_hit_sort_fn.js b/src/plugins/kibana/public/discover/_hit_sort_fn.js
index 7699396b4c297..83cc68c160504 100644
--- a/src/plugins/kibana/public/discover/_hit_sort_fn.js
+++ b/src/plugins/kibana/public/discover/_hit_sort_fn.js
@@ -29,18 +29,18 @@ define(function () {
      * @return {[type]}           [description]
      */
     return function createHitSortFn(direction) {
-      var descending = (direction === 'desc');
+      const descending = (direction === 'desc');
 
       return function sortHits(hitA, hitB) {
-        var bBelowa = null;
+        let bBelowa = null;
 
-        var aSorts = hitA.sort || [];
-        var bSorts = hitB.sort || [];
+        const aSorts = hitA.sort || [];
+        const bSorts = hitB.sort || [];
 
         // walk each sort value, and compair until one is different
-        for (var i = 0; i < bSorts.length; i++) {
-          var a = aSorts[i];
-          var b = bSorts[i];
+        for (let i = 0; i < bSorts.length; i++) {
+          const a = aSorts[i];
+          const b = bSorts[i];
 
           if (a == null || b > a) {
             bBelowa = !descending;
diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js
index 2a073ceaafda7..a880a14ee110d 100644
--- a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js
+++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var $ = require('jquery');
-  var app = require('ui/modules').get('apps/discover');
-  var html = require('plugins/kibana/discover/components/field_chooser/discover_field.html');
-  var _ = require('lodash');
+  const $ = require('jquery');
+  const app = require('ui/modules').get('apps/discover');
+  const html = require('plugins/kibana/discover/components/field_chooser/discover_field.html');
+  const _ = require('lodash');
 
   require('ui/directives/css_truncate');
   require('ui/directives/field_name');
@@ -14,19 +14,19 @@ define(function (require) {
       template: html,
       replace: true,
       link: function ($scope, $elem) {
-        var detailsElem;
-        var detailScope = $scope.$new();
+        let detailsElem;
+        let detailScope = $scope.$new();
 
-        var detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html');
+        const detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html');
 
-        var init = function () {
+        const init = function () {
           if ($scope.field.details) {
             $scope.toggleDetails($scope.field, true);
           }
         };
 
-        var getWarnings = function (field) {
-          var warnings = [];
+        const getWarnings = function (field) {
+          let warnings = [];
 
           if (!field.scripted) {
             if (!field.doc_values && field.type !== 'boolean' && !(field.analyzed && field.type === 'string')) {
@@ -60,11 +60,11 @@ define(function (require) {
         };
 
         $scope.toggleDisplay = function (field) {
-          // inheritted param to fieldChooser
+          // This is inherited from fieldChooser
           $scope.toggle(field.name);
           if (field.display) $scope.increaseFieldCounter(field);
 
-          // we are now displaying the field, kill it's details
+          // we are now displaying the field, kill its details
           if (field.details) {
             $scope.toggleDetails(field);
           }
diff --git a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js
index 1b5dba460f0cc..85a4c294d8887 100644
--- a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var app = require('ui/modules').get('apps/discover');
+  const app = require('ui/modules').get('apps/discover');
 
 
   require('ui/directives/css_truncate');
@@ -8,11 +8,11 @@ define(function (require) {
   require('plugins/kibana/discover/components/field_chooser/discover_field');
 
   app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var rison = require('ui/utils/rison');
-    var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
-    var FieldList = Private(require('ui/index_patterns/_field_list'));
+    const _ = require('lodash');
+    const $ = require('jquery');
+    const rison = require('ui/utils/rison');
+    const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
+    const FieldList = Private(require('ui/index_patterns/_field_list'));
 
     return {
       restrict: 'E',
@@ -37,7 +37,7 @@ define(function (require) {
           $route.reload();
         });
 
-        var filter = $scope.filter = {
+        const filter = $scope.filter = {
           props: [
             'type',
             'indexed',
@@ -64,11 +64,11 @@ define(function (require) {
             return field.display;
           },
           isFieldFiltered: function (field) {
-            var matchFilter = (filter.vals.type == null || field.type === filter.vals.type);
-            var isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed);
-            var isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed);
-            var scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0);
-            var matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1);
+            const matchFilter = (filter.vals.type == null || field.type === filter.vals.type);
+            const isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed);
+            const isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed);
+            const scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0);
+            const matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1);
 
             return !field.display
               && matchFilter
@@ -105,10 +105,10 @@ define(function (require) {
           '[]columns',
           '[]hits'
         ], function (cur, prev) {
-          var newHits = cur[2] !== prev[2];
-          var fields = $scope.fields;
-          var columns = $scope.columns || [];
-          var fieldCounts = $scope.fieldCounts;
+          const newHits = cur[2] !== prev[2];
+          let fields = $scope.fields;
+          const columns = $scope.columns || [];
+          const fieldCounts = $scope.fieldCounts;
 
           if (!fields || newHits) {
             $scope.fields = fields = getFields();
@@ -137,7 +137,7 @@ define(function (require) {
             groups.unpopular = groups.unpopular || [];
 
             // move excess popular fields to un-popular list
-            var extras = groups.popular.splice(config.get('fields:popularLimit'));
+            const extras = groups.popular.splice(config.get('fields:popularLimit'));
             groups.unpopular = extras.concat(groups.unpopular);
           })
           .each(function (group, name) {
@@ -156,9 +156,9 @@ define(function (require) {
         $scope.vizLocation = function (field) {
           if (!$scope.state) {return '';}
 
-          var agg = {};
-          var isGeoPoint = field.type === 'geo_point';
-          var type = isGeoPoint ? 'tile_map' : 'histogram';
+          let agg = {};
+          const isGeoPoint = field.type === 'geo_point';
+          const type = isGeoPoint ? 'tile_map' : 'histogram';
           // If we're visualizing a date field, and our index is time based (and thus has a time filter),
           // then run a date histogram
           if (field.type === 'date' && $scope.indexPattern.timeFieldName === field.name) {
@@ -227,16 +227,16 @@ define(function (require) {
         };
 
         function getFields() {
-          var prevFields = $scope.fields;
-          var indexPattern = $scope.indexPattern;
-          var hits = $scope.hits;
-          var fieldCounts = $scope.fieldCounts;
+          const prevFields = $scope.fields;
+          const indexPattern = $scope.indexPattern;
+          const hits = $scope.hits;
+          const fieldCounts = $scope.fieldCounts;
 
           if (!indexPattern || !hits || !fieldCounts) return;
 
-          var fieldSpecs = indexPattern.fields.slice(0);
-          var fieldNamesInDocs = _.keys(fieldCounts);
-          var fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName);
+          const fieldSpecs = indexPattern.fields.slice(0);
+          const fieldNamesInDocs = _.keys(fieldCounts);
+          const fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName);
 
           _.difference(fieldNamesInDocs, fieldNamesInIndexPattern)
           .forEach(function (unknownFieldName) {
@@ -246,7 +246,7 @@ define(function (require) {
             });
           });
 
-          var fields = new FieldList(indexPattern, fieldSpecs);
+          const fields = new FieldList(indexPattern, fieldSpecs);
 
           if (prevFields) {
             fields.forEach(function (field) {
diff --git a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
index 54592ccf2c5d7..add0c7bdb4cd6 100644
--- a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
+++ b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   function getFieldValues(hits, field) {
-    var name = field.name;
-    var flattenHit = field.indexPattern.flattenHit;
+    const name = field.name;
+    const flattenHit = field.indexPattern.flattenHit;
     return _.map(hits, function (hit) {
       return flattenHit(hit)[name];
     });
@@ -23,12 +23,12 @@ define(function (require) {
       return { error: 'Analysis is not available for geo fields.' };
     }
 
-    var allValues = getFieldValues(params.hits, params.field);
-    var counts;
-    var missing = _countMissing(allValues);
+    const allValues = getFieldValues(params.hits, params.field);
+    let counts;
+    const missing = _countMissing(allValues);
 
     try {
-      var groups = _groupValues(allValues, params);
+      const groups = _groupValues(allValues, params);
       counts = _.map(
         _.sortBy(groups, 'count').reverse().slice(0, params.count),
         function (bucket) {
@@ -66,8 +66,8 @@ define(function (require) {
 
 
   function _groupValues(allValues, params) {
-    var groups = {};
-    var k;
+    const groups = {};
+    let k;
 
     allValues.forEach(function (value) {
       if (_.isObject(value) && !_.isArray(value)) {
diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
index f144362cd7a8e..80676474d4498 100644
--- a/src/plugins/kibana/public/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -1,17 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var moment = require('moment');
-  var ConfigTemplate = require('ui/ConfigTemplate');
-  var getSort = require('ui/doc_table/lib/get_sort');
-  var rison = require('ui/utils/rison');
+  const _ = require('lodash');
+  const angular = require('angular');
+  const moment = require('moment');
+  const ConfigTemplate = require('ui/ConfigTemplate');
+  const getSort = require('ui/doc_table/lib/get_sort');
+  const rison = require('ui/utils/rison');
 
-  var dateMath = require('ui/utils/dateMath');
+  const dateMath = require('ui/utils/dateMath');
 
   require('ui/doc_table');
   require('ui/visualize');
   require('ui/notify');
-  require('ui/timepicker');
   require('ui/fixedScroll');
   require('ui/directives/validate_json');
   require('ui/filters/moment');
@@ -20,8 +19,9 @@ define(function (require) {
   require('ui/state_management/app_state');
   require('ui/timefilter');
   require('ui/highlight/highlight_tags');
+  require('ui/share');
 
-  var app = require('ui/modules').get('apps/discover', [
+  const app = require('ui/modules').get('apps/discover', [
     'kibana/notify',
     'kibana/courier',
     'kibana/index_patterns'
@@ -35,15 +35,15 @@ define(function (require) {
       ip: function (Promise, courier, config, $location) {
         return courier.indexPatterns.getIds()
         .then(function (list) {
-          var stateRison = $location.search()._a;
+          const stateRison = $location.search()._a;
 
-          var state;
+          let state;
           try { state = rison.decode(stateRison); }
           catch (e) { state = {}; }
 
-          var specified = !!state.index;
-          var exists = _.contains(list, state.index);
-          var id = exists ? state.index : config.get('defaultIndex');
+          const specified = !!state.index;
+          const exists = _.contains(list, state.index);
+          const id = exists ? state.index : config.get('defaultIndex');
 
           return Promise.props({
             list: list,
@@ -66,14 +66,14 @@ define(function (require) {
   app.controller('discover', function ($scope, config, courier, $route, $window, Notifier,
     AppState, timefilter, Promise, Private, kbnUrl, highlightTags) {
 
-    var Vis = Private(require('ui/Vis'));
-    var docTitle = Private(require('ui/doc_title'));
-    var brushEvent = Private(require('ui/utils/brush_event'));
-    var HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var filterManager = Private(require('ui/filter_manager'));
+    const Vis = Private(require('ui/Vis'));
+    const docTitle = Private(require('ui/doc_title'));
+    const brushEvent = Private(require('ui/utils/brush_event'));
+    const HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
+    const queryFilter = Private(require('ui/filter_bar/query_filter'));
+    const filterManager = Private(require('ui/filter_manager'));
 
-    var notify = new Notifier({
+    const notify = new Notifier({
       location: 'Discover'
     });
 
@@ -91,13 +91,14 @@ define(function (require) {
     // config panel templates
     $scope.configTemplate = new ConfigTemplate({
       load: require('plugins/kibana/discover/partials/load_search.html'),
-      save: require('plugins/kibana/discover/partials/save_search.html')
+      save: require('plugins/kibana/discover/partials/save_search.html'),
+      share: require('plugins/kibana/discover/partials/share_search.html')
     });
 
     $scope.timefilter = timefilter;
 
     // the saved savedSearch
-    var savedSearch = $route.current.locals.savedSearch;
+    const savedSearch = $route.current.locals.savedSearch;
     $scope.$on('$destroy', savedSearch.destroy);
 
     // the actual courier.SearchSource
@@ -109,7 +110,9 @@ define(function (require) {
       docTitle.change(savedSearch.title);
     }
 
-    var $state = $scope.state = new AppState(getStateDefaults());
+    const $state = $scope.state = new AppState(getStateDefaults());
+    $scope.uiState = $state.makeStateful('uiState');
+
     function getStateDefaults() {
       return {
         query: $scope.searchSource.get('query') || '',
@@ -138,8 +141,8 @@ define(function (require) {
       indexPatternList: $route.current.locals.ip.list
     };
 
-    var init = _.once(function () {
-      var showTotal = 5;
+    const init = _.once(function () {
+      const showTotal = 5;
       $scope.failuresShown = showTotal;
       $scope.showAllFailures = function () {
         $scope.failuresShown = $scope.failures.length;
@@ -158,7 +161,7 @@ define(function (require) {
           if (!sort) return;
 
           // get the current sort from {key: val} to ["key", "val"];
-          var currentSort = _.pairs($scope.searchSource.get('sort')).pop();
+          const currentSort = _.pairs($scope.searchSource.get('sort')).pop();
 
           // if the searchSource doesn't know, tell it so
           if (!angular.equals(sort, currentSort)) $scope.fetch();
@@ -191,7 +194,10 @@ define(function (require) {
         });
 
         $scope.$watch('vis.aggs', function () {
-          var buckets = $scope.vis.aggs.bySchemaGroup.buckets;
+          // no timefield, no vis, nothing to update
+          if (!$scope.opts.timefield) return;
+
+          const buckets = $scope.vis.aggs.bySchemaGroup.buckets;
 
           if (buckets && buckets.length === 1) {
             $scope.intervalName = 'by ' + buckets[0].buckets.getInterval().description;
@@ -204,8 +210,8 @@ define(function (require) {
           'rows',
           'fetchStatus'
         ], (function updateResultState() {
-          var prev = {};
-          var status = {
+          let prev = {};
+          const status = {
             LOADING: 'loading', // initial data load
             READY: 'ready', // results came back
             NO_RESULTS: 'none' // no results came back
@@ -215,12 +221,12 @@ define(function (require) {
             // initial state, pretend we are loading
             if (rows == null && oldRows == null) return status.LOADING;
 
-            var rowsEmpty = _.isEmpty(rows);
+            const rowsEmpty = _.isEmpty(rows);
             // An undefined fetchStatus means the requests are still being
             // prepared to be sent. When all requests are completed,
             // fetchStatus is set to null, so it's important that we
             // specifically check for undefined to determine a loading status.
-            var preparingForFetch = _.isUndefined(fetchStatus);
+            const preparingForFetch = _.isUndefined(fetchStatus);
             if (preparingForFetch) return status.LOADING;
             else if (rowsEmpty && fetchStatus) return status.LOADING;
             else if (!rowsEmpty) return status.READY;
@@ -228,7 +234,7 @@ define(function (require) {
           }
 
           return function () {
-            var current = {
+            const current = {
               rows: $scope.rows,
               fetchStatus: $scope.fetchStatus
             };
@@ -312,9 +318,9 @@ define(function (require) {
 
       if (!$scope.rows) flushResponseData();
 
-      var sort = $state.sort;
-      var timeField = $scope.indexPattern.timeFieldName;
-      var totalSize = $scope.size || $scope.opts.sampleSize;
+      const sort = $state.sort;
+      const timeField = $scope.indexPattern.timeFieldName;
+      const totalSize = $scope.size || $scope.opts.sampleSize;
 
       /**
        * Basically an emum.
@@ -326,22 +332,23 @@ define(function (require) {
        *
        * @type {String}
        */
-      var sortBy = (function () {
+      const sortBy = (function () {
         if (!_.isArray(sort)) return 'implicit';
         else if (sort[0] === '_score') return 'implicit';
         else if (sort[0] === timeField) return 'time';
         else return 'non-time';
       }());
 
-      var sortFn = null;
-      if (sortBy === 'non-time') {
+      let sortFn = null;
+      if (sortBy !== 'implicit') {
         sortFn = new HitSortFn(sort[1]);
       }
 
       $scope.updateTime();
       if (sort[0] === '_score') segmented.setMaxSegments(1);
       segmented.setDirection(sortBy === 'time' ? (sort[1] || 'desc') : 'desc');
-      segmented.setSize(sortBy === 'time' ? $scope.opts.sampleSize : false);
+      segmented.setSortFn(sortFn);
+      segmented.setSize($scope.opts.sampleSize);
 
       // triggered when the status updated
       segmented.on('status', function (status) {
@@ -359,47 +366,40 @@ define(function (require) {
             return failure.index + failure.shard + failure.reason;
           });
         }
+      }));
 
-        var rows = $scope.rows;
-        var indexPattern = $scope.searchSource.get('index');
+      segmented.on('mergedSegment', function (merged) {
+        $scope.mergedEsResp = merged;
+        $scope.hits = merged.hits.total;
 
-        // merge the rows and the hits, use a new array to help watchers
-        rows = $scope.rows = rows.concat(resp.hits.hits);
+        const indexPattern = $scope.searchSource.get('index');
 
-        if (sortFn) {
-          notify.event('resort rows', function () {
-            rows.sort(sortFn);
-            rows = $scope.rows = rows.slice(0, totalSize);
-            $scope.fieldCounts = {};
-          });
-        }
+        // the merge rows, use a new array to help watchers
+        $scope.rows = merged.hits.hits.slice();
 
         notify.event('flatten hit and count fields', function () {
-          var counts = $scope.fieldCounts;
+          let counts = $scope.fieldCounts;
+
+          // if we haven't counted yet, or need a fresh count because we are sorting, reset the counts
+          if (!counts || sortFn) counts = $scope.fieldCounts = {};
+
           $scope.rows.forEach(function (hit) {
-            // skip this work if we have already done it and we are NOT sorting.
-            // ---
+            // skip this work if we have already done it
+            if (hit.$$_counted) return;
+
             // when we are sorting results, we need to redo the counts each time because the
-            // "top 500" may change with each response
-            if (hit.$$_counted && !sortFn) return;
-            hit.$$_counted = true;
+            // "top 500" may change with each response, so don't mark this as counted
+            if (!sortFn) hit.$$_counted = true;
 
-            var fields = _.keys(indexPattern.flattenHit(hit));
-            var n = fields.length;
-            var field;
+            const fields = _.keys(indexPattern.flattenHit(hit));
+            let n = fields.length;
+            let field;
             while (field = fields[--n]) {
               if (counts[field]) counts[field] += 1;
               else counts[field] = 1;
             }
           });
         });
-
-      }));
-
-      segmented.on('mergedSegment', function (merged) {
-        $scope.mergedEsResp = merged;
-        $scope.hits = merged.hits.total;
-
       });
 
       segmented.on('complete', function () {
@@ -454,13 +454,13 @@ define(function (require) {
       $window.scrollTo(0, 0);
     };
 
-    var loadingVis;
+    let loadingVis;
     function setupVisualization() {
       // If we're not setting anything up we need to return an empty promise
       if (!$scope.opts.timefield) return Promise.resolve();
       if (loadingVis) return loadingVis;
 
-      var visStateAggs = [
+      const visStateAggs = [
         {
           type: 'count',
           schema: 'metric'
@@ -478,7 +478,7 @@ define(function (require) {
 
       // we have a vis, just modify the aggs
       if ($scope.vis) {
-        var visState = $scope.vis.getState();
+        const visState = $scope.vis.getState();
         visState.aggs = visStateAggs;
 
         $scope.vis.setState(visState);
@@ -486,6 +486,7 @@ define(function (require) {
       }
 
       $scope.vis = new Vis($scope.indexPattern, {
+        title: savedSearch.title,
         type: 'histogram',
         params: {
           addLegend: false,
@@ -523,16 +524,16 @@ define(function (require) {
     }
 
     function resolveIndexPatternLoading() {
-      var props = $route.current.locals.ip;
-      var loaded = props.loaded;
-      var stateVal = props.stateVal;
-      var stateValFound = props.stateValFound;
+      const props = $route.current.locals.ip;
+      const loaded = props.loaded;
+      const stateVal = props.stateVal;
+      const stateValFound = props.stateValFound;
 
-      var own = $scope.searchSource.getOwn('index');
+      const own = $scope.searchSource.getOwn('index');
 
       if (own && !stateVal) return own;
       if (stateVal && !stateValFound) {
-        var err = '"' + stateVal + '" is not a configured pattern. ';
+        const err = '"' + stateVal + '" is not a configured pattern. ';
         if (own) {
           notify.warning(err + ' Using the saved index pattern: "' + own.id + '"');
           return own;
diff --git a/src/plugins/kibana/public/discover/directives/timechart.js b/src/plugins/kibana/public/discover/directives/timechart.js
index 7450ce2b3686a..b397d752054af 100644
--- a/src/plugins/kibana/public/discover/directives/timechart.js
+++ b/src/plugins/kibana/public/discover/directives/timechart.js
@@ -1,9 +1,9 @@
 require('ui/modules')
 .get('apps/discover')
 .directive('discoverTimechart', function (Private, $compile) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var vislib = Private(require('ui/vislib'));
+  const _ = require('lodash');
+  const $ = require('jquery');
+  const vislib = Private(require('ui/vislib'));
 
   return {
     restrict: 'E',
@@ -12,9 +12,9 @@ require('ui/modules')
     },
     link: function ($scope, elem) {
 
-      var init = function () {
+      const init = function () {
         // This elem should already have a height/width
-        var myChart = new vislib.Chart(elem[0], {
+        const myChart = new vislib.Chart(elem[0], {
 
         });
 
diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html
index ac17f7bf80d43..215bfe5ab0e9d 100644
--- a/src/plugins/kibana/public/discover/index.html
+++ b/src/plugins/kibana/public/discover/index.html
@@ -1,5 +1,5 @@
 <div ng-controller="discover" class="app-container">
-  <navbar>
+  <navbar name="discover">
     <form role="form" class="fill inline-form" ng-submit="fetch()" name="discoverSearch">
       <div class="typeahead" kbn-typeahead="discover">
         <div class="input-group"
@@ -50,6 +50,16 @@
           <i aria-hidden="true" class="fa fa-folder-open-o"></i>
         </button>
       </kbn-tooltip>
+      <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
+        <button
+          aria-label="Share Search"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('share') }}"
+          ng-class="{active: configTemplate.is('share')}"
+          ng-click="configTemplate.toggle('share');">
+          <i aria-hidden="true" class="fa fa-external-link"></i>
+        </button>
+      </kbn-tooltip>
     </div>
   </navbar>
 
@@ -176,7 +186,13 @@ <h2>Searching</h2>
 
               </header>
 
-              <visualize ng-if="vis && rows.length != 0" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
+              <visualize
+                ng-if="vis && rows.length != 0"
+                vis="vis"
+                es-resp="mergedEsResp"
+                ui-state="uiState"
+                search-source="searchSource">
+              </visualize>
             </div>
 
             <div class="discover-table" fixed-scroll>
diff --git a/src/plugins/kibana/public/discover/index.js b/src/plugins/kibana/public/discover/index.js
index 1a34560164418..21b2e6a082945 100644
--- a/src/plugins/kibana/public/discover/index.js
+++ b/src/plugins/kibana/public/discover/index.js
@@ -1,6 +1,7 @@
 define(function (require, module, exports) {
   require('plugins/kibana/discover/saved_searches/saved_searches');
   require('plugins/kibana/discover/directives/timechart');
+  require('ui/navbar');
   require('ui/collapsible_sidebar');
   require('plugins/kibana/discover/components/field_chooser/field_chooser');
   require('plugins/kibana/discover/controllers/discover');
@@ -9,6 +10,6 @@ define(function (require, module, exports) {
   // preload
   require('ui/doc_table/components/table_row');
 
-  require('ui/saved_objects/saved_object_registry').register(require('plugins/kibana/discover/saved_searches/saved_search_register'));
-
+  var savedObjectRegistry = require('ui/saved_objects/saved_object_registry');
+  savedObjectRegistry.register(require('plugins/kibana/discover/saved_searches/saved_search_register'));
 });
diff --git a/src/plugins/kibana/public/discover/partials/share_search.html b/src/plugins/kibana/public/discover/partials/share_search.html
new file mode 100644
index 0000000000000..69fee7ad756d0
--- /dev/null
+++ b/src/plugins/kibana/public/discover/partials/share_search.html
@@ -0,0 +1,5 @@
+<share
+  object-type="search"
+  object-id="{{opts.savedSearch.id}}"
+  allow-embed="false">
+</share>
diff --git a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js
index 0f678b49770cb..14d9dcba9cb94 100644
--- a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js
+++ b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   require('ui/notify');
 
-  var module = require('ui/modules').get('discover/saved_searches', [
+  const module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify',
     'kibana/courier'
   ]);
diff --git a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
index cf3c1895eb1e8..60cbe43b79ac7 100644
--- a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
+++ b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -1,10 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
+  const Scanner = require('ui/utils/scanner');
 
   require('plugins/kibana/discover/saved_searches/_saved_search');
   require('ui/notify');
 
-  var module = require('ui/modules').get('discover/saved_searches', [
+  const module = require('ui/modules').get('discover/saved_searches', [
     'kibana/notify'
   ]);
 
@@ -16,9 +17,12 @@ define(function (require) {
   });
 
   module.service('savedSearches', function (Promise, config, kbnIndex, es, createNotifier, SavedSearch, kbnUrl) {
+    const scanner = new Scanner(es, {
+      index: kbnIndex,
+      type: 'search'
+    });
 
-
-    var notify = createNotifier({
+    const notify = createNotifier({
       location: 'Saved Searches'
     });
 
@@ -31,6 +35,15 @@ define(function (require) {
       nouns: 'saved searches'
     };
 
+
+    this.scanAll = function (queryString, pageSize = 1000) {
+      return scanner.scanAndMap(queryString, {
+        pageSize,
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
+    };
+
+
     this.get = function (id) {
       return (new SavedSearch(id)).init();
     };
@@ -46,9 +59,15 @@ define(function (require) {
       });
     };
 
+    this.mapHits = function (hit) {
+      const source = hit._source;
+      source.id = hit._id;
+      source.url = this.urlFor(hit._id);
+      return source;
+    };
+
     this.find = function (searchString, size = 100) {
-      var self = this;
-      var body;
+      let body;
       if (searchString) {
         body = {
           query: {
@@ -69,15 +88,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: resp.hits.hits.map(function (hit) {
-            var source = hit._source;
-            source.id = hit._id;
-            source.url = self.urlFor(hit._id);
-            return source;
-          })
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };
diff --git a/src/plugins/kibana/public/doc/__tests__/doc.js b/src/plugins/kibana/public/doc/__tests__/doc.js
index 88823cf0fc7dd..bd5980f0e6b3c 100644
--- a/src/plugins/kibana/public/doc/__tests__/doc.js
+++ b/src/plugins/kibana/public/doc/__tests__/doc.js
@@ -1,13 +1,13 @@
 // Load the kibana app dependencies.
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+const ngMock = require('ngMock');
+const expect = require('expect.js');
 require('plugins/kibana/doc/index');
 
-var $scope;
-var createController;
-var timefilter;
+let $scope;
+let createController;
+let timefilter;
 
-var init = function (index, type, id) {
+const init = function (index, type, id) {
 
   ngMock.module('kibana');
 
@@ -28,7 +28,7 @@ var init = function (index, type, id) {
 
     $provide.service('es', function (Private, $q) {
       this.search = function (config) {
-        var deferred = $q.defer();
+        const deferred = $q.defer();
 
         switch (config.index) {
           case 'goodSearch':
diff --git a/src/plugins/kibana/public/doc/controllers/doc.js b/src/plugins/kibana/public/doc/controllers/doc.js
index fa109900833e5..975bd5c0a277b 100644
--- a/src/plugins/kibana/public/doc/controllers/doc.js
+++ b/src/plugins/kibana/public/doc/controllers/doc.js
@@ -1,21 +1,21 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  const _ = require('lodash');
+  const angular = require('angular');
 
   require('ui/notify');
   require('ui/courier');
   require('ui/doc_viewer');
   require('ui/index_patterns');
 
-  var app = require('ui/modules').get('apps/doc', [
+  const app = require('ui/modules').get('apps/doc', [
     'kibana/notify',
     'kibana/courier',
     'kibana/index_patterns'
   ]);
 
-  var html = require('plugins/kibana/doc/index.html');
+  const html = require('plugins/kibana/doc/index.html');
 
-  var resolveIndexPattern = {
+  const resolveIndexPattern = {
     indexPattern: function (courier, savedSearches, $route) {
       return courier.indexPatterns.get($route.current.params.indexPattern);
     }
@@ -38,7 +38,7 @@ define(function (require) {
     // Pretty much only need this for formatting, not actually using it for fetching anything.
     $scope.indexPattern = $route.current.locals.indexPattern;
 
-    var computedFields = $scope.indexPattern.getComputedFields();
+    const computedFields = $scope.indexPattern.getComputedFields();
 
     es.search({
       index: $route.current.params.index,
diff --git a/src/plugins/kibana/public/kibana.js b/src/plugins/kibana/public/kibana.js
index 698eb43faa26d..6aa6281289319 100644
--- a/src/plugins/kibana/public/kibana.js
+++ b/src/plugins/kibana/public/kibana.js
@@ -3,14 +3,17 @@ require('plugins/kibana/visualize/index');
 require('plugins/kibana/dashboard/index');
 require('plugins/kibana/settings/index');
 require('plugins/kibana/doc/index');
+require('ui/timepicker');
 
-var moment = require('moment-timezone');
+const moment = require('moment-timezone');
 
-var chrome = require('ui/chrome');
-var routes = require('ui/routes');
-var modules = require('ui/modules');
+const chrome = require('ui/chrome');
+const routes = require('ui/routes');
+const modules = require('ui/modules');
 
-var kibanaLogoUrl = require('ui/images/kibana.svg');
+const kibanaLogoUrl = require('ui/images/kibana.svg');
+
+routes.enable();
 
 routes
 .otherwise({
diff --git a/src/plugins/kibana/public/settings/app.html b/src/plugins/kibana/public/settings/app.html
index 0d86dff90fd96..6bb1ecd5a167c 100644
--- a/src/plugins/kibana/public/settings/app.html
+++ b/src/plugins/kibana/public/settings/app.html
@@ -1,9 +1,9 @@
 <div class="app-container">
-  <nav class="navbar navbar-default navbar-static-top subnav">
+  <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="settingsNav">
     <div class="container-fluid">
       <ul class="nav navbar-nav">
         <li ng-repeat="section in sections" ng-class="section.class">
-          <a class="navbar-link" kbn-href="{{section.url}}">{{section.display}}</a>
+          <a class="navbar-link" kbn-href="{{section.url}}" data-test-subj="{{section.name}}">{{section.display}}</a>
         </li>
       </ul>
     </div>
diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js
index 3fe76bcde2d90..af1adf82a4ce5 100644
--- a/src/plugins/kibana/public/settings/index.js
+++ b/src/plugins/kibana/public/settings/index.js
@@ -1,7 +1,12 @@
 define(function (require, module, exports) {
-  var _ = require('lodash');
+  const _ = require('lodash');
+  var registry = require('ui/registry/settings_sections');
 
-  var sections = require('plugins/kibana/settings/sections/index');
+  require('plugins/kibana/settings/sections/indices/index');
+  require('plugins/kibana/settings/sections/advanced/index');
+  require('plugins/kibana/settings/sections/objects/index');
+  require('plugins/kibana/settings/sections/status/index');
+  require('plugins/kibana/settings/sections/about/index');
   require('plugins/kibana/settings/styles/main.less');
   require('ui/filters/start_from');
 
@@ -18,6 +23,7 @@ define(function (require, module, exports) {
   require('ui/modules')
   .get('apps/settings')
   .directive('kbnSettingsApp', function (Private, $route, timefilter) {
+    const sections = Private(registry);
     return {
       restrict: 'E',
       template: require('plugins/kibana/settings/app.html'),
@@ -27,7 +33,7 @@ define(function (require, module, exports) {
       },
       link: function ($scope, $el) {
         timefilter.enabled = false;
-        $scope.sections = sections;
+        $scope.sections = sections.inOrder;
         $scope.section = _.find($scope.sections, { name: $scope.sectionName });
 
         $scope.sections.forEach(function (section) {
diff --git a/src/plugins/kibana/public/settings/saved_object_registry.js b/src/plugins/kibana/public/settings/saved_object_registry.js
index be0f0484b8061..ae384c891eb9b 100644
--- a/src/plugins/kibana/public/settings/saved_object_registry.js
+++ b/src/plugins/kibana/public/settings/saved_object_registry.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var registry = [];
+  const _ = require('lodash');
+  const registry = [];
   return {
     register: function (service) {
       registry.push(service);
diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js
index fec9ad2da3165..6cba64da62e46 100644
--- a/src/plugins/kibana/public/settings/sections/about/index.js
+++ b/src/plugins/kibana/public/settings/sections/about/index.js
@@ -1,5 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
   require('ui/routes')
   .when('/settings/about', {
@@ -13,10 +14,10 @@ define(function (require) {
     $scope.buildSha = buildSha;
   });
 
-  return {
-    order: Infinity,
+  registry.register(_.constant({
+    order: 1001,
     name: 'about',
     display: 'About',
     url: '#/settings/about'
-  };
+  }));
 });
diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
index 51d419b166715..4b57f33041143 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
+++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.html
@@ -1,4 +1,4 @@
-<tr ng-class="conf.value === undefined ? 'default' : 'custom'">
+<tr ng-class="conf.value === undefined ? 'default' : 'custom'" data-test-subj="advancedSetting {{conf.name}}" >
   <td class="name">
     <b>{{conf.name}}</b>
     <span class="smaller" ng-show="!conf.isCustom && conf.value !== undefined">
@@ -16,7 +16,7 @@
     <!-- Settings editors -->
     <form
       name="forms.configEdit"
-      ng-if="conf.editting"
+      ng-if="conf.editing"
       ng-submit="save(conf)"
       role="form">
 
@@ -59,12 +59,13 @@
         name="conf.name"
         ng-model="conf.unsavedValue"
         ng-options="option as option for option in conf.options"
-        class="form-control">
+        class="form-control"
+        data-test-subj="selectInput">
       </select>
     </form>
 
     <!-- Setting display formats -->
-    <span ng-if="!conf.editting">
+    <span ng-if="!conf.editing" data-test-subj="currentValue">
       <span ng-show="(conf.normal || conf.json || conf.select)">{{conf.value || conf.defVal}}</span>
       <span ng-show="conf.array">{{(conf.value || conf.defVal).join(', ')}}</span>
       <span ng-show="conf.bool">{{conf.value === undefined ? conf.defVal : conf.value}}</span>
@@ -73,41 +74,45 @@
   </td>
   <td class="actions">
     <button
-      ng-if="!conf.editting"
+      ng-if="!conf.editing"
       ng-click="edit(conf)"
       class="btn btn-default"
       ng-disabled="conf.tooComplex"
-      aria-label="Edit">
+      aria-label="Edit"
+      data-test-subj="editButton">
       <span class="sr-only">Edit</span>
       <i aria-hidden="true" class="fa fa-pencil"></i>
     </button>
 
     <button
-      ng-if="conf.editting"
+      ng-if="conf.editing"
       ng-click="save(conf)"
       class="btn btn-success"
       ng-disabled="conf.loading || conf.tooComplex || forms.configEdit.$invalid"
-      aria-label="Save">
+      aria-label="Save"
+      data-test-subj="saveButton">
       <span class="sr-only">Save</span>
       <i aria-hidden="true" ng-if="!conf.loading" class="fa fa-save"></i>
       <i aria-hidden="true" ng-if="conf.loading" class="fa fa-spinner"></i>
     </button>
 
     <button
-      ng-if="!conf.editting"
+      ng-if="!conf.editing"
       ng-click="clear(conf)"
       ng-hide="conf.value === undefined"
       class="btn btn-danger"
-      aria-label="Clear">
+      aria-label="Clear"
+      data-test-subj="clearButton">
       <span class="sr-only">Clear</span>
       <i aria-hidden="true" class="fa fa-trash-o"></i>
     </button>
 
     <button
-      ng-if="conf.editting"
+      ng-if="conf.editing"
       ng-click="cancelEdit(conf)"
       class="btn btn-default"
-      aria-label="Cancel edit">
+      aria-label="Cancel edit"
+      data-test-subj="cancelButton">
       <span class="sr-only">Cancel Edit</span>
       <i aria-hidden="true" class="fa fa-times"></i>
     </button>
diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
index 7371827e073fb..75d84a2815f76 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   require('ui/elastic_textarea');
 
   require('ui/modules').get('apps/settings')
@@ -13,21 +13,21 @@ define(function (require) {
         configs: '='
       },
       link: function ($scope) {
-        var configDefaults = Private(require('ui/config/defaults'));
-        var notify = new Notifier();
-        var keyCodes = {
+        const configDefaults = Private(require('ui/config/defaults'));
+        const notify = new Notifier();
+        const keyCodes = {
           ESC: 27
         };
 
         // To allow passing form validation state back
         $scope.forms = {};
 
-        // setup loading flag, run async op, then clear loading and editting flag (just in case)
-        var loading = function (conf, fn) {
+        // setup loading flag, run async op, then clear loading and editing flag (just in case)
+        const loading = function (conf, fn) {
           conf.loading = true;
           fn()
           .finally(function () {
-            conf.loading = conf.editting = false;
+            conf.loading = conf.editing = false;
           })
           .catch(notify.fatal);
         };
@@ -41,7 +41,7 @@ define(function (require) {
         $scope.edit = function (conf) {
           conf.unsavedValue = conf.value == null ? conf.defVal : conf.value;
           $scope.configs.forEach(function (c) {
-            c.editting = (c === conf);
+            c.editing = (c === conf);
           });
         };
 
@@ -56,7 +56,7 @@ define(function (require) {
         };
 
         $scope.cancelEdit = function (conf) {
-          conf.editting = false;
+          conf.editing = false;
         };
 
         $scope.clear = function (conf) {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.html b/src/plugins/kibana/public/settings/sections/advanced/index.html
index a2894631dc868..13f85f7c88194 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/index.html
+++ b/src/plugins/kibana/public/settings/sections/advanced/index.html
@@ -3,7 +3,7 @@
     <div class="bs-callout bs-callout-warning">
       <h4>Caution: You can break stuff here</h4>
       Be careful in here, these settings are for very advanced users only.
-      Tweaks you make here can break large portionsof Kibana. Some of these
+      Tweaks you make here can break large portions of Kibana. Some of these
       settings may be undocumented, unsupported or experimental. If a field has
       a default value, blanking the field will reset it to its default which
       may be unacceptable given other configuration directives. Deleting a
diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.js b/src/plugins/kibana/public/settings/sections/advanced/index.js
index bcff939994f56..11d5c9e512dfd 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/index.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/index.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config');
-
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
+  const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config');
 
   require('plugins/kibana/settings/sections/advanced/advanced_row');
 
@@ -15,8 +15,8 @@ define(function (require) {
     return {
       restrict: 'E',
       link: function ($scope) {
-        var configDefaults = Private(require('ui/config/defaults'));
-        var keyCodes = {
+        const configDefaults = Private(require('ui/config/defaults'));
+        const keyCodes = {
           ESC: 27
         };
 
@@ -29,9 +29,9 @@ define(function (require) {
         }
 
         function readConfigVals() {
-          var configVals = config._vals();
+          const configVals = config._vals();
 
-          var customConfig = Object.keys(configVals)
+          const customConfig = Object.keys(configVals)
           .filter(notDefaultConfig)
           .map(name => toEditableConfig(false, name, configVals[name]));
 
@@ -43,7 +43,7 @@ define(function (require) {
         }
 
         // react to changes of the config values
-        var unhook = $rootScope.$on('change:config', readConfigVals);
+        const unhook = $rootScope.$on('change:config', readConfigVals);
         $scope.$on('$destroy', unhook);
 
         // initial config setup
@@ -52,10 +52,10 @@ define(function (require) {
     };
   });
 
-  return {
+  registry.register(_.constant({
     order: 2,
     name: 'advanced',
     display: 'Advanced',
     url: '#/settings/advanced'
-  };
+  }));
 });
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js
index 968a3cf3f44bf..2f8978ece786a 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js
@@ -1,6 +1,6 @@
 
-var getEditorType = require('plugins/kibana/settings/sections/advanced/lib/get_editor_type');
-var expect = require('expect.js');
+const getEditorType = require('plugins/kibana/settings/sections/advanced/lib/get_editor_type');
+const expect = require('expect.js');
 
 describe('Settings', function () {
   describe('Advanced', function () {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js
index 64742a3766fd6..0de3de12b1a12 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js
@@ -1,6 +1,6 @@
 
-var getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type');
-var expect = require('expect.js');
+const getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type');
+const expect = require('expect.js');
 
 describe('Settings', function () {
   describe('Advanced', function () {
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js
index 7a9a78d34f0ad..fa255ea066e6e 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js
@@ -1,6 +1,6 @@
 
-var toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config');
-var expect = require('expect.js');
+const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config');
+const expect = require('expect.js');
 
 describe('Settings', function () {
   describe('Advanced', function () {
@@ -20,7 +20,7 @@ describe('Settings', function () {
       });
 
       context('when given a setting definition object', function () {
-        var def;
+        let def;
         beforeEach(function () {
           def = {
             value: 'the original',
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js
index 54ec1e240bbf3..3b75cc23091b6 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
-  var NAMED_EDITORS = ['json', 'array', 'boolean', 'select'];
-  var NORMAL_EDITOR = ['number', 'string', 'null', 'undefined'];
+  const NAMED_EDITORS = ['json', 'array', 'boolean', 'select'];
+  const NORMAL_EDITOR = ['number', 'string', 'null', 'undefined'];
 
   /**
    * @param {object} advanced setting configuration object
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
index 08ea1dd483deb..784f1f3844e6b 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   /**
    * @param {object} advanced setting definition object
diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js
index a147cb61c31e4..cf6b359eb8ba8 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js
+++ b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var getValType = require('./get_val_type');
-  var getEditorType = require('./get_editor_type');
+  const _ = require('lodash');
+  const getValType = require('./get_val_type');
+  const getEditorType = require('./get_editor_type');
 
   /**
    * @param {object} advanced setting definition object
@@ -10,10 +10,10 @@ define(function (require) {
    * @returns {object} the editable config object
    */
   function toEditableConfig(def, name, value) {
-    var isCustom = !def;
+    const isCustom = !def;
     if (isCustom) def = {};
 
-    var conf = {
+    const conf = {
       name,
       value,
       isCustom,
@@ -24,7 +24,7 @@ define(function (require) {
       options: def.options
     };
 
-    var editor = getEditorType(conf);
+    const editor = getEditorType(conf);
     conf.json = editor === 'json';
     conf.select = editor === 'select';
     conf.bool = editor === 'boolean';
diff --git a/src/plugins/kibana/public/settings/sections/index.js b/src/plugins/kibana/public/settings/sections/index.js
deleted file mode 100644
index c2be1402c526c..0000000000000
--- a/src/plugins/kibana/public/settings/sections/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function (require) {
-  // each of these private modules returns an object defining that section, their properties
-  // are used to create the nav bar
-  return [
-    require('plugins/kibana/settings/sections/indices/index'),
-    require('plugins/kibana/settings/sections/advanced/index'),
-    require('plugins/kibana/settings/sections/objects/index'),
-    require('plugins/kibana/settings/sections/status/index'),
-    require('plugins/kibana/settings/sections/about/index')
-  ];
-});
diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.html b/src/plugins/kibana/public/settings/sections/indices/_create.html
index 9f18d319050ac..4bf6c76fec6c5 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_create.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_create.html
@@ -73,6 +73,36 @@ <h4>Time-interval based index patterns are deprecated!</h4>
               </small>
             </div>
 
+          <div class="form-group" ng-if="canExpandIndices()">
+            <label>
+              <input ng-model="index.notExpandable" type="checkbox">
+              Do not expand index pattern when searching <small>(Not recommended)</small>
+            </label>
+
+            <div ng-if="index.notExpandable" class="alert alert-info">
+              This index pattern will be queried directly rather than being
+              expanded into more performant searches against individual indices.
+
+              Elasticsearch will receive a query against <em>{{index.name}}</em>
+              and will have to search through all matching indices regardless
+              of whether they have data that matches the current time range.
+            </div>
+
+            <p class="help-block">
+              By default, searches against any time-based index pattern that
+              contains a wildcard will automatically be expanded to query only
+              the indices that contain data within the currently selected time
+              range.
+            </p>
+
+            <p class="help-block">
+              Searching against the index pattern <em>logstash-*</em> will
+              actually query elasticsearch for the specific matching indices
+              (e.g. <em>logstash-2015.12.21</em>) that fall within the current
+              time range.
+            </p>
+          </div>
+
           <section>
             <div class="alert alert-danger" ng-repeat="err in index.patternErrors">
               {{err}}
diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js
index e701e310f3341..720e5de639d09 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_create.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_create.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var moment = require('moment');
-  var { IndexPatternMissingIndices } = require('ui/errors');
+  const _ = require('lodash');
+  const moment = require('moment');
+  const { IndexPatternMissingIndices } = require('ui/errors');
 
   require('ui/directives/validate_index_name');
   require('ui/directives/auto_select_if_only_one');
@@ -13,17 +13,18 @@ define(function (require) {
 
   require('ui/modules').get('apps/settings')
   .controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
-    var notify = new Notifier();
-    var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
-    var intervals = indexPatterns.intervals;
-    var samplePromise;
+    const notify = new Notifier();
+    const refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
+    const intervals = indexPatterns.intervals;
+    let samplePromise;
 
     // this and child scopes will write pattern vars here
-    var index = $scope.index = {
+    const index = $scope.index = {
       name: 'logstash-*',
 
       isTimeBased: true,
       nameIsPattern: false,
+      notExpandable: false,
       sampleCount: 5,
       nameIntervalOptions: intervals,
 
@@ -33,6 +34,12 @@ define(function (require) {
     index.nameInterval = _.find(index.nameIntervalOptions, { name: 'daily' });
     index.timeField = null;
 
+    $scope.canExpandIndices = function () {
+      // to maximize performance in the digest cycle, move from the least
+      // expensive operation to most
+      return index.isTimeBased && !index.nameIsPattern && _.includes(index.name, '*');
+    };
+
     $scope.refreshFieldList = function () {
       fetchFieldList().then(updateFieldList);
     };
@@ -50,6 +57,10 @@ define(function (require) {
           }
         }
 
+        if (index.notExpandable && $scope.canExpandIndices()) {
+          indexPattern.notExpandable = true;
+        }
+
         // fetch the fields
         return indexPattern.create()
         .then(function (id) {
@@ -81,10 +92,10 @@ define(function (require) {
       'index.nameIsPattern',
       'index.nameInterval.name'
     ], function (newVal, oldVal) {
-      var isTimeBased = newVal[0];
-      var nameIsPattern = newVal[1];
-      var newDefault = getPatternDefault(newVal[2]);
-      var oldDefault = getPatternDefault(oldVal[2]);
+      const isTimeBased = newVal[0];
+      const nameIsPattern = newVal[1];
+      const newDefault = getPatternDefault(newVal[2]);
+      const oldDefault = getPatternDefault(oldVal[2]);
 
       if (index.name === oldDefault) {
         index.name = newDefault;
@@ -112,7 +123,7 @@ define(function (require) {
       'index.name',
       'index.nameInterval'
     ], function (newVal, oldVal) {
-      var lastPromise;
+      let lastPromise;
       resetIndex();
       samplePromise = lastPromise = updateSamples()
       .then(function () {
@@ -146,13 +157,13 @@ define(function (require) {
     ], $scope.refreshFieldList);
 
     function updateSamples() {
-      var patternErrors = [];
+      const patternErrors = [];
 
       if (!index.nameInterval || !index.name) {
         return Promise.resolve();
       }
 
-      var pattern = mockIndexPattern(index);
+      const pattern = mockIndexPattern(index);
 
       return indexPatterns.mapper.getIndicesForIndexPattern(pattern)
       .catch(function (err) {
@@ -160,8 +171,8 @@ define(function (require) {
         notify.error(err);
       })
       .then(function (existing) {
-        var all = _.get(existing, 'all', []);
-        var matches = _.get(existing, 'matches', []);
+        const all = _.get(existing, 'all', []);
+        const matches = _.get(existing, 'matches', []);
         if (all.length) {
           index.existing = {
             class: 'success',
@@ -174,8 +185,8 @@ define(function (require) {
         }
 
         patternErrors.push('Pattern does not match any existing indices');
-        var radius = Math.round(index.sampleCount / 2);
-        var samples = intervals.toIndexList(index.name, index.nameInterval, -radius, radius);
+        const radius = Math.round(index.sampleCount / 2);
+        const samples = intervals.toIndexList(index.name, index.nameInterval, -radius, radius);
 
         if (_.uniq(samples).length !== samples.length) {
           patternErrors.push('Invalid pattern, interval does not create unique index names');
@@ -189,9 +200,9 @@ define(function (require) {
 
     function fetchFieldList() {
       index.dateFields = index.timeField = index.listUsed = null;
-      var useIndexList = index.isTimeBased && index.nameIsPattern;
-      var fetchFieldsError;
-      var dateFields;
+      const useIndexList = index.isTimeBased && index.nameIsPattern;
+      let fetchFieldsError;
+      let dateFields;
 
       // we don't have enough info to continue
       if (!index.name) {
@@ -206,7 +217,7 @@ define(function (require) {
 
       return indexPatterns.mapper.clearCache(index.name)
       .then(function () {
-        var pattern = mockIndexPattern(index);
+        const pattern = mockIndexPattern(index);
 
         return indexPatterns.mapper.getFieldsForIndexPattern(pattern, true)
         .catch(function (err) {
diff --git a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
index 791f13ba47b50..735e7ae7bfa02 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   return function (indexPattern) {
-    var dateScripts = {};
-    var scripts = {
+    const dateScripts = {};
+    const scripts = {
       __dayOfMonth:   'dayOfMonth',
       __dayOfWeek:    'dayOfWeek',
       __dayOfYear:    'dayOfYear',
diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.html b/src/plugins/kibana/public/settings/sections/indices/_edit.html
index fc3ca133dd156..ee0e6f65a307c 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_edit.html
+++ b/src/plugins/kibana/public/settings/sections/indices/_edit.html
@@ -22,6 +22,10 @@
         <div ng-if="indexPattern.timeFieldName && indexPattern.intervalName" class="alert alert-info">
           This index uses a <strong>Time-based index pattern</strong> which repeats <span ng-bind="::indexPattern.getInterval().display"></span>
         </div>
+        <div ng-if="!indexPattern.canExpandIndices()" class="alert alert-info">
+          This index pattern is set to be queried directly rather than being
+          expanded into more performant searches against individual indices.
+        </div>
         <div ng-if="conflictFields.length" class="alert alert-warning">
           <strong>Mapping conflict!</strong> {{conflictFields.length > 1 ? conflictFields.length : 'A'}} field{{conflictFields.length > 1 ? 's' : ''}} {{conflictFields.length > 1 ? 'are' : 'is'}} defined as several types (string, integer, etc) across the indices that match this pattern. You may still be able to use these conflict fields in parts of Kibana, but they will be unavailable for functions that require Kibana to know their type. Correcting this issue will require reindexing your data.
         </div>
diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.js b/src/plugins/kibana/public/settings/sections/indices/_edit.js
index abd5ee43ea8a9..e7dfee046db96 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_edit.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_edit.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   require('plugins/kibana/settings/sections/indices/_indexed_fields');
   require('plugins/kibana/settings/sections/indices/_scripted_fields');
   require('plugins/kibana/settings/sections/indices/_index_header');
@@ -18,16 +18,16 @@ define(function (require) {
   require('ui/modules').get('apps/settings')
   .controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
 
-    var notify = new Notifier();
-    var $state = $scope.state = new AppState();
-    var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
+    const notify = new Notifier();
+    const $state = $scope.state = new AppState();
+    const refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index'));
 
     $scope.kbnUrl = Private(require('ui/url'));
     $scope.indexPattern = $route.current.locals.indexPattern;
     docTitle.change($scope.indexPattern.id);
-    var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
+    const otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
 
-    var fieldTypes = Private(require('plugins/kibana/settings/sections/indices/_field_types'));
+    const fieldTypes = Private(require('plugins/kibana/settings/sections/indices/_field_types'));
     $scope.$watch('indexPattern.fields', function () {
       $scope.fieldTypes = fieldTypes($scope.indexPattern);
     });
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
index a93db7f716542..db93662f9454b 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js
@@ -15,9 +15,9 @@ define(function (require) {
     },
     controllerAs: 'fieldSettings',
     controller: function FieldEditorPageController($route, Private, Notifier, docTitle) {
-      var Field = Private(require('ui/index_patterns/_field'));
-      var notify = new Notifier({ location: 'Field Editor' });
-      var kbnUrl = Private(require('ui/url'));
+      const Field = Private(require('ui/index_patterns/_field'));
+      const notify = new Notifier({ location: 'Field Editor' });
+      const kbnUrl = Private(require('ui/url'));
 
 
       this.mode = $route.current.mode;
@@ -25,7 +25,7 @@ define(function (require) {
 
 
       if (this.mode === 'edit') {
-        var fieldName = $route.current.params.fieldName;
+        const fieldName = $route.current.params.fieldName;
         this.field = this.indexPattern.fields.byName[fieldName];
 
         if (!this.field) {
diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_types.js b/src/plugins/kibana/public/settings/sections/indices/_field_types.js
index 6e4e1f284315c..e4c3725ca27c5 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_field_types.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_field_types.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function GetFieldTypes() {
-    var _ = require('lodash');
+    const _ = require('lodash');
 
     return function (indexPattern) {
-      var fieldCount = _.countBy(indexPattern.fields, function (field) {
+      const fieldCount = _.countBy(indexPattern.fields, function (field) {
         return (field.scripted) ? 'scripted' : 'indexed';
       });
 
diff --git a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
index cebb4f10e6009..6b72662e308da 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js
@@ -1,22 +1,22 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   require('ui/paginated_table');
 
   require('ui/modules').get('apps/settings')
   .directive('indexedFields', function ($filter) {
-    var yesTemplate = '<i class="fa fa-check" aria-label="yes"></i>';
-    var noTemplate = '';
-    var nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html');
-    var typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html');
-    var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
-    var filter = $filter('filter');
+    const yesTemplate = '<i class="fa fa-check" aria-label="yes"></i>';
+    const noTemplate = '';
+    const nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html');
+    const typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html');
+    const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
+    const filter = $filter('filter');
 
     return {
       restrict: 'E',
       template: require('plugins/kibana/settings/sections/indices/_indexed_fields.html'),
       scope: true,
       link: function ($scope) {
-        var rowScopes = []; // track row scopes, so they can be destroyed as needed
+        const rowScopes = []; // track row scopes, so they can be destroyed as needed
         $scope.perPage = 25;
         $scope.columns = [
           { title: 'name' },
@@ -33,11 +33,11 @@ define(function (require) {
           // clear and destroy row scopes
           _.invoke(rowScopes.splice(0), '$destroy');
 
-          var fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter);
+          const fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter);
           _.find($scope.fieldTypes, {index: 'indexedFields'}).count = fields.length; // Update the tab count
 
           $scope.rows = fields.map(function (field) {
-            var childScope = _.assign($scope.$new(), { field: field });
+            const childScope = _.assign($scope.$new(), { field: field });
             rowScopes.push(childScope);
 
             return [
diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
index 7c9ecf1b4b7f5..a3d8c97e8fbd7 100644
--- a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
+++ b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js
@@ -1,25 +1,25 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   require('ui/paginated_table');
 
   require('ui/modules').get('apps/settings')
   .directive('scriptedFields', function (kbnUrl, Notifier, $filter) {
-    var rowScopes = []; // track row scopes, so they can be destroyed as needed
-    var popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html');
-    var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
-    var filter = $filter('filter');
+    const rowScopes = []; // track row scopes, so they can be destroyed as needed
+    const popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html');
+    const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html');
+    const filter = $filter('filter');
 
-    var notify = new Notifier();
+    const notify = new Notifier();
 
     return {
       restrict: 'E',
       template: require('plugins/kibana/settings/sections/indices/_scripted_fields.html'),
       scope: true,
       link: function ($scope) {
-        var dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts');
+        const dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts');
 
-        var fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField';
-        var fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}';
+        const fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField';
+        const fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}';
 
         $scope.perPage = 25;
         $scope.columns = [
@@ -35,17 +35,17 @@ define(function (require) {
           _.invoke(rowScopes, '$destroy');
           rowScopes.length = 0;
 
-          var fields = filter($scope.indexPattern.getScriptedFields(), $scope.fieldFilter);
+          const fields = filter($scope.indexPattern.getScriptedFields(), $scope.fieldFilter);
           _.find($scope.fieldTypes, {index: 'scriptedFields'}).count = fields.length; // Update the tab count
 
           $scope.rows = fields.map(function (field) {
-            var rowScope = $scope.$new();
+            const rowScope = $scope.$new();
             rowScope.field = field;
             rowScopes.push(rowScope);
 
             return [
-              field.name,
-              field.script,
+              _.escape(field.name),
+              _.escape(field.script),
               _.get($scope.indexPattern, ['fieldFormatMap', field.name, 'type', 'title']),
               {
                 markup: controlsHtml,
@@ -56,8 +56,8 @@ define(function (require) {
         }
 
         $scope.addDateScripts = function () {
-          var conflictFields = [];
-          var fieldsAdded = 0;
+          const conflictFields = [];
+          let fieldsAdded = 0;
           _.each(dateScripts($scope.indexPattern), function (script, field) {
             try {
               $scope.indexPattern.addScriptedField(field, script, 'number');
@@ -77,7 +77,7 @@ define(function (require) {
         };
 
         $scope.create = function () {
-          var params = {
+          const params = {
             indexPattern: $scope.indexPattern.id
           };
 
@@ -85,7 +85,7 @@ define(function (require) {
         };
 
         $scope.edit = function (field) {
-          var params = {
+          const params = {
             indexPattern: $scope.indexPattern.id,
             fieldName: field.name
           };
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.html b/src/plugins/kibana/public/settings/sections/indices/index.html
index 15809f900a47e..755db8397209d 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.html
+++ b/src/plugins/kibana/public/settings/sections/indices/index.html
@@ -4,7 +4,7 @@
       <h5>
         Index Patterns&nbsp;
         <a
-          ng-if="edittingId"
+          ng-if="editingId"
           href="#/settings/indices"
           class="btn btn-primary btn-xs"
           aria-label="Add New">
diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js
index b3588ef40bd72..afc5a198bb490 100644
--- a/src/plugins/kibana/public/settings/sections/indices/index.js
+++ b/src/plugins/kibana/public/settings/sections/indices/index.js
@@ -1,5 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
   require('plugins/kibana/settings/sections/indices/_create');
   require('plugins/kibana/settings/sections/indices/_edit');
@@ -23,16 +24,16 @@ define(function (require) {
       transclude: true,
       template: require('plugins/kibana/settings/sections/indices/index.html'),
       link: function ($scope) {
-        $scope.edittingId = $route.current.params.indexPatternId;
+        $scope.editingId = $route.current.params.indexPatternId;
         config.$bind($scope, 'defaultIndex');
 
         $scope.$watch('defaultIndex', function () {
-          var ids = $route.current.locals.indexPatternIds;
+          const ids = $route.current.locals.indexPatternIds;
           $scope.indexPatternList = ids.map(function (id) {
             return {
               id: id,
               url: kbnUrl.eval('#/settings/indices/{{id}}', {id: id}),
-              class: 'sidebar-item-title ' + ($scope.edittingId === id ? 'active' : ''),
+              class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''),
               default: $scope.defaultIndex === id
             };
           });
@@ -43,9 +44,10 @@ define(function (require) {
     };
   });
 
-  return {
+  registry.register(_.constant({
+    order: 1,
     name: 'indices',
     display: 'Indices',
-    url: '#/settings/indices',
-  };
+    url: '#/settings/indices'
+  }));
 });
diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.html b/src/plugins/kibana/public/settings/sections/objects/_objects.html
index 3c1da5cd909ad..867a26ee44f30 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_objects.html
+++ b/src/plugins/kibana/public/settings/sections/objects/_objects.html
@@ -29,7 +29,7 @@ <h2 class="title">Edit Saved Objects</h2>
         </label>
         <a ng-disabled="selectedItems.length == 0"
           confirm-click="bulkDelete()"
-          confirmation="Are you sure want to delete the selected {{currentTab.title}}? This action is irreversible!"
+          confirmation="Are you sure you want to delete the selected {{currentTab.title}}? This action is irreversible!"
           class="btn btn-xs btn-danger" aria-label="Delete"><i aria-hidden="true" class="fa fa-trash"></i> Delete</a>
         <a ng-disabled="selectedItems.length == 0"
           ng-click="bulkExport()"
diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.js b/src/plugins/kibana/public/settings/sections/objects/_objects.js
index bc31a3d2182db..702cc14130072 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_objects.js
+++ b/src/plugins/kibana/public/settings/sections/objects/_objects.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var saveAs = require('@spalger/filesaver').saveAs;
-  var registry = require('plugins/kibana/settings/saved_object_registry');
-  var objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html');
+  const _ = require('lodash');
+  const angular = require('angular');
+  const saveAs = require('@spalger/filesaver').saveAs;
+  const registry = require('plugins/kibana/settings/saved_object_registry');
+  const objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html');
   const MAX_SIZE = Math.pow(2, 31) - 1;
 
   require('ui/directives/file_upload');
@@ -18,15 +18,15 @@ define(function (require) {
     return {
       restrict: 'E',
       controller: function ($scope, $injector, $q, AppState, es) {
-        var notify = new Notifier({ location: 'Saved Objects' });
+        const notify = new Notifier({ location: 'Saved Objects' });
 
-        var $state = $scope.state = new AppState();
+        const $state = $scope.state = new AppState();
         $scope.currentTab = null;
         $scope.selectedItems = [];
 
-        var getData = function (filter) {
-          var services = registry.all().map(function (obj) {
-            var service = $injector.get(obj.service);
+        const getData = function (filter) {
+          const services = registry.all().map(function (obj) {
+            const service = $injector.get(obj.service);
             return service.find(filter).then(function (data) {
               return {
                 service: service,
@@ -41,7 +41,7 @@ define(function (require) {
 
           $q.all(services).then(function (data) {
             $scope.services = _.sortBy(data, 'title');
-            var tab = $scope.services[0];
+            let tab = $scope.services[0];
             if ($state.tab) $scope.currentTab = tab = _.find($scope.services, {title: $state.tab});
 
             $scope.$watch('state.tab', function (tab) {
@@ -60,7 +60,7 @@ define(function (require) {
         };
 
         $scope.toggleItem = function (item) {
-          var i = $scope.selectedItems.indexOf(item);
+          const i = $scope.selectedItems.indexOf(item);
           if (i >= 0) {
             $scope.selectedItems.splice(i, 1);
           } else {
@@ -73,7 +73,7 @@ define(function (require) {
         };
 
         $scope.edit = function (service, item) {
-          var params = {
+          const params = {
             service: service.serviceName,
             id: item.id
           };
@@ -88,19 +88,20 @@ define(function (require) {
         };
 
         $scope.bulkExport = function () {
-          var objs = $scope.selectedItems.map(_.partialRight(_.extend, {type: $scope.currentTab.type}));
+          const objs = $scope.selectedItems.map(_.partialRight(_.extend, {type: $scope.currentTab.type}));
           retrieveAndExportDocs(objs);
         };
 
         $scope.exportAll = () => {
           Promise.map($scope.services, (service) =>
-            service.service.find('', MAX_SIZE).then((results) =>
+            service.service.scanAll('').then((results) =>
               results.hits.map((hit) => _.extend(hit, {type: service.type}))
             )
           ).then((results) => retrieveAndExportDocs(_.flattenDeep(results)));
         };
 
         function retrieveAndExportDocs(objs) {
+          if (!objs.length) return notify.error('No saved objects to export.');
           es.mget({
             index: kbnIndex,
             body: {docs: objs.map(transformToMget)}
@@ -116,12 +117,12 @@ define(function (require) {
         }
 
         function saveToFile(results) {
-          var blob = new Blob([angular.toJson(results, true)], {type: 'application/json'});
+          const blob = new Blob([angular.toJson(results, true)], {type: 'application/json'});
           saveAs(blob, 'export.json');
         }
 
         $scope.importAll = function (fileContents) {
-          var docs;
+          let docs;
           try {
             docs = JSON.parse(fileContents);
           } catch (e) {
@@ -129,7 +130,7 @@ define(function (require) {
           }
 
           return Promise.map(docs, function (doc) {
-            var service = _.find($scope.services, {type: doc._type}).service;
+            const service = _.find($scope.services, {type: doc._type}).service;
             return service.get().then(function (obj) {
               obj.id = doc._id;
               return obj.applyESResp(doc).then(function () {
diff --git a/src/plugins/kibana/public/settings/sections/objects/_view.js b/src/plugins/kibana/public/settings/sections/objects/_view.js
index a78fe2bd77b4b..3fef727f455df 100644
--- a/src/plugins/kibana/public/settings/sections/objects/_view.js
+++ b/src/plugins/kibana/public/settings/sections/objects/_view.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var rison = require('ui/utils/rison');
-  var registry = require('plugins/kibana/settings/saved_object_registry');
-  var objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html');
+  const _ = require('lodash');
+  const angular = require('angular');
+  const rison = require('ui/utils/rison');
+  const registry = require('plugins/kibana/settings/saved_object_registry');
+  const objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html');
 
   require('ui/routes')
   .when('/settings/objects/:service/:id', {
@@ -15,10 +15,10 @@ define(function (require) {
     return {
       restrict: 'E',
       controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, es, Private) {
-        var notify = new Notifier({ location: 'SavedObject view' });
-        var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
-        var serviceObj = registry.get($routeParams.service);
-        var service = $injector.get(serviceObj.service);
+        const notify = new Notifier({ location: 'SavedObject view' });
+        const castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
+        const serviceObj = registry.get($routeParams.service);
+        const service = $injector.get(serviceObj.service);
 
         /**
          * Creates a field definition and pushes it to the memo stack. This function
@@ -33,14 +33,14 @@ define(function (require) {
          * @param {array} parents The parent keys to the field
          * @returns {array}
          */
-        var createField = function (memo, val, key, collection, parents) {
+        const createField = function (memo, val, key, collection, parents) {
           if (_.isArray(parents)) {
             parents.push(key);
           } else {
             parents = [key];
           }
 
-          var field = { type: 'text', name: parents.join('.'), value: val };
+          const field = { type: 'text', name: parents.join('.'), value: val };
 
           if (_.isString(field.value)) {
             try {
@@ -70,8 +70,8 @@ define(function (require) {
           return memo;
         };
 
-        var readObjectClass = function (fields, Class) {
-          var fieldMap = _.indexBy(fields, 'name');
+        const readObjectClass = function (fields, Class) {
+          const fieldMap = _.indexBy(fields, 'name');
 
           _.forOwn(Class.mapping, function (esType, name) {
             if (fieldMap[name]) return;
@@ -111,7 +111,7 @@ define(function (require) {
           $scope.obj = obj;
           $scope.link = service.urlFor(obj._id);
 
-          var fields =  _.reduce(obj._source, createField, []);
+          const fields =  _.reduce(obj._source, createField, []);
           if (service.Class) readObjectClass(fields, service.Class);
           $scope.fields = _.sortBy(fields, 'name');
         })
@@ -122,7 +122,7 @@ define(function (require) {
         // we need to use the annotations to see if they have any errors. If they
         // do then we push the field.name to aceInvalidEditor variable.
         // Otherwise we remove it.
-        var loadedEditors = [];
+        const loadedEditors = [];
         $scope.aceInvalidEditors = [];
 
         $scope.aceLoaded = function (editor) {
@@ -131,13 +131,13 @@ define(function (require) {
 
           editor.$blockScrolling = Infinity;
 
-          var session = editor.getSession();
-          var fieldName = editor.container.id;
+          const session = editor.getSession();
+          const fieldName = editor.container.id;
 
           session.setTabSize(2);
           session.setUseSoftTabs(true);
           session.on('changeAnnotation', function () {
-            var annotations = session.getAnnotations();
+            const annotations = session.getAnnotations();
             if (_.some(annotations, { type: 'error'})) {
               if (!_.contains($scope.aceInvalidEditors, fieldName)) {
                 $scope.aceInvalidEditors.push(fieldName);
@@ -173,10 +173,10 @@ define(function (require) {
         };
 
         $scope.submit = function () {
-          var source = _.cloneDeep($scope.obj._source);
+          const source = _.cloneDeep($scope.obj._source);
 
           _.each($scope.fields, function (field) {
-            var value = field.value;
+            let value = field.value;
 
             if (field.type === 'number') {
               value = Number(field.value);
@@ -206,7 +206,7 @@ define(function (require) {
             index: kbnIndex
           })
           .then(function (resp) {
-            var msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
+            const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
 
             $location.path('/settings/objects').search({
               _a: rison.encode({
diff --git a/src/plugins/kibana/public/settings/sections/objects/index.js b/src/plugins/kibana/public/settings/sections/objects/index.js
index 08ed7d77155d0..b3881f1b5c4e9 100644
--- a/src/plugins/kibana/public/settings/sections/objects/index.js
+++ b/src/plugins/kibana/public/settings/sections/objects/index.js
@@ -1,4 +1,7 @@
 define(function (require) {
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
+
   require('plugins/kibana/settings/sections/objects/_view');
   require('plugins/kibana/settings/sections/objects/_objects');
 
@@ -8,9 +11,10 @@ define(function (require) {
   // add the module deps to this module
   require('ui/modules').get('apps/settings');
 
-  return {
+  registry.register(_.constant({
+    order: 3,
     name: 'objects',
     display: 'Objects',
     url: '#/settings/objects'
-  };
+  }));
 });
diff --git a/src/plugins/kibana/public/settings/sections/status/index.js b/src/plugins/kibana/public/settings/sections/status/index.js
index 4887afcacf4cb..eff7094a2e79d 100644
--- a/src/plugins/kibana/public/settings/sections/status/index.js
+++ b/src/plugins/kibana/public/settings/sections/status/index.js
@@ -1,10 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
-  return {
-    order: 3,
+  registry.register(_.constant({
+    order: 1000,
     name: 'status',
     display: 'Status',
     url: '/status'
-  };
+  }));
 });
diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
index e2acbc9f78c22..99afaac6d36d7 100644
--- a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
@@ -1,19 +1,19 @@
 
-var angular = require('angular');
-var $ = require('jquery');
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+const angular = require('angular');
+const $ = require('jquery');
+const _ = require('lodash');
+const expect = require('expect.js');
+const ngMock = require('ngMock');
 
 require('plugins/kibana/visualize/editor/agg');
 
 describe('Vis-Editor-Agg plugin directive', function () {
-  var $parentScope = {};
-  var $scope;
-  var $elem;
+  const $parentScope = {};
+  let $scope;
+  let $elem;
 
   function makeConfig(which) {
-    var schemaMap = {
+    const schemaMap = {
       radius: {
         title: 'Dot Size',
         min: 0,
@@ -25,10 +25,10 @@ describe('Vis-Editor-Agg plugin directive', function () {
         max: Infinity
       }
     };
-    var typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality'];
+    const typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality'];
     which = which || 'metric';
 
-    var schema = schemaMap[which];
+    const schema = schemaMap[which];
 
     return {
       min: schema.min,
diff --git a/src/plugins/kibana/public/visualize/editor/agg.html b/src/plugins/kibana/public/visualize/editor/agg.html
index 56b3906d6fdde..5cdbf20e72f0c 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.html
+++ b/src/plugins/kibana/public/visualize/editor/agg.html
@@ -42,7 +42,7 @@
 
     <!-- down button -->
     <button
-      aria-lebl="Decrease Priority"
+      aria-label="Decrease Priority"
       ng-if="stats.count > 1"
       ng-class="{ disabled: $last }"
       ng-click="moveDown(agg)"
@@ -65,7 +65,9 @@
       class="btn btn-xs btn-danger">
       <i aria-hidden="true" class="fa fa-times"></i>
     </button>
+
   </div>
+
 </div>
 
 <vis-editor-agg-params
diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
index 3f551f81647c9..df8012c6fc85a 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -5,12 +5,12 @@ define(function (require) {
     require('plugins/kibana/visualize/editor/agg_params');
     require('plugins/kibana/visualize/editor/agg_add');
 
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var aggTypes = Private(require('ui/agg_types/index'));
-    var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
+    const _ = require('lodash');
+    const $ = require('jquery');
+    const aggTypes = Private(require('ui/agg_types/index'));
+    const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
 
-    var notify = new Notifier({
+    const notify = new Notifier({
       location: 'visAggGroup'
     });
 
@@ -41,7 +41,7 @@ define(function (require) {
          */
         $scope.describe = function () {
           if (!$scope.agg.type.makeLabel) return '';
-          var label = $scope.agg.type.makeLabel($scope.agg);
+          const label = $scope.agg.type.makeLabel($scope.agg);
           return label ? label : '';
         };
 
@@ -54,16 +54,16 @@ define(function (require) {
         $scope.moveDown = _.partial(move, true);
 
         $scope.remove = function (agg) {
-          var aggs = $scope.vis.aggs;
+          const aggs = $scope.vis.aggs;
 
-          var index = aggs.indexOf(agg);
+          const index = aggs.indexOf(agg);
           if (index === -1) return notify.log('already removed');
 
           aggs.splice(index, 1);
         };
 
         $scope.canRemove = function (aggregation) {
-          var metricCount = _.reduce($scope.group, function (count, agg) {
+          const metricCount = _.reduce($scope.group, function (count, agg) {
             return (agg.schema.name === aggregation.schema.name) ? ++count : count;
           }, 0);
 
@@ -76,7 +76,7 @@ define(function (require) {
             return false;
           }
 
-          var firstDifferentSchema = _.findIndex($scope.group, function (agg) {
+          const firstDifferentSchema = _.findIndex($scope.group, function (agg) {
             return agg.schema !== $scope.agg.schema;
           });
 
diff --git a/src/plugins/kibana/public/visualize/editor/agg_add.js b/src/plugins/kibana/public/visualize/editor/agg_add.js
index 932e4cb55a1e0..dffb16127f2c6 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_add.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_add.js
@@ -2,20 +2,20 @@ define(function (require) {
   require('ui/modules')
   .get('kibana')
   .directive('visEditorAggAdd', function (Private) {
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    const AggConfig = Private(require('ui/Vis/AggConfig'));
 
     return {
       restrict: 'E',
       template: require('plugins/kibana/visualize/editor/agg_add.html'),
       controllerAs: 'add',
       controller: function ($scope) {
-        var self = this;
+        const self = this;
 
         self.form = false;
         self.submit = function (schema) {
           self.form = false;
 
-          var aggConfig = new AggConfig($scope.vis, {
+          const aggConfig = new AggConfig($scope.vis, {
             schema: schema
           });
           aggConfig.brandNew = true;
diff --git a/src/plugins/kibana/public/visualize/editor/agg_filter.js b/src/plugins/kibana/public/visualize/editor/agg_filter.js
index 8f1cabb7e1983..97ba638fd0815 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_filter.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_filter.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var propFilter = require('ui/filters/_prop_filter');
+  const _ = require('lodash');
+  const propFilter = require('ui/filters/_prop_filter');
 
   require('ui/modules')
   .get('kibana')
diff --git a/src/plugins/kibana/public/visualize/editor/agg_group.js b/src/plugins/kibana/public/visualize/editor/agg_group.js
index 2aa7383be7c2b..f0d48f4d7d484 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_group.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_group.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
 define(function (require) {
   require('ui/modules')
@@ -21,7 +21,7 @@ define(function (require) {
           'schemas',
           '[]group'
         ], function () {
-          var stats = $scope.stats = {
+          const stats = $scope.stats = {
             min: 0,
             max: 0,
             count: $scope.group ? $scope.group.length : 0
@@ -35,7 +35,7 @@ define(function (require) {
           });
 
           $scope.availableSchema = $scope.schemas.filter(function (schema) {
-            var count = _.where($scope.group, { schema }).length;
+            const count = _.where($scope.group, { schema }).length;
             if (count < schema.max) return true;
           });
         });
diff --git a/src/plugins/kibana/public/visualize/editor/agg_param.js b/src/plugins/kibana/public/visualize/editor/agg_param.js
index dd2986ed8a071..82730722889ec 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_param.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_param.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   require('ui/modules')
   .get('app/visualize')
diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js
index b64599f5d1716..0a4768c44de48 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_params.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_params.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var IndexedArray = require('ui/IndexedArray');
+  const IndexedArray = require('ui/IndexedArray');
 
   require('ui/modules')
   .get('app/visualize')
   .directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var aggTypes = Private(require('ui/agg_types/index'));
-    var aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html');
-    var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
+    const _ = require('lodash');
+    const $ = require('jquery');
+    const aggTypes = Private(require('ui/agg_types/index'));
+    const aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html');
+    const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html');
     require('ui/filters/match_any');
     require('plugins/kibana/visualize/editor/agg_param');
 
-    var notify = new Notifier({
+    const notify = new Notifier({
       location: 'visAggGroup'
     });
 
@@ -29,7 +29,7 @@ define(function (require) {
 
         // this will contain the controls for the schema (rows or columns?), which are unrelated to
         // controls for the agg, which is why they are first
-        var $schemaEditor = $('<div>').addClass('schemaEditors').appendTo($el);
+        const $schemaEditor = $('<div>').addClass('schemaEditors').appendTo($el);
 
         if ($scope.agg.schema.editor) {
           $schemaEditor.append($scope.agg.schema.editor);
@@ -37,12 +37,12 @@ define(function (require) {
         }
 
         // allow selection of an aggregation
-        var $aggSelect = $(aggSelectHtml).appendTo($el);
+        const $aggSelect = $(aggSelectHtml).appendTo($el);
         $compile($aggSelect)($scope);
 
         // params for the selected agg, these are rebuilt every time the agg in $aggSelect changes
-        var $aggParamEditors; //  container for agg type param editors
-        var $aggParamEditorsScope;
+        let $aggParamEditors; //  container for agg type param editors
+        let $aggParamEditorsScope;
         $scope.$watch('agg.type', function updateAggParamEditor(newType, oldType) {
           if ($aggParamEditors) {
             $aggParamEditors.remove();
@@ -58,10 +58,10 @@ define(function (require) {
           // create child scope, used in the editors
           $aggParamEditorsScope = $scope.$new();
 
-          var agg = $scope.agg;
+          const agg = $scope.agg;
           if (!agg) return;
 
-          var type = $scope.agg.type;
+          const type = $scope.agg.type;
 
           if (newType !== oldType) {
             // don't reset on initial load, the
@@ -71,29 +71,29 @@ define(function (require) {
 
           if (!type) return;
 
-          var aggParamHTML = {
+          const aggParamHTML = {
             basic: [],
             advanced: []
           };
 
           // build collection of agg params html
           type.params.forEach(function (param, i) {
-            var aggParam;
+            let aggParam;
             // if field param exists, compute allowed fields
             if (param.name === 'field') {
               $aggParamEditorsScope.indexedFields = getIndexedFields(param);
             }
 
             if ($aggParamEditorsScope.indexedFields) {
-              var hasIndexedFields = $aggParamEditorsScope.indexedFields.length > 0;
-              var isExtraParam = i > 0;
+              const hasIndexedFields = $aggParamEditorsScope.indexedFields.length > 0;
+              const isExtraParam = i > 0;
               if (!hasIndexedFields && isExtraParam) { // don't draw the rest of the options if their are no indexed fields.
                 return;
               }
             }
 
 
-            var type = 'basic';
+            let type = 'basic';
             if (param.advanced) type = 'advanced';
 
             if (aggParam = getAggParamHTML(param, i)) {
@@ -103,7 +103,7 @@ define(function (require) {
           });
 
           // compile the paramEditors html elements
-          var paramEditors = aggParamHTML.basic;
+          let paramEditors = aggParamHTML.basic;
 
           if (aggParamHTML.advanced.length) {
             paramEditors.push($(advancedToggleHtml).get(0));
@@ -121,7 +121,7 @@ define(function (require) {
             return;
           }
 
-          var attrs = {
+          const attrs = {
             'agg-param': 'agg.type.params[' + idx + ']'
           };
 
@@ -136,8 +136,8 @@ define(function (require) {
         }
 
         function getIndexedFields(param) {
-          var fields = $scope.agg.vis.indexPattern.fields.raw;
-          var fieldTypes = param.filterFieldTypes;
+          let fields = $scope.agg.vis.indexPattern.fields.raw;
+          const fieldTypes = param.filterFieldTypes;
 
           if (fieldTypes) {
             fields = $filter('fieldType')(fields, fieldTypes);
diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index 4b886f9fdfc08..c50e7f2ec3b92 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -1,6 +1,5 @@
 <div ng-controller="VisEditor" class="vis-editor vis-type-{{ vis.type.name }}">
-
-  <navbar ng-if="chrome.getVisible()">
+  <navbar ng-if="chrome.getVisible()" name="visualize">
     <div class="fill bitty-modal-container">
       <div ng-if="vis.type.requiresSearch && $state.linked && !unlinking"
         ng-dblclick="unlink()"
@@ -138,7 +137,13 @@
         </div>
       </div>
 
-      <visualize vis="vis" ui-state="uiState" show-spy-panel="chrome.getVisible()" search-source="savedVis.searchSource" editable-vis="editableVis"></visualize>
+      <visualize
+        vis="vis"
+        ui-state="uiState"
+        show-spy-panel="chrome.getVisible()"
+        editable-vis="editableVis"
+        search-source="savedVis.searchSource">
+      </visualize>
     </div>
   </div>
 
diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
index d37eb924345aa..85466abe0fd70 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -1,19 +1,21 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
   require('plugins/kibana/visualize/saved_visualizations/saved_visualizations');
   require('plugins/kibana/visualize/editor/sidebar');
   require('plugins/kibana/visualize/editor/agg_filter');
 
+  require('ui/navbar');
   require('ui/visualize');
   require('ui/collapsible_sidebar');
+  require('ui/share');
 
   require('ui/routes')
   .when('/visualize/create', {
     template: require('plugins/kibana/visualize/editor/editor.html'),
     resolve: {
       savedVis: function (savedVisualizations, courier, $route, Private) {
-        var visTypes = Private(require('ui/registry/vis_types'));
-        var visType = _.find(visTypes, {name: $route.current.params.type});
+        const visTypes = Private(require('ui/registry/vis_types'));
+        const visType = _.find(visTypes, {name: $route.current.params.type});
         if (visType.requiresSearch && !$route.current.params.indexPattern && !$route.current.params.savedSearchId) {
           throw new Error('You must provide either an indexPattern or a savedSearchId');
         }
@@ -47,32 +49,32 @@ define(function (require) {
   ])
   .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise) {
 
-    var angular = require('angular');
-    var ConfigTemplate = require('ui/ConfigTemplate');
-    var Notifier = require('ui/notify/Notifier');
-    var docTitle = Private(require('ui/doc_title'));
-    var brushEvent = Private(require('ui/utils/brush_event'));
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
+    const angular = require('angular');
+    const ConfigTemplate = require('ui/ConfigTemplate');
+    const Notifier = require('ui/notify/notifier');
+    const docTitle = Private(require('ui/doc_title'));
+    const brushEvent = Private(require('ui/utils/brush_event'));
+    const queryFilter = Private(require('ui/filter_bar/query_filter'));
+    const filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
 
-    var notify = new Notifier({
+    const notify = new Notifier({
       location: 'Visualization Editor'
     });
 
-    var savedVis = $route.current.locals.savedVis;
+    const savedVis = $route.current.locals.savedVis;
 
-    var vis = savedVis.vis;
-    var editableVis = vis.createEditableVis();
+    const vis = savedVis.vis;
+    const editableVis = vis.createEditableVis();
     vis.requesting = function () {
-      var requesting = editableVis.requesting;
+      const requesting = editableVis.requesting;
       requesting.call(vis);
       requesting.call(editableVis);
     };
 
-    var searchSource = savedVis.searchSource;
+    const searchSource = savedVis.searchSource;
 
     // config panel templates
-    var configTemplate = new ConfigTemplate({
+    const configTemplate = new ConfigTemplate({
       save: require('plugins/kibana/visualize/editor/panels/save.html'),
       load: require('plugins/kibana/visualize/editor/panels/load.html'),
       share: require('plugins/kibana/visualize/editor/panels/share.html'),
@@ -82,9 +84,9 @@ define(function (require) {
       docTitle.change(savedVis.title);
     }
 
-    var $state = $scope.$state = (function initState() {
-      var savedVisState = vis.getState();
-      var stateDefaults = {
+    let $state = $scope.$state = (function initState() {
+      const savedVisState = vis.getState();
+      const stateDefaults = {
         uiState: savedVis.uiStateJSON ? JSON.parse(savedVis.uiStateJSON) : {},
         linked: !!savedVis.savedSearchId,
         query: searchSource.getOwn('query') || {query_string: {query: '*'}},
@@ -234,21 +236,12 @@ define(function (require) {
       }, notify.fatal);
     };
 
-    $scope.shareData = function () {
-      return {
-        link: $location.absUrl(),
-        // This sucks, but seems like the cleanest way. Uhg.
-        embed: '<iframe src="' + $location.absUrl().replace('?', '?embed&') +
-          '" height="600" width="800"></iframe>'
-      };
-    };
-
     $scope.unlink = function () {
       if (!$state.linked) return;
 
       $state.linked = false;
-      var parent = searchSource.getParent(true);
-      var parentsParent = parent.getParent(true);
+      const parent = searchSource.getParent(true);
+      const parentsParent = parent.getParent(true);
 
       // display unlinking for 2 seconds, unless it is double clicked
       $scope.unlinking = $timeout($scope.clearUnlinking, 2000);
diff --git a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js
index 00cc86204898a..7288eb51f3a7f 100644
--- a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js
+++ b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js
@@ -2,9 +2,9 @@ define(function (require) {
   require('ui/modules')
   .get('kibana')
   .directive('nestingIndicator', function ($rootScope, $parse, Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var getColors = Private(require('ui/vislib/components/color/color_palette'));
+    const _ = require('lodash');
+    const $ = require('jquery');
+    const getColors = Private(require('ui/vislib/components/color/color_palette'));
 
     return {
       restrict: 'E',
@@ -16,10 +16,10 @@ define(function (require) {
         $scope.$watchCollection('list', function () {
           if (!$scope.list || !$scope.item) return;
 
-          var item = $scope.item;
-          var index = $scope.list.indexOf($scope.item);
-          var bars = $scope.list.slice(0, index + 1);
-          var colors = getColors(bars.length);
+          const item = $scope.item;
+          const index = $scope.list.indexOf($scope.item);
+          const bars = $scope.list.slice(0, index + 1);
+          const colors = getColors(bars.length);
 
           $el.html(bars.map(function (bar, i) {
             return $(document.createElement('span'))
diff --git a/src/plugins/kibana/public/visualize/editor/panels/share.html b/src/plugins/kibana/public/visualize/editor/panels/share.html
index a356060024e00..016109cfff6f5 100644
--- a/src/plugins/kibana/public/visualize/editor/panels/share.html
+++ b/src/plugins/kibana/public/visualize/editor/panels/share.html
@@ -1,22 +1,4 @@
-<form role="form" class="vis-share">
-
-  <p>
-    <div class="form-group">
-      <label>
-        Embed this visualization.
-        <small>Add to your html source. Note all clients must still be able to access kibana</small>
-      </label>
-      <div class="form-control" disabled>{{conf.shareData().embed}}</div>
-    </div>
-  </p>
-
-  <p>
-    <div class="form-group">
-      <label>
-        Share a link
-      </label>
-      <div class="form-control" disabled>{{conf.shareData().link}}</div>
-    </div>
-  </p>
-
-</form>
\ No newline at end of file
+<share
+  object-type="visualization"
+  object-id="{{conf.savedVis.id}}">
+</share>
diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.html b/src/plugins/kibana/public/visualize/editor/sidebar.html
index d2de10a1d6c13..0e153d2eb4996 100644
--- a/src/plugins/kibana/public/visualize/editor/sidebar.html
+++ b/src/plugins/kibana/public/visualize/editor/sidebar.html
@@ -13,7 +13,7 @@
 
         <!-- tabs -->
         <ul class="nav navbar-nav">
-          <li ng-class="{active: sidebar.section == 'data'}" ng-show="vis.type.schemas.metrics">
+          <li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
             <a class="navbar-link active" ng-click="sidebar.section='data'">Data</a>
           </li>
           <li ng-class="{active: sidebar.section == 'options'}">
@@ -60,10 +60,9 @@
 
     <div class="vis-editor-config" ng-show="sidebar.section == 'options'">
       <!-- vis options -->
-      <vis-editor-vis-options vis="vis"></vis-editor-vis-options>
+      <vis-editor-vis-options vis="vis" saved-vis="savedVis"></vis-editor-vis-options>
     </div>
 
 
   </form>
 </div>
-
diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js
index 56671c8e0bfaa..6ec8b6357222d 100644
--- a/src/plugins/kibana/public/visualize/editor/sidebar.js
+++ b/src/plugins/kibana/public/visualize/editor/sidebar.js
@@ -2,7 +2,7 @@ define(function (require) {
   require('ui/modules')
   .get('app/visualize')
   .directive('visEditorSidebar', function () {
-    var _ = require('lodash');
+    const _ = require('lodash');
 
     require('plugins/kibana/visualize/editor/agg_group');
     require('plugins/kibana/visualize/editor/vis_options');
@@ -15,7 +15,12 @@ define(function (require) {
       controller: function ($scope) {
         $scope.$bind('vis', 'editableVis');
         $scope.$bind('outputVis', 'vis');
-        this.section = _.get($scope, 'vis.type.requiresSearch') ? 'data' : 'options';
+        $scope.$watch('vis.type', (visType) => {
+          if (visType) {
+            this.showData = visType.schemas.buckets || visType.schemas.metrics;
+            this.section = this.section || (this.showData ? 'data' : 'options');
+          }
+        });
       }
     };
   });
diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
index d7a988196a33a..00ebb510e805b 100644
--- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -57,6 +57,7 @@
 
   &-content {
     .flex-parent();
+    z-index: 0;
 
     // overrides for tablet and desktop
     @media (min-width: @screen-md-min) {
@@ -355,7 +356,6 @@
     }
 
     .visualize-chart {
-      flex: 1 1 100%;
       position: relative;
     }
   }
diff --git a/src/plugins/kibana/public/visualize/editor/vis_options.js b/src/plugins/kibana/public/visualize/editor/vis_options.js
index 762a1e3e8f699..3bdf9210dcb30 100644
--- a/src/plugins/kibana/public/visualize/editor/vis_options.js
+++ b/src/plugins/kibana/public/visualize/editor/vis_options.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
+  const _ = require('lodash');
+  const $ = require('jquery');
 
   require('ui/modules')
   .get('app/visualize')
@@ -10,10 +10,11 @@ define(function (require) {
       template: require('plugins/kibana/visualize/editor/vis_options.html'),
       scope: {
         vis: '=',
+        savedVis: '=',
       },
       link: function ($scope, $el) {
-        var $optionContainer = $('.visualization-options');
-        var $editor = $compile($scope.vis.type.params.editor)($scope);
+        const $optionContainer = $el.find('.visualization-options');
+        const $editor = $compile($scope.vis.type.params.editor)($scope);
         $optionContainer.append($editor);
 
         $scope.$watch('vis.type.schemas.all.length', function (len) {
diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index 534a8ae25346d..c1da50201bba5 100644
--- a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -2,16 +2,16 @@ define(function (require) {
   require('ui/modules')
   .get('app/visualize')
   .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) {
-    var _ = require('lodash');
-    var Vis = Private(require('ui/Vis'));
+    const _ = require('lodash');
+    const Vis = Private(require('ui/Vis'));
 
-    var notify = new Notifier({
+    const notify = new Notifier({
       location: 'SavedVis'
     });
 
     _.class(SavedVis).inherits(courier.SavedObject);
     function SavedVis(opts) {
-      var self = this;
+      const self = this;
       opts = opts || {};
       if (typeof opts !== 'object') opts = { id: opts };
 
@@ -26,7 +26,7 @@ define(function (require) {
           title: 'New Visualization',
           visState: (function () {
             if (!opts.type) return null;
-            var def = {};
+            const def = {};
             def.type = opts.type;
             return def;
           }()),
@@ -54,7 +54,7 @@ define(function (require) {
     SavedVis.searchSource = true;
 
     SavedVis.prototype._afterEsResp = function () {
-      var self = this;
+      const self = this;
 
       return self._getLinkedSavedSearch()
       .then(function () {
@@ -73,9 +73,9 @@ define(function (require) {
     };
 
     SavedVis.prototype._getLinkedSavedSearch = Promise.method(function () {
-      var self = this;
-      var linkedSearch = !!self.savedSearchId;
-      var current = self.savedSearch;
+      const self = this;
+      const linkedSearch = !!self.savedSearchId;
+      const current = self.savedSearch;
 
       if (linkedSearch && current && current.id === self.savedSearchId) {
         return;
@@ -97,12 +97,18 @@ define(function (require) {
     });
 
     SavedVis.prototype._createVis = function () {
-      var self = this;
+      const self = this;
 
       if (self.stateJSON) {
         self.visState = Vis.convertOldState(self.typeName, JSON.parse(self.stateJSON));
       }
 
+      // visState doesn't yet exist when importing a visualization, so we can't
+      // assume that exists at this point. If it does exist, then we're not
+      // importing a visualization, so we want to sync the title.
+      if (self.visState) {
+        self.visState.title = self.title;
+      }
       self.vis = new Vis(
         self.searchSource.get('index'),
         self.visState
@@ -112,9 +118,10 @@ define(function (require) {
     };
 
     SavedVis.prototype._updateVis = function () {
-      var self = this;
+      const self = this;
 
       self.vis.indexPattern = self.searchSource.get('index');
+      self.visState.title = self.title;
       self.vis.setState(self.visState);
     };
 
diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index 8019ff9c540a7..4c3ca00b19988 100644
--- a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -1,6 +1,7 @@
 define(function (require) {
-  var app = require('ui/modules').get('app/visualize');
-  var _ = require('lodash');
+  const app = require('ui/modules').get('app/visualize');
+  const _ = require('lodash');
+  const Scanner = require('ui/utils/scanner');
 
   require('plugins/kibana/visualize/saved_visualizations/_saved_vis');
 
@@ -12,8 +13,14 @@ define(function (require) {
   });
 
   app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Private, Notifier, kbnUrl) {
-    var visTypes = Private(require('ui/registry/vis_types'));
-    var notify = new Notifier({
+    const visTypes = Private(require('ui/registry/vis_types'));
+
+    const scanner = new Scanner(es, {
+      index: kbnIndex,
+      type: 'visualization'
+    });
+
+    const notify = new Notifier({
       location: 'Saved Visualization Service'
     });
 
@@ -41,9 +48,37 @@ define(function (require) {
       });
     };
 
+    this.scanAll = function (queryString, pageSize = 1000) {
+      return scanner.scanAndMap(queryString, {
+        pageSize,
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
+    };
+
+    this.mapHits = function (hit) {
+      const source = hit._source;
+      source.id = hit._id;
+      source.url = this.urlFor(hit._id);
+
+      let typeName = source.typeName;
+      if (source.visState) {
+        try { typeName = JSON.parse(source.visState).type; }
+        catch (e) { /* missing typename handled below */ } // eslint-disable-line no-empty
+      }
+
+      if (!typeName || !visTypes.byName[typeName]) {
+        if (!typeName) notify.error('Visualization type is missing. Please add a type to this visualization.', hit);
+        else notify.error('Visualization type of "' + typeName + '" is invalid. Please change to a valid type.', hit);
+        return kbnUrl.redirect('/settings/objects/savedVisualizations/{{id}}', {id: source.id});
+      }
+
+      source.type = visTypes.byName[typeName];
+      source.icon = source.type.icon;
+      return source;
+    };
+
     this.find = function (searchString, size = 100) {
-      var self = this;
-      var body;
+      let body;
       if (searchString) {
         body = {
           query: {
@@ -64,30 +99,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: _.transform(resp.hits.hits, function (hits, hit) {
-            var source = hit._source;
-            source.id = hit._id;
-            source.url = self.urlFor(hit._id);
-
-            var typeName = source.typeName;
-            if (source.visState) {
-              try { typeName = JSON.parse(source.visState).type; }
-              catch (e) { /* missing typename handled below */ } // eslint-disable-line no-empty
-            }
-
-            if (!typeName || !visTypes.byName[typeName]) {
-              if (!typeName) notify.error('Visualization type is missing. Please add a type to this visualization.', hit);
-              else notify.error('Visualization type of "' + typeName + '" is invalid. Please change to a valid type.', hit);
-              return kbnUrl.redirect('/settings/objects/savedVisualizations/{{id}}', {id: source.id});
-            }
-
-            source.type = visTypes.byName[typeName];
-            source.icon = source.type.icon;
-            hits.push(source);
-          }, [])
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };
diff --git a/src/plugins/kibana/public/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js
index 3644127b4ffbf..3097e3adf9c70 100644
--- a/src/plugins/kibana/public/visualize/wizard/wizard.js
+++ b/src/plugins/kibana/public/visualize/wizard/wizard.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   require('plugins/kibana/visualize/saved_visualizations/saved_visualizations');
   require('ui/directives/saved_object_finder');
   require('plugins/kibana/discover/saved_searches/saved_searches');
 
-  var templateStep = function (num, txt) {
+  const templateStep = function (num, txt) {
     return '<div ng-controller="VisualizeWizardStep' + num + '" class="container vis-wizard">' + txt + '</div>';
   };
 
-  var module = require('ui/modules').get('app/visualize', ['kibana/courier']);
-  var routes = require('ui/routes');
+  const module = require('ui/modules').get('app/visualize', ['kibana/courier']);
+  const routes = require('ui/routes');
 
   /********
   /** Wizard Step 1
@@ -42,7 +42,7 @@ define(function (require) {
   });
 
   module.controller('VisualizeWizardStep2', function ($route, $scope, $location, timefilter, kbnUrl) {
-    var type = $route.current.params.type;
+    const type = $route.current.params.type;
 
     $scope.step2WithSearchUrl = function (hit) {
       return kbnUrl.eval('#/visualize/create?&type={{type}}&savedSearchId={{id}}', {type: type, id: hit.id});
diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
index 97f9e5a019d79..465eeb6f0ce69 100644
--- a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
+++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
@@ -1,9 +1,9 @@
 
 describe('markdown vis controller', function () {
-  var $scope;
-  var $el;
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let $scope;
+  let $el;
+  const ngMock = require('ngMock');
+  const expect = require('expect.js');
 
   beforeEach(ngMock.module('kibana/markdown_vis'));
   beforeEach(ngMock.inject(function ($rootScope, $controller) {
diff --git a/src/plugins/markdown_vis/public/markdown_vis.js b/src/plugins/markdown_vis/public/markdown_vis.js
index 3066cd8c108af..d455097e3b497 100644
--- a/src/plugins/markdown_vis/public/markdown_vis.js
+++ b/src/plugins/markdown_vis/public/markdown_vis.js
@@ -9,7 +9,7 @@ define(function (require) {
   require('ui/registry/vis_types').register(MarkdownVisProvider);
 
   function MarkdownVisProvider(Private) {
-    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+    const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
 
     // return the visType object, which kibana will use to display and configure new
     // Vis object of this type.
diff --git a/src/plugins/markdown_vis/public/markdown_vis_controller.js b/src/plugins/markdown_vis/public/markdown_vis_controller.js
index d46d278520beb..00b859702edd5 100644
--- a/src/plugins/markdown_vis/public/markdown_vis_controller.js
+++ b/src/plugins/markdown_vis/public/markdown_vis_controller.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var marked = require('marked');
+  const marked = require('marked');
   marked.setOptions({
     gfm: true, // Github-flavored markdown
     sanitize: true // Sanitize HTML tags
   });
 
-  var module = require('ui/modules').get('kibana/markdown_vis', ['kibana']);
+  const module = require('ui/modules').get('kibana/markdown_vis', ['kibana']);
   module.controller('KbnMarkdownVisController', function ($scope, $sce) {
     $scope.$watch('vis.params.markdown', function (html) {
       if (!html) return;
diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
index b1309ff569ebc..133d8d6f979ac 100644
--- a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
@@ -1,10 +1,10 @@
 
 describe('metric vis', function () {
-  var $scope;
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let $scope;
+  const ngMock = require('ngMock');
+  const expect = require('expect.js');
 
-  var formatter = function (value) {
+  const formatter = function (value) {
     return value.toFixed(3);
   };
 
diff --git a/src/plugins/metric_vis/public/metric_vis.html b/src/plugins/metric_vis/public/metric_vis.html
index ef30d0404d8c1..c1d9150b679a2 100644
--- a/src/plugins/metric_vis/public/metric_vis.html
+++ b/src/plugins/metric_vis/public/metric_vis.html
@@ -1,6 +1,6 @@
 <div ng-controller="KbnMetricVisController" class="metric-vis">
-    <div class="metric-container" ng-repeat="metric in metrics">
-        <div class="metric-value" ng-style="{'font-size': vis.params.fontSize+'pt'}">{{metric.value}}</div>
-        <div>{{metric.label}}</div>
-    </div>
+  <div class="metric-container" ng-repeat="metric in metrics">
+      <div class="metric-value" ng-style="{'font-size': vis.params.fontSize+'pt'}">{{metric.value}}</div>
+      <div>{{metric.label}}</div>
+  </div>
 </div>
diff --git a/src/plugins/metric_vis/public/metric_vis.js b/src/plugins/metric_vis/public/metric_vis.js
index 0e5b99c4e225f..96b22d0c862ec 100644
--- a/src/plugins/metric_vis/public/metric_vis.js
+++ b/src/plugins/metric_vis/public/metric_vis.js
@@ -9,8 +9,8 @@ define(function (require) {
   require('ui/registry/vis_types').register(MetricVisProvider);
 
   function MetricVisProvider(Private) {
-    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     // return the visType object, which kibana will use to display and configure new
     // Vis object of this type.
@@ -23,6 +23,7 @@ define(function (require) {
       template: require('plugins/metric_vis/metric_vis.html'),
       params: {
         defaults: {
+          handleNoResults: true,
           fontSize: 60
         },
         editor: require('plugins/metric_vis/metric_vis_params.html')
diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js
index 3ac2ef17c7d22..2fd6c87cf4ba4 100644
--- a/src/plugins/metric_vis/public/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/metric_vis_controller.js
@@ -1,20 +1,29 @@
 define(function (require) {
+  let _ = require('lodash');
   // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it
   // didn't already
-  var module = require('ui/modules').get('kibana/metric_vis', ['kibana']);
+  const module = require('ui/modules').get('kibana/metric_vis', ['kibana']);
 
   module.controller('KbnMetricVisController', function ($scope, Private) {
-    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
 
-    var metrics = $scope.metrics = [];
+    const metrics = $scope.metrics = [];
+
+    function isInvalid(val) {
+      return _.isUndefined(val) || _.isNull(val) || _.isNaN(val);
+    }
 
     $scope.processTableGroups = function (tableGroups) {
       tableGroups.tables.forEach(function (table) {
         table.columns.forEach(function (column, i) {
-          var fieldFormatter = table.aggConfig(column).fieldFormatter();
+          const fieldFormatter = table.aggConfig(column).fieldFormatter();
+          let value = table.rows[0][i];
+
+          value = isInvalid(value) ? '?' : fieldFormatter(value);
+
           metrics.push({
             label: column.title,
-            value: fieldFormatter(table.rows[0][i])
+            value: value
           });
         });
       });
diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
index 471026beca368..59b42509f5f8d 100644
--- a/src/plugins/spyModes/public/reqRespStatsSpyMode.js
+++ b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html');
+  const _ = require('lodash');
+  const reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html');
 
-  var linkReqRespStats = function ($scope, config) {
+  const linkReqRespStats = function ($scope, config) {
     $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
     $scope.$watchMulti([
       'req',
@@ -12,9 +12,9 @@ define(function (require) {
     ], function () {
       if (!$scope.searchSource || !$scope.req) return;
 
-      var req = $scope.req;
-      var resp = $scope.req.resp;
-      var stats = $scope.stats = [];
+      const req = $scope.req;
+      const resp = $scope.req.resp;
+      const stats = $scope.stats = [];
 
       if (resp && resp.took != null) stats.push(['Query Duration', resp.took + 'ms']);
       if (req && req.ms != null) stats.push(['Request Duration', req.ms + 'ms']);
diff --git a/src/plugins/spyModes/public/tableSpyMode.html b/src/plugins/spyModes/public/tableSpyMode.html
index 2a70eacea7498..e541921c24765 100644
--- a/src/plugins/spyModes/public/tableSpyMode.html
+++ b/src/plugins/spyModes/public/tableSpyMode.html
@@ -1 +1,5 @@
-<kbn-agg-table table="table" per-page="editableVis.params.spyPerPage"></kbn-agg-table>
+<kbn-agg-table
+  table="table"
+  export-title="vis.title"
+  per-page="spy.params.spyPerPage">
+</kbn-agg-table>
diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spyModes/public/tableSpyMode.js
index 97eac984b0914..d7a2981623d45 100644
--- a/src/plugins/spyModes/public/tableSpyMode.js
+++ b/src/plugins/spyModes/public/tableSpyMode.js
@@ -1,10 +1,10 @@
 define(function (require) {
   function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) {
-    var _ = require('lodash');
-    var saveAs = require('@spalger/filesaver').saveAs;
-    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    const _ = require('lodash');
+    const saveAs = require('@spalger/filesaver').saveAs;
+    const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
 
-    var PER_PAGE_DEFAULT = 10;
+    const PER_PAGE_DEFAULT = 10;
 
     require('ui/agg_table');
 
@@ -21,8 +21,8 @@ define(function (require) {
           if (!$scope.vis || !$scope.esResp) {
             $scope.table = null;
           } else {
-            if (!$scope.editableVis.params.spyPerPage) {
-              $scope.editableVis.params.spyPerPage = PER_PAGE_DEFAULT;
+            if (!$scope.spy.params.spyPerPage) {
+              $scope.spy.params.spyPerPage = PER_PAGE_DEFAULT;
             }
 
             $scope.table = tabifyAggResponse($scope.vis, $scope.esResp, {
diff --git a/src/plugins/statusPage/public/lib/formatNumber.js b/src/plugins/statusPage/public/lib/formatNumber.js
index 291ea77ae7d4b..291e4c5a3406f 100644
--- a/src/plugins/statusPage/public/lib/formatNumber.js
+++ b/src/plugins/statusPage/public/lib/formatNumber.js
@@ -1,10 +1,10 @@
 
-var moment = require('moment');
-var numeral = require('numeral');
+const moment = require('moment');
+const numeral = require('numeral');
 
 module.exports = function formatNumber(num, which) {
-  var format = '0.00';
-  var postfix = '';
+  let format = '0.00';
+  let postfix = '';
   switch (which) {
     case 'time':
       return moment(num).format('HH:mm:ss');
diff --git a/src/plugins/statusPage/public/lib/makeChartOptions.js b/src/plugins/statusPage/public/lib/makeChartOptions.js
index b7a8783c84396..fdcad49d96799 100644
--- a/src/plugins/statusPage/public/lib/makeChartOptions.js
+++ b/src/plugins/statusPage/public/lib/makeChartOptions.js
@@ -1,5 +1,5 @@
 
-var formatNumber = require('./formatNumber');
+const formatNumber = require('./formatNumber');
 
 module.exports = function makeChartOptions(type) {
   return {
diff --git a/src/plugins/statusPage/public/lib/readStatData.js b/src/plugins/statusPage/public/lib/readStatData.js
index 1bfe56392fe29..7a21a045cd6b4 100644
--- a/src/plugins/statusPage/public/lib/readStatData.js
+++ b/src/plugins/statusPage/public/lib/readStatData.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
 module.exports = function readStatData(data, seriesNames) {
   // Metric Values format
@@ -13,13 +13,13 @@ module.exports = function readStatData(data, seriesNames) {
   // Go through all of the metric values and split the values out.
   // returns an array of all of the averages
 
-  var metricList = [];
+  const metricList = [];
   seriesNames = seriesNames || [];
   data.forEach(function (vector) {
     vector = _.flatten(vector);
-    var x = vector.shift();
+    const x = vector.shift();
     vector.forEach(function (yValue, i) {
-      var series = seriesNames[i] || '';
+      const series = seriesNames[i] || '';
 
       if (!metricList[i]) {
         metricList[i] = {
diff --git a/src/plugins/statusPage/public/lib/toTitleCase.js b/src/plugins/statusPage/public/lib/toTitleCase.js
index e7f4a1d33a4fa..798039898817a 100644
--- a/src/plugins/statusPage/public/lib/toTitleCase.js
+++ b/src/plugins/statusPage/public/lib/toTitleCase.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
 // Turns thisIsASentence to
 // This Is A Sentence
diff --git a/src/plugins/statusPage/public/statusPage.html b/src/plugins/statusPage/public/statusPage.html
index 33ebdcc6fff7c..f879311b0968b 100644
--- a/src/plugins/statusPage/public/statusPage.html
+++ b/src/plugins/statusPage/public/statusPage.html
@@ -22,14 +22,16 @@ <h4 ng-if="!ui.statuses && !ui.loading" class="missing_statuses">
       No plugin status information available
     </h4>
 
-    <table class="plugin_status_breakdown row" ng-if="ui.statuses">
-      <tr>
-        <th class="col-xs-1">Name</th>
-        <th class="col-xs-11">Status</th>
+    <table class="plugin_status_breakdown" ng-if="ui.statuses">
+      <tr class="row">
+        <th class="col-xs-2">Name</th>
+        <th class="col-xs-2">Version</th>
+        <th class="col-xs-8">Status</th>
       </tr>
-      <tr ng-repeat="status in ui.statuses" class="status_row plugin_state_default plugin_state_{{status.state}}">
-        <td class="col-xs-1 status_name">{{status.name}}</td>
-        <td class="col-xs-11 status_message">
+      <tr ng-repeat="status in ui.statuses" class="status_row plugin_state_default plugin_state_{{status.state}} row">
+        <td class="col-xs-2 status_name">{{status.name}}</td>
+        <td class="col-xs-2 status_version">{{status.version}}</td>
+        <td class="col-xs-8 status_message">
           <i class="fa plugin_state_color plugin_state_icon" />
           {{status.message}}
         </td>
diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/statusPage/public/statusPage.js
index 6189ec0832581..ecadba6467607 100644
--- a/src/plugins/statusPage/public/statusPage.js
+++ b/src/plugins/statusPage/public/statusPage.js
@@ -1,11 +1,11 @@
-var $ = require('jquery');
-var _ = require('lodash');
-var notify = require('ui/notify');
+const $ = require('jquery');
+const _ = require('lodash');
+const notify = require('ui/notify');
 
 require('plugins/statusPage/statusPageMetric');
 require('plugins/statusPage/statusPage.less');
 
-var chrome = require('ui/chrome')
+const chrome = require('ui/chrome')
 .setTabs([
   {
     id: '',
@@ -15,7 +15,7 @@ var chrome = require('ui/chrome')
 ])
 .setRootTemplate(require('plugins/statusPage/statusPage.html'))
 .setRootController('ui', function ($http, $scope) {
-  var ui = this;
+  const ui = this;
   ui.loading = false;
 
   ui.refresh = function () {
@@ -31,11 +31,11 @@ var chrome = require('ui/chrome')
         ui.fetchError = null;
       }
 
-      var data = resp.data;
+      const data = resp.data;
       ui.metrics = data.metrics;
       ui.statuses = data.status.statuses;
 
-      var overall = data.status.overall;
+      const overall = data.status.overall;
       if (!ui.serverState || (ui.serverState !== overall.state)) {
         ui.serverState = overall.state;
         ui.serverStateMessage = overall.title;
diff --git a/src/plugins/statusPage/public/statusPageMetric.js b/src/plugins/statusPage/public/statusPageMetric.js
index 99de1c3670240..180fb2826a492 100644
--- a/src/plugins/statusPage/public/statusPageMetric.js
+++ b/src/plugins/statusPage/public/statusPageMetric.js
@@ -1,14 +1,14 @@
-var _ = require('lodash');
-var moment = require('moment');
-var numeral = require('numeral');
+const _ = require('lodash');
+const moment = require('moment');
+const numeral = require('numeral');
 
-var toTitleCase = require('./lib/toTitleCase');
-var formatNumber = require('./lib/formatNumber');
-var readStatData = require('./lib/readStatData');
+const toTitleCase = require('./lib/toTitleCase');
+const formatNumber = require('./lib/formatNumber');
+const readStatData = require('./lib/readStatData');
 
 function calcAvg(metricList, metricNumberType) {
   return metricList.map(function (data) {
-    var uglySum = data.values.reduce(function (sumSoFar, vector) {
+    const uglySum = data.values.reduce(function (sumSoFar, vector) {
       return sumSoFar + vector.y;
     }, 0);
     return formatNumber(uglySum / data.values.length, metricNumberType);
@@ -27,7 +27,7 @@ require('ui/modules')
     },
     controllerAs: 'metric',
     controller: function ($scope) {
-      var self = this;
+      const self = this;
 
       self.name = $scope.name;
       self.title = toTitleCase(self.name);
@@ -56,10 +56,10 @@ require('ui/modules')
         self.chartData = readStatData(self.rawData, self.seriesNames);
         self.averages = calcAvg(self.chartData, self.numberType);
 
-        var unit = '';
+        let unit = '';
         self.averages = self.averages.map(function (average) {
-          var parts = average.split(' ');
-          var value = parts.shift();
+          const parts = average.split(' ');
+          const value = parts.shift();
           unit = parts.join(' ');
           return value;
         });
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js
index e2068932f61cc..8df38cb5c669d 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis.js
@@ -1,18 +1,18 @@
 describe('Integration', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var sinon = require('auto-release-sinon');
-
-  var $rootScope;
-  var TableGroup;
-  var $compile;
-  var $scope;
-  var $el;
-  var Vis;
-  var indexPattern;
-  var fixtures;
+  const $ = require('jquery');
+  const _ = require('lodash');
+  const expect = require('expect.js');
+  const ngMock = require('ngMock');
+  const sinon = require('auto-release-sinon');
+
+  let $rootScope;
+  let TableGroup;
+  let $compile;
+  let $scope;
+  let $el;
+  let Vis;
+  let indexPattern;
+  let fixtures;
 
   beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -30,7 +30,8 @@ describe('Integration', function () {
 
     $rootScope.vis = vis;
     $rootScope.esResponse = esResponse;
-    $el = $('<visualize vis="vis" es-resp="esResponse">');
+    $rootScope.uiState = require('fixtures/mock_ui_state');
+    $el = $('<visualize vis="vis" es-resp="esResponse" ui-state="uiState">');
     $compile($el)($rootScope);
     $rootScope.$apply();
 
@@ -92,7 +93,7 @@ describe('Integration', function () {
   it('passes the table groups to the kbnAggTableGroup directive', function () {
     init(new OneRangeVis(), fixtures.oneRangeBucket);
 
-    var $atg = $el.find('kbn-agg-table-group').first();
+    const $atg = $el.find('kbn-agg-table-group').first();
     expect($atg.size()).to.be(1);
     expect($atg.attr('group')).to.be('tableGroups');
     expect($atg.isolateScope().group).to.be($atg.scope().tableGroups);
@@ -103,18 +104,18 @@ describe('Integration', function () {
 
     expect($el.find('kbn-agg-table-group').size()).to.be(0);
 
-    var $err = $el.find('.table-vis-error');
+    const $err = $el.find('.table-vis-error');
     expect($err.size()).to.be(1);
     expect($err.text().trim()).to.be('No results found');
   });
 
   it('displays an error if the search hits, but didn\'t create any rows', function () {
-    var visParams = {
+    const visParams = {
       showPartialRows: false,
       metricsAtAllLevels: true
     };
 
-    var resp = _.cloneDeep(fixtures.threeTermBuckets);
+    const resp = _.cloneDeep(fixtures.threeTermBuckets);
     resp.aggregations.agg_2.buckets.forEach(function (extensionBucket) {
       extensionBucket.agg_3.buckets.forEach(function (countryBucket) {
         // clear all the machine os buckets
@@ -126,7 +127,7 @@ describe('Integration', function () {
 
     expect($el.find('kbn-agg-table-group').size()).to.be(0);
 
-    var $err = $el.find('.table-vis-error');
+    const $err = $el.find('.table-vis-error');
     expect($err.size()).to.be(1);
     expect($err.text().trim()).to.be('No results found');
   });
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
index c7f0575b1c9ee..4ea3df8f66a2d 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
@@ -1,18 +1,18 @@
 describe('Controller', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var sinon = require('auto-release-sinon');
-
-  var $rootScope;
-  var TableGroup;
-  var $compile;
-  var Private;
-  var $scope;
-  var $el;
-  var Vis;
-  var fixtures;
+  const $ = require('jquery');
+  const _ = require('lodash');
+  const expect = require('expect.js');
+  const ngMock = require('ngMock');
+  const sinon = require('auto-release-sinon');
+
+  let $rootScope;
+  let TableGroup;
+  let $compile;
+  let Private;
+  let $scope;
+  let $el;
+  let Vis;
+  let fixtures;
 
   beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -103,7 +103,7 @@ describe('Controller', function () {
     initController(new OneRangeVis());
 
     // modify the data to not have any buckets
-    var resp = _.cloneDeep(fixtures.oneRangeBucket);
+    const resp = _.cloneDeep(fixtures.oneRangeBucket);
     resp.aggregations.agg_2.buckets = {};
 
     attachEsResponseToScope(resp);
@@ -114,11 +114,11 @@ describe('Controller', function () {
 
   it('passes partialRows:true to tabify based on the vis params', function () {
     // spy on the tabify private module
-    var tabifyPm = require('ui/agg_response/tabify/tabify');
-    var spiedTabify = sinon.spy(Private(tabifyPm));
+    const tabifyPm = require('ui/agg_response/tabify/tabify');
+    const spiedTabify = sinon.spy(Private(tabifyPm));
     Private.stub(tabifyPm, spiedTabify);
 
-    var vis = new OneRangeVis({ showPartialRows: true });
+    const vis = new OneRangeVis({ showPartialRows: true });
     initController(vis);
     attachEsResponseToScope(fixtures.oneRangeBucket);
 
@@ -128,11 +128,11 @@ describe('Controller', function () {
 
   it('passes partialRows:false to tabify based on the vis params', function () {
     // spy on the tabify private module
-    var tabifyPm = require('ui/agg_response/tabify/tabify');
-    var spiedTabify = sinon.spy(Private(tabifyPm));
+    const tabifyPm = require('ui/agg_response/tabify/tabify');
+    const spiedTabify = sinon.spy(Private(tabifyPm));
     Private.stub(tabifyPm, spiedTabify);
 
-    var vis = new OneRangeVis({ showPartialRows: false });
+    const vis = new OneRangeVis({ showPartialRows: false });
     initController(vis);
     attachEsResponseToScope(fixtures.oneRangeBucket);
 
@@ -142,11 +142,11 @@ describe('Controller', function () {
 
   it('passes partialRows:true to tabify based on the vis params', function () {
     // spy on the tabify private module
-    var tabifyPm = require('ui/agg_response/tabify/tabify');
-    var spiedTabify = sinon.spy(Private(tabifyPm));
+    const tabifyPm = require('ui/agg_response/tabify/tabify');
+    const spiedTabify = sinon.spy(Private(tabifyPm));
     Private.stub(tabifyPm, spiedTabify);
 
-    var vis = new OneRangeVis({ showPartialRows: true });
+    const vis = new OneRangeVis({ showPartialRows: true });
     initController(vis);
     attachEsResponseToScope(fixtures.oneRangeBucket);
 
@@ -156,11 +156,11 @@ describe('Controller', function () {
 
   it('passes partialRows:false to tabify based on the vis params', function () {
     // spy on the tabify private module
-    var tabifyPm = require('ui/agg_response/tabify/tabify');
-    var spiedTabify = sinon.spy(Private(tabifyPm));
+    const tabifyPm = require('ui/agg_response/tabify/tabify');
+    const spiedTabify = sinon.spy(Private(tabifyPm));
     Private.stub(tabifyPm, spiedTabify);
 
-    var vis = new OneRangeVis({ showPartialRows: false });
+    const vis = new OneRangeVis({ showPartialRows: false });
     initController(vis);
     attachEsResponseToScope(fixtures.oneRangeBucket);
 
diff --git a/src/plugins/table_vis/public/table_vis.html b/src/plugins/table_vis/public/table_vis.html
index 68e604ef8fe16..af4c63541457d 100644
--- a/src/plugins/table_vis/public/table_vis.html
+++ b/src/plugins/table_vis/public/table_vis.html
@@ -5,6 +5,10 @@ <h4>No results found</h4>
   </div>
 
   <div ng-if="tableGroups" class="table-vis-container">
-    <kbn-agg-table-group group="tableGroups" per-page="vis.params.perPage"></kbn-agg-table-group>
+    <kbn-agg-table-group
+      group="tableGroups"
+      export-title="vis.title"
+      per-page="vis.params.perPage">
+    </kbn-agg-table-group>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/plugins/table_vis/public/table_vis.js b/src/plugins/table_vis/public/table_vis.js
index a912925950f6c..15650ca33ee1a 100644
--- a/src/plugins/table_vis/public/table_vis.js
+++ b/src/plugins/table_vis/public/table_vis.js
@@ -17,8 +17,8 @@ define(function (require) {
 
   // define the TableVisType
   function TableVisTypeProvider(Private) {
-    var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
+    const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType'));
+    const Schemas = Private(require('ui/Vis/Schemas'));
 
     // define the TableVisController which is used in the template
     // by angular's ng-controller directive
diff --git a/src/plugins/table_vis/public/table_vis_controller.js b/src/plugins/table_vis/public/table_vis_controller.js
index 970e82f025d97..7f398cad107eb 100644
--- a/src/plugins/table_vis/public/table_vis_controller.js
+++ b/src/plugins/table_vis/public/table_vis_controller.js
@@ -1,20 +1,20 @@
 define(function (require) {
   // get the kibana/table_vis module, and make sure that it requires the "kibana" module if it
   // didn't already
-  var module = require('ui/modules').get('kibana/table_vis', ['kibana']);
+  const module = require('ui/modules').get('kibana/table_vis', ['kibana']);
 
   // add a controller to tha module, which will transform the esResponse into a
   // tabular format that we can pass to the table directive
   module.controller('KbnTableVisController', function ($scope, Private) {
-    var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
+    const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
 
     $scope.$watch('esResponse', function (resp, oldResp) {
-      var tableGroups = $scope.tableGroups = null;
-      var hasSomeRows = $scope.hasSomeRows = null;
+      let tableGroups = $scope.tableGroups = null;
+      let hasSomeRows = $scope.hasSomeRows = null;
 
       if (resp) {
-        var vis = $scope.vis;
-        var params = vis.params;
+        const vis = $scope.vis;
+        const params = vis.params;
 
         tableGroups = tabifyAggResponse(vis, resp, {
           partialRows: params.showPartialRows,
@@ -32,7 +32,6 @@ define(function (require) {
       if (hasSomeRows) {
         $scope.tableGroups = tableGroups;
       }
-
     });
   });
 
diff --git a/src/plugins/table_vis/public/table_vis_params.js b/src/plugins/table_vis/public/table_vis_params.js
index 0d8f5f7ae43d9..a984b428b0aa6 100644
--- a/src/plugins/table_vis/public/table_vis_params.js
+++ b/src/plugins/table_vis/public/table_vis_params.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   require('ui/modules').get('kibana/table_vis')
   .directive('tableVisParams', function () {
@@ -13,7 +13,7 @@ define(function (require) {
         ], function () {
           if (!$scope.vis) return;
 
-          var params = $scope.vis.params;
+          const params = $scope.vis.params;
           if (params.showPartialRows || params.showMeticsAtAllLevels) {
             $scope.metricsAtAllLevels = true;
           } else {
diff --git a/src/plugins/testsBundle/testsEntryTemplate.js b/src/plugins/testsBundle/testsEntryTemplate.js
index aff1601d50675..61127f4bfc48f 100644
--- a/src/plugins/testsBundle/testsEntryTemplate.js
+++ b/src/plugins/testsBundle/testsEntryTemplate.js
@@ -27,6 +27,7 @@ window.__KBN__ = {
     kbnIndex: '.kibana',
     esShardTimeout: 1500,
     esApiVersion: '2.0',
+    esRequestTimeout: '300000'
   }
 };
 
diff --git a/src/server/__tests__/basePath.js b/src/server/__tests__/basePath.js
index e9b362df40be9..ec67b9fa538a6 100644
--- a/src/server/__tests__/basePath.js
+++ b/src/server/__tests__/basePath.js
@@ -1,10 +1,10 @@
 import { resolve } from 'path';
 import { fromNode as fn } from 'bluebird';
 import expect from 'expect.js';
+import requirefrom from 'requirefrom';
 
-import KbnServer from '../KbnServer';
-
-const src = resolve.bind(__dirname, '../../');
+const requireFromTest = requirefrom('test');
+const kbnTestServer = requireFromTest('utils/kbn_server');
 const basePath = '/kibana';
 
 describe('Server basePath config', function () {
@@ -13,11 +13,8 @@ describe('Server basePath config', function () {
 
   let kbnServer;
   before(async function () {
-    kbnServer = new KbnServer({
-      server: { autoListen: false, basePath },
-      plugins: { scanDirs: [src('plugins')] },
-      logging: { quiet: true },
-      optimize: { enabled: false },
+    kbnServer = kbnTestServer.createServer({
+      server: { basePath }
     });
     await kbnServer.ready();
     return kbnServer;
@@ -27,12 +24,18 @@ describe('Server basePath config', function () {
     await kbnServer.close();
   });
 
-  it('appends the basePath to root redirect', async function () {
-    const response = await kbnServer.inject({
+  it('appends the basePath to root redirect', function (done) {
+    const options = {
       url: '/',
       method: 'GET'
+    };
+    kbnTestServer.makeRequest(kbnServer, options, function (res) {
+      try {
+        expect(res.payload).to.match(/defaultRoute = '\/kibana\/app\/kibana'/);
+        done();
+      } catch (e) {
+        done(e);
+      }
     });
-
-    expect(response.payload).to.match(/defaultRoute = '\/kibana\/app\/kibana'/);
   });
 });
diff --git a/src/server/config/__tests__/config.js b/src/server/config/__tests__/config.js
index 80ae95e33ce35..ca137413ad124 100644
--- a/src/server/config/__tests__/config.js
+++ b/src/server/config/__tests__/config.js
@@ -1,7 +1,7 @@
-var Config = require('../Config');
-var expect = require('expect.js');
-var _ = require('lodash');
-var Joi = require('joi');
+let Config = require('../config');
+let expect = require('expect.js');
+let _ = require('lodash');
+let Joi = require('joi');
 
 /**
  * Plugins should defined a config method that takes a joi object. By default
@@ -9,12 +9,12 @@ var Joi = require('joi');
  *
  * Config should be newed up with a joi schema (containing defaults via joi)
  *
- * var schema = { ... }
+ * let schema = { ... }
  * new Config(schema);
  *
  */
 
-var data = {
+let data = {
   test: {
     hosts: ['host-01', 'host-02'],
     client: {
@@ -25,7 +25,7 @@ var data = {
   }
 };
 
-var schema = Joi.object({
+let schema = Joi.object({
   test: Joi.object({
     enable: Joi.boolean().default(true),
     hosts: Joi.array().items(Joi.string()),
@@ -44,8 +44,8 @@ describe('lib/config/config', function () {
     describe('constructor', function () {
 
       it('should not allow any config if the schema is not passed', function (done) {
-        var config = new Config();
-        var run = function () {
+        let config = new Config();
+        let run = function () {
           config.set('something.enable', true);
         };
         expect(run).to.throwException();
@@ -53,7 +53,7 @@ describe('lib/config/config', function () {
       });
 
       it('should set defaults', function () {
-        var config = new Config(schema);
+        let config = new Config(schema);
         expect(config.get('test.enable')).to.be(true);
         expect(config.get('test.client.type')).to.be('datastore');
       });
@@ -62,14 +62,14 @@ describe('lib/config/config', function () {
 
     describe('#resetTo(object)', function () {
 
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });
 
       it('should reset the config object with new values', function () {
         config.set(data);
-        var newData = config.get();
+        let newData = config.get();
         newData.test.enable = false;
         config.resetTo(newData);
         expect(config.get()).to.eql(newData);
@@ -79,7 +79,7 @@ describe('lib/config/config', function () {
 
     describe('#has(key)', function () {
 
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });
@@ -99,7 +99,7 @@ describe('lib/config/config', function () {
     });
 
     describe('#set(key, value)', function () {
-      var config;
+      let config;
 
       beforeEach(function () {
         config = new Config(schema);
@@ -111,21 +111,21 @@ describe('lib/config/config', function () {
       });
 
       it('should use an object to set config values', function () {
-        var hosts = ['host-01', 'host-02'];
+        let hosts = ['host-01', 'host-02'];
         config.set({ test: { enable: false, hosts: hosts } });
         expect(config.get('test.enable')).to.be(false);
         expect(config.get('test.hosts')).to.eql(hosts);
       });
 
       it('should use a flatten object to set config values', function () {
-        var hosts = ['host-01', 'host-02'];
+        let hosts = ['host-01', 'host-02'];
         config.set({ 'test.enable': false, 'test.hosts': hosts });
         expect(config.get('test.enable')).to.be(false);
         expect(config.get('test.hosts')).to.eql(hosts);
       });
 
       it('should override values with just the values present', function () {
-        var newData = _.cloneDeep(data);
+        let newData = _.cloneDeep(data);
         config.set(data);
         newData.test.enable = false;
         config.set({ test: { enable: false } });
@@ -133,7 +133,7 @@ describe('lib/config/config', function () {
       });
 
       it('should thow an exception when setting a value with the wrong type', function (done) {
-        var run = function () {
+        let run = function () {
           config.set('test.enable', 'something');
         };
         expect(run).to.throwException(function (err) {
@@ -148,7 +148,7 @@ describe('lib/config/config', function () {
 
     describe('#get(key)', function () {
 
-      var config;
+      let config;
 
       beforeEach(function () {
         config = new Config(schema);
@@ -156,7 +156,7 @@ describe('lib/config/config', function () {
       });
 
       it('should return the whole config object when called without a key', function () {
-        var newData = _.cloneDeep(data);
+        let newData = _.cloneDeep(data);
         newData.test.enable = true;
         expect(config.get()).to.eql(newData);
       });
@@ -171,14 +171,14 @@ describe('lib/config/config', function () {
       });
 
       it('should throw exception for unknown config values', function () {
-        var run = function () {
+        let run = function () {
           config.get('test.does.not.exist');
         };
         expect(run).to.throwException(/Unknown config key: test.does.not.exist/);
       });
 
       it('should not throw exception for undefined known config values', function () {
-        var run = function getUndefValue() {
+        let run = function getUndefValue() {
           config.get('test.undefValue');
         };
         expect(run).to.not.throwException();
@@ -187,20 +187,20 @@ describe('lib/config/config', function () {
     });
 
     describe('#extendSchema(key, schema)', function () {
-      var config;
+      let config;
       beforeEach(function () {
         config = new Config(schema);
       });
 
       it('should allow you to extend the schema at the top level', function () {
-        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
         config.extendSchema('myTest', newSchema);
         expect(config.get('myTest.test')).to.be(true);
       });
 
       it('should NOT allow you to extend the schema if somethign else is there', function () {
-        var newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
-        var run = function () {
+        let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        let run = function () {
           config.extendSchema('test', newSchema);
         };
         expect(run).to.throwException();
@@ -210,7 +210,7 @@ describe('lib/config/config', function () {
 
     describe('#removeSchema(key)', function () {
       it('should completely remove the key', function () {
-        var config = new Config(Joi.object().keys({
+        let config = new Config(Joi.object().keys({
           a: Joi.number().default(1)
         }));
 
@@ -220,7 +220,7 @@ describe('lib/config/config', function () {
       });
 
       it('only removes existing keys', function () {
-        var config = new Config(Joi.object());
+        let config = new Config(Joi.object());
 
         expect(() => config.removeSchema('b')).to.throwException('Unknown schema');
       });
@@ -228,4 +228,3 @@ describe('lib/config/config', function () {
 
   });
 });
-
diff --git a/src/server/config/__tests__/explodeBy.js b/src/server/config/__tests__/explodeBy.js
index cfda593e9d59f..ad2625da75fb8 100644
--- a/src/server/config/__tests__/explodeBy.js
+++ b/src/server/config/__tests__/explodeBy.js
@@ -1,10 +1,10 @@
-var explodeBy = require('../explodeBy');
-var expect = require('expect.js');
+let explodeBy = require('../explodeBy');
+let expect = require('expect.js');
 
 describe('explode_by(dot, flatObject)', function () {
 
   it('should explode a flatten object with dots', function () {
-    var flatObject = {
+    let flatObject = {
       'test.enable': true,
       'test.hosts': ['host-01', 'host-02']
     };
@@ -17,7 +17,7 @@ describe('explode_by(dot, flatObject)', function () {
   });
 
   it('should explode a flatten object with slashes', function () {
-    var flatObject = {
+    let flatObject = {
       'test/enable': true,
       'test/hosts': ['host-01', 'host-02']
     };
diff --git a/src/server/config/__tests__/flattenWith.js b/src/server/config/__tests__/flattenWith.js
index 3795f9ba41d0f..6e99d91400ff6 100644
--- a/src/server/config/__tests__/flattenWith.js
+++ b/src/server/config/__tests__/flattenWith.js
@@ -1,10 +1,10 @@
-var flattenWith = require('../flattenWith');
-var expect = require('expect.js');
+let flattenWith = require('../flattenWith');
+let expect = require('expect.js');
 
 describe('flatten_with(dot, nestedObj)', function () {
 
   it('should flatten object with dot', function () {
-    var nestedObj = {
+    let nestedObj = {
       test: {
         enable: true,
         hosts: ['host-01', 'host-02'],
diff --git a/src/server/config/__tests__/override.js b/src/server/config/__tests__/override.js
index cac9e4340cd06..3f8b369244662 100644
--- a/src/server/config/__tests__/override.js
+++ b/src/server/config/__tests__/override.js
@@ -1,10 +1,10 @@
-var override = require('../override');
-var expect = require('expect.js');
+let override = require('../override');
+let expect = require('expect.js');
 
 describe('override(target, source)', function () {
 
   it('should override the values form source to target', function () {
-    var target = {
+    let target = {
       test: {
         enable: true,
         host: ['host-01', 'host-02'],
@@ -13,7 +13,7 @@ describe('override(target, source)', function () {
         }
       }
     };
-    var source = { test: { client: { type: 'nosql' } } };
+    let source = { test: { client: { type: 'nosql' } } };
     expect(override(target, source)).to.eql({
       test: {
         enable: true,
diff --git a/src/server/config/Config.js b/src/server/config/config.js
similarity index 100%
rename from src/server/config/Config.js
rename to src/server/config/config.js
diff --git a/src/server/config/explodeBy.js b/src/server/config/explodeBy.js
index ca30b346ea82a..a7fd2df3e1e8c 100644
--- a/src/server/config/explodeBy.js
+++ b/src/server/config/explodeBy.js
@@ -1,10 +1,10 @@
-var _ = require('lodash');
+let _ = require('lodash');
 module.exports = function (dot, flatObject) {
-  var fullObject = {};
+  let fullObject = {};
   _.each(flatObject, function (value, key) {
-    var keys = key.split(dot);
+    let keys = key.split(dot);
     (function walk(memo, keys, value) {
-      var _key = keys.shift();
+      let _key = keys.shift();
       if (keys.length === 0) {
         memo[_key] = value;
       } else {
diff --git a/src/server/config/flattenWith.js b/src/server/config/flattenWith.js
index 8718c9c4313c0..e07b2bebe7101 100644
--- a/src/server/config/flattenWith.js
+++ b/src/server/config/flattenWith.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
+let _ = require('lodash');
 module.exports = function (dot, nestedObj, flattenArrays) {
-  var key; // original key
-  var stack = []; // track key stack
-  var flatObj = {};
+  let key; // original key
+  let stack = []; // track key stack
+  let flatObj = {};
   (function flattenObj(obj) {
     _.keys(obj).forEach(function (key) {
       stack.push(key);
diff --git a/src/server/config/override.js b/src/server/config/override.js
index a14ccb980706c..60077911f99c1 100644
--- a/src/server/config/override.js
+++ b/src/server/config/override.js
@@ -1,10 +1,10 @@
-var _ = require('lodash');
-var flattenWith = require('./flattenWith');
-var explodeBy = require('./explodeBy');
+let _ = require('lodash');
+let flattenWith = require('./flattenWith');
+let explodeBy = require('./explodeBy');
 
 module.exports = function (target, source) {
-  var _target = flattenWith('.', target);
-  var _source = flattenWith('.', source);
+  let _target = flattenWith('.', target);
+  let _source = flattenWith('.', source);
   return explodeBy('.', _.defaults(_source, _target));
 };
 
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index 763ee22db591d..daaa8a1da2853 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -6,6 +6,7 @@ let path = require('path');
 let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');
 const randomBytes = require('crypto').randomBytes;
+const getData = require('../path').getData;
 
 module.exports = () => Joi.object({
   pkg: Joi.object({
@@ -28,6 +29,7 @@ module.exports = () => Joi.object({
   server: Joi.object({
     host: Joi.string().hostname().default('0.0.0.0'),
     port: Joi.number().default(5601),
+    maxPayloadBytes: Joi.number().default(1048576),
     autoListen: Joi.boolean().default(true),
     defaultRoute: Joi.string(),
     basePath: Joi.string().default('').allow('').regex(/(^$|^\/.*[^\/]$)/, `start with a slash, don't end with one`),
@@ -43,8 +45,8 @@ module.exports = () => Joi.object({
       otherwise: Joi.boolean().default(false)
     }),
     xsrf: Joi.object({
-      token: Joi.string().default(randomBytes(32).toString('hex')),
       disableProtection: Joi.boolean().default(false),
+      token: Joi.string().optional().notes('Deprecated')
     }).default(),
   }).default(),
 
@@ -83,6 +85,10 @@ module.exports = () => Joi.object({
     initialize: Joi.boolean().default(true)
   }).default(),
 
+  path: Joi.object({
+    data: Joi.string().default(getData())
+  }).default(),
+
   optimize: Joi.object({
     enabled: Joi.boolean().default(true),
     bundleFilter: Joi.string().default('!tests'),
@@ -109,6 +115,10 @@ module.exports = () => Joi.object({
       )
       .default(Joi.ref('$dev')),
     profile: Joi.boolean().default(false)
+  }).default(),
+
+  status: Joi.object({
+    allowAnonymous: Joi.boolean().default(false)
   }).default()
 
 }).default();
diff --git a/src/server/config/setup.js b/src/server/config/setup.js
index e1728111a2de0..6df37c77c5167 100644
--- a/src/server/config/setup.js
+++ b/src/server/config/setup.js
@@ -1,5 +1,5 @@
 module.exports = function (kbnServer) {
-  let Config = require('./Config');
+  let Config = require('./config');
   let schema = require('./schema')();
 
   kbnServer.config = new Config(schema, kbnServer.settings || {});
diff --git a/src/server/http/__tests__/index.js b/src/server/http/__tests__/index.js
new file mode 100644
index 0000000000000..707f11638b37c
--- /dev/null
+++ b/src/server/http/__tests__/index.js
@@ -0,0 +1,88 @@
+import expect from 'expect.js';
+
+import * as kbnTestServer from '../../../../test/utils/kbn_server';
+import fromRoot from '../../../utils/fromRoot';
+
+describe('routes', function () {
+  this.slow(10000);
+  this.timeout(60000);
+
+  let kbnServer;
+  beforeEach(function () {
+    kbnServer = kbnTestServer.createServer({
+      plugins: {
+        scanDirs: [
+          fromRoot('src/plugins')
+        ]
+      }
+    });
+    return kbnServer.ready();
+  });
+  afterEach(function () {
+    return kbnServer.close();
+  });
+
+  describe('cookie validation', function () {
+    it('allows non-strict cookies', function (done) {
+      const options = {
+        method: 'GET',
+        url: '/',
+        headers: {
+          cookie: 'test:80=value;test_80=value'
+        }
+      };
+      kbnTestServer.makeRequest(kbnServer, options, (res) => {
+        expect(res.payload).not.to.contain('Invalid cookie header');
+        done();
+      });
+    });
+
+    it('returns an error if the cookie can\'t be parsed', function (done) {
+      const options = {
+        method: 'GET',
+        url: '/',
+        headers: {
+          cookie: 'a'
+        }
+      };
+      kbnTestServer.makeRequest(kbnServer, options, (res) =>  {
+        expect(res.payload).to.contain('Invalid cookie header');
+        done();
+      });
+    });
+  });
+
+  describe('url shortener', () => {
+    const shortenOptions = {
+      method: 'POST',
+      url: '/shorten',
+      payload: {
+        url: '/app/kibana#/visualize/create'
+      }
+    };
+
+    it('generates shortened urls', (done) => {
+      kbnTestServer.makeRequest(kbnServer, shortenOptions, (res) => {
+        expect(typeof res.payload).to.be('string');
+        expect(res.payload.length > 0).to.be(true);
+        done();
+      });
+    });
+
+    it('redirects shortened urls', (done) => {
+      kbnTestServer.makeRequest(kbnServer, shortenOptions, (res) => {
+        const gotoOptions = {
+          method: 'GET',
+          url: '/goto/' + res.payload
+        };
+        kbnTestServer.makeRequest(kbnServer, gotoOptions, (res) => {
+          expect(res.statusCode).to.be(302);
+          expect(res.headers.location).to.be(shortenOptions.payload.url);
+          done();
+        });
+      });
+    });
+
+  });
+
+});
diff --git a/src/server/http/__tests__/xsrf.js b/src/server/http/__tests__/xsrf.js
index a38ca767edce4..fc7da5f941592 100644
--- a/src/server/http/__tests__/xsrf.js
+++ b/src/server/http/__tests__/xsrf.js
@@ -2,27 +2,30 @@ import expect from 'expect.js';
 import { fromNode as fn } from 'bluebird';
 import { resolve } from 'path';
 
-import KbnServer from '../../KbnServer';
+const requireFromTest = require('requirefrom')('test');
+const kbnTestServer = requireFromTest('utils/kbn_server');
 
 const nonDestructiveMethods = ['GET'];
 const destructiveMethods = ['POST', 'PUT', 'DELETE'];
 const src = resolve.bind(null, __dirname, '../../../../src');
 
+const xsrfHeader = 'kbn-version';
+const version = require(src('../package.json')).version;
+
 describe('xsrf request filter', function () {
   function inject(kbnServer, opts) {
     return fn(cb => {
-      kbnServer.server.inject(opts, (resp) => {
+      kbnTestServer.makeRequest(kbnServer, opts, (resp) => {
         cb(null, resp);
       });
     });
   }
 
-  const makeServer = async function (token) {
-    const kbnServer = new KbnServer({
-      server: { autoListen: false, xsrf: { token } },
-      plugins: { scanDirs: [src('plugins')] },
-      logging: { quiet: true },
-      optimize: { enabled: false },
+  const makeServer = async function () {
+    const kbnServer = kbnTestServer.createServer({
+      server: {
+        xsrf: { disableProtection: false }
+      }
     });
 
     await kbnServer.ready();
@@ -38,108 +41,75 @@ describe('xsrf request filter', function () {
     return kbnServer;
   };
 
-  describe('issuing tokens', function () {
-    const token = 'secur3';
-    let kbnServer;
-    beforeEach(async () => kbnServer = await makeServer(token));
-    afterEach(async () => await kbnServer.close());
+  let kbnServer;
+  beforeEach(async () => kbnServer = await makeServer());
+  afterEach(async () => await kbnServer.close());
 
-    it('sends a token when rendering an app', async function () {
-      var resp = await inject(kbnServer, {
-        method: 'GET',
-        url: '/app/kibana',
-      });
+  for (const method of nonDestructiveMethods) {
+    context(`nonDestructiveMethod: ${method}`, function () { // eslint-disable-line no-loop-func
+      it('accepts requests without a token', async function () {
+        const resp = await inject(kbnServer, {
+          url: '/xsrf/test/route',
+          method: method
+        });
 
-      expect(resp.payload).to.contain(`"xsrfToken":"${token}"`);
-    });
-  });
+        expect(resp.statusCode).to.be(200);
+        expect(resp.payload).to.be('ok');
+      });
 
-  context('without configured token', function () {
-    let kbnServer;
-    beforeEach(async () => kbnServer = await makeServer());
-    afterEach(async () => await kbnServer.close());
+      it('failes on invalid tokens', async function () {
+        const resp = await inject(kbnServer, {
+          url: '/xsrf/test/route',
+          method: method,
+          headers: {
+            [xsrfHeader]: `invalid:${version}`,
+          },
+        });
 
-    it('responds with a random token', async function () {
-      var resp = await inject(kbnServer, {
-        method: 'GET',
-        url: '/app/kibana',
+        expect(resp.statusCode).to.be(400);
+        expect(resp.headers).to.have.property(xsrfHeader, version);
+        expect(resp.payload).to.match(/"Browser client is out of date/);
       });
-
-      expect(resp.payload).to.match(/"xsrfToken":".{64}"/);
     });
-  });
-
-  context('with configured token', function () {
-    const token = 'mytoken';
-    let kbnServer;
-    beforeEach(async () => kbnServer = await makeServer(token));
-    afterEach(async () => await kbnServer.close());
-
-    for (const method of nonDestructiveMethods) {
-      context(`nonDestructiveMethod: ${method}`, function () { // eslint-disable-line no-loop-func
-        it('accepts requests without a token', async function () {
-          const resp = await inject(kbnServer, {
-            url: '/xsrf/test/route',
-            method: method
-          });
-
-          expect(resp.statusCode).to.be(200);
-          expect(resp.payload).to.be('ok');
-        });
+  }
 
-        it('ignores invalid tokens', async function () {
-          const resp = await inject(kbnServer, {
-            url: '/xsrf/test/route',
-            method: method,
-            headers: {
-              'kbn-xsrf-token': `invalid:${token}`,
-            },
-          });
-
-          expect(resp.statusCode).to.be(200);
-          expect(resp.headers).to.not.have.property('kbn-xsrf-token');
+  for (const method of destructiveMethods) {
+    context(`destructiveMethod: ${method}`, function () { // eslint-disable-line no-loop-func
+      it('accepts requests with the correct token', async function () {
+        const resp = await inject(kbnServer, {
+          url: '/xsrf/test/route',
+          method: method,
+          headers: {
+            [xsrfHeader]: version,
+          },
         });
+
+        expect(resp.statusCode).to.be(200);
+        expect(resp.payload).to.be('ok');
       });
-    }
-
-    for (const method of destructiveMethods) {
-      context(`destructiveMethod: ${method}`, function () { // eslint-disable-line no-loop-func
-        it('accepts requests with the correct token', async function () {
-          const resp = await inject(kbnServer, {
-            url: '/xsrf/test/route',
-            method: method,
-            headers: {
-              'kbn-xsrf-token': token,
-            },
-          });
-
-          expect(resp.statusCode).to.be(200);
-          expect(resp.payload).to.be('ok');
+
+      it('rejects requests without a token', async function () {
+        const resp = await inject(kbnServer, {
+          url: '/xsrf/test/route',
+          method: method
         });
 
-        it('rejects requests without a token', async function () {
-          const resp = await inject(kbnServer, {
-            url: '/xsrf/test/route',
-            method: method
-          });
+        expect(resp.statusCode).to.be(400);
+        expect(resp.payload).to.match(/"Missing kbn-version header/);
+      });
 
-          expect(resp.statusCode).to.be(403);
-          expect(resp.payload).to.match(/"Missing XSRF token"/);
+      it('rejects requests with an invalid token', async function () {
+        const resp = await inject(kbnServer, {
+          url: '/xsrf/test/route',
+          method: method,
+          headers: {
+            [xsrfHeader]: `invalid:${version}`,
+          },
         });
 
-        it('rejects requests with an invalid token', async function () {
-          const resp = await inject(kbnServer, {
-            url: '/xsrf/test/route',
-            method: method,
-            headers: {
-              'kbn-xsrf-token': `invalid:${token}`,
-            },
-          });
-
-          expect(resp.statusCode).to.be(403);
-          expect(resp.payload).to.match(/"Invalid XSRF token"/);
-        });
+        expect(resp.statusCode).to.be(400);
+        expect(resp.payload).to.match(/"Browser client is out of date/);
       });
-    }
-  });
+    });
+  }
 });
diff --git a/src/server/http/index.js b/src/server/http/index.js
index 26ecf8ed41767..120f877c7b559 100644
--- a/src/server/http/index.js
+++ b/src/server/http/index.js
@@ -10,12 +10,20 @@ module.exports = function (kbnServer, server, config) {
 
   server = kbnServer.server = new Hapi.Server();
 
+  const shortUrlLookup = require('./short_url_lookup')(server);
+
   // Create a new connection
-  var connectionOptions = {
+  let connectionOptions = {
     host: config.get('server.host'),
     port: config.get('server.port'),
+    state: {
+      strictHeader: false
+    },
     routes: {
-      cors: config.get('server.cors')
+      cors: config.get('server.cors'),
+      payload: {
+        maxBytes: config.get('server.maxPayloadBytes')
+      }
     }
   };
 
@@ -23,7 +31,36 @@ module.exports = function (kbnServer, server, config) {
   if (config.get('server.ssl.key') && config.get('server.ssl.cert')) {
     connectionOptions.tls = {
       key: fs.readFileSync(config.get('server.ssl.key')),
-      cert: fs.readFileSync(config.get('server.ssl.cert'))
+      cert: fs.readFileSync(config.get('server.ssl.cert')),
+      // The default ciphers in node 0.12.x include insecure ciphers, so until
+      // we enforce a more recent version of node, we craft our own list
+      // @see https://github.com/nodejs/node/blob/master/src/node_constants.h#L8-L28
+      ciphers: [
+        'ECDHE-RSA-AES128-GCM-SHA256',
+        'ECDHE-ECDSA-AES128-GCM-SHA256',
+        'ECDHE-RSA-AES256-GCM-SHA384',
+        'ECDHE-ECDSA-AES256-GCM-SHA384',
+        'DHE-RSA-AES128-GCM-SHA256',
+        'ECDHE-RSA-AES128-SHA256',
+        'DHE-RSA-AES128-SHA256',
+        'ECDHE-RSA-AES256-SHA384',
+        'DHE-RSA-AES256-SHA384',
+        'ECDHE-RSA-AES256-SHA256',
+        'DHE-RSA-AES256-SHA256',
+        'HIGH',
+        '!aNULL',
+        '!eNULL',
+        '!EXPORT',
+        '!DES',
+        '!RC4',
+        '!MD5',
+        '!PSK',
+        '!SRP',
+        '!CAMELLIA'
+      ].join(':'),
+      // We use the server's cipher order rather than the client's to prevent
+      // the BEAST attack
+      honorCipherOrder: true
     };
   }
 
@@ -84,11 +121,11 @@ module.exports = function (kbnServer, server, config) {
     let response = req.response;
 
     if (response.isBoom) {
-      response.output.headers['x-app-name'] = kbnServer.name;
-      response.output.headers['x-app-version'] = kbnServer.version;
+      response.output.headers['kbn-name'] = kbnServer.name;
+      response.output.headers['kbn-version'] = kbnServer.version;
     } else {
-      response.header('x-app-name', kbnServer.name);
-      response.header('x-app-version', kbnServer.version);
+      response.header('kbn-name', kbnServer.name);
+      response.header('kbn-version', kbnServer.version);
     }
 
     return reply.continue();
@@ -122,5 +159,31 @@ module.exports = function (kbnServer, server, config) {
     }
   });
 
+  server.route({
+    method: 'GET',
+    path: '/goto/{urlId}',
+    handler: async function (request, reply) {
+      try {
+        const url = await shortUrlLookup.getUrl(request.params.urlId);
+        reply().redirect(config.get('server.basePath') + url);
+      } catch (err) {
+        reply(err);
+      }
+    }
+  });
+
+  server.route({
+    method: 'POST',
+    path: '/shorten',
+    handler: async function (request, reply) {
+      try {
+        const urlId = await shortUrlLookup.generateUrlId(request.payload.url);
+        reply(urlId);
+      } catch (err) {
+        reply(err);
+      }
+    }
+  });
+
   return kbnServer.mixin(require('./xsrf'));
 };
diff --git a/src/server/http/short_url_lookup.js b/src/server/http/short_url_lookup.js
new file mode 100644
index 0000000000000..033a040d4f8ac
--- /dev/null
+++ b/src/server/http/short_url_lookup.js
@@ -0,0 +1,103 @@
+const crypto = require('crypto');
+
+export default function (server) {
+  async function updateMetadata(urlId, urlDoc) {
+    const client = server.plugins.elasticsearch.client;
+    const kibanaIndex = server.config().get('kibana.index');
+
+    try {
+      await client.update({
+        index: kibanaIndex,
+        type: 'url',
+        id: urlId,
+        body: {
+          doc: {
+            'accessDate': new Date(),
+            'accessCount': urlDoc._source.accessCount + 1
+          }
+        }
+      });
+    } catch (err) {
+      server.log('Warning: Error updating url metadata', err);
+      //swallow errors. It isn't critical if there is no update.
+    }
+  }
+
+  async function getUrlDoc(urlId) {
+    const urlDoc = await new Promise((resolve, reject) => {
+      const client = server.plugins.elasticsearch.client;
+      const kibanaIndex = server.config().get('kibana.index');
+
+      client.get({
+        index: kibanaIndex,
+        type: 'url',
+        id: urlId
+      })
+      .then(response => {
+        resolve(response);
+      })
+      .catch(err => {
+        resolve();
+      });
+    });
+
+    return urlDoc;
+  }
+
+  async function createUrlDoc(url, urlId) {
+    const newUrlId = await new Promise((resolve, reject) => {
+      const client = server.plugins.elasticsearch.client;
+      const kibanaIndex = server.config().get('kibana.index');
+
+      client.index({
+        index: kibanaIndex,
+        type: 'url',
+        id: urlId,
+        body: {
+          url,
+          'accessCount': 0,
+          'createDate': new Date(),
+          'accessDate': new Date()
+        }
+      })
+      .then(response => {
+        resolve(response._id);
+      })
+      .catch(err => {
+        reject(err);
+      });
+    });
+
+    return newUrlId;
+  }
+
+  function createUrlId(url) {
+    const urlId = crypto.createHash('md5')
+    .update(url)
+    .digest('hex');
+
+    return urlId;
+  }
+
+  return {
+    async generateUrlId(url) {
+      const urlId = createUrlId(url);
+      const urlDoc = await getUrlDoc(urlId);
+      if (urlDoc) return urlId;
+
+      return createUrlDoc(url, urlId);
+    },
+    async getUrl(urlId) {
+      try {
+        const urlDoc = await getUrlDoc(urlId);
+        if (!urlDoc) throw new Error('Requested shortened url does note exist in kibana index');
+
+        updateMetadata(urlId, urlDoc);
+
+        return urlDoc._source.url;
+      } catch (err) {
+        return '/';
+      }
+    }
+  };
+};
diff --git a/src/server/http/xsrf.js b/src/server/http/xsrf.js
index 7b20501481921..a3cf8f583d8e5 100644
--- a/src/server/http/xsrf.js
+++ b/src/server/http/xsrf.js
@@ -1,19 +1,22 @@
-import { forbidden } from 'boom';
+import { badRequest } from 'boom';
 
 export default function (kbnServer, server, config) {
-  const token = config.get('server.xsrf.token');
+  const version = config.get('pkg.version');
   const disabled = config.get('server.xsrf.disableProtection');
-
-  server.decorate('reply', 'issueXsrfToken', function () {
-    return token;
-  });
+  const header = 'kbn-version';
 
   server.ext('onPostAuth', function (req, reply) {
-    if (disabled || req.method === 'get') return reply.continue();
+    const noHeaderGet = req.method === 'get' && !req.headers[header];
+    if (disabled || noHeaderGet) return reply.continue();
 
-    const attempt = req.headers['kbn-xsrf-token'];
-    if (!attempt) return reply(forbidden('Missing XSRF token'));
-    if (attempt !== token) return reply(forbidden('Invalid XSRF token'));
+    const submission = req.headers[header];
+    if (!submission) return reply(badRequest(`Missing ${header} header`));
+    if (submission !== version) {
+      return reply(badRequest('Browser client is out of date, please refresh the page', {
+        expected: version,
+        got: submission
+      }));
+    }
 
     return reply.continue();
   });
diff --git a/src/server/logging/LogFormat.js b/src/server/logging/LogFormat.js
index 18832199fa91a..15c9672a69173 100644
--- a/src/server/logging/LogFormat.js
+++ b/src/server/logging/LogFormat.js
@@ -41,13 +41,13 @@ module.exports = class TransformObjStream extends Stream.Transform {
   }
 
   _transform(event, enc, next) {
-    var data = this.filter(this.readEvent(event));
+    let data = this.filter(this.readEvent(event));
     this.push(this.format(data) + '\n');
     next();
   }
 
   readEvent(event) {
-    var data = {
+    let data = {
       type: event.event,
       '@timestamp': moment.utc(event.timestamp).format(),
       tags: [].concat(event.tags || []),
@@ -69,7 +69,7 @@ module.exports = class TransformObjStream extends Stream.Transform {
         referer: event.source.referer
       };
 
-      var contentLength = 0;
+      let contentLength = 0;
       if (typeof event.responsePayload === 'object') {
         contentLength = stringify(event.responsePayload).length;
       } else {
@@ -82,7 +82,7 @@ module.exports = class TransformObjStream extends Stream.Transform {
         contentLength: contentLength
       };
 
-      var query = querystring.stringify(event.query);
+      let query = querystring.stringify(event.query);
       if (query) data.req.url += '?' + query;
 
 
diff --git a/src/server/logging/__tests__/applyFiltersToKeys.js b/src/server/logging/__tests__/applyFiltersToKeys.js
index bb900f3fa2fbc..0c5d95862bdc7 100644
--- a/src/server/logging/__tests__/applyFiltersToKeys.js
+++ b/src/server/logging/__tests__/applyFiltersToKeys.js
@@ -1,9 +1,9 @@
-var applyFiltersToKeys = require('../applyFiltersToKeys');
-var expect = require('expect.js');
+let applyFiltersToKeys = require('../applyFiltersToKeys');
+let expect = require('expect.js');
 
 describe('applyFiltersToKeys(obj, actionsByKey)', function () {
   it('applies for each key+prop in actionsByKey', function () {
-    var data = applyFiltersToKeys({
+    let data = applyFiltersToKeys({
       a: {
         b: {
           c: 1
diff --git a/src/server/logging/applyFiltersToKeys.js b/src/server/logging/applyFiltersToKeys.js
index 860bdd38b76f0..bc85f2fd1f555 100644
--- a/src/server/logging/applyFiltersToKeys.js
+++ b/src/server/logging/applyFiltersToKeys.js
@@ -21,7 +21,7 @@ function apply(obj, key, action) {
           obj[k] = ('' + val).replace(/./g, 'X');
         }
         else if (/\/.+\//.test(action)) {
-          var matches = action.match(/\/(.+)\//);
+          let matches = action.match(/\/(.+)\//);
           if (matches) {
             let regex = new RegExp(matches[1]);
             obj[k] = ('' + val).replace(regex, replacer);
diff --git a/src/server/path/__tests__/index.js b/src/server/path/__tests__/index.js
new file mode 100644
index 0000000000000..c709df29dc0e3
--- /dev/null
+++ b/src/server/path/__tests__/index.js
@@ -0,0 +1,15 @@
+import expect from 'expect.js';
+import path from '../';
+import { accessSync, R_OK} from 'fs';
+
+describe('Default path finder', function () {
+  it('should find a kibana.yml', () => {
+    const configPath = path.getConfig();
+    expect(() => accessSync(configPath, R_OK)).to.not.throwError();
+  });
+
+  it('should find a data directory', () => {
+    const dataPath = path.getData();
+    expect(() => accessSync(dataPath, R_OK)).to.not.throwError();
+  });
+});
diff --git a/src/server/path/index.js b/src/server/path/index.js
new file mode 100644
index 0000000000000..15ca518055632
--- /dev/null
+++ b/src/server/path/index.js
@@ -0,0 +1,31 @@
+import { accessSync, R_OK} from 'fs';
+import { find } from 'lodash';
+import fromRoot from '../../utils/fromRoot';
+
+const CONFIG_PATHS = [
+  process.env.CONFIG_PATH,
+  fromRoot('config/kibana.yml')
+].filter(Boolean);
+
+const DATA_PATHS = [
+  process.env.DATA_PATH,
+  fromRoot('installedPlugins/.data'),
+  '/var/lib/kibana'
+].filter(Boolean);
+
+function findFile(paths) {
+  const availablePath = find(paths, configPath => {
+    try {
+      accessSync(configPath, R_OK);
+      return true;
+    } catch (e) {
+      //Check the next path
+    }
+  });
+  return availablePath || paths[0];
+}
+
+export default {
+  getConfig: () => findFile(CONFIG_PATHS),
+  getData: () => findFile(DATA_PATHS)
+};
diff --git a/src/server/pid/index.js b/src/server/pid/index.js
index b93a464d2c466..0af92fcd32eb4 100644
--- a/src/server/pid/index.js
+++ b/src/server/pid/index.js
@@ -1,20 +1,20 @@
-var _ = require('lodash');
-var Boom = require('boom');
-var Promise = require('bluebird');
-var writeFile = Promise.promisify(require('fs').writeFile);
-var unlink = require('fs').unlinkSync;
+let _ = require('lodash');
+let Boom = require('boom');
+let Promise = require('bluebird');
+let writeFile = Promise.promisify(require('fs').writeFile);
+let unlink = require('fs').unlinkSync;
 
 module.exports = Promise.method(function (kbnServer, server, config) {
-  var path = config.get('pid.file');
+  let path = config.get('pid.file');
   if (!path) return;
 
-  var pid = String(process.pid);
+  let pid = String(process.pid);
 
   return writeFile(path, pid, { flag: 'wx' })
   .catch(function (err) {
     if (err.code !== 'EEXIST') throw err;
 
-    var log = {
+    let log = {
       tmpl: 'pid file already exists at <%= path %>',
       path: path,
       pid: pid
@@ -36,7 +36,7 @@ module.exports = Promise.method(function (kbnServer, server, config) {
       pid: pid
     });
 
-    var clean = _.once(function (code) {
+    let clean = _.once(function (code) {
       unlink(path);
     });
 
diff --git a/src/server/plugins/Plugin.js b/src/server/plugins/Plugin.js
index 226f17239a703..0cc9292169c87 100644
--- a/src/server/plugins/Plugin.js
+++ b/src/server/plugins/Plugin.js
@@ -1,9 +1,11 @@
 let _ = require('lodash');
 let Joi = require('joi');
-let { attempt, fromNode } = require('bluebird');
+let Bluebird = require('bluebird');
 let { resolve } = require('path');
 let { inherits } = require('util');
 
+const extendInitFns = Symbol('extend plugin initialization');
+
 const defaultConfigSchema = Joi.object({
   enabled: Joi.boolean().default(true)
 }).default();
@@ -23,6 +25,7 @@ module.exports = class Plugin {
     this.externalInit = opts.init || _.noop;
     this.getConfigSchema = opts.config || _.noop;
     this.init = _.once(this.init);
+    this[extendInitFns] = [];
   }
 
   static scoped(kbnServer, path, pkg) {
@@ -51,17 +54,17 @@ module.exports = class Plugin {
     let { config } = kbnServer;
 
     // setup the hapi register function and get on with it
-    let register = (server, options, next) => {
+    const asyncRegister = async (server, options, next) => {
       this.server = server;
 
       // bind the server and options to all
       // apps created by this plugin
-      for (let app of this.apps) {
-        app.getInjectedVars = _.partial(app.getInjectedVars, server, options);
-      }
+      await Promise.all(this[extendInitFns].map(async fn => {
+        await fn.call(this, server, options);
+      }));
 
       server.log(['plugins', 'debug'], {
-        tmpl: 'Initializing plugin <%= plugin.id %>',
+        tmpl: 'Initializing plugin <%= plugin.toString() %>',
         plugin: this
       });
 
@@ -69,15 +72,19 @@ module.exports = class Plugin {
         server.exposeStaticDir(`/plugins/${id}/{path*}`, this.publicDir);
       }
 
-      this.status = kbnServer.status.create(`plugin:${this.id}`);
+      this.status = kbnServer.status.create(this);
       server.expose('status', this.status);
 
-      attempt(this.externalInit, [server, options], this).nodeify(next);
+      return await Bluebird.attempt(this.externalInit, [server, options], this);
+    };
+
+    const register = (server, options, next) => {
+      Bluebird.resolve(asyncRegister(server, options)).nodeify(next);
     };
 
     register.attributes = { name: id, version: version };
 
-    await fromNode(cb => {
+    await Bluebird.fromNode(cb => {
       kbnServer.server.register({
         register: register,
         options: config.has(id) ? config.get(id) : null
@@ -91,6 +98,10 @@ module.exports = class Plugin {
     }
   }
 
+  extendInit(fn) {
+    this[extendInitFns].push(fn);
+  }
+
   toJSON() {
     return this.pkg;
   }
diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js
index 37d07e0537c09..ebfeead4e3df5 100644
--- a/src/server/plugins/scan.js
+++ b/src/server/plugins/scan.js
@@ -5,8 +5,8 @@ module.exports = async (kbnServer, server, config) => {
   let { resolve } = require('path');
   let { each } = require('bluebird');
 
-  var PluginCollection = require('./PluginCollection');
-  var plugins = kbnServer.plugins = new PluginCollection(kbnServer);
+  let PluginCollection = require('./PluginCollection');
+  let plugins = kbnServer.plugins = new PluginCollection(kbnServer);
 
   let scanDirs = [].concat(config.get('plugins.scanDirs') || []);
   let pluginPaths = [].concat(config.get('plugins.paths') || []);
diff --git a/src/server/status/Samples.js b/src/server/status/Samples.js
index 879c93d1f7c18..9dff24c02c50a 100644
--- a/src/server/status/Samples.js
+++ b/src/server/status/Samples.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 function Samples(max) {
   this.vals = {};
@@ -7,8 +7,8 @@ function Samples(max) {
 }
 
 Samples.prototype.add = function (sample) {
-  var vals = this.vals;
-  var length = this.length = Math.min(this.length + 1, this.max);
+  let vals = this.vals;
+  let length = this.length = Math.min(this.length + 1, this.max);
 
   _.forOwn(sample, function (val, name) {
     if (val == null) val = null;
diff --git a/src/server/status/ServerStatus.js b/src/server/status/ServerStatus.js
index 60f3f3ee6415c..ecf54e2e976c3 100644
--- a/src/server/status/ServerStatus.js
+++ b/src/server/status/ServerStatus.js
@@ -9,8 +9,8 @@ module.exports = class ServerStatus {
     this._created = {};
   }
 
-  create(name) {
-    return (this._created[name] = new Status(name, this.server));
+  create(plugin) {
+    return (this._created[plugin.id] = new Status(plugin, this.server));
   }
 
   each(fn) {
@@ -31,15 +31,15 @@ module.exports = class ServerStatus {
   }
 
   overall() {
-    var state = _(this._created)
+    let state = _(this._created)
     .map(function (status) {
       return states.get(status.state);
     })
     .sortBy('severity')
     .pop();
 
-    var statuses = _.where(this._created, { state: state.id });
-    var since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
+    let statuses = _.where(this._created, { state: state.id });
+    let since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
 
     return {
       state: state.id,
@@ -59,7 +59,7 @@ module.exports = class ServerStatus {
   }
 
   toString() {
-    var overall = this.overall();
+    let overall = this.overall();
     return `${overall.title} – ${overall.nickname}`;
   }
 
diff --git a/src/server/status/Status.js b/src/server/status/Status.js
index 430d44d0a114f..f5e9fb9efe991 100644
--- a/src/server/status/Status.js
+++ b/src/server/status/Status.js
@@ -3,22 +3,21 @@ let EventEmitter = require('events').EventEmitter;
 let states = require('./states');
 
 class Status extends EventEmitter {
-  constructor(name, server) {
+  constructor(plugin, server) {
     super();
 
-    this.name = name;
+    this.plugin = plugin;
     this.since = new Date();
     this.state = 'uninitialized';
     this.message = 'uninitialized';
 
     this.on('change', function (previous, previousMsg) {
       this.since = new Date();
-      var tags = ['status', name];
+      let tags = ['status', `plugin:${this.plugin.toString()}`];
       tags.push(this.state === 'red' ? 'error' : 'info');
 
       server.log(tags, {
         tmpl: 'Status changed from <%= prevState %> to <%= state %><%= message ? " - " + message : "" %>',
-        name: name,
         state: this.state,
         message: this.message,
         prevState: previous,
@@ -29,7 +28,8 @@ class Status extends EventEmitter {
 
   toJSON() {
     return {
-      name: this.name,
+      name: this.plugin.id,
+      version: this.plugin.version,
       state: this.state,
       icon: states.get(this.state).icon,
       message: this.message,
diff --git a/src/server/status/__tests__/ServerStatus.js b/src/server/status/__tests__/ServerStatus.js
index 08187c0b8bcd6..e31296228a20c 100644
--- a/src/server/status/__tests__/ServerStatus.js
+++ b/src/server/status/__tests__/ServerStatus.js
@@ -1,37 +1,39 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var sinon = require('sinon');
+let _ = require('lodash');
+let expect = require('expect.js');
+let sinon = require('sinon');
 
-var states = require('../states');
-var Status = require('../Status');
-var ServerStatus = require('../ServerStatus');
+let states = require('../states');
+let Status = require('../Status');
+let ServerStatus = require('../ServerStatus');
 
 describe('ServerStatus class', function () {
-  var server;
-  var serverStatus;
+  const plugin = {id: 'name', version: '1.2.3'};
+
+  let server;
+  let serverStatus;
 
   beforeEach(function () {
     server = { expose: sinon.stub(), log: sinon.stub() };
     serverStatus = new ServerStatus(server);
   });
 
-  describe('#create(name)', function () {
-    it('should create a new status by name', function () {
-      var status = serverStatus.create('name');
+  describe('#create(plugin)', function () {
+    it('should create a new status by plugin', function () {
+      let status = serverStatus.create(plugin);
       expect(status).to.be.a(Status);
     });
   });
 
   describe('#get(name)', function () {
-    it('exposes plugins by name', function () {
-      var status = serverStatus.create('name');
+    it('exposes plugins by its id/name', function () {
+      let status = serverStatus.create(plugin);
       expect(serverStatus.get('name')).to.be(status);
     });
   });
 
   describe('#getState(name)', function () {
     it('should expose the state of the plugin by name', function () {
-      var status = serverStatus.create('name');
+      let status = serverStatus.create(plugin);
       status.green();
       expect(serverStatus.getState('name')).to.be('green');
     });
@@ -39,11 +41,11 @@ describe('ServerStatus class', function () {
 
   describe('#overall()', function () {
     it('considers each status to produce a summary', function () {
-      var status = serverStatus.create('name');
+      let status = serverStatus.create(plugin);
 
       expect(serverStatus.overall().state).to.be('uninitialized');
 
-      var match = function (overall, state) {
+      let match = function (overall, state) {
         expect(overall).to.have.property('state', state.id);
         expect(overall).to.have.property('title', state.title);
         expect(overall).to.have.property('icon', state.icon);
@@ -65,20 +67,24 @@ describe('ServerStatus class', function () {
 
   describe('#toJSON()', function () {
     it('serializes to overall status and individuals', function () {
-      var one = serverStatus.create('one');
-      var two = serverStatus.create('two');
-      var three = serverStatus.create('three');
+      const pluginOne = {id: 'one', version: '1.0.0'};
+      const pluginTwo = {id: 'two', version: '2.0.0'};
+      const pluginThree = {id: 'three', version: '3.0.0'};
+
+      let one = serverStatus.create(pluginOne);
+      let two = serverStatus.create(pluginTwo);
+      let three = serverStatus.create(pluginThree);
 
       one.green();
       two.yellow();
       three.red();
 
-      var obj = JSON.parse(JSON.stringify(serverStatus));
+      let obj = JSON.parse(JSON.stringify(serverStatus));
       expect(obj).to.have.property('overall');
       expect(obj.overall.state).to.eql(serverStatus.overall().state);
       expect(obj.statuses).to.have.length(3);
 
-      var outs = _.indexBy(obj.statuses, 'name');
+      let outs = _.indexBy(obj.statuses, 'name');
       expect(outs.one).to.have.property('state', 'green');
       expect(outs.two).to.have.property('state', 'yellow');
       expect(outs.three).to.have.property('state', 'red');
diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/Status.js
index 8563500a34af0..2ad878c78fb9d 100644
--- a/src/server/status/__tests__/Status.js
+++ b/src/server/status/__tests__/Status.js
@@ -1,12 +1,14 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var Status = require('../Status');
-var ServerStatus = require('../ServerStatus');
+let expect = require('expect.js');
+let sinon = require('sinon');
+let Status = require('../Status');
+let ServerStatus = require('../ServerStatus');
 
 describe('Status class', function () {
 
-  var server;
-  var serverStatus;
+  const plugin = {id: 'test', version: '1.2.3'};
+
+  let server;
+  let serverStatus;
 
   beforeEach(function () {
     server = { expose: sinon.stub(), log: sinon.stub() };
@@ -14,11 +16,11 @@ describe('Status class', function () {
   });
 
   it('should have an "uninitialized" state initially', function () {
-    expect(serverStatus.create('test')).to.have.property('state', 'uninitialized');
+    expect(serverStatus.create(plugin)).to.have.property('state', 'uninitialized');
   });
 
   it('emits change when the status is set', function (done) {
-    var status = serverStatus.create('test');
+    let status = serverStatus.create(plugin);
 
     status.once('change', function (prev, prevMsg) {
       expect(status.state).to.be('green');
@@ -41,8 +43,8 @@ describe('Status class', function () {
   });
 
   it('should only trigger the change listener when something changes', function () {
-    var status = serverStatus.create('test');
-    var stub = sinon.stub();
+    let status = serverStatus.create(plugin);
+    let stub = sinon.stub();
     status.on('change', stub);
     status.green('Ready');
     status.green('Ready');
@@ -51,26 +53,28 @@ describe('Status class', function () {
   });
 
   it('should create a JSON representation of the status', function () {
-    var status = serverStatus.create('test');
+    let status = serverStatus.create(plugin);
     status.green('Ready');
 
-    var json = status.toJSON();
+    let json = status.toJSON();
+    expect(json.name).to.eql(plugin.id);
+    expect(json.version).to.eql(plugin.version);
     expect(json.state).to.eql('green');
     expect(json.message).to.eql('Ready');
   });
 
   function testState(color) {
     it(`should change the state to ${color} when #${color}() is called`, function () {
-      var status = serverStatus.create('test');
-      var message = 'testing ' + color;
+      let status = serverStatus.create(plugin);
+      let message = 'testing ' + color;
       status[color](message);
       expect(status).to.have.property('state', color);
       expect(status).to.have.property('message', message);
     });
 
     it(`should trigger the "change" listner when #${color}() is called`, function (done) {
-      var status = serverStatus.create('test');
-      var message = 'testing ' + color;
+      let status = serverStatus.create(plugin);
+      let message = 'testing ' + color;
       status.on('change', function (prev, prevMsg) {
         expect(status.state).to.be(color);
         expect(status.message).to.be(message);
@@ -83,8 +87,8 @@ describe('Status class', function () {
     });
 
     it(`should trigger the "${color}" listner when #${color}() is called`, function (done) {
-      var status = serverStatus.create('test');
-      var message = 'testing ' + color;
+      let status = serverStatus.create(plugin);
+      let message = 'testing ' + color;
       status.on(color, function (prev, prevMsg) {
         expect(status.state).to.be(color);
         expect(status.message).to.be(message);
diff --git a/src/server/status/__tests__/wrap_auth_config.js b/src/server/status/__tests__/wrap_auth_config.js
new file mode 100644
index 0000000000000..e06e38ae9481c
--- /dev/null
+++ b/src/server/status/__tests__/wrap_auth_config.js
@@ -0,0 +1,42 @@
+import expect from 'expect.js';
+import wrapAuthConfig from '../wrap_auth_config';
+
+describe('Status wrapAuthConfig', () => {
+  let options;
+
+  beforeEach(() => {
+    options = {
+      method: 'GET',
+      path: '/status',
+      handler: function (request, reply) {
+        return reply();
+      }
+    };
+  });
+
+  it('should return a function', () => {
+    expect(wrapAuthConfig()).to.be.a('function');
+    expect(wrapAuthConfig(true)).to.be.a('function');
+    expect(wrapAuthConfig(false)).to.be.a('function');
+  });
+
+  it('should not add auth config by default', () => {
+    const wrapAuth = wrapAuthConfig();
+    const wrapped = wrapAuth(options);
+    expect(wrapped).to.not.have.property('config');
+  });
+
+  it('should not add auth config if allowAnonymous is false', () => {
+    const wrapAuth = wrapAuthConfig(false);
+    const wrapped = wrapAuth(options);
+    expect(wrapped).to.not.have.property('config');
+  });
+
+  it('should add auth config if allowAnonymous is true', () => {
+    const wrapAuth = wrapAuthConfig(true);
+    const wrapped = wrapAuth(options);
+    expect(wrapped).to.have.property('config');
+    expect(wrapped.config).to.have.property('auth');
+    expect(wrapped.config.auth).to.be(false);
+  });
+});
diff --git a/src/server/status/index.js b/src/server/status/index.js
index 16dc436b01369..f9584d541ea03 100644
--- a/src/server/status/index.js
+++ b/src/server/status/index.js
@@ -1,6 +1,8 @@
+import wrapAuthConfig from './wrap_auth_config';
+
 module.exports = function (kbnServer, server, config) {
-  var _ = require('lodash');
-  var ServerStatus = require('./ServerStatus');
+  let _ = require('lodash');
+  let ServerStatus = require('./ServerStatus');
   var { join } = require('path');
 
   kbnServer.status = new ServerStatus(kbnServer.server);
@@ -9,7 +11,9 @@ module.exports = function (kbnServer, server, config) {
     kbnServer.mixin(require('./metrics'));
   }
 
-  server.route({
+  const wrapAuth = wrapAuthConfig(config.get('status.allowAnonymous'));
+
+  server.route(wrapAuth({
     method: 'GET',
     path: '/api/status',
     handler: function (request, reply) {
@@ -18,20 +22,20 @@ module.exports = function (kbnServer, server, config) {
         metrics: kbnServer.metrics
       });
     }
-  });
+  }));
 
   server.decorate('reply', 'renderStatusPage', function () {
-    var app = kbnServer.uiExports.getHiddenApp('statusPage');
-    var resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
+    let app = kbnServer.uiExports.getHiddenApp('statusPage');
+    let resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
     resp.code(kbnServer.status.isGreen() ? 200 : 503);
     return resp;
   });
 
-  server.route({
+  server.route(wrapAuth({
     method: 'GET',
     path: '/status',
     handler: function (request, reply) {
       return reply.renderStatusPage();
     }
-  });
+  }));
 };
diff --git a/src/server/status/metrics.js b/src/server/status/metrics.js
index 837c0bf01939b..df141096e0491 100644
--- a/src/server/status/metrics.js
+++ b/src/server/status/metrics.js
@@ -1,6 +1,6 @@
 module.exports = function (kbnServer, server, config) {
-  var _ = require('lodash');
-  var Samples = require('./Samples');
+  let _ = require('lodash');
+  let Samples = require('./Samples');
   let lastReport = Date.now();
 
   kbnServer.metrics = new Samples(12);
@@ -10,7 +10,7 @@ module.exports = function (kbnServer, server, config) {
     let secSinceLast = (now - lastReport) / 1000;
     lastReport = now;
 
-    var port = config.get('server.port');
+    let port = config.get('server.port');
     let requests = _.get(event, ['requests', port, 'total'], 0);
     let requestsPerSecond = requests / secSinceLast;
 
diff --git a/src/server/status/wrap_auth_config.js b/src/server/status/wrap_auth_config.js
new file mode 100644
index 0000000000000..f9530987f24d4
--- /dev/null
+++ b/src/server/status/wrap_auth_config.js
@@ -0,0 +1,6 @@
+import {assign, identity} from 'lodash';
+
+export default (allowAnonymous) => {
+  if (allowAnonymous) return options => assign(options, {config: {auth: false}});
+  return identity;
+};
diff --git a/src/testUtils/noDigestPromises.js b/src/testUtils/noDigestPromises.js
index 4b57a52f0acee..979da33236356 100644
--- a/src/testUtils/noDigestPromises.js
+++ b/src/testUtils/noDigestPromises.js
@@ -1,4 +1,4 @@
-var Bluebird = require('bluebird');
+let Bluebird = require('bluebird');
 require('ui/promises');
 
 Bluebird.longStackTraces();
@@ -7,7 +7,7 @@ Bluebird.longStackTraces();
  * replace the Promise service with Bluebird so that tests
  * can use promises without having to call $rootScope.apply()
  *
- * var noDigestPromises = require('testUtils/noDigestPromises');
+ * let noDigestPromises = require('testUtils/noDigestPromises');
  *
  * describe('some module that does complex shit with promises', function () {
  *   beforeEach(noDigestPromises.activate);
@@ -15,7 +15,7 @@ Bluebird.longStackTraces();
  * });
  */
 
-var active = false;
+let active = false;
 
 require('ui/modules')
 .get('kibana')
diff --git a/src/testUtils/simulateKeys.js b/src/testUtils/simulateKeys.js
index ae3c6c0738b1b..34fb65a9bd6b5 100644
--- a/src/testUtils/simulateKeys.js
+++ b/src/testUtils/simulateKeys.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var Promise = require('bluebird');
-  var keyMap = require('ui/utils/key_map');
-  var reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
-  var KeyboardEvent = window.KeyboardEvent;
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let Promise = require('bluebird');
+  let keyMap = require('ui/utils/key_map');
+  let reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
+  let KeyboardEvent = window.KeyboardEvent;
 
   /**
    * Simulate keyboard events in an element. This allows testing the way that
@@ -36,7 +36,7 @@ define(function (require) {
    * @async
    */
   return function ($el, sequence) {
-    var modifierState = {
+    let modifierState = {
       ctrlKey: false,
       shiftKey: false,
       altKey: false,
@@ -46,7 +46,7 @@ define(function (require) {
     return doList(_.clone(sequence));
 
     function setModifier(key, state) {
-      var name = key + 'Key';
+      let name = key + 'Key';
       if (modifierState.hasOwnProperty(name)) {
         modifierState[name] = !!state;
       }
@@ -56,7 +56,7 @@ define(function (require) {
       return Promise.try(function () {
         if (!list || !list.length) return;
 
-        var event = list[0];
+        let event = list[0];
         if (_.isString(event)) {
           event = { type: 'press', key: event };
         }
@@ -92,14 +92,14 @@ define(function (require) {
     }
 
     function fire(type, key, repeat) {
-      var keyCode = reverseKeyMap[key];
+      let keyCode = reverseKeyMap[key];
       if (!keyCode) throw new TypeError('invalid key "' + key + '"');
 
       if (type === 'keydown') setModifier(key, true);
       if (type === 'keyup') setModifier(key, false);
 
-      var $target = _.isFunction($el) ? $el() : $el;
-      var $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
+      let $target = _.isFunction($el) ? $el() : $el;
+      let $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
       $target.trigger($event);
     }
   };
diff --git a/src/testUtils/stubIndexPattern.js b/src/testUtils/stub_index_pattern.js
similarity index 62%
rename from src/testUtils/stubIndexPattern.js
rename to src/testUtils/stub_index_pattern.js
index a4338c9b553ed..8850a4cbe2da4 100644
--- a/src/testUtils/stubIndexPattern.js
+++ b/src/testUtils/stub_index_pattern.js
@@ -1,16 +1,16 @@
 define(function (require) {
   return function (Private) {
-    var _ = require('lodash');
-    var sinon = require('sinon');
-    var Promise = require('bluebird');
-    var IndexedArray = require('ui/IndexedArray');
-    var IndexPattern = require('ui/index_patterns/_index_pattern');
-    var fieldFormats = Private(require('ui/registry/field_formats'));
-    var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
-    var formatHit = require('ui/index_patterns/_format_hit');
-    var getComputedFields = require('ui/index_patterns/_get_computed_fields');
+    let _ = require('lodash');
+    let sinon = require('sinon');
+    let Promise = require('bluebird');
+    let IndexedArray = require('ui/IndexedArray');
+    let IndexPattern = require('ui/index_patterns/_index_pattern');
+    let fieldFormats = Private(require('ui/registry/field_formats'));
+    let flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
+    let formatHit = require('ui/index_patterns/_format_hit');
+    let getComputedFields = require('ui/index_patterns/_get_computed_fields');
 
-    var Field = Private(require('ui/index_patterns/_field'));
+    let Field = Private(require('ui/index_patterns/_field'));
 
     function StubIndexPattern(pattern, timeField, fields) {
       this.id = pattern;
@@ -23,6 +23,13 @@ define(function (require) {
       this.routes = IndexPattern.prototype.routes;
 
       this.toIndexList = _.constant(Promise.resolve([pattern]));
+      this.toDetailedIndexList = _.constant(Promise.resolve([
+        {
+          index: pattern,
+          min: 0,
+          max: 1
+        }
+      ]));
       this.getComputedFields = _.bind(getComputedFields, this);
       this.flattenHit = flattenHit(this);
       this.formatHit = formatHit(this, fieldFormats.getDefaultInstance('string'));
diff --git a/src/ui/UiApp.js b/src/ui/UiApp.js
index 40efd5b0be3e2..8967b528228d6 100644
--- a/src/ui/UiApp.js
+++ b/src/ui/UiApp.js
@@ -1,6 +1,6 @@
-var _ = require('lodash');
+const _ = require('lodash');
 var { join } = require('path');
-var autoload = require('./autoload');
+const autoload = require('./autoload');
 
 class UiApp {
   constructor(uiExports, spec) {
@@ -18,7 +18,7 @@ class UiApp {
     this.icon = this.spec.icon;
     this.hidden = this.spec.hidden;
     this.autoloadOverrides = this.spec.autoload;
-    this.templateName = this.spec.templateName || 'uiApp';
+    this.templateName = this.spec.templateName || 'ui_app';
     this.url = `${spec.urlBasePath || ''}${this.spec.url || `/app/${this.id}`}`;
 
     // once this resolves, no reason to run it again
@@ -32,6 +32,7 @@ class UiApp {
     return _.chain([
       this.autoloadOverrides || autoload.require,
       this.uiExports.find(_.get(this, 'spec.uses', [])),
+      this.uiExports.find(['chromeNavControls']),
     ])
     .flatten()
     .uniq()
diff --git a/src/ui/UiAppCollection.js b/src/ui/UiAppCollection.js
index e4eda77fb0ede..79456e57773d2 100644
--- a/src/ui/UiAppCollection.js
+++ b/src/ui/UiAppCollection.js
@@ -1,8 +1,8 @@
-let _ = require('lodash');
-let UiApp = require('./UiApp');
-let Collection = require('requirefrom')('src')('utils/Collection');
+const _ = require('lodash');
+const UiApp = require('./UiApp');
+const Collection = require('requirefrom')('src')('utils/Collection');
 
-let byIdCache = Symbol('byId');
+const byIdCache = Symbol('byId');
 
 module.exports = class UiAppCollection extends Collection {
 
@@ -25,7 +25,7 @@ module.exports = class UiAppCollection extends Collection {
       return this.hidden.new(spec);
     }
 
-    let app = new UiApp(this.uiExports, spec);
+    const app = new UiApp(this.uiExports, spec);
 
     if (_.includes(this.claimedIds, app.id)) {
       throw new Error('Unable to create two apps with the id ' + app.id + '.');
diff --git a/src/ui/UiBundle.js b/src/ui/UiBundle.js
index b610c24b7b4d0..0a37e38e03cf1 100644
--- a/src/ui/UiBundle.js
+++ b/src/ui/UiBundle.js
@@ -1,10 +1,10 @@
 
 let { join } = require('path');
 let { promisify } = require('bluebird');
-let read = promisify(require('fs').readFile);
-let write = promisify(require('fs').writeFile);
-let unlink = promisify(require('fs').unlink);
-let stat = promisify(require('fs').stat);
+const read = promisify(require('fs').readFile);
+const write = promisify(require('fs').writeFile);
+const unlink = promisify(require('fs').unlink);
+const stat = promisify(require('fs').stat);
 
 module.exports = class UiBundle {
   constructor(opts) {
@@ -15,7 +15,7 @@ module.exports = class UiBundle {
     this.template = opts.template;
     this.env = opts.env;
 
-    let pathBase = join(this.env.workingDir, this.id);
+    const pathBase = join(this.env.workingDir, this.id);
     this.entryPath = `${pathBase}.entry.js`;
     this.outputPath = `${pathBase}.bundle.js`;
 
@@ -30,7 +30,7 @@ module.exports = class UiBundle {
 
   async readEntryFile() {
     try {
-      let content = await read(this.entryPath);
+      const content = await read(this.entryPath);
       return content.toString('utf8');
     }
     catch (e) {
diff --git a/src/ui/UiBundleCollection.js b/src/ui/UiBundleCollection.js
index 328c03dad1568..e2083f0f7444b 100644
--- a/src/ui/UiBundleCollection.js
+++ b/src/ui/UiBundleCollection.js
@@ -2,14 +2,14 @@ let { pull, transform, pluck } = require('lodash');
 let { join } = require('path');
 let { resolve, promisify } = require('bluebird');
 let { makeRe } = require('minimatch');
-let rimraf = promisify(require('rimraf'));
-let mkdirp = promisify(require('mkdirp'));
-let unlink = promisify(require('fs').unlink);
-let readdir = promisify(require('fs').readdir);
-let readSync = require('fs').readFileSync;
+const rimraf = promisify(require('rimraf'));
+const mkdirp = promisify(require('mkdirp'));
+const unlink = promisify(require('fs').unlink);
+const readdir = promisify(require('fs').readdir);
+const readSync = require('fs').readFileSync;
 
-let UiBundle = require('./UiBundle');
-let appEntryTemplate = require('./appEntryTemplate');
+const UiBundle = require('./UiBundle');
+const appEntryTemplate = require('./appEntryTemplate');
 
 class UiBundleCollection {
   constructor(bundlerEnv, filter) {
@@ -48,9 +48,9 @@ class UiBundleCollection {
       case 1:
         return `bundle for ${this.each[0].id}`;
       default:
-        var ids = this.getIds();
-        var last = ids.pop();
-        var commas = ids.join(', ');
+        const ids = this.getIds();
+        const last = ids.pop();
+        const commas = ids.join(', ');
         return `bundles for ${commas} and ${last}`;
     }
   }
@@ -63,8 +63,8 @@ class UiBundleCollection {
     await this.ensureDir();
 
     for (let bundle of this.each) {
-      let existing = await bundle.readEntryFile();
-      let expected = bundle.renderContent();
+      const existing = await bundle.readEntryFile();
+      const expected = bundle.renderContent();
 
       if (existing !== expected) {
         await bundle.writeEntryFile();
@@ -74,10 +74,10 @@ class UiBundleCollection {
   }
 
   async getInvalidBundles() {
-    let invalids = new UiBundleCollection(this.env);
+    const invalids = new UiBundleCollection(this.env);
 
     for (let bundle of this.each) {
-      let exists = await bundle.checkForExistingOutput();
+      const exists = await bundle.checkForExistingOutput();
       if (!exists) {
         invalids.add(bundle);
       }
diff --git a/src/ui/UiBundlerEnv.js b/src/ui/UiBundlerEnv.js
index 74a2195d152c5..d01e8cdcd4eb4 100644
--- a/src/ui/UiBundlerEnv.js
+++ b/src/ui/UiBundlerEnv.js
@@ -1,12 +1,12 @@
 let { includes, flow, escapeRegExp } = require('lodash');
 let { isString, isArray, isPlainObject, get } = require('lodash');
 let { keys } = require('lodash');
-let fromRoot = require('../utils/fromRoot');
+const fromRoot = require('../utils/fromRoot');
 
-let asRegExp = flow(
+const asRegExp = flow(
   escapeRegExp,
   function (path) {
-    let last = path.slice(-1);
+    const last = path.slice(-1);
     if (last === '/' || last === '\\') {
       // match a directory explicitly
       return path + '.*';
@@ -18,7 +18,7 @@ let asRegExp = flow(
   RegExp
 );
 
-let arr = v => [].concat(v || []);
+const arr = v => [].concat(v || []);
 
 module.exports = class UiBundlerEnv {
   constructor(workingDir) {
@@ -58,7 +58,7 @@ module.exports = class UiBundlerEnv {
   }
 
   consumePlugin(plugin) {
-    let tag = `${plugin.id}@${plugin.version}`;
+    const tag = `${plugin.id}@${plugin.version}`;
     if (includes(this.pluginInfo, tag)) return;
 
     if (plugin.publicDir) {
@@ -141,7 +141,7 @@ module.exports = class UiBundlerEnv {
 
     this.aliases[id] = path;
 
-    let loader = [];
+    const loader = [];
     if (imports) {
       loader.push(`imports?${imports}`);
     }
@@ -153,10 +153,10 @@ module.exports = class UiBundlerEnv {
   }
 
   claim(id, pluginId) {
-    let owner = pluginId ? `Plugin ${pluginId}` : 'Kibana Server';
+    const owner = pluginId ? `Plugin ${pluginId}` : 'Kibana Server';
 
     // TODO(spalger): we could do a lot more to detect colliding module defs
-    var existingOwner = this.aliasOwners[id] || this.aliasOwners[`${id}$`];
+    const existingOwner = this.aliasOwners[id] || this.aliasOwners[`${id}$`];
 
     if (existingOwner) {
       throw new TypeError(`${owner} attempted to override export "${id}" from ${existingOwner}`);
diff --git a/src/ui/UiExports.js b/src/ui/UiExports.js
index 06150249076ef..90b0bf923d0d3 100644
--- a/src/ui/UiExports.js
+++ b/src/ui/UiExports.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
-var minimatch = require('minimatch');
+const _ = require('lodash');
+const minimatch = require('minimatch');
 
-var UiAppCollection = require('./UiAppCollection');
+const UiAppCollection = require('./UiAppCollection');
 
 class UiExports {
   constructor({ urlBasePath }) {
@@ -11,15 +11,16 @@ class UiExports {
     this.exportConsumer = _.memoize(this.exportConsumer);
     this.consumers = [];
     this.bundleProviders = [];
+    this.defaultInjectedVars = [];
   }
 
   consumePlugin(plugin) {
     plugin.apps = new UiAppCollection(this);
 
-    var types = _.keys(plugin.uiExportsSpecs);
+    const types = _.keys(plugin.uiExportsSpecs);
     if (!types) return false;
 
-    var unkown = _.reject(types, this.exportConsumer, this);
+    const unkown = _.reject(types, this.exportConsumer, this);
     if (unkown.length) {
       throw new Error('unknown export types ' + unkown.join(', ') + ' in plugin ' + plugin.id);
     }
@@ -40,7 +41,7 @@ class UiExports {
   exportConsumer(type) {
     for (let consumer of this.consumers) {
       if (!consumer.exportConsumer) continue;
-      let fn = consumer.exportConsumer(type);
+      const fn = consumer.exportConsumer(type);
       if (fn) return fn;
     }
 
@@ -49,10 +50,16 @@ class UiExports {
       case 'apps':
         return (plugin, specs) => {
           for (let spec of [].concat(specs || [])) {
-            let app = this.apps.new(_.defaults({}, spec, {
+            const app = this.apps.new(_.defaults({}, spec, {
               id: plugin.id,
               urlBasePath: this.urlBasePath
             }));
+
+            plugin.extendInit((server, options) => { // eslint-disable-line no-loop-func
+              const wrapped = app.getInjectedVars;
+              app.getInjectedVars = () => wrapped.call(plugin, server, options);
+            });
+
             plugin.apps.add(app);
           }
         };
@@ -60,6 +67,9 @@ class UiExports {
       case 'visTypes':
       case 'fieldFormats':
       case 'spyModes':
+      case 'chromeNavControls':
+      case 'navbarExtensions':
+      case 'settingsSections':
         return (plugin, spec) => {
           this.aliases[type] = _.union(this.aliases[type] || [], spec);
         };
@@ -75,21 +85,24 @@ class UiExports {
             this.aliases[adhocType] = _.union(this.aliases[adhocType] || [], spec);
           });
         };
+
+      case 'injectDefaultVars':
+        return (plugin, injector) => {
+          plugin.extendInit(async (server, options) => {
+            _.merge(this.defaultInjectedVars, await injector.call(plugin, server, options));
+          });
+        };
     }
   }
 
   find(patterns) {
-    var aliases = this.aliases;
-    var names = _.keys(aliases);
-    var matcher = _.partialRight(minimatch.filter, { matchBase: true });
+    const aliases = this.aliases;
+    const names = _.keys(aliases);
+    const matcher = _.partialRight(minimatch.filter, { matchBase: true });
 
     return _.chain(patterns)
     .map(function (pattern) {
-      var matches = names.filter(matcher(pattern));
-      if (!matches.length) {
-        throw new Error('Unable to find uiExports for pattern ' + pattern);
-      }
-      return matches;
+      return names.filter(matcher(pattern));
     })
     .flattenDeep()
     .reduce(function (found, name) {
diff --git a/src/ui/__tests__/fixtures/plugin_async_foo/index.js b/src/ui/__tests__/fixtures/plugin_async_foo/index.js
new file mode 100644
index 0000000000000..a0cd8887bbed0
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_async_foo/index.js
@@ -0,0 +1,18 @@
+import Bluebird from 'bluebird';
+
+export default kibana => new kibana.Plugin({
+  config(Joi) {
+    return Joi.object().keys({
+      enabled: Joi.boolean().default(true),
+      delay: Joi.number().required(),
+      shared: Joi.string(),
+    }).default();
+  },
+
+  uiExports: {
+    async injectDefaultVars(server, options) {
+      await Bluebird.delay(options.delay);
+      return { shared: options.shared };
+    }
+  }
+});
diff --git a/src/ui/__tests__/fixtures/plugin_async_foo/package.json b/src/ui/__tests__/fixtures/plugin_async_foo/package.json
new file mode 100644
index 0000000000000..4ad7dda995ca5
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_async_foo/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "plugin_async_foo",
+  "version": "0.0.0"
+}
diff --git a/src/ui/__tests__/fixtures/plugin_bar/index.js b/src/ui/__tests__/fixtures/plugin_bar/index.js
new file mode 100644
index 0000000000000..59c5556444496
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_bar/index.js
@@ -0,0 +1,14 @@
+export default kibana => new kibana.Plugin({
+  config(Joi) {
+    return Joi.object().keys({
+      enabled: Joi.boolean().default(true),
+      shared: Joi.string()
+    }).default();
+  },
+
+  uiExports: {
+    injectDefaultVars(server, options) {
+      return { shared: options.shared };
+    }
+  }
+});
diff --git a/src/ui/__tests__/fixtures/plugin_bar/package.json b/src/ui/__tests__/fixtures/plugin_bar/package.json
new file mode 100644
index 0000000000000..bfc5da0182266
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_bar/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "plugin_bar",
+  "version": "0.0.0"
+}
diff --git a/src/ui/__tests__/fixtures/plugin_foo/index.js b/src/ui/__tests__/fixtures/plugin_foo/index.js
new file mode 100644
index 0000000000000..59c5556444496
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_foo/index.js
@@ -0,0 +1,14 @@
+export default kibana => new kibana.Plugin({
+  config(Joi) {
+    return Joi.object().keys({
+      enabled: Joi.boolean().default(true),
+      shared: Joi.string()
+    }).default();
+  },
+
+  uiExports: {
+    injectDefaultVars(server, options) {
+      return { shared: options.shared };
+    }
+  }
+});
diff --git a/src/ui/__tests__/fixtures/plugin_foo/package.json b/src/ui/__tests__/fixtures/plugin_foo/package.json
new file mode 100644
index 0000000000000..6a73b89110ae9
--- /dev/null
+++ b/src/ui/__tests__/fixtures/plugin_foo/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "plugin_foo",
+  "version": "0.0.0"
+}
diff --git a/src/ui/__tests__/ui_exports.js b/src/ui/__tests__/ui_exports.js
new file mode 100644
index 0000000000000..4250c140db0c8
--- /dev/null
+++ b/src/ui/__tests__/ui_exports.js
@@ -0,0 +1,107 @@
+import expect from 'expect.js';
+import { resolve } from 'path';
+
+import UiExports from '../ui_exports';
+import * as kbnTestServer from '../../../test/utils/kbn_server';
+
+describe('UiExports', function () {
+  describe('#find()', function () {
+    it('finds exports based on the passed export names', function () {
+      var uiExports = new UiExports({});
+      uiExports.aliases.foo = ['a', 'b', 'c'];
+      uiExports.aliases.bar = ['d', 'e', 'f'];
+
+      expect(uiExports.find(['foo'])).to.eql(['a', 'b', 'c']);
+      expect(uiExports.find(['bar'])).to.eql(['d', 'e', 'f']);
+      expect(uiExports.find(['foo', 'bar'])).to.eql(['a', 'b', 'c', 'd', 'e', 'f']);
+    });
+
+    it('allows query types that match nothing', function () {
+      var uiExports = new UiExports({});
+      uiExports.aliases.foo = ['a', 'b', 'c'];
+
+      expect(uiExports.find(['foo'])).to.eql(['a', 'b', 'c']);
+      expect(uiExports.find(['bar'])).to.eql([]);
+      expect(uiExports.find(['foo', 'bar'])).to.eql(['a', 'b', 'c']);
+    });
+  });
+//
+  describe('#defaultInjectedVars', function () {
+    context('two plugins, two sync', function () {
+      this.slow(10000);
+      this.timeout(60000);
+
+      let kbnServer;
+      before(async function () {
+        kbnServer = kbnTestServer.createServer({
+          plugins: {
+            paths: [
+              resolve(__dirname, 'fixtures/plugin_bar'),
+              resolve(__dirname, 'fixtures/plugin_foo')
+            ]
+          },
+
+          plugin_foo: {
+            shared: 'foo'
+          },
+
+          plugin_bar: {
+            shared: 'bar'
+          }
+        });
+
+        await kbnServer.ready();
+      });
+
+      after(async function () {
+        await kbnServer.close();
+      });
+
+      it('merges the two plugins in the order they are loaded', function () {
+        expect(kbnServer.uiExports.defaultInjectedVars).to.eql({
+          shared: 'foo'
+        });
+      });
+    });
+
+    context('two plugins, one async', function () {
+      this.slow(10000);
+      this.timeout(60000);
+
+      let kbnServer;
+      before(async function () {
+        kbnServer = kbnTestServer.createServer({
+          plugins: {
+            scanDirs: [],
+            paths: [
+              resolve(__dirname, 'fixtures/plugin_async_foo'),
+              resolve(__dirname, 'fixtures/plugin_foo')
+            ]
+          },
+
+          plugin_async_foo: {
+            delay: 500,
+            shared: 'foo'
+          },
+
+          plugin_bar: {
+            shared: 'bar'
+          }
+        });
+
+        await kbnServer.ready();
+      });
+
+      after(async function () {
+        await kbnServer.close();
+      });
+
+      it('merges the two plugins in the order they are loaded', function () {
+        // even though plugin_async_foo loads 500ms later, it is still "first" to merge
+        expect(kbnServer.uiExports.defaultInjectedVars).to.eql({
+          shared: 'foo'
+        });
+      });
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/ui/appEntryTemplate.js b/src/ui/appEntryTemplate.js
index 714de7ba07fce..99a04121005bb 100644
--- a/src/ui/appEntryTemplate.js
+++ b/src/ui/appEntryTemplate.js
@@ -1,10 +1,10 @@
 module.exports = function ({env, bundle}) {
 
-  let pluginSlug = env.pluginInfo.sort()
+  const pluginSlug = env.pluginInfo.sort()
   .map(p => ' *  - ' + p)
   .join('\n');
 
-  let requires = bundle.modules
+  const requires = bundle.modules
   .map(m => `require('${m}');`)
   .join('\n');
 
diff --git a/src/ui/autoload.js b/src/ui/autoload.js
index e77111eccd4b7..82bf7a18dc86a 100644
--- a/src/ui/autoload.js
+++ b/src/ui/autoload.js
@@ -1,30 +1,30 @@
-var _ = require('lodash');
-var resolve = require('path').resolve;
-var basename = require('path').basename;
-var readdir = require('fs').readdirSync;
+const _ = require('lodash');
+const resolve = require('path').resolve;
+const basename = require('path').basename;
+const readdir = require('fs').readdirSync;
 
-var utils = require('requirefrom')('src/utils');
-var fromRoot = utils('fromRoot');
+const utils = require('requirefrom')('src/utils');
+const fromRoot = utils('fromRoot');
 
 function scan(type) {
-  var dir = fromRoot('src/ui/public', type);
+  const dir = fromRoot('src/ui/public', type);
 
   return _.chain(readdir(dir))
   .reject(function (name) {
     return name[0] === '.' || name[0] === '_';
   })
   .map(function (filename) {
-    var path = resolve(dir, filename);
-    var name = basename(filename, '.js');
+    const path = resolve(dir, filename);
+    const name = basename(filename, '.js');
     return `ui/${type}/${name}`;
   })
   .value();
 }
 
 function findStyles() {
-  var base = ['ui/styles/theme.less', 'ui/styles/base.less'];
-  var exclude = ['ui/styles/mixins.less', 'ui/styles/variables.less'];
-  var found = scan('styles', true);
+  const base = ['ui/styles/theme.less', 'ui/styles/base.less'];
+  const exclude = ['ui/styles/mixins.less', 'ui/styles/variables.less'];
+  const found = scan('styles', true);
 
   return _.difference(_.union(base, found), exclude);
 }
@@ -63,7 +63,7 @@ exports.reload = function () {
     'ui/stringify/register',
     'ui/styleCompile',
     'ui/timefilter',
-    'ui/timepicker',
+    'ui/timepicker', // TODO: remove this for 5.0
     'ui/tooltip',
     'ui/typeahead',
     'ui/url',
diff --git a/src/ui/index.js b/src/ui/index.js
index 8f68a018d01ca..3a3ff6e60e7db 100644
--- a/src/ui/index.js
+++ b/src/ui/index.js
@@ -1,22 +1,22 @@
 module.exports = async (kbnServer, server, config) => {
   let { defaults } = require('lodash');
-  let Boom = require('boom');
-  let formatUrl = require('url').format;
+  const Boom = require('boom');
+  const formatUrl = require('url').format;
   let { resolve } = require('path');
-  let readFile = require('fs').readFileSync;
+  const readFile = require('fs').readFileSync;
 
-  let fromRoot = require('../utils/fromRoot');
-  let UiExports = require('./UiExports');
-  let UiBundle = require('./UiBundle');
-  let UiBundleCollection = require('./UiBundleCollection');
-  let UiBundlerEnv = require('./UiBundlerEnv');
-  let loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64'});
+  const fromRoot = require('../utils/fromRoot');
+  const UiExports = require('./UiExports');
+  const UiBundle = require('./UiBundle');
+  const UiBundleCollection = require('./UiBundleCollection');
+  const UiBundlerEnv = require('./UiBundlerEnv');
+  const loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64'});
 
-  let uiExports = kbnServer.uiExports = new UiExports({
+  const uiExports = kbnServer.uiExports = new UiExports({
     urlBasePath: config.get('server.basePath')
   });
 
-  let bundlerEnv = new UiBundlerEnv(config.get('optimize.bundleDir'));
+  const bundlerEnv = new UiBundlerEnv(config.get('optimize.bundleDir'));
   bundlerEnv.addContext('env', config.get('env.name'));
   bundlerEnv.addContext('urlBasePath', config.get('server.basePath'));
   bundlerEnv.addContext('sourceMaps', config.get('optimize.sourceMaps'));
@@ -28,14 +28,14 @@ module.exports = async (kbnServer, server, config) => {
     uiExports.consumePlugin(plugin);
   }
 
-  let bundles = kbnServer.bundles = new UiBundleCollection(bundlerEnv, config.get('optimize.bundleFilter'));
+  const bundles = kbnServer.bundles = new UiBundleCollection(bundlerEnv, config.get('optimize.bundleFilter'));
 
   for (let app of uiExports.getAllApps()) {
     bundles.addApp(app);
   }
 
   for (let gen of uiExports.getBundleProviders()) {
-    let bundle = await gen(UiBundle, bundlerEnv, uiExports.getAllApps());
+    const bundle = await gen(UiBundle, bundlerEnv, uiExports.getAllApps());
     if (bundle) bundles.add(bundle);
   }
 
@@ -47,8 +47,8 @@ module.exports = async (kbnServer, server, config) => {
     path: '/app/{id}',
     method: 'GET',
     handler: function (req, reply) {
-      let id = req.params.id;
-      let app = uiExports.apps.byId[id];
+      const id = req.params.id;
+      const app = uiExports.apps.byId[id];
       if (!app) return reply(Boom.notFound('Unknown app ' + id));
 
       if (kbnServer.status.isGreen()) {
@@ -59,15 +59,6 @@ module.exports = async (kbnServer, server, config) => {
     }
   });
 
-  const defaultInjectedVars = {};
-  if (config.has('kibana')) {
-    defaultInjectedVars.kbnIndex = config.get('kibana.index');
-  }
-  if (config.has('elasticsearch')) {
-    defaultInjectedVars.esShardTimeout = config.get('elasticsearch.shardTimeout');
-    defaultInjectedVars.esApiVersion = config.get('elasticsearch.apiVersion');
-  }
-
   server.decorate('reply', 'renderApp', function (app) {
     const payload = {
       app: app,
@@ -76,8 +67,7 @@ module.exports = async (kbnServer, server, config) => {
       buildNum: config.get('pkg.buildNum'),
       buildSha: config.get('pkg.buildSha'),
       basePath: config.get('server.basePath'),
-      vars: defaults(app.getInjectedVars(), defaultInjectedVars),
-      xsrfToken: this.issueXsrfToken(),
+      vars: defaults(app.getInjectedVars() || {}, uiExports.defaultInjectedVars),
     };
 
     return this.view(app.templateName, {
diff --git a/src/ui/public/Binder/Binder.js b/src/ui/public/Binder/Binder.js
index 9f5308a2210d9..568b313b0f1b0 100644
--- a/src/ui/public/Binder/Binder.js
+++ b/src/ui/public/Binder/Binder.js
@@ -1,8 +1,8 @@
-var $ = require('jquery');
-var d3 = require('d3');
-var callEach = require('lodash').callEach;
-var bindKey = require('lodash').bindKey;
-var rest = require('lodash').rest;
+let $ = require('jquery');
+let d3 = require('d3');
+let callEach = require('lodash').callEach;
+let bindKey = require('lodash').bindKey;
+let rest = require('lodash').rest;
 
 function Binder($scope) {
   this.disposal = [];
@@ -23,14 +23,14 @@ Binder.prototype.on = function (emitter/*, ...args */) {
 };
 
 Binder.prototype.jqOn = function (el/*, ...args */) {
-  var $el = $(el);
+  let $el = $(el);
   this._bind($el.on, $el.off, $el, rest(arguments));
 };
 
 Binder.prototype.fakeD3Bind = function (el, event, handler) {
   this.jqOn(el, event, function (e) {
     // mimick https://github.com/mbostock/d3/blob/3abb00113662463e5c19eb87cd33f6d0ddc23bc0/src/selection/on.js#L87-L94
-    var o = d3.event; // Events can be reentrant (e.g., focus).
+    let o = d3.event; // Events can be reentrant (e.g., focus).
     d3.event = e;
     try {
       handler.apply(this, [this.__data__]);
@@ -41,7 +41,7 @@ Binder.prototype.fakeD3Bind = function (el, event, handler) {
 };
 
 Binder.prototype.destroy = function () {
-  var destroyers = this.disposal;
+  let destroyers = this.disposal;
   this.disposal = [];
   callEach(destroyers);
 };
diff --git a/src/ui/public/Binder/__tests__/Binder.js b/src/ui/public/Binder/__tests__/Binder.js
index c54c053865dd6..cba69bddba4a6 100644
--- a/src/ui/public/Binder/__tests__/Binder.js
+++ b/src/ui/public/Binder/__tests__/Binder.js
@@ -1,12 +1,12 @@
-var $ = require('jquery');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let $ = require('jquery');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var Binder = require('ui/Binder');
+let Binder = require('ui/Binder');
 
 describe('Binder class', function () {
-  var $scope;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($rootScope) {
@@ -16,13 +16,13 @@ describe('Binder class', function () {
   context('Constructing with a $scope', function () {
     it('accepts a $scope and listens for $destroy', function () {
       sinon.stub($scope, '$on');
-      var binder = new Binder($scope);
+      let binder = new Binder($scope);
       expect($scope.$on.callCount).to.be(1);
       expect($scope.$on.args[0][0]).to.be('$destroy');
     });
 
     it('unbinds when the $scope is destroyed', function () {
-      var binder = new Binder($scope);
+      let binder = new Binder($scope);
       sinon.stub(binder, 'destroy');
       $scope.$destroy();
       expect(binder.destroy.callCount).to.be(1);
@@ -31,12 +31,12 @@ describe('Binder class', function () {
 
   describe('Binder#on', function () {
     it('binds to normal event emitters', function () {
-      var binder = new Binder();
-      var emitter = {
+      let binder = new Binder();
+      let emitter = {
         on: sinon.stub(),
         removeListener: sinon.stub()
       };
-      var handler = sinon.stub();
+      let handler = sinon.stub();
 
       binder.on(emitter, 'click', handler);
       expect(emitter.on.callCount).to.be(1);
@@ -52,9 +52,9 @@ describe('Binder class', function () {
 
   describe('Binder#jqOn', function () {
     it('binds jquery event handlers', function () {
-      var binder = new Binder();
-      var el = document.createElement('div');
-      var handler = sinon.stub();
+      let binder = new Binder();
+      let el = document.createElement('div');
+      let handler = sinon.stub();
 
       binder.jqOn(el, 'click', handler);
       $(el).click();
diff --git a/src/ui/public/ConfigTemplate.js b/src/ui/public/ConfigTemplate.js
index 3b8307ab8481a..13026f55de5d3 100644
--- a/src/ui/public/ConfigTemplate.js
+++ b/src/ui/public/ConfigTemplate.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   function ConfigTemplate(templates) {
-    var template = this;
+    const template = this;
     template.current = null;
     template.toggle = _.partial(update, null);
     template.open = _.partial(update, true);
     template.close = _.partial(update, false);
 
     function update(newState, name) {
-      var toUpdate = templates[name];
-      var curState = template.is(name);
+      const toUpdate = templates[name];
+      const curState = template.is(name);
       if (newState == null) newState = !curState;
 
       if (newState) {
diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/IndexedArray/IndexedArray.js
index e42b67bbf7502..add336596c166 100644
--- a/src/ui/public/IndexedArray/IndexedArray.js
+++ b/src/ui/public/IndexedArray/IndexedArray.js
@@ -1,14 +1,14 @@
 define(function (require) {
 
-  var _ = require('lodash');
+  let _ = require('lodash');
 
-  var inflector = require('ui/IndexedArray/inflector');
-  var pathGetter = _(_.get).rearg(1, 0).ary(2);
-  var inflectIndex = inflector('by');
-  var inflectOrder = inflector('in', 'Order');
+  let inflector = require('ui/IndexedArray/inflector');
+  let pathGetter = _(_.get).rearg(1, 0).ary(2);
+  let inflectIndex = inflector('by');
+  let inflectOrder = inflector('in', 'Order');
 
-  var CLEAR_CACHE = {};
-  var OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
+  let CLEAR_CACHE = {};
+  let OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
 
   /**
    * Generic extension of Array class, which will index (and reindex) the
@@ -70,12 +70,12 @@ define(function (require) {
     // shortcut for empty props
     if (!props || props.length === 0) return;
 
-    var self = this;
+    let self = this;
     return props.map(function (prop) {
 
-      var from = pathGetter.partial(prop).value();
-      var to = inflect(prop);
-      var cache;
+      let from = pathGetter.partial(prop).value();
+      let to = inflect(prop);
+      let cache;
 
       Object.defineProperty(self, to, {
         enumerable: false,
@@ -106,7 +106,7 @@ define(function (require) {
    * @return {undefined}
    */
   IndexedArray.prototype._clearIndices = function () {
-    var self = this;
+    let self = this;
     self._indexNames.forEach(function (name) {
       self[name] = CLEAR_CACHE;
     });
@@ -121,7 +121,7 @@ define(function (require) {
    * @return {[type]}        [description]
    */
   'pop push shift splice unshift reverse'.split(' ').forEach(function (method) {
-    var orig = Array.prototype[method];
+    let orig = Array.prototype[method];
 
     IndexedArray.prototype[method] = function (/* args... */) {
       // call the original method with this context
@@ -142,7 +142,7 @@ define(function (require) {
   * @return {array} - the removed data
   */
   IndexedArray.prototype.remove = function (predicate, context) {
-    var out = _.remove(this, predicate, context);
+    let out = _.remove(this, predicate, context);
     _.remove(this.raw, predicate, context);
     this._clearIndices();
     return out;
diff --git a/src/ui/public/IndexedArray/__tests__/IndexedArray.js b/src/ui/public/IndexedArray/__tests__/IndexedArray.js
index c3f19ef00456a..63b5324f0b984 100644
--- a/src/ui/public/IndexedArray/__tests__/IndexedArray.js
+++ b/src/ui/public/IndexedArray/__tests__/IndexedArray.js
@@ -1,10 +1,10 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var IndexedArray = require('ui/IndexedArray');
+let _ = require('lodash');
+let expect = require('expect.js');
+let IndexedArray = require('ui/IndexedArray');
 
 // this is generally a data-structure that IndexedArray is good for managing
-var users = [
+let users = [
   { name: 'John', id: 69, username: 'beast', group: 'admins' },
   { name: 'Anon', id:  0, username: 'shhhh', group: 'secret' },
   { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
@@ -21,7 +21,7 @@ users.inIdOrder = _.sortBy(users, 'id');
 
 describe('IndexedArray', function () {
   describe('Basics', function () {
-    var reg;
+    let reg;
 
     beforeEach(function () {
       reg = new IndexedArray();
@@ -43,7 +43,7 @@ describe('IndexedArray', function () {
 
   describe('Indexing', function () {
     it('provides the initial set', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         initialSet: [1, 2, 3]
       });
 
@@ -55,7 +55,7 @@ describe('IndexedArray', function () {
     });
 
     it('indexes the initial set', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         index: ['username'],
         initialSet: users
       });
@@ -66,11 +66,11 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are added', function () {
       // split up the user list, and add it in chunks
-      var firstUser = users.slice(0, 1).pop();
-      var otherUsers = users.slice(1);
+      let firstUser = users.slice(0, 1).pop();
+      let otherUsers = users.slice(1);
 
       // start off with all but the first
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: otherUsers
@@ -86,7 +86,7 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are removed', function () {
       // start off with all
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
@@ -95,18 +95,18 @@ describe('IndexedArray', function () {
       // remove the last
       reg.pop();
 
-      var expectedCount = users.length - 1;
+      let expectedCount = users.length - 1;
       // indexed lists should be updated
       expect(reg).to.have.length(expectedCount);
 
-      var sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
+      let sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
         return note + group.length;
       }, 0);
       expect(sumOfGroups).to.eql(expectedCount);
     });
 
     it('removes items based on a predicate', function () {
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
@@ -120,26 +120,26 @@ describe('IndexedArray', function () {
     });
 
     it('updates indices after values are re-ordered', function () {
-      var rawUsers = users.slice(0);
+      let rawUsers = users.slice(0);
 
       // collect and shuffle the ids available
-      var ids = [];
+      let ids = [];
       _.times(rawUsers.length, function (i) { ids.push(i); });
       ids = _.shuffle(ids);
 
       // move something here
-      var toI = ids.shift();
+      let toI = ids.shift();
       // from here
-      var fromI = ids.shift();
+      let fromI = ids.shift();
       // do the move
-      var move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
+      let move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
 
-      var reg = new IndexedArray({
+      let reg = new IndexedArray({
         index: ['username'],
         initialSet: rawUsers
       });
 
-      var index = reg.byUsername;
+      let index = reg.byUsername;
 
       move(reg);
 
diff --git a/src/ui/public/IndexedArray/__tests__/inflector.js b/src/ui/public/IndexedArray/__tests__/inflector.js
index eb4f04696702a..d418931a36af6 100644
--- a/src/ui/public/IndexedArray/__tests__/inflector.js
+++ b/src/ui/public/IndexedArray/__tests__/inflector.js
@@ -1,15 +1,15 @@
-var inflector = require('ui/IndexedArray/inflector');
-var expect = require('expect.js');
+let inflector = require('ui/IndexedArray/inflector');
+let expect = require('expect.js');
 
 describe('IndexedArray Inflector', function () {
   it('returns a function', function () {
-    var getter = inflector();
+    let getter = inflector();
     expect(getter).to.be.a('function');
   });
 
   describe('fn', function () {
     it('prepends a prefix', function () {
-      var inflect = inflector('my');
+      let inflect = inflector('my');
 
       expect(inflect('Family')).to.be('myFamily');
       expect(inflect('family')).to.be('myFamily');
@@ -17,7 +17,7 @@ describe('IndexedArray Inflector', function () {
     });
 
     it('adds both a prefix and suffix', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
 
       expect(inflect('box')).to.be('fooBoxBar');
       expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
@@ -25,19 +25,19 @@ describe('IndexedArray Inflector', function () {
     });
 
     it('ignores prefix if it is already at the end of the inflected string', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
       expect(inflect('fooBox')).to.be('fooBoxBar');
       expect(inflect('FooBox')).to.be('FooBoxBar');
     });
 
     it('ignores postfix if it is already at the end of the inflected string', function () {
-      var inflect = inflector('foo', 'Bar');
+      let inflect = inflector('foo', 'Bar');
       expect(inflect('bar')).to.be('fooBar');
       expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
     });
 
     it('works with "name"', function () {
-      var inflect = inflector('in', 'Order');
+      let inflect = inflector('in', 'Order');
       expect(inflect('name')).to.be('inNameOrder');
     });
   });
diff --git a/src/ui/public/IndexedArray/inflector.js b/src/ui/public/IndexedArray/inflector.js
index 38f324274d496..82619b93897c9 100644
--- a/src/ui/public/IndexedArray/inflector.js
+++ b/src/ui/public/IndexedArray/inflector.js
@@ -9,7 +9,7 @@ define(function (require) {
   }
 
   function endsWith(str, test) {
-    var tooShort = str.length < test.length;
+    let tooShort = str.length < test.length;
     if (tooShort) return;
 
     return str.substr(str.length - test.length).toLowerCase() === test.toLowerCase();
@@ -17,7 +17,7 @@ define(function (require) {
 
   function inflector(prefix, postfix) {
     return function inflect(key) {
-      var inflected;
+      let inflected;
 
       if (key.indexOf('.') !== -1) {
         inflected = key
diff --git a/src/ui/public/StackTraceMapper/SourceMapReader.js b/src/ui/public/StackTraceMapper/SourceMapReader.js
index 122a89317d697..7bbabefcb36b9 100644
--- a/src/ui/public/StackTraceMapper/SourceMapReader.js
+++ b/src/ui/public/StackTraceMapper/SourceMapReader.js
@@ -1,6 +1,6 @@
-var _ = require('lodash');
-var SourceMapConsumer = require('source-map/lib/source-map/source-map-consumer').SourceMapConsumer;
-var parse = require('url').parse;
+let _ = require('lodash');
+let SourceMapConsumer = require('source-map/lib/source-map/source-map-consumer').SourceMapConsumer;
+let parse = require('url').parse;
 
 function SourceMapReader(url, map) {
   this.smc = new SourceMapConsumer(map);
diff --git a/src/ui/public/StackTraceMapper/StackTraceMapper.js b/src/ui/public/StackTraceMapper/StackTraceMapper.js
index 0324e1b13aa45..85cdad2a3eed3 100644
--- a/src/ui/public/StackTraceMapper/StackTraceMapper.js
+++ b/src/ui/public/StackTraceMapper/StackTraceMapper.js
@@ -1,12 +1,12 @@
-var _ = require('lodash');
-var $ = require('jquery');
-var resolve = require('bluebird').resolve;
-var fetch = require('exports?window.fetch!imports?Promise=bluebird!whatwg-fetch');
+let _ = require('lodash');
+let $ = require('jquery');
+let resolve = require('bluebird').resolve;
+let fetch = require('exports?window.fetch!imports?Promise=bluebird!whatwg-fetch');
 
-var setErrorStack = require('./setErrorStack');
-var translateStackLine = require('./translateStackLine');
-var stackLineFormat = require('./stackLineFormat');
-var SourceMapReader = require('./SourceMapReader');
+let setErrorStack = require('./setErrorStack');
+let translateStackLine = require('./translateStackLine');
+let stackLineFormat = require('./stackLineFormat');
+let SourceMapReader = require('./SourceMapReader');
 
 function StackTraceMapper() {
   this.maps = [];
@@ -22,7 +22,7 @@ StackTraceMapper.prototype.init = function (mapUrls) {
 StackTraceMapper.prototype.mapError = function (err) {
   if (!stackLineFormat || !err.stack) return err;
 
-  var stack = err.stack.replace(stackLineFormat, this.mapLine);
+  let stack = err.stack.replace(stackLineFormat, this.mapLine);
   return setErrorStack(err, stack);
 };
 
@@ -39,10 +39,10 @@ StackTraceMapper.prototype.getMapFor = function (url) {
 StackTraceMapper.prototype.loadMaps = function (mapUrls) {
   mapUrls = _.clone(mapUrls || {});
 
-  var maps = this.maps;
+  let maps = this.maps;
 
   $('script[src][src-map]').each(function () {
-    var $el = $(this);
+    let $el = $(this);
     mapUrls[$el.attr('src')] = $el.attr('src-map');
   });
 
diff --git a/src/ui/public/StackTraceMapper/setErrorStack.js b/src/ui/public/StackTraceMapper/setErrorStack.js
index 5ae5e0b553535..eb28b408d5c26 100644
--- a/src/ui/public/StackTraceMapper/setErrorStack.js
+++ b/src/ui/public/StackTraceMapper/setErrorStack.js
@@ -1,6 +1,6 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
-var err = new Error();
+let err = new Error();
 try { setByAssignment(err, 'john'); } catch (e) {} // eslint-disable-line
 
 // err.stack is not always writeable, so we
@@ -13,7 +13,7 @@ if (err.stack === 'john') module.exports = setByAssignment;
 else module.exports = setByShadowing;
 
 function setByShadowing(err, stack) {
-  var props = _.mapValues(err, function (val) {
+  let props = _.mapValues(err, function (val) {
     return {
       enumerable: true,
       value: val
diff --git a/src/ui/public/StackTraceMapper/stackLineFormat.js b/src/ui/public/StackTraceMapper/stackLineFormat.js
index 27706a165a5c1..a571a50219398 100644
--- a/src/ui/public/StackTraceMapper/stackLineFormat.js
+++ b/src/ui/public/StackTraceMapper/stackLineFormat.js
@@ -1,14 +1,14 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
-var opts = [
+let opts = [
   /@((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig,
   /(?: \(|at )((?:[!#$&-;=?-\[\]_a-z~]|%[0-9a-f]{2})+\.js)\:(\d+)(?:\:(\d+)|())/ig
 ];
 
-var sample;
+let sample;
 try { throw new Error('msg'); } catch (e) { sample = e.stack; }
 
-var format = _.find(opts, function (format) {
+let format = _.find(opts, function (format) {
   return format.test(sample);
 });
 
diff --git a/src/ui/public/StackTraceMapper/translateStackLine.js b/src/ui/public/StackTraceMapper/translateStackLine.js
index de6eae6347b03..f9983daade78a 100644
--- a/src/ui/public/StackTraceMapper/translateStackLine.js
+++ b/src/ui/public/StackTraceMapper/translateStackLine.js
@@ -1,19 +1,19 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = function (map, match, filename, line, col) {
   if (!map) return match;
 
-  var position = {
+  let position = {
     line: parseFloat(line) || 0,
     column: parseFloat(col) || 0
   };
 
-  var srcPosition = map.smc.originalPositionFor(position);
+  let srcPosition = map.smc.originalPositionFor(position);
   if (!srcPosition || !srcPosition.source) return match;
 
-  var srcFilename = srcPosition.source;
-  var srcLine = srcPosition.line;
-  var srcCol = srcPosition.column;
+  let srcFilename = srcPosition.source;
+  let srcLine = srcPosition.line;
+  let srcCol = srcPosition.column;
 
   if (srcCol === 0 && position.column) {
     // TODO: teach sourcemaps correct column
@@ -26,10 +26,10 @@ module.exports = function (map, match, filename, line, col) {
   // fold the components into the original match, so that supporting
   // characters (parens, periods, etc) from the format are kept, and so
   // we don't accidentally replace the wrong part we use splitting and consumption
-  var resp = '';
-  var remainingResp = match;
-  var fold = function (replace, replacement) {
-    var wrappingContent = remainingResp.split(replace);
+  let resp = '';
+  let remainingResp = match;
+  let fold = function (replace, replacement) {
+    let wrappingContent = remainingResp.split(replace);
     resp += wrappingContent.shift() + replacement;
     remainingResp = wrappingContent.join(replace);
   };
diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
index 46ed915a813a8..8c8cbf89db224 100644
--- a/src/ui/public/Vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function AggConfigFactory(Private, fieldTypeFilter) {
-    var _ = require('lodash');
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let _ = require('lodash');
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
     function AggConfig(vis, opts) {
-      var self = this;
+      let self = this;
 
       self.id = String(opts.id || AggConfig.nextId(vis.aggs));
       self.vis = vis;
@@ -26,13 +26,13 @@ define(function (require) {
      * @return {array} - the list that was passed in
      */
     AggConfig.ensureIds = function (list) {
-      var have = [];
-      var haveNot = [];
+      let have = [];
+      let haveNot = [];
       list.forEach(function (obj) {
         (obj.id ? have : haveNot).push(obj);
       });
 
-      var nextId = AggConfig.nextId(have);
+      let nextId = AggConfig.nextId(have);
       haveNot.forEach(function (obj) {
         obj.id = String(nextId++);
       });
@@ -97,12 +97,12 @@ define(function (require) {
      * @return {undefined}
      */
     AggConfig.prototype.fillDefaults = function (from) {
-      var self = this;
+      let self = this;
       from = from || self.params || {};
-      var to = self.params = {};
+      let to = self.params = {};
 
       self.getAggParams().forEach(function (aggParam) {
-        var val = from[aggParam.name];
+        let val = from[aggParam.name];
 
         if (val == null) {
           if (aggParam.default == null) return;
@@ -116,11 +116,11 @@ define(function (require) {
         }
 
         if (aggParam.deserialize) {
-          var isTyped = _.isFunction(aggParam.type);
+          let isTyped = _.isFunction(aggParam.type);
 
-          var isType = isTyped && (val instanceof aggParam.type);
-          var isObject = !isTyped && _.isObject(val);
-          var isDeserialized = (isType || isObject);
+          let isType = isTyped && (val instanceof aggParam.type);
+          let isObject = !isTyped && _.isObject(val);
+          let isDeserialized = (isType || isObject);
 
           if (!isDeserialized) {
             val = aggParam.deserialize(val, self);
@@ -140,12 +140,12 @@ define(function (require) {
      * @return {object} the new params object
      */
     AggConfig.prototype.resetParams = function () {
-      var fieldParam = this.type && this.type.params.byName.field;
-      var field;
+      let fieldParam = this.type && this.type.params.byName.field;
+      let field;
 
       if (fieldParam) {
-        var prevField = this.params.field;
-        var fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
+        let prevField = this.params.field;
+        let fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
         field = _.contains(fieldOpts, prevField) ? prevField : null;
       }
 
@@ -161,10 +161,10 @@ define(function (require) {
         throw new TypeError('The "' + this.type.title + '" aggregation does not support filtering.');
       }
 
-      var field = this.field();
-      var label = this.fieldDisplayName();
+      let field = this.field();
+      let label = this.fieldDisplayName();
       if (field && !field.filterable) {
-        var message = 'The "' + label + '" field can not be used for filtering.';
+        let message = 'The "' + label + '" field can not be used for filtering.';
         if (field.scripted) {
           message = 'The "' + label + '" field is scripted and can not be used for filtering.';
         }
@@ -181,7 +181,7 @@ define(function (require) {
      * @return {[type]} [description]
      */
     AggConfig.prototype.requesting = function () {
-      var self = this;
+      let self = this;
       self.type && self.type.params.forEach(function (param) {
         if (param.onRequest) param.onRequest(self);
       });
@@ -198,14 +198,14 @@ define(function (require) {
      */
     AggConfig.prototype.toDsl = function () {
       if (this.type.hasNoDsl) return;
-      var output = this.write();
+      let output = this.write();
 
-      var configDsl = {};
+      let configDsl = {};
       configDsl[this.type.dslName || this.type.name] = output.params;
 
       // if the config requires subAggs, write them to the dsl as well
       if (output.subAggs) {
-        var subDslLvl = configDsl.aggs || (configDsl.aggs = {});
+        let subDslLvl = configDsl.aggs || (configDsl.aggs = {});
         output.subAggs.forEach(function nestAdhocSubAggs(subAggConfig) {
           subDslLvl[subAggConfig.id] = subAggConfig.toDsl();
         });
@@ -215,11 +215,11 @@ define(function (require) {
     };
 
     AggConfig.prototype.toJSON = function () {
-      var self = this;
-      var params = self.params;
+      let self = this;
+      let params = self.params;
 
-      var outParams = _.transform(self.getAggParams(), function (out, aggParam) {
-        var val = params[aggParam.name];
+      let outParams = _.transform(self.getAggParams(), function (out, aggParam) {
+        let val = params[aggParam.name];
 
         // don't serialize undefined/null values
         if (val == null) return;
@@ -259,8 +259,12 @@ define(function (require) {
     };
 
     AggConfig.prototype.makeLabel = function () {
+      if (this.params.customLabel) {
+        return this.params.customLabel;
+      }
+
       if (!this.type) return '';
-      var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
+      let pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
       return pre += this.type.makeLabel(this);
     };
 
@@ -269,31 +273,31 @@ define(function (require) {
     };
 
     AggConfig.prototype.fieldFormatter = function (contentType, defaultFormat) {
-      var format = this.type && this.type.getFormat(this);
+      let format = this.type && this.type.getFormat(this);
       if (format) return format.getConverterFor(contentType);
       return this.fieldOwnFormatter(contentType, defaultFormat);
     };
 
     AggConfig.prototype.fieldOwnFormatter = function (contentType, defaultFormat) {
-      var field = this.field();
-      var format = field && field.format;
+      let field = this.field();
+      let format = field && field.format;
       if (!format) format = defaultFormat;
       if (!format) format = fieldFormats.getDefaultInstance('string');
       return format.getConverterFor(contentType);
     };
 
     AggConfig.prototype.fieldName = function () {
-      var field = this.field();
+      let field = this.field();
       return field ? field.name : '';
     };
 
     AggConfig.prototype.fieldDisplayName = function () {
-      var field = this.field();
+      let field = this.field();
       return field ? (field.displayName || this.fieldName()) : '';
     };
 
     AggConfig.prototype.fieldIsTimeField = function () {
-      var timeFieldName = this.vis.indexPattern.timeFieldName;
+      let timeFieldName = this.vis.indexPattern.timeFieldName;
       return timeFieldName && this.fieldName() === timeFieldName;
     };
 
diff --git a/src/ui/public/Vis/AggConfigResult.js b/src/ui/public/Vis/AggConfigResult.js
index b7dac72820efa..4df97b55477c6 100644
--- a/src/ui/public/Vis/AggConfigResult.js
+++ b/src/ui/public/Vis/AggConfigResult.js
@@ -1,5 +1,5 @@
 define(function () {
-  var i = 0;
+  let i = 0;
 
   function AggConfigResult(aggConfig, parent, value, key) {
     this.key = key;
diff --git a/src/ui/public/Vis/AggConfigs.js b/src/ui/public/Vis/AggConfigs.js
index 5a42d9accef10..7a9938f942aee 100644
--- a/src/ui/public/Vis/AggConfigs.js
+++ b/src/ui/public/Vis/AggConfigs.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function AggConfigsFactory(Private) {
-    var _ = require('lodash');
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
-    var IndexedArray = require('ui/IndexedArray');
+    let _ = require('lodash');
+    let AggConfig = Private(require('ui/Vis/AggConfig'));
+    let IndexedArray = require('ui/IndexedArray');
 
     AggConfig.aggTypes = Private(require('ui/agg_types/index'));
 
     _.class(AggConfigs).inherits(IndexedArray);
     function AggConfigs(vis, configStates) {
-      var self = this;
+      let self = this;
       self.vis = vis;
 
       configStates = AggConfig.ensureIds(configStates || []);
@@ -35,9 +35,9 @@ define(function (require) {
         })
         .each(function (schema) {
           if (!self.bySchemaName[schema.name]) {
-            var defaults = schema.defaults.slice(0, schema.max);
+            let defaults = schema.defaults.slice(0, schema.max);
             _.each(defaults, function (defaultState) {
-              var state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
+              let state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
               self.push(new AggConfig(vis, state));
             });
           }
@@ -47,9 +47,9 @@ define(function (require) {
     }
 
     AggConfigs.prototype.toDsl = function () {
-      var dslTopLvl = {};
-      var dslLvlCursor;
-      var nestedMetrics;
+      let dslTopLvl = {};
+      let dslLvlCursor;
+      let nestedMetrics;
 
       if (this.vis.isHierarchical()) {
         // collect all metrics, and filter out the ones that we won't be copying
@@ -75,8 +75,8 @@ define(function (require) {
           // start at the top level
           dslLvlCursor = dslTopLvl;
         } else {
-          var prevConfig = list[i - 1];
-          var prevDsl = dslLvlCursor[prevConfig.id];
+          let prevConfig = list[i - 1];
+          let prevDsl = dslLvlCursor[prevConfig.id];
 
           // advance the cursor and nest under the previous agg, or
           // put it on the same level if the previous agg doesn't accept
@@ -84,8 +84,8 @@ define(function (require) {
           dslLvlCursor = prevDsl.aggs || dslLvlCursor;
         }
 
-        var dsl = dslLvlCursor[config.id] = config.toDsl();
-        var subAggs;
+        let dsl = dslLvlCursor[config.id] = config.toDsl();
+        let subAggs;
 
         if (config.schema.group === 'buckets' && i < list.length - 1) {
           // buckets that are not the last item in the list accept sub-aggs
@@ -121,7 +121,7 @@ define(function (require) {
      */
     AggConfigs.prototype.getResponseAggs = function () {
       return this.getRequestAggs().reduce(function (responseValuesAggs, agg) {
-        var aggs = agg.getResponseAggs();
+        let aggs = agg.getResponseAggs();
         return aggs ? responseValuesAggs.concat(aggs) : responseValuesAggs;
       }, []);
     };
@@ -136,7 +136,7 @@ define(function (require) {
      */
     AggConfigs.prototype.getResponseAggById = function (id) {
       id = String(id);
-      var reqAgg = _.find(this.getRequestAggs(), function (agg) {
+      let reqAgg = _.find(this.getRequestAggs(), function (agg) {
         return id.substr(0, String(agg.id).length) === agg.id;
       });
       if (!reqAgg) return;
diff --git a/src/ui/public/Vis/Renderbot.js b/src/ui/public/Vis/Renderbot.js
index 27ba9d2bd2c53..34533e3ef29c3 100644
--- a/src/ui/public/Vis/Renderbot.js
+++ b/src/ui/public/Vis/Renderbot.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function RenderbotFactory(Private) {
 
@@ -9,9 +9,10 @@ define(function (require) {
      * @param {Vis} vis - the vis object that contains all configuration data required to render the vis
      * @param {jQuery<DOMElement>} $el - a jQuery wrapped element to render into
      */
-    function Renderbot(vis, $el) {
+    function Renderbot(vis, $el, uiState) {
       this.vis = vis;
       this.$el = $el;
+      this.uiState = uiState;
     }
 
     /**
diff --git a/src/ui/public/Vis/Schemas.js b/src/ui/public/Vis/Schemas.js
index d3b4159f985ee..2b53115059b4e 100644
--- a/src/ui/public/Vis/Schemas.js
+++ b/src/ui/public/Vis/Schemas.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function VisTypeSchemasFactory(Private) {
-    var _ = require('lodash');
-    var IndexedArray = require('ui/IndexedArray');
-    var AggParams = Private(require('ui/agg_types/AggParams'));
+    let _ = require('lodash');
+    let IndexedArray = require('ui/IndexedArray');
+    let AggParams = Private(require('ui/agg_types/AggParams'));
 
     function Schemas(schemas) {
-      var self = this;
+      let self = this;
 
       _(schemas || [])
       .map(function (schema) {
diff --git a/src/ui/public/Vis/Vis.js b/src/ui/public/Vis/Vis.js
index 79f7b6bcf5d1b..d7c72aaafe3d1 100644
--- a/src/ui/public/Vis/Vis.js
+++ b/src/ui/public/Vis/Vis.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function VisFactory(Notifier, Private) {
-    var _ = require('lodash');
-    var aggTypes = Private(require('ui/agg_types/index'));
-    var visTypes = Private(require('ui/registry/vis_types'));
-    var AggConfigs = Private(require('ui/Vis/AggConfigs'));
+    let _ = require('lodash');
+    let aggTypes = Private(require('ui/agg_types/index'));
+    let visTypes = Private(require('ui/registry/vis_types'));
+    let AggConfigs = Private(require('ui/Vis/AggConfigs'));
 
-    var notify = new Notifier({
+    let notify = new Notifier({
       location: 'Vis'
     });
 
@@ -29,10 +29,10 @@ define(function (require) {
         type = visTypes.byName[type || 'histogram'];
       }
 
-      var schemas = type.schemas;
+      let schemas = type.schemas;
 
-      var aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
-        var schema = schemas.all.byName[oldGroupName];
+      let aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
+        let schema = schemas.all.byName[oldGroupName];
 
         if (!schema) {
           notify.log('unable to match old schema', oldGroupName, 'to a new schema');
@@ -40,12 +40,12 @@ define(function (require) {
         }
 
         oldConfigs.forEach(function (oldConfig) {
-          var agg = {
+          let agg = {
             schema: schema.name,
             type: oldConfig.agg,
           };
 
-          var aggType = aggTypes.byName[agg.type];
+          let aggType = aggTypes.byName[agg.type];
           if (!aggType) {
             notify.log('unable to find an agg type for old confg', oldConfig);
             return;
@@ -66,6 +66,7 @@ define(function (require) {
     Vis.prototype.type = 'histogram';
 
     Vis.prototype.setState = function (state) {
+      this.title = state.title || '';
       this.type = state.type || this.type;
       if (_.isString(this.type)) this.type = visTypes.byName[this.type];
 
@@ -80,6 +81,7 @@ define(function (require) {
 
     Vis.prototype.getState = function () {
       return {
+        title: this.title,
         type: this.type.name,
         params: this.params,
         aggs: this.aggs.map(function (agg) {
@@ -114,7 +116,7 @@ define(function (require) {
     };
 
     Vis.prototype.hasSchemaAgg = function (schemaName, aggTypeName) {
-      var aggs = this.aggs.bySchemaName[schemaName] || [];
+      let aggs = this.aggs.bySchemaName[schemaName] || [];
       return aggs.some(function (agg) {
         if (!agg.type || !agg.type.name) return false;
         return agg.type.name === aggTypeName;
diff --git a/src/ui/public/Vis/VisType.js b/src/ui/public/Vis/VisType.js
index 0c995bd108b14..5ba1214ee6ade 100644
--- a/src/ui/public/Vis/VisType.js
+++ b/src/ui/public/Vis/VisType.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function VisTypeFactory(Private) {
-    var VisTypeSchemas = Private(require('ui/Vis/Schemas'));
+    let VisTypeSchemas = Private(require('ui/Vis/Schemas'));
 
     function VisType(opts) {
       opts = opts || {};
diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/Vis/__tests__/_AggConfig.js
index 579c120fc7e13..9297e92db43fc 100644
--- a/src/ui/public/Vis/__tests__/_AggConfig.js
+++ b/src/ui/public/Vis/__tests__/_AggConfig.js
@@ -1,13 +1,13 @@
 describe('AggConfig', function () {
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var Vis;
-  var AggType;
-  var AggConfig;
-  var indexPattern;
-  var fieldFormat;
+  let Vis;
+  let AggType;
+  let AggConfig;
+  let indexPattern;
+  let fieldFormat;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -20,7 +20,7 @@ describe('AggConfig', function () {
 
   describe('#toDsl', function () {
     it('calls #write()', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -30,15 +30,15 @@ describe('AggConfig', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      var stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
+      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      let stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
 
       aggConfig.toDsl();
       expect(stub.callCount).to.be(1);
     });
 
     it('uses the type name as the agg name', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -48,15 +48,15 @@ describe('AggConfig', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
       sinon.stub(aggConfig, 'write').returns({ params: {} });
 
-      var dsl = aggConfig.toDsl();
+      let dsl = aggConfig.toDsl();
       expect(dsl).to.have.property('date_histogram');
     });
 
     it('uses the params from #write() output as the agg params', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -66,17 +66,17 @@ describe('AggConfig', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      var football = {};
+      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      let football = {};
 
       sinon.stub(aggConfig, 'write').returns({ params: football });
 
-      var dsl = aggConfig.toDsl();
+      let dsl = aggConfig.toDsl();
       expect(dsl.date_histogram).to.be(football);
     });
 
     it('includes subAggs from #write() output', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -90,14 +90,14 @@ describe('AggConfig', function () {
         ]
       });
 
-      var histoConfig = vis.aggs.byTypeName.date_histogram[0];
-      var avgConfig = vis.aggs.byTypeName.avg[0];
-      var football = {};
+      let histoConfig = vis.aggs.byTypeName.date_histogram[0];
+      let avgConfig = vis.aggs.byTypeName.avg[0];
+      let football = {};
 
       sinon.stub(histoConfig, 'write').returns({ params: {}, subAggs: [avgConfig] });
       sinon.stub(avgConfig, 'write').returns({ params: football });
 
-      var dsl = histoConfig.toDsl();
+      let dsl = histoConfig.toDsl();
 
       // didn't use .eql() because of variable key names, and final check is strict
       expect(dsl).to.have.property('aggs');
@@ -109,7 +109,7 @@ describe('AggConfig', function () {
 
   describe('::ensureIds', function () {
     it('accepts an array of objects and assigns ids to them', function () {
-      var objs = [
+      let objs = [
         {},
         {},
         {},
@@ -123,7 +123,7 @@ describe('AggConfig', function () {
     });
 
     it('assigns ids relative to the other items in the list', function () {
-      var objs = [
+      let objs = [
         { id: '100' },
         {},
       ];
@@ -133,7 +133,7 @@ describe('AggConfig', function () {
     });
 
     it('assigns ids relative to the other items in the list', function () {
-      var objs = [
+      let objs = [
         { id: '100' },
         { id: '200' },
         { id: '500' },
@@ -150,14 +150,14 @@ describe('AggConfig', function () {
 
     it('uses ::nextId to get the starting value', function () {
       sinon.stub(AggConfig, 'nextId').returns(534);
-      var objs = AggConfig.ensureIds([{}]);
+      let objs = AggConfig.ensureIds([{}]);
       expect(objs[0]).to.have.property('id', '534');
     });
 
     it('only calls ::nextId once', function () {
-      var start = 420;
+      let start = 420;
       sinon.stub(AggConfig, 'nextId').returns(start);
-      var objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
+      let objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
 
       expect(AggConfig.nextId).to.have.property('callCount', 1);
       objs.forEach(function (obj, i) {
@@ -168,12 +168,12 @@ describe('AggConfig', function () {
 
   describe('::nextId', function () {
     it('accepts a list of objects and picks the next id', function () {
-      var next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
+      let next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
       expect(next).to.be(501);
     });
 
     it('handles an empty list', function () {
-      var next = AggConfig.nextId([]);
+      let next = AggConfig.nextId([]);
       expect(next).to.be(1);
     });
 
@@ -186,7 +186,7 @@ describe('AggConfig', function () {
 
   describe('#toJSON', function () {
     it('includes the aggs id, params, type and schema', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -196,13 +196,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
       expect(aggConfig.id).to.be('1');
       expect(aggConfig.params).to.be.an('object');
       expect(aggConfig.type).to.be.an(AggType).and.have.property('name', 'date_histogram');
       expect(aggConfig.schema).to.be.an('object').and.have.property('name', 'segment');
 
-      var state = aggConfig.toJSON();
+      let state = aggConfig.toJSON();
       expect(state).to.have.property('id', '1');
       expect(state.params).to.be.an('object');
       expect(state).to.have.property('type', 'date_histogram');
@@ -210,9 +210,39 @@ describe('AggConfig', function () {
     });
   });
 
+  describe('#makeLabel', function () {
+    it('uses the custom label if it is defined', function () {
+      let vis = new Vis(indexPattern, {});
+      let aggConfig = vis.aggs[0];
+      aggConfig.params.customLabel = 'Custom label';
+      let label = aggConfig.makeLabel();
+      expect(label).to.be(aggConfig.params.customLabel);
+    });
+    it('default label should be "Count"', function () {
+      let vis = new Vis(indexPattern, {});
+      let aggConfig = vis.aggs[0];
+      let label = aggConfig.makeLabel();
+      expect(label).to.be('Count');
+    });
+    it('default label should be "Percentage of Count" when Vis is in percentage mode', function () {
+      let vis = new Vis(indexPattern, {});
+      let aggConfig = vis.aggs[0];
+      aggConfig.vis.params.mode = 'percentage';
+      let label = aggConfig.makeLabel();
+      expect(label).to.be('Percentage of Count');
+    });
+    it('empty label if the Vis type is not defined', function () {
+      let vis = new Vis(indexPattern, {});
+      let aggConfig = vis.aggs[0];
+      aggConfig.type = undefined;
+      let label = aggConfig.makeLabel();
+      expect(label).to.be('');
+    });
+  });
+
   describe('#fieldFormatter', function () {
     it('returns the fields format unless the agg type has a custom getFormat handler', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -238,7 +268,7 @@ describe('AggConfig', function () {
     });
 
     it('returns the string format if the field does not have a format', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -249,13 +279,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      var agg = vis.aggs[0];
+      let agg = vis.aggs[0];
       agg.params.field = { type: 'date', format: null };
       expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
     });
 
     it('returns the string format if their is no field', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -266,13 +296,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      var agg = vis.aggs[0];
+      let agg = vis.aggs[0];
       delete agg.params.field;
       expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
     });
 
     it('returns the html converter if "html" is passed in', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -283,7 +313,7 @@ describe('AggConfig', function () {
         ]
       });
 
-      var field = indexPattern.fields.byName.ssl;
+      let field = indexPattern.fields.byName.ssl;
       expect(vis.aggs[0].fieldFormatter('html')).to.be(field.format.getConverterFor('html'));
     });
   });
diff --git a/src/ui/public/Vis/__tests__/_AggConfigResult.js b/src/ui/public/Vis/__tests__/_AggConfigResult.js
index 9a48b95f433be..d855090527907 100644
--- a/src/ui/public/Vis/__tests__/_AggConfigResult.js
+++ b/src/ui/public/Vis/__tests__/_AggConfigResult.js
@@ -1,12 +1,12 @@
 describe('AggConfigResult', function () {
-  var _ = require('lodash');
-  var AggConfigResult = require('ui/Vis/AggConfigResult');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let AggConfigResult = require('ui/Vis/AggConfigResult');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var AggConfig;
-  var indexPattern;
-  var Vis;
+  let AggConfig;
+  let indexPattern;
+  let Vis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -17,12 +17,12 @@ describe('AggConfigResult', function () {
 
   describe('initialization', function () {
     it('should set the type to bucket for bucket based results', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
       });
-      var aggConfig = vis.aggs.byTypeName.terms[0];
-      var results = new AggConfigResult(aggConfig, null, 10, 'apache');
+      let aggConfig = vis.aggs.byTypeName.terms[0];
+      let results = new AggConfigResult(aggConfig, null, 10, 'apache');
       expect(results).to.have.property('aggConfig', aggConfig);
       expect(results).to.have.property('$parent', null);
       expect(results).to.have.property('type', 'bucket');
@@ -31,12 +31,12 @@ describe('AggConfigResult', function () {
     });
 
     it('should set the type to metric for metric based results', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'avg', schema: 'metric', params: { field: 'bytes' } } ]
       });
-      var aggConfig = vis.aggs.byTypeName.avg[0];
-      var results = new AggConfigResult(aggConfig, null, 1024);
+      let aggConfig = vis.aggs.byTypeName.avg[0];
+      let results = new AggConfigResult(aggConfig, null, 1024);
       expect(results).to.have.property('aggConfig', aggConfig);
       expect(results).to.have.property('$parent', null);
       expect(results).to.have.property('type', 'metric');
@@ -50,18 +50,18 @@ describe('AggConfigResult', function () {
     describe('getPath()', function () {
 
       it('should return the parent and itself (in an array) for the path', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: '_type' } },
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        var parentAggConfig = vis.aggs.byTypeName.terms[0];
-        var aggConfig = vis.aggs.byTypeName.terms[1];
-        var parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
-        var result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
-        var path = result.getPath();
+        let parentAggConfig = vis.aggs.byTypeName.terms[0];
+        let aggConfig = vis.aggs.byTypeName.terms[1];
+        let parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
+        let result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
+        let path = result.getPath();
         expect(path).to.be.an(Array);
         expect(path).to.have.length(2);
         expect(path[0]).to.be(parentResult);
@@ -69,15 +69,15 @@ describe('AggConfigResult', function () {
       });
 
       it('should return itself (in an array) for the path', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        var aggConfig = vis.aggs.byTypeName.terms[0];
-        var result = new AggConfigResult(aggConfig, null, 15, 'php');
-        var path = result.getPath();
+        let aggConfig = vis.aggs.byTypeName.terms[0];
+        let result = new AggConfigResult(aggConfig, null, 15, 'php');
+        let path = result.getPath();
         expect(path).to.be.an(Array);
         expect(path).to.have.length(1);
         expect(path[0]).to.be(result);
@@ -87,15 +87,15 @@ describe('AggConfigResult', function () {
 
     describe('createFilter', function () {
       it('should return a filter object that represents the result', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        var aggConfig = vis.aggs.byTypeName.terms[0];
-        var result = new AggConfigResult(aggConfig, null, 15, 'php');
-        var filter = result.createFilter();
+        let aggConfig = vis.aggs.byTypeName.terms[0];
+        let result = new AggConfigResult(aggConfig, null, 15, 'php');
+        let filter = result.createFilter();
         expect(filter).to.have.property('query');
         expect(filter.query).to.have.property('match');
         expect(filter.query.match).to.have.property('extension');
diff --git a/src/ui/public/Vis/__tests__/_AggConfigs.js b/src/ui/public/Vis/__tests__/_AggConfigs.js
index cd165a86c0682..a3c294e20306f 100644
--- a/src/ui/public/Vis/__tests__/_AggConfigs.js
+++ b/src/ui/public/Vis/__tests__/_AggConfigs.js
@@ -1,23 +1,23 @@
 describe('AggConfigs', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-
-  var Vis;
-  var IndexedArray;
-  var AggConfig;
-  var AggConfigs;
-  var SpiedAggConfig;
-  var indexPattern;
-  var Schemas;
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+
+  let Vis;
+  let IndexedArray;
+  let AggConfig;
+  let AggConfigs;
+  let SpiedAggConfig;
+  let indexPattern;
+  let Schemas;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     // replace the AggConfig module with a spy
-    var RealAggConfigPM = require('ui/Vis/AggConfig');
+    let RealAggConfigPM = require('ui/Vis/AggConfig');
     AggConfig = Private(RealAggConfigPM);
-    var spy = sinon.spy(AggConfig);
+    let spy = sinon.spy(AggConfig);
     Object.defineProperty(spy, 'aggTypes', {
       get: function () { return AggConfig.aggTypes; },
       set: function (val) { AggConfig.aggTypes = val; }
@@ -35,28 +35,28 @@ describe('AggConfigs', function () {
   }));
 
   it('extends IndexedArray', function () {
-    var ac = new AggConfigs();
+    let ac = new AggConfigs();
     expect(ac).to.be.a(IndexedArray);
   });
 
   describe('constructor', function () {
     it('handles passing just a vis', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      var ac = new AggConfigs(vis);
+      let ac = new AggConfigs(vis);
       expect(ac).to.have.length(1);
     });
 
     it('converts configStates into AggConfig objects if they are not already', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      var ac = new AggConfigs(vis, [
+      let ac = new AggConfigs(vis, [
         {
           type: 'date_histogram',
           schema: 'segment'
@@ -72,12 +72,12 @@ describe('AggConfigs', function () {
     });
 
     it('attemps to ensure that all states have an id', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      var states = [
+      let states = [
         {
           type: 'date_histogram',
           schema: 'segment'
@@ -88,14 +88,14 @@ describe('AggConfigs', function () {
         }
       ];
 
-      var spy = sinon.spy(SpiedAggConfig, 'ensureIds');
-      var ac = new AggConfigs(vis, states);
+      let spy = sinon.spy(SpiedAggConfig, 'ensureIds');
+      let ac = new AggConfigs(vis, states);
       expect(spy.callCount).to.be(1);
       expect(spy.firstCall.args[0]).to.be(states);
     });
 
     describe('defaults', function () {
-      var vis;
+      let vis;
       beforeEach(function () {
         vis = {
           indexPattern: indexPattern,
@@ -130,17 +130,17 @@ describe('AggConfigs', function () {
       });
 
       it('should only set the number of defaults defined by the max', function () {
-        var ac = new AggConfigs(vis);
+        let ac = new AggConfigs(vis);
         expect(ac.bySchemaName.metric).to.have.length(2);
       });
 
       it('should set the defaults defined in the schema when none exist', function () {
-        var ac = new AggConfigs(vis);
+        let ac = new AggConfigs(vis);
         expect(ac).to.have.length(3);
       });
 
       it('should NOT set the defaults defined in the schema when some exist', function () {
-        var ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
+        let ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
         expect(ac).to.have.length(3);
         expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
       });
@@ -149,7 +149,7 @@ describe('AggConfigs', function () {
 
   describe('#getRequestAggs', function () {
     it('performs a stable sort, but moves metrics to the bottom', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'avg', schema: 'metric' },
@@ -162,8 +162,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var sorted = vis.aggs.getRequestAggs();
-      var aggs = _.indexBy(vis.aggs, function (agg) {
+      let sorted = vis.aggs.getRequestAggs();
+      let aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -180,7 +180,7 @@ describe('AggConfigs', function () {
 
   describe('#getResponseAggs', function () {
     it('returns all request aggs for basic aggs', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'split' },
@@ -189,8 +189,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var sorted = vis.aggs.getResponseAggs();
-      var aggs = _.indexBy(vis.aggs, function (agg) {
+      let sorted = vis.aggs.getResponseAggs();
+      let aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -201,7 +201,7 @@ describe('AggConfigs', function () {
     });
 
     it('expands aggs that have multiple responses', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'split' },
@@ -210,8 +210,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var sorted = vis.aggs.getResponseAggs();
-      var aggs = _.indexBy(vis.aggs, function (agg) {
+      let sorted = vis.aggs.getResponseAggs();
+      let aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -226,14 +226,14 @@ describe('AggConfigs', function () {
 
   describe('#toDsl', function () {
     it('uses the sorted aggs', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram' });
+      let vis = new Vis(indexPattern, { type: 'histogram' });
       sinon.spy(vis.aggs, 'getRequestAggs');
       vis.aggs.toDsl();
       expect(vis.aggs.getRequestAggs).to.have.property('callCount', 1);
     });
 
     it('calls aggConfig#toDsl() on each aggConfig and compiles the nested output', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment' },
@@ -241,8 +241,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var aggInfos = vis.aggs.map(function (aggConfig) {
-        var football = {};
+      let aggInfos = vis.aggs.map(function (aggConfig) {
+        let football = {};
 
         sinon.stub(aggConfig, 'toDsl', function () {
           return football;
@@ -255,7 +255,7 @@ describe('AggConfigs', function () {
       });
 
       (function recurse(lvl) {
-        var info = aggInfos.shift();
+        let info = aggInfos.shift();
 
         expect(lvl).to.have.property(info.id);
         expect(lvl[info.id]).to.be(info.football);
@@ -269,7 +269,7 @@ describe('AggConfigs', function () {
     });
 
     it('skips aggs that don\'t have a dsl representation', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@@ -277,9 +277,9 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var dsl = vis.aggs.toDsl();
-      var histo = vis.aggs.byTypeName.date_histogram[0];
-      var count = vis.aggs.byTypeName.count[0];
+      let dsl = vis.aggs.toDsl();
+      let histo = vis.aggs.byTypeName.date_histogram[0];
+      let count = vis.aggs.byTypeName.count[0];
 
       expect(dsl).to.have.property(histo.id);
       expect(dsl[histo.id]).to.be.an('object');
@@ -288,7 +288,7 @@ describe('AggConfigs', function () {
     });
 
     it('writes multiple metric aggregations at the same level', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@@ -299,10 +299,10 @@ describe('AggConfigs', function () {
         ]
       });
 
-      var dsl = vis.aggs.toDsl();
+      let dsl = vis.aggs.toDsl();
 
-      var histo = vis.aggs.byTypeName.date_histogram[0];
-      var metrics = vis.aggs.bySchemaGroup.metrics;
+      let histo = vis.aggs.byTypeName.date_histogram[0];
+      let metrics = vis.aggs.bySchemaGroup.metrics;
 
       expect(dsl).to.have.property(histo.id);
       expect(dsl[histo.id]).to.be.an('object');
@@ -315,7 +315,7 @@ describe('AggConfigs', function () {
     });
 
     it('writes multiple metric aggregations at every level if the vis is hierarchical', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'segment', params: { field: 'ip', orderBy: 1 } },
@@ -328,12 +328,12 @@ describe('AggConfigs', function () {
       });
       vis.isHierarchical = _.constant(true);
 
-      var topLevelDsl = vis.aggs.toDsl();
-      var buckets = vis.aggs.bySchemaGroup.buckets;
-      var metrics = vis.aggs.bySchemaGroup.metrics;
+      let topLevelDsl = vis.aggs.toDsl();
+      let buckets = vis.aggs.bySchemaGroup.buckets;
+      let metrics = vis.aggs.bySchemaGroup.metrics;
 
       (function checkLevel(dsl) {
-        var bucket = buckets.shift();
+        let bucket = buckets.shift();
         expect(dsl).to.have.property(bucket.id);
 
         expect(dsl[bucket.id]).to.be.an('object');
diff --git a/src/ui/public/Vis/__tests__/_Renderbot.js b/src/ui/public/Vis/__tests__/_Renderbot.js
index a1bfd462fa0a1..c2e95227703b3 100644
--- a/src/ui/public/Vis/__tests__/_Renderbot.js
+++ b/src/ui/public/Vis/__tests__/_Renderbot.js
@@ -1,7 +1,7 @@
 describe('renderbot', function () {
-  var Renderbot;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let Renderbot;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   function init() {
     ngMock.module('kibana');
@@ -12,15 +12,17 @@ describe('renderbot', function () {
   }
 
   describe('API', function () {
-    var vis;
-    var $el;
-    var renderbot;
+    let vis;
+    let $el;
+    let renderbot;
+    let uiState;
 
     beforeEach(init);
     beforeEach(function () {
       vis = { hello: 'world' };
       $el = 'element';
-      renderbot = new Renderbot(vis, $el);
+      uiState = {};
+      renderbot = new Renderbot(vis, $el, uiState);
     });
 
     it('should have expected methods', function () {
diff --git a/src/ui/public/Vis/__tests__/_Vis.js b/src/ui/public/Vis/__tests__/_Vis.js
index f72e69e29af9d..21512ab0ae66a 100644
--- a/src/ui/public/Vis/__tests__/_Vis.js
+++ b/src/ui/public/Vis/__tests__/_Vis.js
@@ -1,15 +1,15 @@
 describe('Vis Class', function () {
 
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var indexPattern;
-  var Vis;
-  var visTypes;
+  let indexPattern;
+  let Vis;
+  let visTypes;
 
-  var vis;
-  var stateFixture = {
+  let vis;
+  let stateFixture = {
     type: 'pie',
     aggs: [
       { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -31,7 +31,7 @@ describe('Vis Class', function () {
     vis = new Vis(indexPattern, stateFixture);
   });
 
-  var verifyVis = function (vis) {
+  let verifyVis = function (vis) {
     expect(vis).to.have.property('aggs');
     expect(vis.aggs).to.have.length(3);
 
@@ -55,7 +55,7 @@ describe('Vis Class', function () {
 
   describe('getState()', function () {
     it('should get a state that represents the... er... state', function () {
-      var state = vis.getState();
+      let state = vis.getState();
       expect(state).to.have.property('type', 'pie');
 
       expect(state).to.have.property('params');
@@ -72,14 +72,14 @@ describe('Vis Class', function () {
 
   describe('clone()', function () {
     it('should make clone of itself', function () {
-      var clone = vis.clone();
+      let clone = vis.clone();
       verifyVis(clone);
     });
   });
 
   describe('setState()', function () {
     it('should set the state to defualts', function () {
-      var vis = new Vis(indexPattern);
+      let vis = new Vis(indexPattern);
       expect(vis).to.have.property('type');
       expect(vis.type).to.eql(visTypes.byName.histogram);
       expect(vis).to.have.property('aggs');
@@ -99,7 +99,7 @@ describe('Vis Class', function () {
       expect(vis.isHierarchical()).to.be(true);
     });
     it('should return false for non-hierarchical vis (like histogram)', function () {
-      var vis = new Vis(indexPattern);
+      let vis = new Vis(indexPattern);
       expect(vis.isHierarchical()).to.be(false);
     });
   });
diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
index f4ad5d637e614..d91c0715f9907 100644
--- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
@@ -1,19 +1,19 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('GeoJson Agg Response Converter', function () {
-  var vis;
-  var tabify;
-  var convert;
-  var esResponse;
-  var aggs;
+  let vis;
+  let tabify;
+  let convert;
+  let esResponse;
+  let aggs;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    var Vis = Private(require('ui/Vis'));
-    var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    let Vis = Private(require('ui/Vis'));
+    let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
     esResponse = Private(require('fixtures/agg_resp/geohash_grid'));
     tabify = Private(require('ui/agg_response/tabify/tabify'));
@@ -55,8 +55,8 @@ describe('GeoJson Agg Response Converter', function () {
 
     describe('with table ' + JSON.stringify(tableOpts), function () {
       it('outputs a chart', function () {
-        var table = makeTable();
-        var chart = makeSingleChart(table);
+        let table = makeTable();
+        let chart = makeSingleChart(table);
         expect(chart).to.only.have.keys(
           'title',
           'tooltipFormatter',
@@ -73,9 +73,9 @@ describe('GeoJson Agg Response Converter', function () {
       });
 
       it('outputs geohash points as features in a feature collection', function () {
-        var table = makeTable();
-        var chart = makeSingleChart(table);
-        var geoJson = chart.geoJson;
+        let table = makeTable();
+        let chart = makeSingleChart(table);
+        let geoJson = chart.geoJson;
 
         expect(geoJson.type).to.be('FeatureCollection');
         expect(geoJson.features).to.be.an('array');
@@ -83,8 +83,8 @@ describe('GeoJson Agg Response Converter', function () {
       });
 
       it('exports a bunch of properties about the geo hash grid', function () {
-        var geoJson = makeGeoJson();
-        var props = geoJson.properties;
+        let geoJson = makeGeoJson();
+        let props = geoJson.properties;
 
         // props
         expect(props).to.be.an('object');
@@ -103,10 +103,10 @@ describe('GeoJson Agg Response Converter', function () {
         describe('includes one feature per row in the table', function () {
           this.timeout(60000);
 
-          var table;
-          var chart;
-          var geoColI;
-          var metricColI;
+          let table;
+          let chart;
+          let geoColI;
+          let metricColI;
 
           before(function () {
             table = makeTable();
@@ -117,7 +117,7 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should be geoJson format', function () {
             table.rows.forEach(function (row, i) {
-              var feature = chart.geoJson.features[i];
+              let feature = chart.geoJson.features[i];
               expect(feature).to.have.property('geometry');
               expect(feature.geometry).to.be.an('object');
               expect(feature).to.have.property('properties');
@@ -127,7 +127,7 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should have valid geometry data', function () {
             table.rows.forEach(function (row, i) {
-              var geometry = chart.geoJson.features[i].geometry;
+              let geometry = chart.geoJson.features[i].geometry;
               expect(geometry.type).to.be('Point');
               expect(geometry).to.have.property('coordinates');
               expect(geometry.coordinates).to.be.an('array');
@@ -139,8 +139,8 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should have value properties data', function () {
             table.rows.forEach(function (row, i) {
-              var props = chart.geoJson.features[i].properties;
-              var keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
+              let props = chart.geoJson.features[i].properties;
+              let keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
               expect(props).to.be.an('object');
               expect(props).to.only.have.keys(keys);
               expect(props.geohash).to.be.a('string');
@@ -150,15 +150,15 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should use latLng in properties and lngLat in geometry', function () {
             table.rows.forEach(function (row, i) {
-              var geometry = chart.geoJson.features[i].geometry;
-              var props = chart.geoJson.features[i].properties;
+              let geometry = chart.geoJson.features[i].geometry;
+              let props = chart.geoJson.features[i].properties;
               expect(props.center).to.eql(geometry.coordinates.slice(0).reverse());
             });
           });
 
           it('should handle both AggConfig and non-AggConfig results', function () {
             table.rows.forEach(function (row, i) {
-              var props = chart.geoJson.features[i].properties;
+              let props = chart.geoJson.features[i].properties;
               if (tableOpts.asAggConfigResults) {
                 expect(props.aggConfigResult).to.be(row[metricColI]);
                 expect(props.value).to.be(row[metricColI].value);
diff --git a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
index 071fc482298be..d85c4732a4744 100644
--- a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
@@ -1,22 +1,22 @@
 define(function (require) {
   return function TileMapTooltipFormatter($compile, $rootScope, Private) {
-    var $ = require('jquery');
-    var _ = require('lodash');
+    let $ = require('jquery');
+    let _ = require('lodash');
 
-    var fieldFormats = Private(require('ui/registry/field_formats'));
-    var $tooltipScope = $rootScope.$new();
-    var $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
+    let $tooltipScope = $rootScope.$new();
+    let $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
     $compile($el)($tooltipScope);
 
     return function tooltipFormatter(feature) {
       if (!feature) return '';
 
-      var value = feature.properties.value;
-      var acr = feature.properties.aggConfigResult;
-      var vis = acr.aggConfig.vis;
+      let value = feature.properties.value;
+      let acr = feature.properties.aggConfigResult;
+      let vis = acr.aggConfig.vis;
 
-      var metricAgg = acr.aggConfig;
-      var geoFormat = _.get(vis.aggs, 'byTypeName.geohash_grid[0].format');
+      let metricAgg = acr.aggConfig;
+      let geoFormat = _.get(vis.aggs, 'byTypeName.geohash_grid[0].format');
       if (!geoFormat) geoFormat = fieldFormats.getDefaultInstance('geo_point');
 
       $tooltipScope.details = [
diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js
index 4b883f13820a5..7919d853e48a0 100644
--- a/src/ui/public/agg_response/geo_json/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/geo_json.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function TileMapConverterFn(Private, timefilter, $compile, $rootScope) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var rowsToFeatures = require('ui/agg_response/geo_json/rowsToFeatures');
-    var tooltipFormatter = Private(require('ui/agg_response/geo_json/_tooltip_formatter'));
+    let rowsToFeatures = require('ui/agg_response/geo_json/rowsToFeatures');
+    let tooltipFormatter = Private(require('ui/agg_response/geo_json/_tooltip_formatter'));
 
     return function (vis, table) {
 
@@ -13,13 +13,13 @@ define(function (require) {
         });
       }
 
-      var geoI = columnIndex('segment');
-      var metricI = columnIndex('metric');
-      var geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
-      var metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
+      let geoI = columnIndex('segment');
+      let metricI = columnIndex('metric');
+      let geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
+      let metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
 
-      var features = rowsToFeatures(table, geoI, metricI);
-      var values = features.map(function (feature) {
+      let features = rowsToFeatures(table, geoI, metricI);
+      let values = features.map(function (feature) {
         return feature.properties.value;
       });
 
diff --git a/src/ui/public/agg_response/geo_json/rowsToFeatures.js b/src/ui/public/agg_response/geo_json/rowsToFeatures.js
index 5ce58a6ddbece..dc1bac8b141ed 100644
--- a/src/ui/public/agg_response/geo_json/rowsToFeatures.js
+++ b/src/ui/public/agg_response/geo_json/rowsToFeatures.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var decodeGeoHash = require('ui/utils/decode_geo_hash');
-  var AggConfigResult = require('ui/Vis/AggConfigResult');
-  var _ = require('lodash');
+  let decodeGeoHash = require('ui/utils/decode_geo_hash');
+  let AggConfigResult = require('ui/Vis/AggConfigResult');
+  let _ = require('lodash');
 
   function getAcr(val) {
     return val instanceof AggConfigResult ? val : null;
@@ -13,19 +13,19 @@ define(function (require) {
 
   function convertRowsToFeatures(table, geoI, metricI) {
     return _.transform(table.rows, function (features, row) {
-      var geohash = unwrap(row[geoI]);
+      let geohash = unwrap(row[geoI]);
       if (!geohash) return;
 
       // fetch latLn of northwest and southeast corners, and center point
-      var location = decodeGeoHash(geohash);
+      let location = decodeGeoHash(geohash);
 
-      var centerLatLng = [
+      let centerLatLng = [
         location.latitude[2],
         location.longitude[2]
       ];
 
       // order is nw, ne, se, sw
-      var rectangle = [
+      let rectangle = [
         [location.latitude[0], location.longitude[0]],
         [location.latitude[0], location.longitude[1]],
         [location.latitude[1], location.longitude[1]],
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
index 176ae74e04f97..d7a92dd345133 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/array_to_linked_list.js
@@ -1,10 +1,10 @@
 
-var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
-var expect = require('expect.js');
+let arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+let expect = require('expect.js');
 describe('buildHierarchicalData()', function () {
   describe('arrayToLinkedList', function () {
 
-    var results;
+    let results;
     beforeEach(function () {
       results = arrayToLinkedList([
         { id: 1 },
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
index efa1b9c003c41..0d3405ab95ed9 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
@@ -1,15 +1,15 @@
 
-var _ = require('lodash');
-var fixtures = require('fixtures/fake_hierarchical_data');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-
-var Vis;
-var Notifier;
-var AggConfigs;
-var indexPattern;
-var buildHierarchicalData;
+let _ = require('lodash');
+let fixtures = require('fixtures/fake_hierarchical_data');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+
+let Vis;
+let Notifier;
+let AggConfigs;
+let indexPattern;
+let buildHierarchicalData;
 
 describe('buildHierarchicalData', function () {
 
@@ -27,11 +27,11 @@ describe('buildHierarchicalData', function () {
 
 
   describe('metric only', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -44,7 +44,7 @@ describe('buildHierarchicalData', function () {
     });
 
     it('should set the slices with one child to a consistent label', function () {
-      var checkLabel = 'Count';
+      let checkLabel = 'Count';
       expect(results).to.have.property('slices');
       expect(results.slices).to.have.property('children');
       expect(results.slices.children).to.have.length(1);
@@ -63,8 +63,8 @@ describe('buildHierarchicalData', function () {
   describe('rows and columns', function () {
 
     it('should set the rows', function () {
-      var id = 1;
-      var vis = new Vis(indexPattern, {
+      let id = 1;
+      let vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -75,13 +75,13 @@ describe('buildHierarchicalData', function () {
       });
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-      var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
       expect(results).to.have.property('rows');
     });
 
     it('should set the columns', function () {
-      var id = 1;
-      var vis = new Vis(indexPattern, {
+      let id = 1;
+      let vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -92,18 +92,18 @@ describe('buildHierarchicalData', function () {
       });
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-      var results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
       expect(results).to.have.property('columns');
     });
 
   });
 
   describe('threeTermBuckets', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -141,11 +141,11 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneHistogramBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -173,11 +173,11 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneRangeBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -214,11 +214,11 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneFilterBucket', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -250,11 +250,11 @@ describe('buildHierarchicalData', function () {
   });
 
   describe('oneFilterBucket that is a split', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -277,7 +277,7 @@ describe('buildHierarchicalData', function () {
     });
 
     it('should set the hits attribute for the results', function () {
-      var errCall = Notifier.prototype.error.getCall(0);
+      let errCall = Notifier.prototype.error.getCall(0);
       expect(errCall).to.be.ok();
       expect(errCall.args[0]).to.contain('not supported');
 
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
index 7de60241fc7e0..0b5574454aca5 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
@@ -1,10 +1,10 @@
 
-var _ = require('lodash');
-var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
-var expect = require('expect.js');
+let _ = require('lodash');
+let collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
+let expect = require('expect.js');
 describe('collectBranch()', function () {
-  var results;
-  var convert = function (name) {
+  let results;
+  let convert = function (name) {
     return 'converted:' + name;
   };
 
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
index ff1312c9eb51f..b4118c116a144 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
@@ -1,19 +1,19 @@
 
-var _ = require('lodash');
-var fixtures = require('fixtures/fake_hierarchical_data');
-var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
-var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let fixtures = require('fixtures/fake_hierarchical_data');
+let createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
+let arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var AggConfigs;
-var Vis;
-var indexPattern;
+let AggConfigs;
+let Vis;
+let indexPattern;
 
 describe('buildHierarchicalData()', function () {
   describe('createRawData()', function () {
-    var vis;
-    var results;
+    let vis;
+    let results;
 
     beforeEach(ngMock.module('kibana'));
 
@@ -24,7 +24,7 @@ describe('buildHierarchicalData()', function () {
     }));
 
     beforeEach(function () {
-      var id = 1;
+      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -34,7 +34,7 @@ describe('buildHierarchicalData()', function () {
           { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
         ]
       });
-      var buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
+      let buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
       results = createRawData(vis, fixtures.threeTermBuckets);
@@ -45,7 +45,7 @@ describe('buildHierarchicalData()', function () {
       expect(results.columns).to.have.length(6);
       _.each(results.columns, function (column) {
         expect(column).to.have.property('aggConfig');
-        var agg = column.aggConfig;
+        let agg = column.aggConfig;
         expect(column).to.have.property('categoryName', agg.schema.name);
         expect(column).to.have.property('id', agg.id);
         expect(column).to.have.property('aggType', agg.type);
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
index ebc0303cdd089..5c3b5f2186f79 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
@@ -1,20 +1,20 @@
 
-var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
-var expect = require('expect.js');
+let extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+let expect = require('expect.js');
 
 describe('buildHierarchicalData()', function () {
   describe('extractBuckets()', function () {
 
     it('should normalize a bucket object into an array', function () {
 
-      var bucket = {
+      let bucket = {
         buckets: {
           foo: { doc_count: 1 },
           bar: { doc_count: 2 }
         }
       };
 
-      var buckets = extractBuckets(bucket);
+      let buckets = extractBuckets(bucket);
       expect(buckets).to.be.an(Array);
       expect(buckets).to.have.length(2);
       expect(buckets[0]).to.have.property('key', 'foo');
@@ -24,19 +24,19 @@ describe('buildHierarchicalData()', function () {
     });
 
     it('should return an empty array for undefined buckets', function () {
-      var buckets = extractBuckets();
+      let buckets = extractBuckets();
       expect(buckets).to.be.an(Array);
       expect(buckets).to.have.length(0);
     });
 
     it('should return the bucket array', function () {
-      var bucket =  {
+      let bucket =  {
         buckets: [
           { key: 'foo', doc_count: 1 },
           { key: 'bar', doc_count: 2 }
         ]
       };
-      var buckets = extractBuckets(bucket);
+      let buckets = extractBuckets(bucket);
       expect(buckets).to.be.an(Array);
       expect(buckets).to.be(bucket.buckets);
     });
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
index 378df0c65d4cb..9ebb2e8dd58cc 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
@@ -1,11 +1,11 @@
 
 describe('buildHierarchicalData()', function () {
   describe('transformAggregation()', function () {
-    var _ = require('lodash');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var transform;
-    var fixture;
+    let _ = require('lodash');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let transform;
+    let fixture;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -41,17 +41,17 @@ describe('buildHierarchicalData()', function () {
     });
 
     it('relies on metricAgg#getValue() for the size of the children', function () {
-      var aggData = {
+      let aggData = {
         buckets: [
           { key: 'foo' },
           { key: 'bar' }
         ]
       };
 
-      var football = {};
+      let football = {};
       fixture.metric.getValue = _.constant(football);
 
-      var children = transform(fixture.agg, fixture.metric, aggData);
+      let children = transform(fixture.agg, fixture.metric, aggData);
       expect(children).to.be.an(Array);
       expect(children).to.have.length(2);
       expect(children[0]).to.have.property('size', football);
@@ -59,7 +59,7 @@ describe('buildHierarchicalData()', function () {
     });
 
     it('should create two levels of metrics', function () {
-      var children = transform(fixture.agg, fixture.metric, fixture.aggData);
+      let children = transform(fixture.agg, fixture.metric, fixture.aggData);
       fixture.metric.getValue = function (b) { return b.doc_count; };
 
       expect(children).to.be.an(Array);
diff --git a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
index fb8b236cd0c0c..230e9cf63ac4a 100644
--- a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
+++ b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function (buckets) {
-    var previous;
+    let previous;
     _.each(buckets, function (bucket) {
       if (previous) {
         bucket._previous = previous;
diff --git a/src/ui/public/agg_response/hierarchical/_build_split.js b/src/ui/public/agg_response/hierarchical/_build_split.js
index 7c6bacc9c5f7f..6ef6ccce2bcca 100644
--- a/src/ui/public/agg_response/hierarchical/_build_split.js
+++ b/src/ui/public/agg_response/hierarchical/_build_split.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function biuldSplitProvider(Private) {
-    var transformer = Private(require('ui/agg_response/hierarchical/_transform_aggregation'));
-    var collectKeys = require('ui/agg_response/hierarchical/_collect_keys');
+    let transformer = Private(require('ui/agg_response/hierarchical/_transform_aggregation'));
+    let collectKeys = require('ui/agg_response/hierarchical/_collect_keys');
     return function (agg, metric, aggData) {
       // Ceate the split structure
-      var split = { label: '', slices: { children: [] } };
+      let split = { label: '', slices: { children: [] } };
 
       // Transform the aggData into splits
       split.slices.children = transformer(agg, metric, aggData);
diff --git a/src/ui/public/agg_response/hierarchical/_collect_branch.js b/src/ui/public/agg_response/hierarchical/_collect_branch.js
index 97370399f0e4e..5ad6518388278 100644
--- a/src/ui/public/agg_response/hierarchical/_collect_branch.js
+++ b/src/ui/public/agg_response/hierarchical/_collect_branch.js
@@ -3,13 +3,13 @@ define(function () {
     // walk up the branch for each parent
     function walk(item, memo) {
       // record the the depth
-      var depth = item.depth - 1;
+      let depth = item.depth - 1;
 
       // Using the aggConfig determine what the field name is. If the aggConfig
       // doesn't exist (which means it's an _all agg) then use the level for
       // the field name
-      var col = item.aggConfig;
-      var field = (col && col.params && col.params.field && col.params.field.displayName)
+      let col = item.aggConfig;
+      let field = (col && col.params && col.params.field && col.params.field.displayName)
         || (col && col.label)
         || ('level ' + item.depth);
 
diff --git a/src/ui/public/agg_response/hierarchical/_collect_keys.js b/src/ui/public/agg_response/hierarchical/_collect_keys.js
index 460e6c0091e2e..53e720403f9cb 100644
--- a/src/ui/public/agg_response/hierarchical/_collect_keys.js
+++ b/src/ui/public/agg_response/hierarchical/_collect_keys.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function collectKeys(children) {
-    var nextChildren = _.pluck(children, 'children');
-    var keys = _.pluck(children, 'name');
+    let nextChildren = _.pluck(children, 'children');
+    let keys = _.pluck(children, 'name');
     return _(nextChildren)
     .map(collectKeys)
     .flattenDeep()
diff --git a/src/ui/public/agg_response/hierarchical/_create_raw_data.js b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
index 9f4346a9fca57..a10a05ee1e849 100644
--- a/src/ui/public/agg_response/hierarchical/_create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
@@ -1,15 +1,15 @@
 define(function (require) {
-  var _ = require('lodash');
-  var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+  let _ = require('lodash');
+  let extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
   return function (vis, resp) {
 
     // Create the initial results structure
-    var results = { rows: [] };
+    let results = { rows: [] };
 
     // Create a reference to the buckets and metrics
-    var metrics = vis.aggs.bySchemaGroup.metrics;
-    var buckets = vis.aggs.bySchemaGroup.buckets;
-    var aggs = [];
+    let metrics = vis.aggs.bySchemaGroup.metrics;
+    let buckets = vis.aggs.bySchemaGroup.buckets;
+    let aggs = [];
 
     if (buckets) {
       _.each(buckets, function (bucket) {
@@ -38,7 +38,7 @@ define(function (require) {
 
     // if there are no buckets then we need to just set the value and return
     if (!buckets) {
-      var value = resp.aggregations
+      let value = resp.aggregations
         && resp.aggregations[metrics[0].id]
         && resp.aggregations[metrics[0].id].value
         || resp.hits.total;
@@ -61,9 +61,9 @@ define(function (require) {
       // iterate through all the buckets
       _.each(extractBuckets(data[agg.id], agg), function (bucket) {
 
-        var _record = _.flattenDeep([record, bucket.key]);
+        let _record = _.flattenDeep([record, bucket.key]);
         _.each(metrics, function (metric) {
-          var value = bucket.doc_count;
+          let value = bucket.doc_count;
           if (bucket[metric.id] && !_.isUndefined(bucket[metric.id].value)) {
             value = bucket[metric.id].value;
           }
@@ -74,7 +74,7 @@ define(function (require) {
         // buckets. If it does then we need to keep on walking the tree.
         // This is where the recursion happens.
         if (agg._next) {
-          var nextBucket = bucket[agg._next.id];
+          let nextBucket = bucket[agg._next.id];
           if (nextBucket && nextBucket.buckets) {
             walkBuckets(agg._next, bucket, _record);
           }
diff --git a/src/ui/public/agg_response/hierarchical/_extract_buckets.js b/src/ui/public/agg_response/hierarchical/_extract_buckets.js
index e1866ea5d0062..e5e6e7d580ff0 100644
--- a/src/ui/public/agg_response/hierarchical/_extract_buckets.js
+++ b/src/ui/public/agg_response/hierarchical/_extract_buckets.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function (bucket, agg) {
     if (bucket && _.isPlainObject(bucket.buckets)) {
       return _.map(bucket.buckets, function (value, key) {
-        var item = _.cloneDeep(value);
+        let item = _.cloneDeep(value);
         item.key = agg ? agg.getKey(value, key) : key;
         return item;
       });
diff --git a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
index bfae524ebf840..e6478433c387a 100644
--- a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
+++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
@@ -1,28 +1,28 @@
 define(function (require) {
   return function HierarchicalTooltipFormaterProvider($rootScope, $compile, $sce) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html'));
-    var collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
-    var $tooltipScope = $rootScope.$new();
-    var numeral = require('numeral');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html'));
+    let collectBranch = require('ui/agg_response/hierarchical/_collect_branch');
+    let $tooltipScope = $rootScope.$new();
+    let numeral = require('numeral');
 
     $compile($tooltip)($tooltipScope);
 
     return function (columns) {
       return function (event) {
-        var datum = event.datum;
+        let datum = event.datum;
 
         // Collect the current leaf and parents into an array of values
         $tooltipScope.rows = collectBranch(datum);
 
-        var metricCol = $tooltipScope.metricCol = _.find(columns, { categoryName: 'metric' });
+        let metricCol = $tooltipScope.metricCol = _.find(columns, { categoryName: 'metric' });
 
         // Map those values to what the tooltipSource.rows format.
         _.forEachRight($tooltipScope.rows, function (row, i, rows) {
           row.spacer = $sce.trustAsHtml(_.repeat('&nbsp;', row.depth));
 
-          var percent;
+          let percent;
           if (row.item.percentOfGroup != null) {
             percent = row.item.percentOfGroup;
           }
diff --git a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
index 0a3342ce8d23f..b45eebe7a7f51 100644
--- a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var _ = require('lodash');
-  var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+  let _ = require('lodash');
+  let extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
   return function transformAggregationProvider(Private) {
-    var AggConfigResult = require('ui/Vis/AggConfigResult');
+    let AggConfigResult = require('ui/Vis/AggConfigResult');
     return function transformAggregation(agg, metric, aggData, parent) {
       return _.map(extractBuckets(aggData, agg), function (bucket) {
-        var aggConfigResult = new AggConfigResult(
+        let aggConfigResult = new AggConfigResult(
           agg,
           parent && parent.aggConfigResult,
           metric.getValue(bucket),
           agg.getKey(bucket)
         );
 
-        var branch = {
+        let branch = {
           name: agg.fieldFormatter()(bucket.key),
           size: aggConfigResult.value,
           aggConfig: agg,
@@ -28,7 +28,7 @@ define(function (require) {
         // If the next bucket exists and it has children the we need to
         // transform it as well. This is where the recursion happens.
         if (agg._next) {
-          var nextBucket = bucket[agg._next.id];
+          let nextBucket = bucket[agg._next.id];
           if (nextBucket && nextBucket.buckets) {
             branch.children = transformAggregation(agg._next, metric, nextBucket, branch);
           }
diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
index 31ca1ca4b0b69..815335cf6e3f6 100644
--- a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
@@ -1,38 +1,38 @@
 define(function (require) {
   return function buildHierarchicalDataProvider(Private, Notifier) {
-    var _ = require('lodash');
-    var buildSplit = Private(require('ui/agg_response/hierarchical/_build_split'));
-    var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
-    var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
-    var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
-    var tooltipFormatter = Private(require('ui/agg_response/hierarchical/_hierarchical_tooltip_formatter'));
+    let _ = require('lodash');
+    let buildSplit = Private(require('ui/agg_response/hierarchical/_build_split'));
+    let extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets');
+    let createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
+    let arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
+    let tooltipFormatter = Private(require('ui/agg_response/hierarchical/_hierarchical_tooltip_formatter'));
 
-    var AggConfigResult = require('ui/Vis/AggConfigResult');
+    let AggConfigResult = require('ui/Vis/AggConfigResult');
 
-    var notify = new Notifier({
+    let notify = new Notifier({
       location: 'Pie chart response converter'
     });
 
     return function (vis, resp) {
       // Create a refrenece to the buckets
-      var buckets = vis.aggs.bySchemaGroup.buckets;
+      let buckets = vis.aggs.bySchemaGroup.buckets;
 
 
       // Find the metric so it's easier to reference.
       // TODO: Change this to support multiple metrics.
-      var metric = vis.aggs.bySchemaGroup.metrics[0];
+      let metric = vis.aggs.bySchemaGroup.metrics[0];
 
       // Link each agg to the next agg. This will be
       // to identify the next bucket aggregation
       buckets = arrayToLinkedList(buckets);
 
       // Create the raw data to be used in the spy panel
-      var raw = createRawData(vis, resp);
+      let raw = createRawData(vis, resp);
 
       // If buckets is falsy then we should just return the aggs
       if (!buckets) {
-        var label = 'Count';
-        var value = resp.aggregations
+        let label = 'Count';
+        let value = resp.aggregations
           && resp.aggregations[metric.id]
           && resp.aggregations[metric.id].value
           || resp.hits.total;
@@ -49,8 +49,8 @@ define(function (require) {
         };
       }
 
-      var firstAgg = buckets[0];
-      var aggData = resp.aggregations[firstAgg.id];
+      let firstAgg = buckets[0];
+      let aggData = resp.aggregations[firstAgg.id];
 
       if (!firstAgg._next && firstAgg.schema.name === 'split') {
         notify.error('Splitting charts without splitting slices is not supported. Pretending that we are just splitting slices.');
@@ -58,7 +58,7 @@ define(function (require) {
 
       // start with splitting slices
       if (!firstAgg._next || firstAgg.schema.name === 'segment') {
-        var split = buildSplit(firstAgg, metric, aggData);
+        let split = buildSplit(firstAgg, metric, aggData);
         split.hits = resp.hits.total;
         split.raw = raw;
         split.tooltipFormatter = tooltipFormatter(raw.columns);
@@ -66,17 +66,17 @@ define(function (require) {
       }
 
       // map the split aggregations into rows.
-      var rows = _.map(extractBuckets(aggData, firstAgg), function (bucket) {
-        var agg = firstAgg._next;
-        var split = buildSplit(agg, metric, bucket[agg.id]);
+      let rows = _.map(extractBuckets(aggData, firstAgg), function (bucket) {
+        let agg = firstAgg._next;
+        let split = buildSplit(agg, metric, bucket[agg.id]);
         // Since splits display labels we need to set it.
         split.label = firstAgg.fieldFormatter()(agg.getKey(bucket));
 
-        var displayName = firstAgg.fieldDisplayName();
+        let displayName = firstAgg.fieldDisplayName();
         if (!_.isEmpty(displayName)) split.label += ': ' + displayName;
 
         split.tooltipFormatter = tooltipFormatter(raw.columns);
-        var aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
+        let aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
         split.split = { aggConfig: firstAgg, aggConfigResult: aggConfigResult, key: bucket.key };
         _.each(split.slices.children, function (child) {
           child.aggConfigResult.$parent = aggConfigResult;
@@ -84,7 +84,7 @@ define(function (require) {
         return split;
       });
 
-      var result = { hits: resp.hits.total, raw: raw };
+      let result = { hits: resp.hits.total, raw: raw };
       if (firstAgg.params.row) {
         result.rows = rows;
       } else {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
index 0e7042d8a2e3a..6aef0e16ead8c 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
@@ -1,7 +1,7 @@
 describe('addToSiri', function () {
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var addToSiri;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let addToSiri;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -9,9 +9,9 @@ describe('addToSiri', function () {
   }));
 
   it('creates a new series the first time it sees an id', function () {
-    var series = new Map();
-    var point = {};
-    var id = 'id';
+    let series = new Map();
+    let point = {};
+    let id = 'id';
     addToSiri(series, point, id);
 
     expect(series.has(id)).to.be(true);
@@ -22,13 +22,13 @@ describe('addToSiri', function () {
   });
 
   it('adds points to existing series if id has been seen', function () {
-    var series = new Map();
-    var id = 'id';
+    let series = new Map();
+    let id = 'id';
 
-    var point = {};
+    let point = {};
     addToSiri(series, point, id);
 
-    var point2 = {};
+    let point2 = {};
     addToSiri(series, point2, id);
 
     expect(series.has(id)).to.be(true);
@@ -40,10 +40,10 @@ describe('addToSiri', function () {
   });
 
   it('allows overriding the series label', function () {
-    var series = new Map();
-    var id = 'id';
-    var label = 'label';
-    var point = {};
+    let series = new Map();
+    let id = 'id';
+    let label = 'label';
+    let point = {};
     addToSiri(series, point, id, label);
 
     expect(series.has(id)).to.be(true);
diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
index 1f7d8e338cf56..fc72b119918c6 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
@@ -1,12 +1,12 @@
 describe('makeFakeXAspect', function () {
 
-  var makeFakeXAspect;
-  var Vis;
-  var AggType;
-  var AggConfig;
-  var indexPattern;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let makeFakeXAspect;
+  let Vis;
+  let AggType;
+  let AggConfig;
+  let indexPattern;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -18,8 +18,8 @@ describe('makeFakeXAspect', function () {
   }));
 
   it('creates an object that looks like an aspect', function () {
-    var vis = new Vis(indexPattern, { type: 'histogram' });
-    var aspect = makeFakeXAspect(vis);
+    let vis = new Vis(indexPattern, { type: 'histogram' });
+    let aspect = makeFakeXAspect(vis);
 
     expect(aspect)
       .to.have.property('i', -1)
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
index 9ac566e0e48bd..ba8b5cb455221 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
@@ -1,14 +1,14 @@
 describe('getAspects', function () {
-  var _ = require('lodash');
-  var moment = require('moment');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let moment = require('moment');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var Vis;
-  var Table;
-  var AggConfig;
-  var indexPattern;
-  var getAspects;
+  let Vis;
+  let Table;
+  let AggConfig;
+  let indexPattern;
+  let getAspects;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -19,10 +19,10 @@ describe('getAspects', function () {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
   }));
 
-  var vis;
-  var table;
+  let vis;
+  let table;
 
-  var date = _.memoize(function (n) {
+  let date = _.memoize(function (n) {
     return moment().startOf('day').add(n, 'hour').valueOf();
   });
 
@@ -45,7 +45,7 @@ describe('getAspects', function () {
 
   function init(group, x, y) {
     // map args to indicies that should be removed
-    var filter = filterByIndex([
+    let filter = filterByIndex([
       x > 0,
       x > 1,
       group > 0,
@@ -87,7 +87,7 @@ describe('getAspects', function () {
       ].map(filter)
     };
 
-    var aggs = vis.aggs.splice(0, vis.aggs.length);
+    let aggs = vis.aggs.splice(0, vis.aggs.length);
     filter(aggs).forEach(function (filter) {
       vis.aggs.push(filter);
     });
@@ -96,7 +96,7 @@ describe('getAspects', function () {
   it('produces an aspect object for each of the aspect types found in the columns', function () {
     init(1, 1, 1);
 
-    var aspects = getAspects(vis, table);
+    let aspects = getAspects(vis, table);
     validate(aspects.x, 0);
     validate(aspects.series, 1);
     validate(aspects.y, 2);
@@ -105,7 +105,7 @@ describe('getAspects', function () {
   it('uses arrays only when there are more than one aspect of a specific type', function () {
     init(0, 1, 2);
 
-    var aspects = getAspects(vis, table);
+    let aspects = getAspects(vis, table);
 
     validate(aspects.x, 0);
     expect(aspects.series == null).to.be(true);
@@ -134,7 +134,7 @@ describe('getAspects', function () {
   it('creates a fake x aspect if the column does not exist', function () {
     init(0, 0, 1);
 
-    var aspects = getAspects(vis, table);
+    let aspects = getAspects(vis, table);
 
     expect(aspects.x)
       .to.be.an('object')
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
index 26afb0d767506..3c144b13b3b87 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
@@ -1,13 +1,13 @@
 
 describe('getPoint', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var getPoint;
+  let getPoint;
 
-  var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
-  var identFormatted = { fieldFormatter: _.constant(_.identity) };
+  let truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
+  let identFormatted = { fieldFormatter: _.constant(_.identity) };
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -15,10 +15,10 @@ describe('getPoint', function () {
   }));
 
   describe('Without series aspect', function () {
-    var seriesAspect;
-    var xAspect;
-    var yAspect;
-    var yScale;
+    let seriesAspect;
+    let xAspect;
+    let yAspect;
+    let yScale;
 
     beforeEach(function () {
       seriesAspect = null;
@@ -28,9 +28,9 @@ describe('getPoint', function () {
     });
 
     it('properly unwraps and scales values', function () {
-      var row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
-      var zAspect = { i: 2 };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
+      let row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
+      let zAspect = { i: 2 };
+      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -41,17 +41,17 @@ describe('getPoint', function () {
     });
 
     it('ignores points with a y value of NaN', function () {
-      var row = [ { value: 1 }, { value: 'NaN' }];
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      let row = [ { value: 1 }, { value: 'NaN' }];
+      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
       expect(point).to.be(void 0);
     });
   });
 
   describe('With series aspect', function () {
-    var row;
-    var xAspect;
-    var yAspect;
-    var yScale;
+    let row;
+    let xAspect;
+    let yAspect;
+    let yScale;
 
     beforeEach(function () {
       row = [ { value: 1 }, { value: 2 }, { value: 3 }];
@@ -61,8 +61,8 @@ describe('getPoint', function () {
     });
 
     it('properly unwraps and scales values', function () {
-      var seriesAspect = { i: 1, agg: identFormatted };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      let seriesAspect = { i: 1, agg: identFormatted };
+      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -72,8 +72,8 @@ describe('getPoint', function () {
     });
 
     it('properly formats series values', function () {
-      var seriesAspect = { i: 1, agg: truthFormatted };
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      let seriesAspect = { i: 1, agg: truthFormatted };
+      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -83,8 +83,8 @@ describe('getPoint', function () {
     });
 
     it ('adds the aggConfig to the points', function () {
-      var seriesAspect = { i: 1, agg:  truthFormatted};
-      var point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      let seriesAspect = { i: 1, agg:  truthFormatted};
+      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point).to.have.property('aggConfig', truthFormatted);
     });
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
index c7c0bf6a2c05e..96aedbc5b126c 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
@@ -1,10 +1,10 @@
 describe('getSeries', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var getSeries;
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let getSeries;
 
-  var agg = { fieldFormatter: _.constant(_.identity) };
+  let agg = { fieldFormatter: _.constant(_.identity) };
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -18,7 +18,7 @@ describe('getSeries', function () {
   }
 
   it('produces a single series with points for each row', function () {
-    var rows = [
+    let rows = [
       [1, 2, 3],
       [1, 2, 3],
       [1, 2, 3],
@@ -26,7 +26,7 @@ describe('getSeries', function () {
       [1, 2, 3]
     ].map(wrapRows);
 
-    var chart = {
+    let chart = {
       aspects: {
         x: { i: 0 },
         y: { i: 1 },
@@ -34,13 +34,13 @@ describe('getSeries', function () {
       }
     };
 
-    var series = getSeries(rows, chart);
+    let series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
       .and.to.have.length(1);
 
-    var siri = series[0];
+    let siri = series[0];
     expect(siri)
       .to.be.an('object')
       .and.have.property('label', '')
@@ -59,7 +59,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there are multiple y aspects', function () {
-    var rows = [
+    let rows = [
       [1, 2, 3],
       [1, 2, 3],
       [1, 2, 3],
@@ -67,7 +67,7 @@ describe('getSeries', function () {
       [1, 2, 3]
     ].map(wrapRows);
 
-    var chart = {
+    let chart = {
       aspects: {
         x: { i: 0 },
         y: [
@@ -77,7 +77,7 @@ describe('getSeries', function () {
       }
     };
 
-    var series = getSeries(rows, chart);
+    let series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -102,7 +102,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there is a series aspect', function () {
-    var rows = [
+    let rows = [
       ['0', 3],
       ['1', 3],
       ['1', 'NaN'],
@@ -113,7 +113,7 @@ describe('getSeries', function () {
       ['1', 3]
     ].map(wrapRows);
 
-    var chart = {
+    let chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -121,7 +121,7 @@ describe('getSeries', function () {
       }
     };
 
-    var series = getSeries(rows, chart);
+    let series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -146,7 +146,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there is a series aspect and multipl y aspects', function () {
-    var rows = [
+    let rows = [
       ['0', 3, 4],
       ['1', 3, 4],
       ['0', 3, 4],
@@ -155,7 +155,7 @@ describe('getSeries', function () {
       ['1', 3, 4]
     ].map(wrapRows);
 
-    var chart = {
+    let chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -166,7 +166,7 @@ describe('getSeries', function () {
       }
     };
 
-    var series = getSeries(rows, chart);
+    let series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -196,7 +196,7 @@ describe('getSeries', function () {
   });
 
   it('produces a series list in the same order as its corresponding metric column', function () {
-    var rows = [
+    let rows = [
       ['0', 3, 4],
       ['1', 3, 4],
       ['0', 3, 4],
@@ -205,7 +205,7 @@ describe('getSeries', function () {
       ['1', 3, 4]
     ].map(wrapRows);
 
-    var chart = {
+    let chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -216,7 +216,7 @@ describe('getSeries', function () {
       }
     };
 
-    var series = getSeries(rows, chart);
+    let series = getSeries(rows, chart);
     expect(series[0]).to.have.property('label', '0: 0');
     expect(series[1]).to.have.property('label', '0: 1');
     expect(series[2]).to.have.property('label', '1: 0');
@@ -229,7 +229,7 @@ describe('getSeries', function () {
       y.i = i;
     });
 
-    var series2 = getSeries(rows, chart);
+    let series2 = getSeries(rows, chart);
     expect(series2[0]).to.have.property('label', '0: 1');
     expect(series2[1]).to.have.property('label', '0: 0');
     expect(series2[2]).to.have.property('label', '1: 1');
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
index 904ee1c1b20d1..a6d35ca0d9a64 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
@@ -1,16 +1,16 @@
 describe('initXAxis', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var initXAxis;
+  let initXAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
   }));
 
-  var baseChart = {
+  let baseChart = {
     aspects: {
       x: {
         agg: {
@@ -26,7 +26,7 @@ describe('initXAxis', function () {
   };
 
   it('sets the xAxisFormatter if the agg is not ordered', function () {
-    var chart = _.cloneDeep(baseChart);
+    let chart = _.cloneDeep(baseChart);
     initXAxis(chart);
     expect(chart)
       .to.have.property('xAxisLabel', 'label')
@@ -34,7 +34,7 @@ describe('initXAxis', function () {
   });
 
   it('makes the chart ordered if the agg is ordered', function () {
-    var chart = _.cloneDeep(baseChart);
+    let chart = _.cloneDeep(baseChart);
     chart.aspects.x.agg.type.ordered = true;
 
     initXAxis(chart);
@@ -49,7 +49,7 @@ describe('initXAxis', function () {
   });
 
   it('reads the interval param from the x agg', function () {
-    var chart = _.cloneDeep(baseChart);
+    let chart = _.cloneDeep(baseChart);
     chart.aspects.x.agg.type.ordered = true;
     chart.aspects.x.agg.write = _.constant({ params: { interval: 10 } });
 
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
index 0421369f95ff7..1d9f541e7efe1 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
@@ -1,9 +1,9 @@
 describe('initYAxis', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var initYAxis;
+  let initYAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -18,7 +18,7 @@ describe('initYAxis', function () {
     };
   }
 
-  var baseChart = {
+  let baseChart = {
     aspects: {
       y: [
         { agg: agg(), col: { title: 'y1' } },
@@ -32,17 +32,17 @@ describe('initYAxis', function () {
   };
 
   describe('with a single y aspect', function () {
-    var singleYBaseChart = _.cloneDeep(baseChart);
+    let singleYBaseChart = _.cloneDeep(baseChart);
     singleYBaseChart.aspects.y = singleYBaseChart.aspects.y[0];
 
     it('sets the yAxisFormatter the the field formats convert fn', function () {
-      var chart = _.cloneDeep(singleYBaseChart);
+      let chart = _.cloneDeep(singleYBaseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisFormatter', chart.aspects.y.agg.fieldFormatter());
     });
 
     it('sets the yAxisLabel', function () {
-      var chart = _.cloneDeep(singleYBaseChart);
+      let chart = _.cloneDeep(singleYBaseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisLabel', 'y1');
     });
@@ -50,7 +50,7 @@ describe('initYAxis', function () {
 
   describe('with mutliple y aspects', function () {
     it('sets the yAxisFormatter the the field formats convert fn for the first y aspect', function () {
-      var chart = _.cloneDeep(baseChart);
+      let chart = _.cloneDeep(baseChart);
       initYAxis(chart);
 
       expect(chart).to.have.property('yAxisFormatter');
@@ -60,7 +60,7 @@ describe('initYAxis', function () {
     });
 
     it('does not set the yAxisLabel, it does not make sense to put multiple labels on the same axis', function () {
-      var chart = _.cloneDeep(baseChart);
+      let chart = _.cloneDeep(baseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisLabel', '');
     });
diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js
index c2f1939ac4182..fd5dbee165cee 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_main.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_main.js
@@ -1,16 +1,16 @@
 describe('pointSeriesChartDataFromTable', function () {
   this.slow(1000);
 
-  var _ = require('lodash');
-  var moment = require('moment');
-  var AggConfigResult = require('ui/Vis/AggConfigResult');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let moment = require('moment');
+  let AggConfigResult = require('ui/Vis/AggConfigResult');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var pointSeriesChartDataFromTable;
-  var indexPattern;
-  var Table;
-  var Vis;
+  let pointSeriesChartDataFromTable;
+  let indexPattern;
+  let Table;
+  let Vis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -21,20 +21,20 @@ describe('pointSeriesChartDataFromTable', function () {
   }));
 
   it('handles a table with just a count', function () {
-    var vis = new Vis(indexPattern, { type: 'histogram' });
-    var agg = vis.aggs[0];
-    var result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
+    let vis = new Vis(indexPattern, { type: 'histogram' });
+    let agg = vis.aggs[0];
+    let result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
 
-    var table = new Table();
+    let table = new Table();
     table.columns = [ { aggConfig: agg } ];
     table.rows.push([ result ]);
 
-    var chartData = pointSeriesChartDataFromTable(vis, table);
+    let chartData = pointSeriesChartDataFromTable(vis, table);
 
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(1);
-    var series = chartData.series[0];
+    let series = chartData.series[0];
     expect(series.values).to.have.length(1);
     expect(series.values[0])
       .to.have.property('x', '_all')
@@ -43,7 +43,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with x and y column', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'count', schema: 'metric' },
@@ -51,32 +51,32 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    var y = {
+    let y = {
       agg: vis.aggs[0],
       col: { aggConfig: vis.aggs[0] },
       at: function (i) { return 100 * i; }
     };
 
-    var x = {
+    let x = {
       agg: vis.aggs[1],
       col: { aggConfig: vis.aggs[1] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    var rowCount = 3;
-    var table = new Table();
+    let rowCount = 3;
+    let table = new Table();
     table.columns = [ x.col, y.col ];
     _.times(rowCount, function (i) {
-      var date = new AggConfigResult(x.agg, void 0, x.at(i));
+      let date = new AggConfigResult(x.agg, void 0, x.at(i));
       table.rows.push([date, new AggConfigResult(y.agg, date, y.at(i))]);
     });
 
-    var chartData = pointSeriesChartDataFromTable(vis, table);
+    let chartData = pointSeriesChartDataFromTable(vis, table);
 
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(1);
-    var series = chartData.series[0];
+    let series = chartData.series[0];
     expect(series.values).to.have.length(rowCount);
     series.values.forEach(function (point, i) {
       expect(point)
@@ -96,7 +96,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with an x and two y aspects', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -105,40 +105,40 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    var avg = {
+    let avg = {
       agg: vis.aggs[0],
       col: { title: 'average', aggConfig: vis.aggs[0] },
       at: function (i) { return 75.444 * (i + 1); }
     };
 
-    var date = {
+    let date = {
       agg: vis.aggs[1],
       col: { title: 'date', aggConfig: vis.aggs[1] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    var max = {
+    let max = {
       agg: vis.aggs[2],
       col: { title: 'maximum', aggConfig: vis.aggs[2] },
       at: function (i) { return 100 * (i + 1); }
     };
 
-    var rowCount = 3;
-    var table = new Table();
+    let rowCount = 3;
+    let table = new Table();
     table.columns = [ date.col, avg.col, max.col ];
     _.times(rowCount, function (i) {
-      var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-      var avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
-      var maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
+      let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      let avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
+      let maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
       table.rows.push([dateResult, avgResult, maxResult]);
     });
 
-    var chartData = pointSeriesChartDataFromTable(vis, table);
+    let chartData = pointSeriesChartDataFromTable(vis, table);
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(2);
     chartData.series.forEach(function (siri, i) {
-      var metric = i === 0 ? avg : max;
+      let metric = i === 0 ? avg : max;
 
       expect(siri).to.have.property('label', metric.col.label);
       expect(siri.values).to.have.length(rowCount);
@@ -166,7 +166,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with an x, a series, and two y aspects', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'terms', schema: 'group', params: { field: 'extension' } },
@@ -176,53 +176,53 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    var extensions = ['php', 'jpg', 'gif', 'css'];
-    var term = {
+    let extensions = ['php', 'jpg', 'gif', 'css'];
+    let term = {
       agg: vis.aggs[0],
       col: { title: 'extensions', aggConfig: vis.aggs[0] },
       at: function (i) { return extensions[i % extensions.length]; }
     };
 
-    var avg = {
+    let avg = {
       agg: vis.aggs[1],
       col: { title: 'average', aggConfig: vis.aggs[1] },
       at: function (i) { return 75.444 * (i + 1); }
     };
 
-    var date = {
+    let date = {
       agg: vis.aggs[2],
       col: { title: 'date', aggConfig: vis.aggs[2] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    var max = {
+    let max = {
       agg: vis.aggs[3],
       col: { title: 'maximum', aggConfig: vis.aggs[3] },
       at: function (i) { return 100 * (i + 1); }
     };
 
-    var metricCount = 2;
-    var rowsPerSegment = 2;
-    var rowCount = extensions.length * rowsPerSegment;
-    var table = new Table();
+    let metricCount = 2;
+    let rowsPerSegment = 2;
+    let rowCount = extensions.length * rowsPerSegment;
+    let table = new Table();
     table.columns = [ date.col, term.col, avg.col, max.col ];
     _.times(rowCount, function (i) {
-      var dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-      var termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
-      var avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
-      var maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
+      let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      let termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
+      let avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
+      let maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
       table.rows.push([dateResult, termResult, avgResult, maxResult]);
     });
 
-    var chartData = pointSeriesChartDataFromTable(vis, table);
+    let chartData = pointSeriesChartDataFromTable(vis, table);
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     // one series for each extension, and then one for each metric inside
     expect(chartData.series).to.have.length(extensions.length * metricCount);
     chartData.series.forEach(function (siri, i) {
       // figure out the metric used to create this series
-      var metricAgg = siri.values[0].aggConfigResult.aggConfig;
-      var metric = avg.agg === metricAgg ? avg : max;
+      let metricAgg = siri.values[0].aggConfigResult.aggConfig;
+      let metric = avg.agg === metricAgg ? avg : max;
 
       expect(siri.values).to.have.length(rowsPerSegment);
       siri.values.forEach(function (point) {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
index f25fcd8321ef0..490e25f241c54 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
@@ -1,11 +1,11 @@
 describe('orderedDateAxis', function () {
-  var moment = require('moment');
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let moment = require('moment');
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var baseArgs = {
+  let baseArgs = {
     vis: {
       indexPattern: {
         timeFieldName: '@timestamp'
@@ -27,7 +27,7 @@ describe('orderedDateAxis', function () {
     }
   };
 
-  var orderedDateAxis;
+  let orderedDateAxis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -36,7 +36,7 @@ describe('orderedDateAxis', function () {
 
   describe('xAxisFormatter', function () {
     it('sets the xAxisFormatter', function () {
-      var args = _.cloneDeep(baseArgs);
+      let args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
       expect(args.chart).to.have.property('xAxisFormatter');
@@ -44,10 +44,10 @@ describe('orderedDateAxis', function () {
     });
 
     it('formats values using moment, and returns strings', function () {
-      var args = _.cloneDeep(baseArgs);
+      let args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
-      var val = '2014-08-06T12:34:01';
+      let val = '2014-08-06T12:34:01';
       expect(args.chart.xAxisFormatter(val))
         .to.be(moment(val).format('hh:mm:ss'));
     });
@@ -55,7 +55,7 @@ describe('orderedDateAxis', function () {
 
   describe('ordered object', function () {
     it('sets date: true', function () {
-      var args = _.cloneDeep(baseArgs);
+      let args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
       expect(args.chart)
@@ -66,21 +66,21 @@ describe('orderedDateAxis', function () {
     });
 
     it('relies on agg.buckets for the interval', function () {
-      var args = _.cloneDeep(baseArgs);
-      var spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
+      let args = _.cloneDeep(baseArgs);
+      let spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
       orderedDateAxis(args.vis, args.chart);
       expect(spy).to.have.property('callCount', 1);
     });
 
     it('sets the min/max when the buckets are bounded', function () {
-      var args = _.cloneDeep(baseArgs);
+      let args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
       expect(moment.isMoment(args.chart.ordered.min)).to.be(true);
       expect(moment.isMoment(args.chart.ordered.max)).to.be(true);
     });
 
     it('does not set the min/max when the buckets are unbounded', function () {
-      var args = _.cloneDeep(baseArgs);
+      let args = _.cloneDeep(baseArgs);
       args.chart.aspects.x.agg.buckets.getBounds = _.constant();
       orderedDateAxis(args.vis, args.chart);
       expect(args.chart.ordered).to.not.have.property('min');
diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
index 75566f842fc09..9a77e2b9ab95a 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
@@ -1,10 +1,10 @@
 describe('tooltipFormatter', function () {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var tooltipFormatter;
+  let tooltipFormatter;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -22,7 +22,7 @@ describe('tooltipFormatter', function () {
     return $row.eq(i).text().trim();
   }
 
-  var baseEvent = {
+  let baseEvent = {
     datum: {
       aggConfigResult: {
         aggConfig: agg('inner'),
@@ -41,20 +41,20 @@ describe('tooltipFormatter', function () {
   };
 
   it('returns html based on the mouse event', function () {
-    var event = _.cloneDeep(baseEvent);
-    var $el = $(tooltipFormatter(event));
-    var $rows = $el.find('tr');
+    let event = _.cloneDeep(baseEvent);
+    let $el = $(tooltipFormatter(event));
+    let $rows = $el.find('tr');
     expect($rows.size()).to.be(3);
 
-    var $row1 = $rows.eq(0).find('td');
+    let $row1 = $rows.eq(0).find('td');
     expect(cell($row1, 0)).to.be('inner');
     expect(cell($row1, 1)).to.be('(3)');
 
-    var $row2 = $rows.eq(1).find('td');
+    let $row2 = $rows.eq(1).find('td');
     expect(cell($row2, 0)).to.be('middle');
     expect(cell($row2, 1)).to.be('(2)');
 
-    var $row3 = $rows.eq(2).find('td');
+    let $row3 = $rows.eq(2).find('td');
     expect(cell($row3, 0)).to.be('top');
     expect(cell($row3, 1)).to.be('(1)');
   });
diff --git a/src/ui/public/agg_response/point_series/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
index 5de2c4928aff9..32094060195c1 100644
--- a/src/ui/public/agg_response/point_series/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function PointSeriesFakeXAxis(Private) {
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
-    var AggType = Private(require('ui/agg_types/AggType'));
+    let AggConfig = Private(require('ui/Vis/AggConfig'));
+    let AggType = Private(require('ui/agg_types/AggType'));
 
-    var allAgg = new AggType({
+    let allAgg = new AggType({
       name: 'all',
       title: 'All docs',
       ordered: false,
@@ -11,7 +11,7 @@ define(function (require) {
     });
 
     return function makeFakeXAxis(vis) {
-      var fake = new AggConfig(vis, {
+      let fake = new AggConfig(vis, {
         type: allAgg,
         schema: vis.type.schemas.all.byName.segment
       });
diff --git a/src/ui/public/agg_response/point_series/_get_aspects.js b/src/ui/public/agg_response/point_series/_get_aspects.js
index 58ce78b3549ef..ff86b41ee317a 100644
--- a/src/ui/public/agg_response/point_series/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/_get_aspects.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function PointSeriesGetAspects(Private) {
-    var _ = require('lodash');
-    var fakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect'));
+    let _ = require('lodash');
+    let fakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect'));
 
-    var map = {
+    let map = {
       segment: 'x',
       metric: 'y',
       radius: 'z',
@@ -12,12 +12,12 @@ define(function (require) {
     };
 
     function columnToAspect(aspects, col, i) {
-      var schema = col.aggConfig.schema.name;
+      let schema = col.aggConfig.schema.name;
 
-      var name = map[schema];
+      let name = map[schema];
       if (!name) throw new TypeError('unknown schema name "' + schema + '"');
 
-      var aspect = {
+      let aspect = {
         i: i,
         col: col,
         agg: col.aggConfig
@@ -36,7 +36,7 @@ define(function (require) {
      *                    may be undefined, a single aspect, or an array of aspects.
      */
     return function getAspects(vis, table) {
-      var aspects = _(table.columns)
+      let aspects = _(table.columns)
       // write each column into the aspects under it's group
       .transform(columnToAspect, {})
       // unwrap groups that only have one value, and validate groups that have more
diff --git a/src/ui/public/agg_response/point_series/_get_point.js b/src/ui/public/agg_response/point_series/_get_point.js
index c0b4e30ef2f0c..105d4675c0f25 100644
--- a/src/ui/public/agg_response/point_series/_get_point.js
+++ b/src/ui/public/agg_response/point_series/_get_point.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function PointSeriesGetPoint() {
-    var _ = require('lodash');
+    let _ = require('lodash');
     function unwrap(aggConfigResult, def) {
       return aggConfigResult ? aggConfigResult.value : def;
     }
 
     return function getPoint(x, series, yScale, row, y, z) {
-      var zRow = z && row[z.i];
-      var xRow = row[x.i];
+      let zRow = z && row[z.i];
+      let xRow = row[x.i];
 
-      var point = {
+      let point = {
         x: unwrap(xRow, '_all'),
         xi: xRow && xRow.$order,
         y: unwrap(row[y.i]),
diff --git a/src/ui/public/agg_response/point_series/_get_series.js b/src/ui/public/agg_response/point_series/_get_series.js
index 7e86ecf67ba2f..331c1531a6448 100644
--- a/src/ui/public/agg_response/point_series/_get_series.js
+++ b/src/ui/public/agg_response/point_series/_get_series.js
@@ -1,30 +1,30 @@
 define(function (require) {
   return function PointSeriesGetSeries(Private) {
-    var _ = require('lodash');
-    var getPoint = Private(require('ui/agg_response/point_series/_get_point'));
-    var addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri'));
+    let _ = require('lodash');
+    let getPoint = Private(require('ui/agg_response/point_series/_get_point'));
+    let addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri'));
 
     return function getSeries(rows, chart) {
-      var aspects = chart.aspects;
-      var multiY = _.isArray(aspects.y);
-      var yScale = chart.yScale;
-      var partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
+      let aspects = chart.aspects;
+      let multiY = _.isArray(aspects.y);
+      let yScale = chart.yScale;
+      let partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
 
-      var series = _(rows)
+      let series = _(rows)
       .transform(function (series, row) {
         if (!multiY) {
-          var point = partGetPoint(row, aspects.y, aspects.z);
+          let point = partGetPoint(row, aspects.y, aspects.z);
           if (point) addToSiri(series, point, point.series);
           return;
         }
 
         aspects.y.forEach(function (y) {
-          var point = partGetPoint(row, y, aspects.z);
+          let point = partGetPoint(row, y, aspects.z);
           if (!point) return;
 
-          var prefix = point.series ? point.series + ': ' : '';
-          var seriesId = prefix + y.agg.id;
-          var seriesLabel = prefix + y.col.title;
+          let prefix = point.series ? point.series + ': ' : '';
+          let seriesId = prefix + y.agg.id;
+          let seriesLabel = prefix + y.col.title;
 
           addToSiri(series, point, seriesId, seriesLabel);
         });
@@ -35,11 +35,11 @@ define(function (require) {
 
       if (multiY) {
         series = _.sortBy(series, function (siri) {
-          var firstVal = siri.values[0];
-          var y;
+          let firstVal = siri.values[0];
+          let y;
 
           if (firstVal) {
-            var agg = firstVal.aggConfigResult.aggConfig;
+            let agg = firstVal.aggConfigResult.aggConfig;
             y = _.find(aspects.y, function (y) {
               return y.agg === agg;
             });
diff --git a/src/ui/public/agg_response/point_series/_init_x_axis.js b/src/ui/public/agg_response/point_series/_init_x_axis.js
index 3910621f701c5..2a3584c3834f7 100644
--- a/src/ui/public/agg_response/point_series/_init_x_axis.js
+++ b/src/ui/public/agg_response/point_series/_init_x_axis.js
@@ -1,14 +1,14 @@
 define(function () {
   return function PointSeriesInitX() {
     return function initXAxis(chart) {
-      var x = chart.aspects.x;
+      let x = chart.aspects.x;
       chart.xAxisFormatter = x.agg ? x.agg.fieldFormatter() : String;
       chart.xAxisLabel = x.col.title;
 
       if (!x.agg || !x.agg.type.ordered) return;
 
       chart.ordered = {};
-      var xAggOutput = x.agg.write();
+      let xAggOutput = x.agg.write();
       if (xAggOutput.params.interval) {
         chart.ordered.interval = xAggOutput.params.interval;
       }
diff --git a/src/ui/public/agg_response/point_series/_init_y_axis.js b/src/ui/public/agg_response/point_series/_init_y_axis.js
index b47ec2ef884c2..a34039073e75f 100644
--- a/src/ui/public/agg_response/point_series/_init_y_axis.js
+++ b/src/ui/public/agg_response/point_series/_init_y_axis.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function PointSeriesInitYAxis() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     return function initYAxis(chart) {
-      var y = chart.aspects.y;
-      var x = chart.aspects.x;
+      let y = chart.aspects.y;
+      let x = chart.aspects.x;
 
       if (_.isArray(y)) {
         // TODO: vis option should allow choosing this format
@@ -15,7 +15,7 @@ define(function (require) {
         chart.yAxisLabel = y.col.title;
       }
 
-      var xAggOutput = x.agg.write();
+      let xAggOutput = x.agg.write();
       chart.yScale = xAggOutput.metricScale || null;
     };
   };
diff --git a/src/ui/public/agg_response/point_series/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/_ordered_date_axis.js
index 805bea1c43bbe..34662a7f1f94c 100644
--- a/src/ui/public/agg_response/point_series/_ordered_date_axis.js
+++ b/src/ui/public/agg_response/point_series/_ordered_date_axis.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function PointSeriesOrderedDateAxis(timefilter) {
-    var moment = require('moment');
+    let moment = require('moment');
 
     return function orderedDateAxis(vis, chart) {
-      var xAgg = chart.aspects.x.agg;
-      var buckets = xAgg.buckets;
-      var format = buckets.getScaledDateFormat();
+      let xAgg = chart.aspects.x.agg;
+      let buckets = xAgg.buckets;
+      let format = buckets.getScaledDateFormat();
 
       chart.xAxisFormatter = function (val) {
         return moment(val).format(format);
@@ -16,8 +16,8 @@ define(function (require) {
         interval: buckets.getInterval(),
       };
 
-      var axisOnTimeField = xAgg.fieldIsTimeField();
-      var bounds = buckets.getBounds();
+      let axisOnTimeField = xAgg.fieldIsTimeField();
+      let bounds = buckets.getBounds();
       if (bounds && axisOnTimeField) {
         chart.ordered.min = bounds.min;
         chart.ordered.max = bounds.max;
diff --git a/src/ui/public/agg_response/point_series/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
index 97345117543a3..edd245ab99d50 100644
--- a/src/ui/public/agg_response/point_series/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
@@ -1,23 +1,23 @@
 define(function (require) {
   return function PointSeriesTooltipFormatter($compile, $rootScope) {
-    var $ = require('jquery');
+    let $ = require('jquery');
 
-    var $tooltipScope = $rootScope.$new();
-    var $tooltip = $(require('ui/agg_response/point_series/_tooltip.html'));
+    let $tooltipScope = $rootScope.$new();
+    let $tooltip = $(require('ui/agg_response/point_series/_tooltip.html'));
     $compile($tooltip)($tooltipScope);
 
     return function tooltipFormatter(event) {
-      var datum = event.datum;
+      let datum = event.datum;
       if (!datum || !datum.aggConfigResult) return '';
 
-      var details = $tooltipScope.details = [];
-      var result = { $parent: datum.aggConfigResult };
+      let details = $tooltipScope.details = [];
+      let result = { $parent: datum.aggConfigResult };
 
       function addDetail(result) {
-        var agg = result.aggConfig;
-        var value = result.value;
+        let agg = result.aggConfig;
+        let value = result.value;
 
-        var detail = {
+        let detail = {
           value: agg.fieldFormatter()(value),
           label: agg.makeLabel()
         };
diff --git a/src/ui/public/agg_response/point_series/point_series.js b/src/ui/public/agg_response/point_series/point_series.js
index ddaf2c9beef21..1bdc88764b77b 100644
--- a/src/ui/public/agg_response/point_series/point_series.js
+++ b/src/ui/public/agg_response/point_series/point_series.js
@@ -1,24 +1,24 @@
 define(function (require) {
   return function PointSeriesProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var getSeries = Private(require('ui/agg_response/point_series/_get_series'));
-    var getAspects = Private(require('ui/agg_response/point_series/_get_aspects'));
-    var initYAxis = Private(require('ui/agg_response/point_series/_init_y_axis'));
-    var initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
-    var setupOrderedDateXAxis = Private(require('ui/agg_response/point_series/_ordered_date_axis'));
-    var tooltipFormatter = Private(require('ui/agg_response/point_series/_tooltip_formatter'));
+    let getSeries = Private(require('ui/agg_response/point_series/_get_series'));
+    let getAspects = Private(require('ui/agg_response/point_series/_get_aspects'));
+    let initYAxis = Private(require('ui/agg_response/point_series/_init_y_axis'));
+    let initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
+    let setupOrderedDateXAxis = Private(require('ui/agg_response/point_series/_ordered_date_axis'));
+    let tooltipFormatter = Private(require('ui/agg_response/point_series/_tooltip_formatter'));
 
     return function pointSeriesChartDataFromTable(vis, table) {
-      var chart = {};
-      var aspects = chart.aspects = getAspects(vis, table);
+      let chart = {};
+      let aspects = chart.aspects = getAspects(vis, table);
 
       chart.tooltipFormatter = tooltipFormatter;
 
       initXAxis(chart);
       initYAxis(chart);
 
-      var datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
+      let datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
       if (datedX) {
         setupOrderedDateXAxis(vis, chart);
       }
diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
index f019564d93853..a6901d891adce 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
@@ -1,7 +1,7 @@
 describe('Buckets wrapper', function () {
-  var Buckets;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let Buckets;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -11,13 +11,13 @@ describe('Buckets wrapper', function () {
 
   function test(aggResp, count, keys) {
     it('reads the length', function () {
-      var buckets = new Buckets(aggResp);
+      let buckets = new Buckets(aggResp);
       expect(buckets).to.have.length(count);
     });
 
     it('itterates properly, passing in the key', function () {
-      var buckets = new Buckets(aggResp);
-      var keysSent = [];
+      let buckets = new Buckets(aggResp);
+      let keysSent = [];
       buckets.forEach(function (bucket, key) {
         keysSent.push(key);
       });
@@ -28,7 +28,7 @@ describe('Buckets wrapper', function () {
   }
 
   describe('with object style buckets', function () {
-    var aggResp = {
+    let aggResp = {
       buckets: {
         '0-100': {},
         '100-200': {},
@@ -36,14 +36,14 @@ describe('Buckets wrapper', function () {
       }
     };
 
-    var count = 3;
-    var keys = ['0-100', '100-200', '200-300'];
+    let count = 3;
+    let keys = ['0-100', '100-200', '200-300'];
 
     test(aggResp, count, keys);
   });
 
   describe('with array style buckets', function () {
-    var aggResp = {
+    let aggResp = {
       buckets: [
         { key: '0-100', value: {} },
         { key: '100-200', value: {} },
@@ -51,8 +51,8 @@ describe('Buckets wrapper', function () {
       ]
     };
 
-    var count = 3;
-    var keys = ['0-100', '100-200', '200-300'];
+    let count = 3;
+    let keys = ['0-100', '100-200', '200-300'];
 
     test(aggResp, count, keys);
   });
diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
index 136ad133d362c..fdd7c078670dc 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
@@ -1,9 +1,9 @@
 describe('get columns', function () {
-  var getColumns;
-  var Vis;
-  var indexPattern;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let getColumns;
+  let Vis;
+  let indexPattern;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -13,11 +13,11 @@ describe('get columns', function () {
   }));
 
   it('should inject a count metric if no aggs exist', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie'
     });
     while (vis.aggs.length) vis.aggs.pop();
-    var columns = getColumns(vis);
+    let columns = getColumns(vis);
 
     expect(columns).to.have.length(1);
     expect(columns[0]).to.have.property('aggConfig');
@@ -25,14 +25,14 @@ describe('get columns', function () {
   });
 
   it('should inject a count metric if only buckets exist', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
       ]
     });
 
-    var columns = getColumns(vis);
+    let columns = getColumns(vis);
 
     expect(columns).to.have.length(2);
     expect(columns[1]).to.have.property('aggConfig');
@@ -40,7 +40,7 @@ describe('get columns', function () {
   });
 
   it('should inject the metric after each bucket if the vis is hierarchical', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -50,7 +50,7 @@ describe('get columns', function () {
       ]
     });
 
-    var columns = getColumns(vis);
+    let columns = getColumns(vis);
 
     expect(columns).to.have.length(8);
     columns.forEach(function (column, i) {
@@ -60,7 +60,7 @@ describe('get columns', function () {
   });
 
   it('should inject the multiple metrics after each bucket if the vis is hierarchical', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -72,7 +72,7 @@ describe('get columns', function () {
       ]
     });
 
-    var columns = getColumns(vis);
+    let columns = getColumns(vis);
 
     function checkColumns(column, i) {
       expect(column).to.have.property('aggConfig');
@@ -90,14 +90,14 @@ describe('get columns', function () {
     }
 
     expect(columns).to.have.length(12);
-    for (var i = 0; i < columns.length; i += 3) {
-      var counts = { buckets: 0, metrics: 0 };
+    for (let i = 0; i < columns.length; i += 3) {
+      let counts = { buckets: 0, metrics: 0 };
       columns.slice(i, i + 3).forEach(checkColumns);
     }
   });
 
   it('should put all metrics at the end of the columns if the vis is not hierarchical', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -109,7 +109,7 @@ describe('get columns', function () {
       ]
     });
 
-    var columns = getColumns(vis);
+    let columns = getColumns(vis);
     expect(columns).to.have.length(6);
 
     // sum should be last
diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js
index fec883f229585..321924347d2af 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_integration.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js
@@ -1,13 +1,13 @@
 describe('tabifyAggResponse Integration', function () {
-  var _ = require('lodash');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let fixtures = require('fixtures/fake_hierarchical_data');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var Vis;
-  var Buckets;
-  var indexPattern;
-  var tabifyAggResponse;
+  let Vis;
+  let Buckets;
+  let indexPattern;
+  let tabifyAggResponse;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -23,13 +23,13 @@ describe('tabifyAggResponse Integration', function () {
   }
 
   it('transforms a simple response properly', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: []
     });
     normalizeIds(vis);
 
-    var resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
+    let resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
 
     expect(resp).to.not.have.property('tables');
     expect(resp).to.have.property('rows').and.property('columns');
@@ -43,12 +43,12 @@ describe('tabifyAggResponse Integration', function () {
   describe('transforms a complex response', function () {
     this.slow(1000);
 
-    var vis;
-    var avg;
-    var ext;
-    var src;
-    var os;
-    var esResp;
+    let vis;
+    let avg;
+    let ext;
+    let src;
+    let os;
+    let esResp;
 
     beforeEach(function () {
       vis = new Vis(indexPattern, {
@@ -78,7 +78,7 @@ describe('tabifyAggResponse Integration', function () {
     function expectRootGroup(rootTableGroup, expectInnerTables) {
       expect(rootTableGroup).to.have.property('tables');
 
-      var tables = rootTableGroup.tables;
+      let tables = rootTableGroup.tables;
       expect(tables).to.be.an('array').and.have.length(3);
       expectExtensionSplit(tables[0], 'png', expectInnerTables);
       expectExtensionSplit(tables[1], 'css', expectInnerTables);
@@ -152,7 +152,7 @@ describe('tabifyAggResponse Integration', function () {
       // only complete rows, and only put the metrics at the end.
 
       vis.isHierarchical = _.constant(false);
-      var tabbed = tabifyAggResponse(vis, esResp);
+      let tabbed = tabifyAggResponse(vis, esResp);
 
       expectRootGroup(tabbed, function expectTable(table, splitKey) {
         expectColumns(table, [src, os, avg]);
@@ -178,7 +178,7 @@ describe('tabifyAggResponse Integration', function () {
       // the existing bucket and it's metric
 
       vis.isHierarchical = _.constant(true);
-      var tabbed = tabifyAggResponse(vis, esResp, {
+      let tabbed = tabifyAggResponse(vis, esResp, {
         partialRows: true
       });
 
@@ -212,7 +212,7 @@ describe('tabifyAggResponse Integration', function () {
       // the end
 
       vis.isHierarchical = _.constant(true);
-      var tabbed = tabifyAggResponse(vis, esResp, {
+      let tabbed = tabifyAggResponse(vis, esResp, {
         partialRows: true,
         minimalColumns: true
       });
@@ -244,7 +244,7 @@ describe('tabifyAggResponse Integration', function () {
       // create metric columns after each bucket
 
       vis.isHierarchical = _.constant(false);
-      var tabbed = tabifyAggResponse(vis, esResp, {
+      let tabbed = tabifyAggResponse(vis, esResp, {
         minimalColumns: false
       });
 
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
index 0b5ab94190f4f..7bfd0aa9bfafa 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -1,17 +1,17 @@
 describe('ResponseWriter class', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-
-  var Vis;
-  var Table;
-  var Buckets;
-  var Private;
-  var TableGroup;
-  var getColumns;
-  var indexPattern;
-  var ResponseWriter;
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+
+  let Vis;
+  let Table;
+  let Buckets;
+  let Private;
+  let TableGroup;
+  let getColumns;
+  let indexPattern;
+  let ResponseWriter;
 
   function defineSetup(stubGetColumns) {
     beforeEach(ngMock.module('kibana'));
@@ -36,15 +36,15 @@ describe('ResponseWriter class', function () {
     defineSetup(true);
 
     it('gets the columns for the vis', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      var writer = new ResponseWriter(vis);
+      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      let writer = new ResponseWriter(vis);
 
       expect(getColumns).to.have.property('callCount', 1);
       expect(getColumns.firstCall.args[0]).to.be(vis);
     });
 
     it('collects the aggConfigs from each column in aggStack', function () {
-      var aggs = [
+      let aggs = [
         { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
         { type: 'terms', schema: 'segment', params: { field: 'extension' } },
         { type: 'avg', schema: 'metric', params: { field: '@timestamp' } }
@@ -54,12 +54,12 @@ describe('ResponseWriter class', function () {
         return { aggConfig: agg };
       }));
 
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: aggs
       });
 
-      var writer = new ResponseWriter(vis);
+      let writer = new ResponseWriter(vis);
       expect(writer.aggStack).to.be.an('array');
       expect(writer.aggStack).to.have.length(aggs.length);
       writer.aggStack.forEach(function (agg, i) {
@@ -68,40 +68,40 @@ describe('ResponseWriter class', function () {
     });
 
     it('sets canSplit=true by default', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      var writer = new ResponseWriter(vis);
+      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      let writer = new ResponseWriter(vis);
       expect(writer).to.have.property('canSplit', true);
     });
 
     it('sets canSplit=false when config says to', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      var writer = new ResponseWriter(vis, { canSplit: false });
+      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      let writer = new ResponseWriter(vis, { canSplit: false });
       expect(writer).to.have.property('canSplit', false);
     });
 
     describe('sets partialRows', function () {
       it('to the value of the config if set', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var partial = Boolean(Math.round(Math.random()));
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let partial = Boolean(Math.round(Math.random()));
 
-        var writer = new ResponseWriter(vis, { partialRows: partial });
+        let writer = new ResponseWriter(vis, { partialRows: partial });
         expect(writer).to.have.property('partialRows', partial);
       });
 
       it('to the value of vis.isHierarchical if no config', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var hierarchical = Boolean(Math.round(Math.random()));
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let hierarchical = Boolean(Math.round(Math.random()));
         sinon.stub(vis, 'isHierarchical').returns(hierarchical);
 
-        var writer = new ResponseWriter(vis, {});
+        let writer = new ResponseWriter(vis, {});
         expect(writer).to.have.property('partialRows', hierarchical);
       });
     });
 
     it('starts off with a root TableGroup', function () {
-      var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
 
-      var writer = new ResponseWriter(vis);
+      let writer = new ResponseWriter(vis);
       expect(writer.root).to.be.a(TableGroup);
       expect(writer.splitStack).to.be.an('array');
       expect(writer.splitStack).to.have.length(1);
@@ -114,29 +114,29 @@ describe('ResponseWriter class', function () {
 
     describe('#response()', function () {
       it('returns the root TableGroup if splitting', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis);
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let writer = new ResponseWriter(vis);
         expect(writer.response()).to.be(writer.root);
       });
 
       it('returns the first table if not splitting', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis, { canSplit: false });
-        var table = writer._table();
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let writer = new ResponseWriter(vis, { canSplit: false });
+        let table = writer._table();
         expect(writer.response()).to.be(table);
       });
 
       it('adds columns to all of the tables', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', params: { field: '_type' }, schema: 'split' },
             { type: 'count', schema: 'metric' }
           ]
         });
-        var buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-        var writer = new ResponseWriter(vis);
-        var tables = [];
+        let buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        let writer = new ResponseWriter(vis);
+        let tables = [];
 
         writer.split(vis.aggs[0], buckets, function () {
           writer.cell(vis.aggs[1], 100, function () {
@@ -148,11 +148,11 @@ describe('ResponseWriter class', function () {
           expect(table.columns == null).to.be(true);
         });
 
-        var resp = writer.response();
+        let resp = writer.response();
         expect(resp).to.be.a(TableGroup);
         expect(resp.tables).to.have.length(2);
 
-        var nginx = resp.tables.shift();
+        let nginx = resp.tables.shift();
         expect(nginx).to.have.property('aggConfig', vis.aggs[0]);
         expect(nginx).to.have.property('key', 'nginx');
         expect(nginx.tables).to.have.length(1);
@@ -160,7 +160,7 @@ describe('ResponseWriter class', function () {
           expect(_.contains(tables, table)).to.be(true);
         });
 
-        var apache = resp.tables.shift();
+        let apache = resp.tables.shift();
         expect(apache).to.have.property('aggConfig', vis.aggs[0]);
         expect(apache).to.have.property('key', 'apache');
         expect(apache.tables).to.have.length(1);
@@ -178,16 +178,16 @@ describe('ResponseWriter class', function () {
 
     describe('#split()', function () {
       it('with break if the user has specified that splitting is to be disabled', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'split', params: { field: '_type' } },
             { type: 'count', schema: 'metric' }
           ]
         });
-        var agg = vis.aggs.bySchemaName.split[0];
-        var buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
-        var writer = new ResponseWriter(vis, { canSplit: false });
+        let agg = vis.aggs.bySchemaName.split[0];
+        let buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
+        let writer = new ResponseWriter(vis, { canSplit: false });
 
         expect(function () {
           writer.split(agg, buckets, _.noop);
@@ -195,7 +195,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('forks the acrStack and rewrites the parents', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', params: { field: 'extension' }, schema: 'segment' },
@@ -205,10 +205,10 @@ describe('ResponseWriter class', function () {
           ]
         });
 
-        var writer = new ResponseWriter(vis, { asAggConfigResults: true });
-        var extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
-        var types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-        var os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
+        let writer = new ResponseWriter(vis, { asAggConfigResults: true });
+        let extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+        let types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        let os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
 
         extensions.forEach(function (b, extension) {
           writer.cell(vis.aggs[0], extension, function () {
@@ -224,11 +224,11 @@ describe('ResponseWriter class', function () {
           });
         });
 
-        var tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
+        let tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
         expect(tables.length).to.be(types.length);
 
         // collect the far left acr from each table
-        var leftAcrs = _.pluck(tables, 'rows[0][0]');
+        let leftAcrs = _.pluck(tables, 'rows[0][0]');
 
         leftAcrs.forEach(function (acr, i, acrs) {
           expect(acr.aggConfig).to.be(vis.aggs[0]);
@@ -237,7 +237,7 @@ describe('ResponseWriter class', function () {
 
           // for all but the last acr, compare to the next
           if (i + 1 >= acrs.length) return;
-          var acr2 = leftAcrs[i + 1];
+          let acr2 = leftAcrs[i + 1];
 
           expect(acr.key).to.be(acr2.key);
           expect(acr.value).to.be(acr2.value);
@@ -252,8 +252,8 @@ describe('ResponseWriter class', function () {
     describe('#cell()', function () {
       it('logs a cell in the ResponseWriters row buffer, calls the block arg, then removes the value from the buffer',
       function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis);
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let writer = new ResponseWriter(vis);
 
         expect(writer.rowBuffer).to.have.length(0);
         writer.cell({}, 500, function () {
@@ -266,10 +266,10 @@ describe('ResponseWriter class', function () {
 
     describe('#row()', function () {
       it('writes the ResponseWriters internal rowBuffer into a table', function () {
-        var vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        var writer = new ResponseWriter(vis);
+        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        let writer = new ResponseWriter(vis);
 
-        var table = writer._table();
+        let table = writer._table();
         writer.cell({}, 1, function () {
           writer.cell({}, 2, function () {
             writer.cell({}, 3, function () {
@@ -283,7 +283,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('always writes to the table group at the top of the split stack', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'split', params: { field: '_type' } },
@@ -292,20 +292,20 @@ describe('ResponseWriter class', function () {
             { type: 'count', schema: 'metric' }
           ]
         });
-        var splits = vis.aggs.bySchemaName.split;
+        let splits = vis.aggs.bySchemaName.split;
 
-        var type = splits[0];
-        var typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        let type = splits[0];
+        let typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
 
-        var ext = splits[1];
-        var extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+        let ext = splits[1];
+        let extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
 
-        var os = splits[2];
-        var osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
+        let os = splits[2];
+        let osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
 
-        var count = vis.aggs[3];
+        let count = vis.aggs[3];
 
-        var writer = new ResponseWriter(vis);
+        let writer = new ResponseWriter(vis);
         writer.split(type, typeBuckets, function () {
           writer.split(ext, extBuckets, function () {
             writer.split(os, osBuckets, function (bucket, key) {
@@ -316,9 +316,9 @@ describe('ResponseWriter class', function () {
           });
         });
 
-        var resp = writer.response();
-        var sum = 0;
-        var tables = 0;
+        let resp = writer.response();
+        let sum = 0;
+        let tables = 0;
         (function recurse(t) {
           if (t.tables) {
             // table group
@@ -341,7 +341,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('writes partial rows for hierarchical vis', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'pie',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: '_type' }},
@@ -349,8 +349,8 @@ describe('ResponseWriter class', function () {
           ]
         });
 
-        var writer = new ResponseWriter(vis);
-        var table = writer._table();
+        let writer = new ResponseWriter(vis);
+        let table = writer._table();
         writer.cell(vis.aggs[0], 'apache', function () {
           writer.row();
         });
@@ -360,7 +360,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('skips partial rows for non-hierarchical vis', function () {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: '_type' }},
@@ -368,8 +368,8 @@ describe('ResponseWriter class', function () {
           ]
         });
 
-        var writer = new ResponseWriter(vis);
-        var table = writer._table();
+        let writer = new ResponseWriter(vis);
+        let table = writer._table();
         writer.cell(vis.aggs[0], 'apache', function () {
           writer.row();
         });
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js
index d65a93b1e906e..ed5d3c972881c 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table.js
@@ -1,9 +1,9 @@
 describe('Table class', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var Table;
+  let Table;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -11,16 +11,16 @@ describe('Table class', function () {
   }));
 
   it('exposes rows array, but not the columns', function () {
-    var table = new Table();
+    let table = new Table();
     expect(table.rows).to.be.an('array');
     expect(table.columns == null).to.be.ok();
   });
 
   describe('#aggConfig', function () {
     it('accepts a column from the table and returns its agg config', function () {
-      var table = new Table();
-      var football = {};
-      var column = {
+      let table = new Table();
+      let football = {};
+      let column = {
         aggConfig: football
       };
 
@@ -29,7 +29,7 @@ describe('Table class', function () {
 
     it('throws a TypeError if the column is malformed', function () {
       expect(function () {
-        var notAColumn = {};
+        let notAColumn = {};
         (new Table()).aggConfig(notAColumn);
       }).to.throwException(TypeError);
     });
@@ -37,12 +37,12 @@ describe('Table class', function () {
 
   describe('#title', function () {
     it('returns nothing if the table is not part of a table group', function () {
-      var table = new Table();
+      let table = new Table();
       expect(table.title()).to.be('');
     });
 
     it('returns the title of the TableGroup if the table is part of one', function () {
-      var table = new Table();
+      let table = new Table();
       table.$parent = {
         title: 'TableGroup Title',
         tables: [table]
@@ -54,9 +54,9 @@ describe('Table class', function () {
 
   describe('#field', function () {
     it('calls the columns aggConfig#field() method', function () {
-      var table = new Table();
-      var football = {};
-      var column = {
+      let table = new Table();
+      let football = {};
+      let column = {
         aggConfig: {
           field: _.constant(football)
         }
@@ -68,9 +68,9 @@ describe('Table class', function () {
 
   describe('#fieldFormatter', function () {
     it('calls the columns aggConfig#fieldFormatter() method', function () {
-      var table = new Table();
-      var football = {};
-      var column = {
+      let table = new Table();
+      let football = {};
+      let column = {
         aggConfig: {
           fieldFormatter: _.constant(football)
         }
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
index ead9e4e41e5ea..b3e020d4d9b85 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
@@ -1,7 +1,7 @@
 describe('Table Group class', function () {
-  var TableGroup;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let TableGroup;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -9,7 +9,7 @@ describe('Table Group class', function () {
   }));
 
   it('exposes tables array and empty aggConfig, key and title', function () {
-    var tableGroup = new TableGroup();
+    let tableGroup = new TableGroup();
     expect(tableGroup.tables).to.be.an('array');
     expect(tableGroup.aggConfig).to.be(null);
     expect(tableGroup.key).to.be(null);
diff --git a/src/ui/public/agg_response/tabify/_buckets.js b/src/ui/public/agg_response/tabify/_buckets.js
index 6fc08cd41e75f..40c9ed62913d3 100644
--- a/src/ui/public/agg_response/tabify/_buckets.js
+++ b/src/ui/public/agg_response/tabify/_buckets.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggResponseBucketsProvider() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     function Buckets(aggResp) {
       aggResp = aggResp || false;
@@ -16,7 +16,7 @@ define(function (require) {
     }
 
     Buckets.prototype.forEach = function (fn) {
-      var buckets = this.buckets;
+      let buckets = this.buckets;
 
       if (this.objectMode) {
         this._keys.forEach(function (key) {
diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js
index e652cf0f61e02..13a3ad8a64b90 100644
--- a/src/ui/public/agg_response/tabify/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/_get_columns.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function GetColumnsProvider(Private) {
-    var _ = require('lodash');
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
+    let _ = require('lodash');
+    let AggConfig = Private(require('ui/Vis/AggConfig'));
 
     return function getColumns(vis, minimal) {
-      var aggs = vis.aggs.getResponseAggs();
+      let aggs = vis.aggs.getResponseAggs();
 
       if (minimal == null) minimal = !vis.isHierarchical();
 
@@ -23,10 +23,10 @@ define(function (require) {
       }
 
       // supposed to be bucket,...metrics,bucket,...metrics
-      var columns = [];
+      let columns = [];
 
       // seperate the metrics
-      var grouped = _.groupBy(aggs, function (agg) {
+      let grouped = _.groupBy(aggs, function (agg) {
         return agg.schema.group;
       });
 
diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js
index f6da52f7b4229..a4f4f6f475281 100644
--- a/src/ui/public/agg_response/tabify/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/_response_writer.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function TabbedAggResponseWriterProvider(Private) {
-    var _ = require('lodash');
-    var Table = Private(require('ui/agg_response/tabify/_table'));
-    var TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
-    var getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
+    let _ = require('lodash');
+    let Table = Private(require('ui/agg_response/tabify/_table'));
+    let TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
+    let getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
 
-    var AggConfigResult = require('ui/Vis/AggConfigResult');
+    let AggConfigResult = require('ui/Vis/AggConfigResult');
 
     _.class(SplitAcr).inherits(AggConfigResult);
     function SplitAcr(agg, parent, key) {
@@ -23,7 +23,7 @@ define(function (require) {
       this.opts = opts || {};
       this.rowBuffer = [];
 
-      var visIsHier = vis.isHierarchical();
+      let visIsHier = vis.isHierarchical();
 
       // do the options allow for splitting? we will only split if true and
       // tabify calls the split method.
@@ -65,9 +65,9 @@ define(function (require) {
      * @return {Table/TableGroup} table - the created table
      */
     TabbedAggResponseWriter.prototype._table = function (group, agg, key) {
-      var Class = (group) ? TableGroup : Table;
-      var table = new Class();
-      var parent = this.splitStack[0];
+      let Class = (group) ? TableGroup : Table;
+      let table = new Class();
+      let parent = this.splitStack[0];
 
       if (group) {
         table.aggConfig = agg;
@@ -93,7 +93,7 @@ define(function (require) {
      * @param  {function} block - a function to execute for each sub bucket
      */
     TabbedAggResponseWriter.prototype.split = function (agg, buckets, block) {
-      var self = this;
+      let self = this;
 
       if (!self.canSplit) {
         throw new Error('attempted to split when splitting is disabled');
@@ -103,11 +103,11 @@ define(function (require) {
 
       buckets.forEach(function (bucket, key) {
         // find the existing split that we should extend
-        var tableGroup = _.find(self.splitStack[0].tables, { aggConfig: agg, key: key });
+        let tableGroup = _.find(self.splitStack[0].tables, { aggConfig: agg, key: key });
         // create the split if it doesn't exist yet
         if (!tableGroup) tableGroup = self._table(true, agg, key);
 
-        var splitAcr = false;
+        let splitAcr = false;
         if (self.asAggConfigResults) {
           splitAcr = self._injectParentSplit(agg, key);
         }
@@ -125,7 +125,7 @@ define(function (require) {
     };
 
     TabbedAggResponseWriter.prototype._removeAggFromColumns = function (agg) {
-      var i = _.findIndex(this.columns, function (col) {
+      let i = _.findIndex(this.columns, function (col) {
         return col.aggConfig === agg;
       });
 
@@ -138,8 +138,8 @@ define(function (require) {
 
       // hierarchical vis creats additional columns for each bucket
       // we will remove those too
-      var mCol = this.columns.splice(i, 1).pop();
-      var mI = _.findIndex(this.aggStack, function (agg) {
+      let mCol = this.columns.splice(i, 1).pop();
+      let mI = _.findIndex(this.aggStack, function (agg) {
         return agg === mCol.aggConfig;
       });
 
@@ -158,12 +158,12 @@ define(function (require) {
      * @return {SplitAcr} - the AggConfigResult created for the split bucket
      */
     TabbedAggResponseWriter.prototype._injectParentSplit = function (agg, key) {
-      var oldList = this.acrStack;
-      var newList = this.acrStack = [];
+      let oldList = this.acrStack;
+      let newList = this.acrStack = [];
 
       // walk from right to left through the old stack
       // and move things to the new stack
-      var injected = false;
+      let injected = false;
 
       if (!oldList.length) {
         injected = new SplitAcr(agg, null, key);
@@ -173,7 +173,7 @@ define(function (require) {
 
       // walk from right to left, emptying the previous list
       while (oldList.length) {
-        var acr = oldList.pop();
+        let acr = oldList.pop();
 
         // ignore other splits
         if (acr instanceof SplitAcr) {
@@ -187,11 +187,11 @@ define(function (require) {
           newList.unshift(injected);
         }
 
-        var newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
+        let newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
         newList.unshift(newAcr);
 
         // and replace the acr in the row buffer if its there
-        var rowI = this.rowBuffer.indexOf(acr);
+        let rowI = this.rowBuffer.indexOf(acr);
         if (rowI > -1) {
           this.rowBuffer[rowI] = newAcr;
         }
@@ -213,7 +213,7 @@ define(function (require) {
         value = new AggConfigResult(agg, this.acrStack[0], value, value);
       }
 
-      var staskResult = this.asAggConfigResults && value.type === 'bucket';
+      let staskResult = this.asAggConfigResults && value.type === 'bucket';
 
       this.rowBuffer.push(value);
       if (staskResult) this.acrStack.unshift(value);
@@ -235,14 +235,14 @@ define(function (require) {
      * @return {undefined}
      */
     TabbedAggResponseWriter.prototype.row = function (buffer) {
-      var cells = buffer || this.rowBuffer.slice(0);
+      let cells = buffer || this.rowBuffer.slice(0);
 
       if (!this.partialRows && cells.length < this.columns.length) {
         return;
       }
 
-      var split = this.splitStack[0];
-      var table = split.tables[0] || this._table(false);
+      let split = this.splitStack[0];
+      let table = split.tables[0] || this._table(false);
 
       while (cells.length < this.columns.length) cells.push('');
       table.rows.push(cells);
@@ -255,7 +255,7 @@ define(function (require) {
      * @return {object} - the final table-tree
      */
     TabbedAggResponseWriter.prototype.response = function () {
-      var columns = this.columns;
+      let columns = this.columns;
 
       // give the columns some metadata
       columns.map(function (col) {
@@ -270,7 +270,7 @@ define(function (require) {
 
       if (this.canSplit) return this.root;
 
-      var table = this.root.tables[0];
+      let table = this.root.tables[0];
       if (!table) return;
 
       delete table.$parent;
diff --git a/src/ui/public/agg_response/tabify/_table.js b/src/ui/public/agg_response/tabify/_table.js
index 855a72a6b4df2..ce8c800d984cf 100644
--- a/src/ui/public/agg_response/tabify/_table.js
+++ b/src/ui/public/agg_response/tabify/_table.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function TableProvider() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /**
      * Simple table class that is used to contain the rows and columns that create
diff --git a/src/ui/public/agg_response/tabify/_table_group.js b/src/ui/public/agg_response/tabify/_table_group.js
index 28830e82493ba..9512d07b50b96 100644
--- a/src/ui/public/agg_response/tabify/_table_group.js
+++ b/src/ui/public/agg_response/tabify/_table_group.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function TableGroupProvider() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /**
      * Simple object that wraps multiple tables. It contains information about the aggConfig
diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js
index 4caa8ee92a93d..68e78d06b6736 100644
--- a/src/ui/public/agg_response/tabify/tabify.js
+++ b/src/ui/public/agg_response/tabify/tabify.js
@@ -1,16 +1,16 @@
 define(function (require) {
   return function tabifyAggResponseProvider(Private, Notifier) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
-    var TabbedAggResponseWriter = Private(require('ui/agg_response/tabify/_response_writer'));
-    var Buckets = Private(require('ui/agg_response/tabify/_buckets'));
-    var notify = new Notifier({ location: 'agg_response/tabify'});
+    let AggConfig = Private(require('ui/Vis/AggConfig'));
+    let TabbedAggResponseWriter = Private(require('ui/agg_response/tabify/_response_writer'));
+    let Buckets = Private(require('ui/agg_response/tabify/_buckets'));
+    let notify = new Notifier({ location: 'agg_response/tabify'});
 
     function tabifyAggResponse(vis, esResponse, respOpts) {
-      var write = new TabbedAggResponseWriter(vis, respOpts);
+      let write = new TabbedAggResponseWriter(vis, respOpts);
 
-      var topLevelBucket = _.assign({}, esResponse.aggregations, {
+      let topLevelBucket = _.assign({}, esResponse.aggregations, {
         doc_count: esResponse.hits.total
       });
 
@@ -29,13 +29,13 @@ define(function (require) {
      * @returns {undefined}
      */
     function collectBucket(write, bucket, key) {
-      var agg = write.aggStack.shift();
+      let agg = write.aggStack.shift();
 
       switch (agg.schema.group) {
         case 'buckets':
-          var buckets = new Buckets(bucket[agg.id]);
+          let buckets = new Buckets(bucket[agg.id]);
           if (buckets.length) {
-            var splitting = write.canSplit && agg.schema.name === 'split';
+            let splitting = write.canSplit && agg.schema.name === 'split';
             if (splitting) {
               write.split(agg, buckets, function forEachBucket(subBucket, key) {
                 collectBucket(write, subBucket, agg.getKey(subBucket), key);
@@ -61,7 +61,7 @@ define(function (require) {
           }
           break;
         case 'metrics':
-          var value = agg.getValue(bucket);
+          let value = agg.getValue(bucket);
           write.cell(agg, value, function () {
             if (!write.aggStack.length) {
               // row complete
@@ -80,7 +80,7 @@ define(function (require) {
     // write empty values for each bucket agg, then write
     // the metrics from the initial bucket using collectBucket()
     function passEmptyBuckets(write, bucket, key) {
-      var agg = write.aggStack.shift();
+      let agg = write.aggStack.shift();
 
       switch (agg.schema.group) {
         case 'metrics':
diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js
index 945a2f274dd6b..c0b236ade0bb9 100644
--- a/src/ui/public/agg_table/__tests__/_group.js
+++ b/src/ui/public/agg_table/__tests__/_group.js
@@ -1,15 +1,15 @@
 describe('AggTableGroup Directive', function () {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-
-  var $rootScope;
-  var $compile;
-  var tabifyAggResponse;
-  var Vis;
-  var indexPattern;
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let fixtures = require('fixtures/fake_hierarchical_data');
+
+  let $rootScope;
+  let $compile;
+  let tabifyAggResponse;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -21,7 +21,7 @@ describe('AggTableGroup Directive', function () {
     $compile = $injector.get('$compile');
   }));
 
-  var $scope;
+  let $scope;
   beforeEach(function () {
     $scope = $rootScope.$new();
   });
@@ -31,9 +31,9 @@ describe('AggTableGroup Directive', function () {
 
 
   it('renders a simple split response properly', function () {
-    var vis = new Vis(indexPattern, 'table');
+    let vis = new Vis(indexPattern, 'table');
     $scope.group = tabifyAggResponse(vis, fixtures.metricOnly);
-    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
 
     $compile($el)($scope);
     $scope.$digest();
@@ -43,7 +43,7 @@ describe('AggTableGroup Directive', function () {
   });
 
   it('renders nothing if the table list is empty', function () {
-    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
 
     $scope.group = {
       tables: []
@@ -52,12 +52,12 @@ describe('AggTableGroup Directive', function () {
     $compile($el)($scope);
     $scope.$digest();
 
-    var $subTables = $el.find('kbn-agg-table');
+    let $subTables = $el.find('kbn-agg-table');
     expect($subTables.size()).to.be(0);
   });
 
   it('renders a complex response properly', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -70,15 +70,15 @@ describe('AggTableGroup Directive', function () {
       agg.id = 'agg_' + (i + 1);
     });
 
-    var group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
-    var $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    let group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
+    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
     $compile($el)($scope);
     $scope.$digest();
 
-    var $subTables = $el.find('kbn-agg-table');
+    let $subTables = $el.find('kbn-agg-table');
     expect($subTables.size()).to.be(3);
 
-    var $subTableHeaders = $el.find('.agg-table-group-header');
+    let $subTableHeaders = $el.find('.agg-table-group-header');
     expect($subTableHeaders.size()).to.be(3);
 
     $subTableHeaders.each(function (i) {
diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js
index 0347f05986496..57e43382bc29c 100644
--- a/src/ui/public/agg_table/__tests__/_table.js
+++ b/src/ui/public/agg_table/__tests__/_table.js
@@ -1,16 +1,16 @@
 describe('AggTable Directive', function () {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var fixtures = require('fixtures/fake_hierarchical_data');
-  var sinon = require('auto-release-sinon');
-
-  var $rootScope;
-  var $compile;
-  var tabifyAggResponse;
-  var Vis;
-  var indexPattern;
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let fixtures = require('fixtures/fake_hierarchical_data');
+  let sinon = require('auto-release-sinon');
+
+  let $rootScope;
+  let $compile;
+  let tabifyAggResponse;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -22,7 +22,7 @@ describe('AggTable Directive', function () {
     $compile = $injector.get('$compile');
   }));
 
-  var $scope;
+  let $scope;
   beforeEach(function () {
     $scope = $rootScope.$new();
   });
@@ -32,10 +32,10 @@ describe('AggTable Directive', function () {
 
 
   it('renders a simple response properly', function () {
-    var vis = new Vis(indexPattern, 'table');
+    let vis = new Vis(indexPattern, 'table');
     $scope.table = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
 
-    var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(1);
@@ -45,14 +45,14 @@ describe('AggTable Directive', function () {
 
   it('renders nothing if the table is empty', function () {
     $scope.table = null;
-    var $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(0);
   });
 
   it('renders a complex response properly', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -66,27 +66,27 @@ describe('AggTable Directive', function () {
     });
 
     $scope.table = tabifyAggResponse(vis, fixtures.threeTermBuckets, { canSplit: false });
-    var $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
+    let $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
     $compile($el)($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(1);
 
-    var $rows = $el.find('tbody tr');
+    let $rows = $el.find('tbody tr');
     expect($rows.size()).to.be.greaterThan(0);
 
     function validBytes(str) {
       expect(str).to.match(/^\d+$/);
-      var bytesAsNum = _.parseInt(str);
+      let bytesAsNum = _.parseInt(str);
       expect(bytesAsNum === 0 || bytesAsNum > 1000).to.be.ok();
     }
 
     $rows.each(function (i) {
       // 6 cells in every row
-      var $cells = $(this).find('td');
+      let $cells = $(this).find('td');
       expect($cells.size()).to.be(6);
 
-      var txts = $cells.map(function () {
+      let txts = $cells.map(function () {
         return $(this).text().trim();
       });
 
@@ -106,11 +106,11 @@ describe('AggTable Directive', function () {
 
   describe('aggTable.toCsv()', function () {
     it('escapes and formats the rows and columns properly', function () {
-      var $el = $compile('<kbn-agg-table table="table">')($scope);
+      let $el = $compile('<kbn-agg-table table="table">')($scope);
       $scope.$digest();
 
-      var $tableScope = $el.isolateScope();
-      var aggTable = $tableScope.aggTable;
+      let $tableScope = $el.isolateScope();
+      let aggTable = $tableScope.aggTable;
 
       $tableScope.table = {
         columns: [
@@ -131,7 +131,7 @@ describe('AggTable Directive', function () {
   });
 
   describe('aggTable.exportAsCsv()', function () {
-    var origBlob;
+    let origBlob;
     function FakeBlob(slices, opts) {
       this.slices = slices;
       this.opts = opts;
@@ -147,13 +147,13 @@ describe('AggTable Directive', function () {
     });
 
     it('calls _saveAs properly', function () {
-      var $el = $compile('<kbn-agg-table table="table">')($scope);
+      let $el = $compile('<kbn-agg-table table="table">')($scope);
       $scope.$digest();
 
-      var $tableScope = $el.isolateScope();
-      var aggTable = $tableScope.aggTable;
+      let $tableScope = $el.isolateScope();
+      let aggTable = $tableScope.aggTable;
 
-      var saveAs = sinon.stub(aggTable, '_saveAs');
+      let saveAs = sinon.stub(aggTable, '_saveAs');
       $tableScope.table = {
         columns: [
           { title: 'one' },
@@ -169,7 +169,7 @@ describe('AggTable Directive', function () {
       aggTable.exportAsCsv();
 
       expect(saveAs.callCount).to.be(1);
-      var call = saveAs.getCall(0);
+      let call = saveAs.getCall(0);
       expect(call.args[0]).to.be.a(FakeBlob);
       expect(call.args[0].slices).to.eql([
         'one,two,"with double-quotes("")"' + '\r\n' +
@@ -180,5 +180,22 @@ describe('AggTable Directive', function () {
       });
       expect(call.args[1]).to.be('somefilename.csv');
     });
+
+    it('should use the export-title attribute', function () {
+      let expected = 'export file name';
+      let $el = $compile(`<kbn-agg-table table="table" export-title="exportTitle">`)($scope);
+      $scope.$digest();
+
+      let $tableScope = $el.isolateScope();
+      let aggTable = $tableScope.aggTable;
+      $tableScope.table = {
+        columns: [],
+        rows: []
+      };
+      $tableScope.exportTitle = expected;
+      $scope.$digest();
+
+      expect(aggTable.csv.filename).to.equal(`${expected}.csv`);
+    });
   });
 });
diff --git a/src/ui/public/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js
index 75344384b4dfd..910dde46a5c0b 100644
--- a/src/ui/public/agg_table/agg_table.js
+++ b/src/ui/public/agg_table/agg_table.js
@@ -6,14 +6,15 @@ define(function (require) {
   require('ui/modules')
   .get('kibana')
   .directive('kbnAggTable', function ($filter, config, Private, compileRecursiveDirective) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     return {
       restrict: 'E',
       template: require('ui/agg_table/agg_table.html'),
       scope: {
         table: '=',
-        perPage: '=?'
+        perPage: '=?',
+        exportTitle: '=?'
       },
       controllerAs: 'aggTable',
       compile: function ($el) {
@@ -22,7 +23,7 @@ define(function (require) {
         return compileRecursiveDirective.compile($el);
       },
       controller: function ($scope) {
-        var self = this;
+        let self = this;
 
         self.sort = null;
         self._saveAs = require('@spalger/filesaver').saveAs;
@@ -32,15 +33,15 @@ define(function (require) {
         };
 
         self.exportAsCsv = function (formatted) {
-          var csv = new Blob([self.toCsv(formatted)], { type: 'text/plain' });
+          let csv = new Blob([self.toCsv(formatted)], { type: 'text/plain' });
           self._saveAs(csv, self.csv.filename);
         };
 
         self.toCsv = function (formatted) {
-          var rows = $scope.table.rows;
-          var columns = formatted ? $scope.formattedColumns : $scope.table.columns;
-          var nonAlphaNumRE = /[^a-zA-Z0-9]/;
-          var allDoubleQuoteRE = /"/g;
+          let rows = $scope.table.rows;
+          let columns = formatted ? $scope.formattedColumns : $scope.table.columns;
+          let nonAlphaNumRE = /[^a-zA-Z0-9]/;
+          let allDoubleQuoteRE = /"/g;
 
           function escape(val) {
             if (!formatted && _.isObject(val)) val = val.valueOf();
@@ -52,7 +53,7 @@ define(function (require) {
           }
 
           // escape each cell in each row
-          var csvRows = rows.map(function (row) {
+          let csvRows = rows.map(function (row) {
             return row.map(escape);
           });
 
@@ -67,7 +68,7 @@ define(function (require) {
         };
 
         $scope.$watch('table', function () {
-          var table = $scope.table;
+          let table = $scope.table;
 
           if (!table) {
             $scope.rows = null;
@@ -75,17 +76,17 @@ define(function (require) {
             return;
           }
 
-          self.csv.filename = (table.title() || 'table') + '.csv';
+          self.csv.filename = ($scope.exportTitle || table.title() || 'table') + '.csv';
           $scope.rows = table.rows;
           $scope.formattedColumns = table.columns.map(function (col, i) {
-            var agg = $scope.table.aggConfig(col);
-            var field = agg.field();
-            var formattedColumn = {
+            let agg = $scope.table.aggConfig(col);
+            let field = agg.field();
+            let formattedColumn = {
               title: col.title,
               filterable: field && field.filterable && agg.schema.group === 'buckets'
             };
 
-            var last = i === (table.columns.length - 1);
+            let last = i === (table.columns.length - 1);
 
             if (last || (agg.schema.group === 'metrics')) {
               formattedColumn.class = 'visualize-table-right';
diff --git a/src/ui/public/agg_table/agg_table_group.html b/src/ui/public/agg_table/agg_table_group.html
index 69c369d75331d..aee3f393cda16 100644
--- a/src/ui/public/agg_table/agg_table_group.html
+++ b/src/ui/public/agg_table/agg_table_group.html
@@ -10,7 +10,12 @@
     <tr>
       <td>
         <kbn-agg-table-group ng-if="table.tables" group="table" per-page="perPage"></kbn-agg-table-group>
-        <kbn-agg-table ng-if="table.rows" table="table" per-page="perPage"></kbn-agg-table>
+        <kbn-agg-table
+          ng-if="table.rows"
+          table="table"
+          export-title="exportTitle"
+          per-page="perPage">
+        </kbn-agg-table>
       </td>
     </tr>
   </tbody>
@@ -28,7 +33,12 @@
     <tr>
       <td ng-repeat="table in columns">
         <kbn-agg-table-group ng-if="table.tables" group="table" per-page="perPage"></kbn-agg-table-group>
-        <kbn-agg-table ng-if="table.rows" table="table" per-page="perPage"></kbn-agg-table>
+        <kbn-agg-table
+          ng-if="table.rows"
+          table="table"
+          export-title="exportTitle"
+          per-page="perPage">
+        </kbn-agg-table>
       </td>
     </tr>
   </tbody>
diff --git a/src/ui/public/agg_table/agg_table_group.js b/src/ui/public/agg_table/agg_table_group.js
index 8d331f734f425..1476730c0032a 100644
--- a/src/ui/public/agg_table/agg_table_group.js
+++ b/src/ui/public/agg_table/agg_table_group.js
@@ -10,7 +10,8 @@ define(function (require) {
       template: require('ui/agg_table/agg_table_group.html'),
       scope: {
         group: '=',
-        perPage: '=?'
+        perPage: '=?',
+        exportTitle: '=?'
       },
       compile: function ($el) {
         // Use the compile function from the RecursionHelper,
@@ -23,10 +24,10 @@ define(function (require) {
 
               if (!group || !group.tables.length) return;
 
-              var firstTable = group.tables[0];
-              var params = firstTable.aggConfig && firstTable.aggConfig.params;
-              // render groups that have Table children as if they were rows, because itteration is cleaner
-              var childLayout = (params && !params.row) ? 'columns' : 'rows';
+              let firstTable = group.tables[0];
+              let params = firstTable.aggConfig && firstTable.aggConfig.params;
+              // render groups that have Table children as if they were rows, because iteration is cleaner
+              let childLayout = (params && !params.row) ? 'columns' : 'rows';
 
               $scope[childLayout] = group.tables;
             });
diff --git a/src/ui/public/agg_types/AggParams.js b/src/ui/public/agg_types/AggParams.js
index 503335d9c567e..7713f6ee38327 100644
--- a/src/ui/public/agg_types/AggParams.js
+++ b/src/ui/public/agg_types/AggParams.js
@@ -2,10 +2,10 @@ define(function (require) {
   return function AggParamsFactory(Private) {
     require('ui/filters/label');
 
-    var _ = require('lodash');
-    var IndexedArray = require('ui/IndexedArray');
+    let _ = require('lodash');
+    let IndexedArray = require('ui/IndexedArray');
 
-    var paramTypeMap = {
+    let paramTypeMap = {
       field: Private(require('ui/agg_types/param_types/field')),
       optioned: Private(require('ui/agg_types/param_types/optioned')),
       regex: Private(require('ui/agg_types/param_types/regex')),
@@ -32,8 +32,8 @@ define(function (require) {
       AggParams.Super.call(this, {
         index: ['name'],
         initialSet: params.map(function (config) {
-          var type = config.name === 'field' ? config.name : config.type;
-          var Class = paramTypeMap[type] || paramTypeMap._default;
+          let type = config.name === 'field' ? config.name : config.type;
+          let Class = paramTypeMap[type] || paramTypeMap._default;
           return new Class(config);
         })
       });
@@ -54,7 +54,7 @@ define(function (require) {
      *         are dependent on the AggParam#write methods which should be studied for each AggType.
      */
     AggParams.prototype.write = function (aggConfig, locals) {
-      var output = { params: {} };
+      let output = { params: {} };
       locals = locals || {};
 
       this.forEach(function (param) {
diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/AggType.js
index 85231ddb3a85a..e163bf7d70ed6 100644
--- a/src/ui/public/agg_types/AggType.js
+++ b/src/ui/public/agg_types/AggType.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function AggTypeFactory(Private) {
-    var _ = require('lodash');
-    var AggParams = Private(require('ui/agg_types/AggParams'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let _ = require('lodash');
+    let AggParams = Private(require('ui/agg_types/AggParams'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
     /**
      * Generic AggType Constructor
@@ -96,6 +96,15 @@ define(function (require) {
           type: 'json',
           advanced: true
         });
+        // always append custom label
+
+        if (config.customLabels !== false) {
+          this.params.push({
+            name: 'customLabel',
+            type: 'string',
+            write: _.noop
+          });
+        }
 
         this.params = new AggParams(this.params);
       }
@@ -132,7 +141,7 @@ define(function (require) {
      * @return {FieldFromat}
      */
     AggType.prototype.getFormat = function (agg) {
-      var field = agg.field();
+      let field = agg.field();
       return field ? field.format : fieldFormats.getDefaultInstance('string');
     };
 
diff --git a/src/ui/public/agg_types/__tests__/AggParamWriter.js b/src/ui/public/agg_types/__tests__/AggParamWriter.js
index b37ff90795d57..1810e535584c5 100644
--- a/src/ui/public/agg_types/__tests__/AggParamWriter.js
+++ b/src/ui/public/agg_types/__tests__/AggParamWriter.js
@@ -1,9 +1,9 @@
 module.exports = function AggParamWriterHelper(Private) {
-  var _ = require('lodash');
-  var Vis = Private(require('ui/Vis'));
-  var aggTypes = Private(require('ui/agg_types/index'));
-  var visTypes = Private(require('ui/registry/vis_types'));
-  var stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+  let _ = require('lodash');
+  let Vis = Private(require('ui/Vis'));
+  let aggTypes = Private(require('ui/agg_types/index'));
+  let visTypes = Private(require('ui/registry/vis_types'));
+  let stubbedLogstashIndexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
   /**
    * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
@@ -13,8 +13,8 @@ module.exports = function AggParamWriterHelper(Private) {
    *  - Verify that the interval parameter of the histogram visualization casts its input to a number
    *    ```js
    *    it('casts to a number', function () {
-   *      var writer = new AggParamWriter({ aggType: 'histogram' });
-   *      var output = writer.write({ interval : '100/10' });
+   *      let writer = new AggParamWriter({ aggType: 'histogram' });
+   *      let output = writer.write({ interval : '100/10' });
    *      expect(output.params.interval).to.be.a('number');
    *      expect(output.params.interval).to.be(100);
    *    });
@@ -25,7 +25,7 @@ module.exports = function AggParamWriterHelper(Private) {
    * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
    */
   function AggParamWriter(opts) {
-    var self = this;
+    let self = this;
 
     self.aggType = opts.aggType;
     if (_.isString(self.aggType)) {
@@ -43,7 +43,7 @@ module.exports = function AggParamWriterHelper(Private) {
 
     // find a suitable vis type and schema
     _.find(visTypes, function (visType) {
-      var schema = _.find(visType.schemas.all, function (schema) {
+      let schema = _.find(visType.schemas.all, function (schema) {
         // type, type, type, type, type... :(
         return schema.group === self.aggType.type;
       });
@@ -65,7 +65,7 @@ module.exports = function AggParamWriterHelper(Private) {
   }
 
   AggParamWriter.prototype.write = function (paramValues) {
-    var self = this;
+    let self = this;
     paramValues = _.clone(paramValues);
 
     if (self.aggType.params.byName.field && !paramValues.field) {
@@ -86,7 +86,7 @@ module.exports = function AggParamWriterHelper(Private) {
       }]
     });
 
-    var aggConfig = _.find(self.vis.aggs, function (aggConfig) {
+    let aggConfig = _.find(self.vis.aggs, function (aggConfig) {
       return aggConfig.type === self.aggType;
     });
 
diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/AggParams.js
index 0d0c839fb9aef..9f3f8e077bb89 100644
--- a/src/ui/public/agg_types/__tests__/AggParams.js
+++ b/src/ui/public/agg_types/__tests__/AggParams.js
@@ -1,13 +1,13 @@
 describe('AggParams class', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var AggParams;
-  var BaseAggParam;
-  var FieldAggParam;
-  var OptionedAggParam;
-  var RegexAggParam;
+  let AggParams;
+  let BaseAggParam;
+  let FieldAggParam;
+  let OptionedAggParam;
+  let RegexAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // stub out the param classes before we get the AggParams
@@ -23,11 +23,11 @@ describe('AggParams class', function () {
 
   describe('constructor args', function () {
     it('accepts an array of param defs', function () {
-      var params = [
+      let params = [
         { name: 'one' },
         { name: 'two' }
       ];
-      var aggParams = new AggParams(params);
+      let aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams).to.be.an(Array);
@@ -37,43 +37,43 @@ describe('AggParams class', function () {
 
   describe('AggParam creation', function () {
     it('Uses the FieldAggParam class for params with the name "field"', function () {
-      var params = [
+      let params = [
         { name: 'field' }
       ];
-      var aggParams = new AggParams(params);
+      let aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(FieldAggParam);
     });
 
     it('Uses the OptionedAggParam class for params of type "optioned"', function () {
-      var params = [
+      let params = [
         {
           name: 'interval',
           type: 'optioned'
         }
       ];
-      var aggParams = new AggParams(params);
+      let aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(OptionedAggParam);
     });
 
     it('Uses the RegexAggParam class for params of type "regex"', function () {
-      var params = [
+      let params = [
         {
           name: 'exclude',
           type: 'regex'
         }
       ];
-      var aggParams = new AggParams(params);
+      let aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(RegexAggParam);
     });
 
     it('Always converts the params to a BaseAggParam', function () {
-      var params = [
+      let params = [
         {
           name: 'height',
           editor: '<blink>high</blink>'
@@ -87,7 +87,7 @@ describe('AggParams class', function () {
           editor: '<blink>small</blink>'
         }
       ];
-      var aggParams = new AggParams(params);
+      let aggParams = new AggParams(params);
 
       expect(BaseAggParam).to.have.property('callCount', params.length);
       expect(FieldAggParam).to.have.property('callCount', 0);
diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js
index 2f3e37f317977..21ba2db39114b 100644
--- a/src/ui/public/agg_types/__tests__/AggType.js
+++ b/src/ui/public/agg_types/__tests__/AggType.js
@@ -1,20 +1,20 @@
 describe('AggType Class', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var sinon = require('auto-release-sinon');
-  var AggType;
-  var AggParams;
-  var AggConfig;
-  var indexPattern;
-  var fieldFormat;
-  var Vis;
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let AggType;
+  let AggParams;
+  let AggConfig;
+  let indexPattern;
+  let fieldFormat;
+  let Vis;
 
   require('ui/private');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    var AggParamsPM = require('ui/agg_types/AggParams');
+    let AggParamsPM = require('ui/agg_types/AggParams');
     AggParams = sinon.spy(Private(AggParamsPM));
     Private.stub(AggParamsPM, AggParams);
 
@@ -34,7 +34,7 @@ describe('AggType Class', function () {
     });
 
     describe('application of config properties', function () {
-      var copiedConfigProps = [
+      let copiedConfigProps = [
         'name',
         'title',
         'makeLabel',
@@ -43,11 +43,11 @@ describe('AggType Class', function () {
 
       describe('"' + copiedConfigProps.join('", "') + '"', function () {
         it('assigns the config value to itself', function () {
-          var config = _.transform(copiedConfigProps, function (config, prop) {
+          let config = _.transform(copiedConfigProps, function (config, prop) {
             config[prop] = {};
           }, {});
 
-          var aggType = new AggType(config);
+          let aggType = new AggType(config);
 
           copiedConfigProps.forEach(function (prop) {
             expect(aggType[prop]).to.be(config[prop]);
@@ -57,9 +57,9 @@ describe('AggType Class', function () {
 
       describe('makeLabel', function () {
         it('makes a function when the makeLabel config is not specified', function () {
-          var someGetter = function () {};
+          let someGetter = function () {};
 
-          var aggType = new AggType({
+          let aggType = new AggType({
             makeLabel: someGetter
           });
 
@@ -76,9 +76,9 @@ describe('AggType Class', function () {
 
       describe('getFormat', function () {
         it('returns the formatter for the aggConfig', function () {
-          var aggType = new AggType({});
+          let aggType = new AggType({});
 
-          var vis = new Vis(indexPattern, {
+          let vis = new Vis(indexPattern, {
             type: 'histogram',
             aggs: [
               {
@@ -88,7 +88,7 @@ describe('AggType Class', function () {
             ]
           });
 
-          var aggConfig = vis.aggs.byTypeName.date_histogram[0];
+          let aggConfig = vis.aggs.byTypeName.date_histogram[0];
 
           expect(aggType.getFormat(aggConfig)).to.be(fieldFormat.getDefaultInstance('date'));
 
@@ -107,9 +107,9 @@ describe('AggType Class', function () {
         });
 
         it('can be overridden via config', function () {
-          var someGetter = function () {};
+          let someGetter = function () {};
 
-          var aggType = new AggType({
+          let aggType = new AggType({
             getFormat: someGetter
           });
 
@@ -123,23 +123,34 @@ describe('AggType Class', function () {
         });
 
         it('defaults to AggParams object with JSON param', function () {
-          var aggType = new AggType({
+          let aggType = new AggType({
             name: 'smart agg'
           });
 
           expect(aggType.params).to.be.an(AggParams);
+          expect(aggType.params.length).to.be(2);
+          expect(aggType.params[0].name).to.be('json');
+          expect(aggType.params[1].name).to.be('customLabel');
+        });
+
+        it('can disable customLabel', function () {
+          let aggType = new AggType({
+            name: 'smart agg',
+            customLabels: false
+          });
+
           expect(aggType.params.length).to.be(1);
           expect(aggType.params[0].name).to.be('json');
         });
 
         it('passes the params arg directly to the AggParams constructor', function () {
-          var params = [
+          let params = [
             {name: 'one'},
             {name: 'two'}
           ];
-          var paramLength = params.length + 1; // json is always appended
+          let paramLength = params.length + 2; // json and custom label are always appended
 
-          var aggType = new AggType({
+          let aggType = new AggType({
             name: 'bucketeer',
             params: params
           });
@@ -153,8 +164,8 @@ describe('AggType Class', function () {
 
       describe('getResponseAggs', function () {
         it('copies the value', function () {
-          var football = {};
-          var aggType = new AggType({
+          let football = {};
+          let aggType = new AggType({
             getResponseAggs: football
           });
 
@@ -162,7 +173,7 @@ describe('AggType Class', function () {
         });
 
         it('defaults to _.noop', function () {
-          var aggType = new AggType({});
+          let aggType = new AggType({});
 
           expect(aggType.getResponseAggs).to.be(_.noop);
         });
diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucketCountBetween.js
index 45f716b99e408..73fb0d5d31837 100644
--- a/src/ui/public/agg_types/__tests__/bucketCountBetween.js
+++ b/src/ui/public/agg_types/__tests__/bucketCountBetween.js
@@ -1,13 +1,13 @@
 describe('bucketCountBetween util', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var indexPattern;
-  var Vis;
-  var visTypes;
-  var aggTypes;
-  var AggConfig;
-  var bucketCountBetween;
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let indexPattern;
+  let Vis;
+  let visTypes;
+  let aggTypes;
+  let AggConfig;
+  let bucketCountBetween;
 
   // http://cwestblog.com/2014/02/25/javascript-testing-for-negative-zero/
   // works for -0 and +0
@@ -26,7 +26,7 @@ describe('bucketCountBetween util', function () {
   }));
 
   it('returns a positive number when a is before b', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -40,14 +40,14 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    var a = vis.aggs.byTypeName.date_histogram[0];
-    var b = vis.aggs.byTypeName.terms[0];
-    var count = bucketCountBetween(a, b);
+    let a = vis.aggs.byTypeName.date_histogram[0];
+    let b = vis.aggs.byTypeName.terms[0];
+    let count = bucketCountBetween(a, b);
     expect(isNegative(count)).to.be(false);
   });
 
   it('returns a negative number when a is after b', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -61,14 +61,14 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    var a = vis.aggs.byTypeName.terms[0];
-    var b = vis.aggs.byTypeName.date_histogram[0];
-    var count = bucketCountBetween(a, b);
+    let a = vis.aggs.byTypeName.terms[0];
+    let b = vis.aggs.byTypeName.date_histogram[0];
+    let count = bucketCountBetween(a, b);
     expect(isNegative(count)).to.be(true);
   });
 
   it('returns 0 when there are no buckets between a and b', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -82,13 +82,13 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    var a = vis.aggs.byTypeName.date_histogram[0];
-    var b = vis.aggs.byTypeName.terms[0];
+    let a = vis.aggs.byTypeName.date_histogram[0];
+    let b = vis.aggs.byTypeName.terms[0];
     expect(bucketCountBetween(a, b)).to.be(0);
   });
 
   it('returns null when b is not in the aggs', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -98,8 +98,8 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    var a = vis.aggs.byTypeName.date_histogram[0];
-    var b = new AggConfig(vis, {
+    let a = vis.aggs.byTypeName.date_histogram[0];
+    let b = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
@@ -108,7 +108,7 @@ describe('bucketCountBetween util', function () {
   });
 
   it('returns null when a is not in the aggs', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -118,27 +118,27 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    var a = new AggConfig(vis, {
+    let a = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
-    var b = vis.aggs.byTypeName.date_histogram[0];
+    let b = vis.aggs.byTypeName.date_histogram[0];
 
     expect(bucketCountBetween(a, b)).to.be(null);
   });
 
   it('returns null when a and b are not in the aggs', function () {
-    var vis = new Vis(indexPattern, {
+    let vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: []
     });
 
-    var a = new AggConfig(vis, {
+    let a = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
 
-    var b = new AggConfig(vis, {
+    let b = new AggConfig(vis, {
       type: 'date_histogram',
       schema: 'segment'
     });
@@ -148,14 +148,14 @@ describe('bucketCountBetween util', function () {
 
   function countTest(pre, post) {
     return function () {
-      var schemas = visTypes.byName.histogram.schemas.buckets;
+      let schemas = visTypes.byName.histogram.schemas.buckets;
 
       // slow for this test is actually somewhere around 1/2 a sec
       this.slow(500);
 
       function randBucketAggForVis(vis) {
-        var schema = _.sample(schemas);
-        var aggType = _.sample(aggTypes.byType.buckets);
+        let schema = _.sample(schemas);
+        let aggType = _.sample(aggTypes.byType.buckets);
 
         return new AggConfig(vis, {
           schema: schema,
@@ -164,20 +164,20 @@ describe('bucketCountBetween util', function () {
       }
 
       _.times(50, function (n) {
-        var vis = new Vis(indexPattern, {
+        let vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: []
         });
 
-        var randBucketAgg = _.partial(randBucketAggForVis, vis);
+        let randBucketAgg = _.partial(randBucketAggForVis, vis);
 
-        var a = randBucketAgg();
-        var b = randBucketAgg();
+        let a = randBucketAgg();
+        let b = randBucketAgg();
 
         // create n aggs between a and b
-        var aggs = [];
+        let aggs = [];
         aggs.fill = function (n) {
-          for (var i = 0; i < n; i++) {
+          for (let i = 0; i < n; i++) {
             aggs.push(randBucketAgg());
           }
         };
diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
index 5da2bf18b56a1..7fabfadf54b0d 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
@@ -1,10 +1,10 @@
 describe('Histogram Agg', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   describe('ordered', function () {
-    var histogram;
+    let histogram;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -22,11 +22,11 @@ describe('Histogram Agg', function () {
 
 
   describe('params', function () {
-    var paramWriter;
+    let paramWriter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      var AggParamWriter = Private(require('../AggParamWriter'));
+      let AggParamWriter = Private(require('../AggParamWriter'));
       paramWriter = new AggParamWriter({ aggType: 'histogram' });
     }));
 
@@ -34,25 +34,25 @@ describe('Histogram Agg', function () {
       // reads aggConfig.params.interval, writes to dsl.interval
 
       it('accepts a number', function () {
-        var output = paramWriter.write({ interval: 100 });
+        let output = paramWriter.write({ interval: 100 });
         expect(output.params).to.have.property('interval', 100);
       });
 
       it('accepts a string', function () {
-        var output = paramWriter.write({ interval: '10' });
+        let output = paramWriter.write({ interval: '10' });
         expect(output.params).to.have.property('interval', 10);
       });
 
       it('fails on non-numeric values', function () {
         // template validation prevents this from users, not devs
-        var output = paramWriter.write({ interval: [] });
+        let output = paramWriter.write({ interval: [] });
         expect(isNaN(output.params.interval)).to.be.ok();
       });
     });
 
     describe('min_doc_count', function () {
       it('casts true values to 0', function () {
-        var output = paramWriter.write({ min_doc_count: true });
+        let output = paramWriter.write({ min_doc_count: true });
         expect(output.params).to.have.property('min_doc_count', 0);
 
         output = paramWriter.write({ min_doc_count: 'yes' });
@@ -66,7 +66,7 @@ describe('Histogram Agg', function () {
       });
 
       it('writes nothing for false values', function () {
-        var output = paramWriter.write({ min_doc_count: '' });
+        let output = paramWriter.write({ min_doc_count: '' });
         expect(output.params).to.not.have.property('min_doc_count');
 
         output = paramWriter.write({ min_doc_count: null });
@@ -79,7 +79,7 @@ describe('Histogram Agg', function () {
 
     describe('extended_bounds', function () {
       it('writes when only eb.min is set', function () {
-        var output = paramWriter.write({
+        let output = paramWriter.write({
           extended_bounds: { min: 0 }
         });
         expect(output.params.extended_bounds).to.have.property('min', 0);
@@ -87,7 +87,7 @@ describe('Histogram Agg', function () {
       });
 
       it('writes when only eb.max is set', function () {
-        var output = paramWriter.write({
+        let output = paramWriter.write({
           extended_bounds: { max: 0 }
         });
         expect(output.params.extended_bounds).to.have.property('min', undefined);
@@ -95,7 +95,7 @@ describe('Histogram Agg', function () {
       });
 
       it('writes when both eb.min and eb.max are set', function () {
-        var output = paramWriter.write({
+        let output = paramWriter.write({
           extended_bounds: { min: 99, max: 100 }
         });
         expect(output.params.extended_bounds).to.have.property('min', 99);
@@ -103,7 +103,7 @@ describe('Histogram Agg', function () {
       });
 
       it('does not write when nothing is set', function () {
-        var output = paramWriter.write({
+        let output = paramWriter.write({
           extended_bounds: {}
         });
         expect(output.params).to.not.have.property('extended_bounds');
diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js
index 998b0857ba642..7f82d99183738 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_range.js
@@ -1,15 +1,15 @@
 describe('Range Agg', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var values = require('lodash').values;
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let values = require('lodash').values;
 
-  var resp = require('fixtures/agg_resp/range');
-  var buckets = values(resp.aggregations[1].buckets);
+  let resp = require('fixtures/agg_resp/range');
+  let buckets = values(resp.aggregations[1].buckets);
 
-  var range;
-  var Vis;
-  var indexPattern;
+  let range;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -17,7 +17,7 @@ describe('Range Agg', function () {
     Vis = Private(require('ui/Vis'));
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
-    var BytesFormat = Private(require('ui/registry/field_formats')).byId.bytes;
+    let BytesFormat = Private(require('ui/registry/field_formats')).byId.bytes;
 
     indexPattern.fieldFormatMap.bytes = new BytesFormat({
       pattern: '0,0.[000] b'
@@ -28,7 +28,7 @@ describe('Range Agg', function () {
 
   describe('formating', function () {
     it('formats bucket keys properly', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -45,8 +45,8 @@ describe('Range Agg', function () {
         ]
       });
 
-      var agg = vis.aggs.byTypeName.range[0];
-      var format = function (val) {
+      let agg = vis.aggs.byTypeName.range[0];
+      let format = function (val) {
         return agg.fieldFormatter()(agg.getKey(val));
       };
       expect(format(buckets[0])).to.be('-∞ to 1 KB');
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
index 21da090d58cd8..cc8fa36e2daa8 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
@@ -1,29 +1,29 @@
 describe('AggConfig Filters', function () {
   describe('date_histogram', function () {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var sinon = require('auto-release-sinon');
-    var aggResp = require('fixtures/agg_resp/date_histogram');
-    var ngMock = require('ngMock');
-    var expect = require('expect.js');
-
-    var vis;
-    var agg;
-    var field;
-    var filter;
-    var bucketKey;
-    var bucketStart;
-    var getIntervalStub;
-    var intervalOptions;
-
-    var init;
+    let _ = require('lodash');
+    let moment = require('moment');
+    let sinon = require('auto-release-sinon');
+    let aggResp = require('fixtures/agg_resp/date_histogram');
+    let ngMock = require('ngMock');
+    let expect = require('expect.js');
+
+    let vis;
+    let agg;
+    let field;
+    let filter;
+    let bucketKey;
+    let bucketStart;
+    let getIntervalStub;
+    let intervalOptions;
+
+    let init;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, $injector) {
-      var Vis = Private(require('ui/Vis'));
-      var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-      var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
-      var TimeBuckets = Private(require('ui/time_buckets'));
+      let Vis = Private(require('ui/Vis'));
+      let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+      let createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
+      let TimeBuckets = Private(require('ui/time_buckets'));
       intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
 
       init = function (interval, duration) {
@@ -46,7 +46,7 @@ describe('AggConfig Filters', function () {
         bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
         bucketStart = moment(bucketKey);
 
-        var timePad = moment.duration(duration / 2);
+        let timePad = moment.duration(duration / 2);
         agg.buckets.setBounds({
           min: bucketStart.clone().subtract(timePad),
           max: bucketStart.clone().add(timePad),
@@ -63,7 +63,7 @@ describe('AggConfig Filters', function () {
       expect(filter).to.have.property('range');
       expect(filter.range).to.have.property(field.name);
 
-      var fieldParams = filter.range[field.name];
+      let fieldParams = filter.range[field.name];
       expect(fieldParams).to.have.property('gte');
       expect(fieldParams.gte).to.be.a('number');
 
@@ -79,7 +79,7 @@ describe('AggConfig Filters', function () {
 
     it('extends the filter edge to 1ms before the next bucket for all interval options', function () {
       intervalOptions.forEach(function (option) {
-        var duration;
+        let duration;
         if (option.val !== 'custom' && moment(1, option.val).isValid()) {
           duration = moment.duration(10, option.val);
 
@@ -90,8 +90,8 @@ describe('AggConfig Filters', function () {
 
         init(option.val, duration);
 
-        var interval = agg.buckets.getInterval();
-        var params = filter.range[field.name];
+        let interval = agg.buckets.getInterval();
+        let params = filter.range[field.name];
 
         expect(params.gte).to.be(+bucketStart);
         expect(params.lte).to.be(+bucketStart.clone().add(interval).subtract(1, 'ms'));
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
index d86bb6ad9e552..09d357bd6ce28 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
@@ -1,14 +1,14 @@
 
-var moment = require('moment');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let moment = require('moment');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('Date range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return a range filter for date_range agg', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -34,8 +34,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.date_range[0];
-      var filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
+      let aggConfig = vis.aggs.byTypeName.date_range[0];
+      let filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
index c891a95c7d157..19dfe044af4f0 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
@@ -1,14 +1,14 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('filters', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return a filters filter', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -35,8 +35,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.filters[0];
-      var filter = createFilter(aggConfig, '_type:nginx');
+      let aggConfig = vis.aggs.byTypeName.filters[0];
+      let filter = createFilter(aggConfig, '_type:nginx');
       expect(_.omit(filter, 'meta')).to.eql(aggConfig.params.filters[1].input);
       expect(filter.meta).to.have.property('index', indexPattern.id);
 
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
index 076386dd4ed69..ab4873a6e6152 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
@@ -1,14 +1,14 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('AggConfig Filters', function () {
   describe('histogram', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -19,7 +19,7 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return an range filter for histogram', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -30,8 +30,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.histogram[0];
-      var filter = createFilter(aggConfig, 2048);
+      let aggConfig = vis.aggs.byTypeName.histogram[0];
+      let filter = createFilter(aggConfig, 2048);
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
       expect(filter).to.have.property('range');
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
index c58bcff71dbb8..8f11c0406efb0 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
@@ -1,12 +1,12 @@
 describe('AggConfig Filters', function () {
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   describe('IP range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -17,7 +17,7 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return a range filter for ip_range agg', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -36,8 +36,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.ip_range[0];
-      var filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
+      let aggConfig = vis.aggs.byTypeName.ip_range[0];
+      let filter = createFilter(aggConfig, '0.0.0.0-1.1.1.1');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
@@ -47,7 +47,7 @@ describe('AggConfig Filters', function () {
     });
 
     it('should return a range filter for ip_range agg using a CIDR mask', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -66,8 +66,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.ip_range[0];
-      var filter = createFilter(aggConfig, '67.129.65.201/27');
+      let aggConfig = vis.aggs.byTypeName.ip_range[0];
+      let filter = createFilter(aggConfig, '67.129.65.201/27');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
index ca5b8eff5f745..24da70169b1e7 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
@@ -1,12 +1,12 @@
 describe('AggConfig Filters', function () {
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   describe('range', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -17,7 +17,7 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return a range filter for range agg', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -33,8 +33,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      var aggConfig = vis.aggs.byTypeName.range[0];
-      var filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
+      let aggConfig = vis.aggs.byTypeName.range[0];
+      let filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
index 32a9fe897921d..947d3e7942709 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
@@ -1,12 +1,12 @@
 describe('AggConfig Filters', function () {
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   describe('terms', function () {
-    var AggConfig;
-    var indexPattern;
-    var Vis;
-    var createFilter;
+    let AggConfig;
+    let indexPattern;
+    let Vis;
+    let createFilter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -17,12 +17,12 @@ describe('AggConfig Filters', function () {
     }));
 
     it('should return a match filter for terms', function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
       });
-      var aggConfig = vis.aggs.byTypeName.terms[0];
-      var filter = createFilter(aggConfig, 'apache');
+      let aggConfig = vis.aggs.byTypeName.terms[0];
+      let filter = createFilter(aggConfig, 'apache');
       expect(filter).to.have.property('query');
       expect(filter.query).to.have.property('match');
       expect(filter.query.match).to.have.property('_type');
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
index 88152a39f55e3..10fe400ae093b 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -1,20 +1,20 @@
 describe('editor', function () {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var indexPattern;
-  var vis;
-  var agg;
-  var render;
-  var $scope;
+  let indexPattern;
+  let vis;
+  let agg;
+  let render;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector, $compile) {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
 
-    var Vis = Private(require('ui/Vis'));
+    let Vis = Private(require('ui/Vis'));
 
     /**
      * Render the AggParams editor for the date histogram aggregation
@@ -35,8 +35,8 @@ describe('editor', function () {
         ]
       });
 
-      var $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
-      var $parentScope = $injector.get('$rootScope').$new();
+      let $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
+      let $parentScope = $injector.get('$rootScope').$new();
 
       agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
       $parentScope.groupName = 'buckets';
@@ -45,10 +45,10 @@ describe('editor', function () {
       $scope = $el.scope();
       $scope.$digest();
 
-      var $inputs = $('vis-agg-param-editor', $el);
+      let $inputs = $('vis-agg-param-editor', $el);
       return _.transform($inputs.toArray(), function (inputs, e) {
-        var $el = $(e);
-        var $scope = $el.scope();
+        let $el = $(e);
+        let $scope = $el.scope();
 
         inputs[$scope.aggParam.name] = {
           $el: $el,
@@ -66,9 +66,9 @@ describe('editor', function () {
   }));
 
   describe('random field/interval', function () {
-    var params;
-    var field;
-    var interval;
+    let params;
+    let field;
+    let interval;
 
     beforeEach(ngMock.inject(function (Private) {
       field = _.sample(indexPattern.fields);
@@ -94,7 +94,7 @@ describe('editor', function () {
   });
 
   describe('interval "auto" and indexPattern timeField', function () {
-    var params;
+    let params;
 
     beforeEach(function () {
       params = render({ field: indexPattern.timeFieldName, interval: 'auto' });
@@ -104,7 +104,7 @@ describe('editor', function () {
       expect(params.interval.modelValue().val).to.be('auto');
       expect(params.field.modelValue().name).to.be(indexPattern.timeFieldName);
 
-      var field = _.find(indexPattern.fields, function (f) {
+      let field = _.find(indexPattern.fields, function (f) {
         return f.type === 'date' && f.name !== indexPattern.timeFieldName;
       });
 
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
index 4ad58ff3d3026..fd2be913b4410 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -1,22 +1,22 @@
 describe('params', function () {
-  var _ = require('lodash');
-  var moment = require('moment');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let moment = require('moment');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var paramWriter;
-  var writeInterval;
+  let paramWriter;
+  let writeInterval;
 
-  var aggTypes;
-  var AggConfig;
-  var setTimeBounds;
-  var timeField;
+  let aggTypes;
+  let AggConfig;
+  let setTimeBounds;
+  let timeField;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
-    var AggParamWriter = Private(require('../../AggParamWriter'));
-    var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
-    var timefilter = $injector.get('timefilter');
+    let AggParamWriter = Private(require('../../AggParamWriter'));
+    let indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
+    let timefilter = $injector.get('timefilter');
 
     timeField = indexPattern.timeFieldName;
     aggTypes = Private(require('ui/agg_types/index'));
@@ -27,7 +27,7 @@ describe('params', function () {
       return paramWriter.write({ interval: interval, field: timeField });
     };
 
-    var now = moment();
+    let now = moment();
     setTimeBounds = function (n, units) {
       timefilter.enabled = true;
       timefilter.getBounds = _.constant({
@@ -39,24 +39,24 @@ describe('params', function () {
 
   describe('interval', function () {
     it('accepts a valid interval', function () {
-      var output = writeInterval('d');
+      let output = writeInterval('d');
       expect(output.params).to.have.property('interval', '1d');
     });
 
     it('ignores invalid intervals', function () {
-      var output = writeInterval('foo');
+      let output = writeInterval('foo');
       expect(output.params).to.have.property('interval', '0ms');
     });
 
     it('automatically picks an interval', function () {
       setTimeBounds(15, 'm');
-      var output = writeInterval('auto');
+      let output = writeInterval('auto');
       expect(output.params.interval).to.be('30s');
     });
 
     it('scales up the interval if it will make too many buckets', function () {
       setTimeBounds(30, 'm');
-      var output = writeInterval('s');
+      let output = writeInterval('s');
       expect(output.params.interval).to.be('10s');
       expect(output.metricScaleText).to.be('second');
       expect(output.metricScale).to.be(0.1);
@@ -64,30 +64,30 @@ describe('params', function () {
 
     it('does not scale down the interval', function () {
       setTimeBounds(1, 'm');
-      var output = writeInterval('h');
+      let output = writeInterval('h');
       expect(output.params.interval).to.be('1h');
       expect(output.metricScaleText).to.be(undefined);
       expect(output.metricScale).to.be(undefined);
     });
 
     describe('only scales when all metrics are sum or count', function () {
-      var tests = [
+      let tests = [
         [ false, 'avg', 'count', 'sum' ],
         [ true, 'count', 'sum' ],
         [ false, 'count', 'cardinality' ]
       ];
 
       tests.forEach(function (test) {
-        var should = test.shift();
-        var typeNames = test.slice();
+        let should = test.shift();
+        let typeNames = test.slice();
 
         it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
           setTimeBounds(1, 'y');
 
-          var vis = paramWriter.vis;
+          let vis = paramWriter.vis;
           vis.aggs.splice(0);
 
-          var histoConfig = new AggConfig(vis, {
+          let histoConfig = new AggConfig(vis, {
             type: aggTypes.byName.date_histogram,
             schema: 'segment',
             params: { interval: 's', field: timeField }
@@ -102,7 +102,7 @@ describe('params', function () {
             }));
           });
 
-          var output = histoConfig.write();
+          let output = histoConfig.write();
           expect(_.has(output, 'metricScale')).to.be(should);
         });
       });
@@ -111,9 +111,9 @@ describe('params', function () {
 
   describe('extended_bounds', function () {
     it('should write a long value if a moment passed in', function () {
-      var then = moment(0);
-      var now = moment(500);
-      var output = paramWriter.write({
+      let then = moment(0);
+      let now = moment(500);
+      let output = paramWriter.write({
         extended_bounds: {
           min: then,
           max: now
@@ -129,9 +129,9 @@ describe('params', function () {
     });
 
     it('should write a long if a long is passed', function () {
-      var then = 0;
-      var now = 500;
-      var output = paramWriter.write({
+      let then = 0;
+      let now = 500;
+      let output = paramWriter.write({
         extended_bounds: {
           min: then,
           max: now
diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js
index 8ea2d47d297f2..6f069f6bcb558 100644
--- a/src/ui/public/agg_types/__tests__/controls/number_list.js
+++ b/src/ui/public/agg_types/__tests__/controls/number_list.js
@@ -1,27 +1,27 @@
 describe('NumberList directive', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var simulateKeys = require('testUtils/simulateKeys');
-  var ngMock = require('ngMock');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let simulateKeys = require('testUtils/simulateKeys');
+  let ngMock = require('ngMock');
 
   require('ui/number_list');
 
-  var $el;
-  var $scope;
-  var compile;
+  let $el;
+  let $scope;
+  let compile;
 
   function onlyValidValues() {
     return $el.find('[ng-model]').toArray().map(function (el) {
-      var ngModel = $(el).controller('ngModel');
+      let ngModel = $(el).controller('ngModel');
       return ngModel.$valid ? ngModel.$modelValue : undefined;
     });
   }
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
-    var $compile = $injector.get('$compile');
-    var $rootScope = $injector.get('$rootScope');
+    let $compile = $injector.get('$compile');
+    let $rootScope = $injector.get('$rootScope');
 
     $scope = $rootScope.$new();
     $el = $('<kbn-number-list ng-model="vals">');
@@ -75,7 +75,7 @@ describe('NumberList directive', function () {
     it('shift-up increases by 0.1', function () {
       compile([4.8]);
 
-      var seq = [
+      let seq = [
         {
           type: 'press',
           key: 'shift',
@@ -111,7 +111,7 @@ describe('NumberList directive', function () {
     it('shift-down decreases by 0.1', function () {
       compile([5.1]);
 
-      var seq = [
+      let seq = [
         {
           type: 'press',
           key: 'shift',
@@ -135,12 +135,12 @@ describe('NumberList directive', function () {
     it('maintains valid number', function () {
       compile([9, 11, 13]);
 
-      var seq = [
+      let seq = [
         'down', // 10 (11 - 1)
         'down'  // 10 (limited by 9)
       ];
 
-      var getEl = function () { return $el.find('input').eq(1); };
+      let getEl = function () { return $el.find('input').eq(1); };
 
       return simulateKeys(getEl, seq)
       .then(function () {
diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js
index ac1e8c19bb91d..4bfa00ed47968 100644
--- a/src/ui/public/agg_types/__tests__/index.js
+++ b/src/ui/public/agg_types/__tests__/index.js
@@ -1,5 +1,5 @@
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('AggTypesComponent', function () {
   require('./AggType');
@@ -9,8 +9,8 @@ describe('AggTypesComponent', function () {
   require('./buckets/_range');
 
   describe('bucket aggs', function () {
-    var bucketAggs;
-    var BucketAggType;
+    let bucketAggs;
+    let BucketAggType;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -26,8 +26,8 @@ describe('AggTypesComponent', function () {
   });
 
   describe('metric aggs', function () {
-    var metricAggs;
-    var MetricAggType;
+    let metricAggs;
+    let MetricAggType;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
index 5dc57a8ed33c0..1ea55f7945c17 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
@@ -1,13 +1,13 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('calculateInterval()', function () {
-  var AggConfig;
-  var indexPattern;
-  var Vis;
-  var createFilter;
-  var calculateInterval;
+  let AggConfig;
+  let indexPattern;
+  let Vis;
+  let createFilter;
+  let calculateInterval;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -17,15 +17,15 @@ describe('calculateInterval()', function () {
     calculateInterval = Private(require('ui/agg_types/param_types/_calculate_interval'));
   }));
 
-  var testInterval = function (option, expected) {
-    var msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
+  let testInterval = function (option, expected) {
+    let msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
     it(msg, function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp', interval: option } } ]
       });
-      var aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      var interval = calculateInterval(aggConfig);
+      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      let interval = calculateInterval(aggConfig);
       _.each(expected, function (val, key) {
         expect(interval).to.have.property(key, val);
       });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js
index 2bc90026efba4..012c4d1bc68e6 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_field.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_field.js
@@ -1,10 +1,10 @@
 describe('Field', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var FieldAggParam;
+  let BaseAggParam;
+  let FieldAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps
@@ -15,7 +15,7 @@ describe('Field', function () {
 
   describe('constructor', function () {
     it('it is an instance of BaseAggParam', function () {
-      var aggParam = new FieldAggParam({
+      let aggParam = new FieldAggParam({
         name: 'field'
       });
 
diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
index b15ecd02e47bd..9af596c3bf75e 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
@@ -1,10 +1,10 @@
 describe('Optioned', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var OptionedAggParam;
+  let BaseAggParam;
+  let OptionedAggParam;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps
@@ -15,7 +15,7 @@ describe('Optioned', function () {
 
   describe('constructor', function () {
     it('it is an instance of BaseAggParam', function () {
-      var aggParam = new OptionedAggParam({
+      let aggParam = new OptionedAggParam({
         name: 'some_param',
         type: 'optioned'
       });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
index 31033b3080d46..f4abd9d735897 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
@@ -1,19 +1,19 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 
 module.exports = describe('JSON', function () {
-  var paramName = 'json_test';
-  var BaseAggParam;
-  var JsonAggParam;
-  var aggParam;
-  var aggConfig;
-  var output;
+  let paramName = 'json_test';
+  let BaseAggParam;
+  let JsonAggParam;
+  let aggParam;
+  let aggConfig;
+  let output;
 
   function initAggParam(config) {
     config = config || {};
-    var defaults = {
+    let defaults = {
       name: paramName,
       type: 'json'
     };
@@ -57,7 +57,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should append param when valid JSON', function () {
-      var jsonData = JSON.stringify({
+      let jsonData = JSON.stringify({
         new_param: 'should exist in output'
       });
 
@@ -73,7 +73,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should not overwrite existing params', function () {
-      var jsonData = JSON.stringify({
+      let jsonData = JSON.stringify({
         new_param: 'should exist in output',
         existing: 'should be used'
       });
@@ -86,7 +86,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should drop nulled params', function () {
-      var jsonData = JSON.stringify({
+      let jsonData = JSON.stringify({
         new_param: 'should exist in output',
         field: null
       });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js
index 6d466df588925..f0fda0a6479fc 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_regex.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js
@@ -1,12 +1,12 @@
 describe('Regex', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var BaseAggParam;
-  var RegexAggParam;
-  var Vis;
-  var indexPattern;
+  let BaseAggParam;
+  let RegexAggParam;
+  let Vis;
+  let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   // fetch out deps
@@ -19,7 +19,7 @@ describe('Regex', function () {
 
   describe('constructor', function () {
     it('should be an instance of BaseAggParam', function () {
-      var aggParam = new RegexAggParam({
+      let aggParam = new RegexAggParam({
         name: 'some_param',
         type: 'regex'
       });
@@ -30,13 +30,13 @@ describe('Regex', function () {
   });
 
   describe('write results', function () {
-    var aggParam;
-    var aggConfig;
-    var output = { params: {} };
-    var paramName = 'exclude';
+    let aggParam;
+    let aggConfig;
+    let output = { params: {} };
+    let paramName = 'exclude';
 
     beforeEach(function () {
-      var vis = new Vis(indexPattern, {
+      let vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
           { type: 'terms', schema: 'split', params: { field: 'extension' }},
diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js
index f55a0a207b7c0..af538d5abe002 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_string.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_string.js
@@ -1,18 +1,18 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 module.exports = describe('String', function () {
-  var paramName = 'json_test';
-  var BaseAggParam;
-  var StringAggParam;
-  var aggParam;
-  var aggConfig;
-  var output;
+  let paramName = 'json_test';
+  let BaseAggParam;
+  let StringAggParam;
+  let aggParam;
+  let aggConfig;
+  let output;
 
   function initAggParam(config) {
     config = config || {};
-    var defaults = {
+    let defaults = {
       name: paramName,
       type: 'string'
     };
@@ -40,8 +40,8 @@ module.exports = describe('String', function () {
 
   describe('write', function () {
     it('should append param by name', function () {
-      var paramName = 'testing';
-      var params = {};
+      let paramName = 'testing';
+      let params = {};
       params[paramName] = 'some input';
 
       initAggParam({ name: paramName });
@@ -53,8 +53,8 @@ module.exports = describe('String', function () {
     });
 
     it('should not be in output with empty input', function () {
-      var paramName = 'more_testing';
-      var params = {};
+      let paramName = 'more_testing';
+      let params = {};
       params[paramName] = '';
 
       initAggParam({ name: paramName });
diff --git a/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
index 7848556f10aef..348ee66c7d4a9 100644
--- a/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
+++ b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
 
 function ParamClassStub(parent, body) {
-  var stub = sinon.spy(body || function () {
+  let stub = sinon.spy(body || function () {
     stub.Super && stub.Super.call(this);
   });
   if (parent) _.class(stub).inherits(parent);
@@ -14,7 +14,7 @@ function ParamClassStub(parent, body) {
  * This method should be passed directly to ngMock.inject();
  *
  * ```js
- * var stubParamClasses = require('./utils/_stub_agg_params');
+ * let stubParamClasses = require('./utils/_stub_agg_params');
  * describe('something', function () {
  *   beforeEach(ngMock.inject(stubParamClasses));
  * })
@@ -24,7 +24,7 @@ function ParamClassStub(parent, body) {
  * @return {undefined}
  */
 module.exports = function stubParamClasses(Private) {
-  var BaseAggParam = Private.stub(
+  let BaseAggParam = Private.stub(
     require('ui/agg_types/param_types/base'),
     new ParamClassStub(null, function (config) {
       _.assign(this, config);
diff --git a/src/ui/public/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
index b76e3911e0c8e..d2310489e73c9 100644
--- a/src/ui/public/agg_types/buckets/_bucket_agg_type.js
+++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function BucketAggTypeProvider(Private) {
-    var _ = require('lodash');
-    var AggType = Private(require('ui/agg_types/AggType'));
+    let _ = require('lodash');
+    let AggType = Private(require('ui/agg_types/AggType'));
 
     _.class(BucketAggType).inherits(AggType);
     function BucketAggType(config) {
diff --git a/src/ui/public/agg_types/buckets/_bucket_count_between.js b/src/ui/public/agg_types/buckets/_bucket_count_between.js
index a969011a9cfec..6e14f38040eeb 100644
--- a/src/ui/public/agg_types/buckets/_bucket_count_between.js
+++ b/src/ui/public/agg_types/buckets/_bucket_count_between.js
@@ -14,19 +14,19 @@ define(function (require) {
      * @return {null|number}
      */
     function bucketCountBetween(aggConfigA, aggConfigB) {
-      var aggs = aggConfigA.vis.aggs.getRequestAggs();
+      let aggs = aggConfigA.vis.aggs.getRequestAggs();
 
-      var aIndex = aggs.indexOf(aggConfigA);
-      var bIndex = aggs.indexOf(aggConfigB);
+      let aIndex = aggs.indexOf(aggConfigA);
+      let bIndex = aggs.indexOf(aggConfigB);
 
       if (aIndex === -1 || bIndex === -1) {
         return null;
       }
 
       // return a negative distance, if b is before a
-      var negative = (aIndex > bIndex);
+      let negative = (aIndex > bIndex);
 
-      var count = aggs
+      let count = aggs
         .slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex))
         .reduce(function (count, cfg) {
           if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') {
diff --git a/src/ui/public/agg_types/buckets/_interval_options.js b/src/ui/public/agg_types/buckets/_interval_options.js
index fa27d2291a01d..6d29637b39787 100644
--- a/src/ui/public/agg_types/buckets/_interval_options.js
+++ b/src/ui/public/agg_types/buckets/_interval_options.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function IntervalOptionsService(Private) {
-    var moment = require('moment');
+    let moment = require('moment');
     require('ui/directives/input_whole_number');
 
     // shorthand
-    var ms = function (type) { return moment.duration(1, type).asMilliseconds(); };
+    let ms = function (type) { return moment.duration(1, type).asMilliseconds(); };
 
     return [
       {
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
index 6040c31ac207b..280e1db1173bf 100644
--- a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function createDateHistogramFilterProvider(Private) {
-    var moment = require('moment');
-    var buildRangeFilter = require('ui/filter_manager/lib/range');
+    let moment = require('moment');
+    let buildRangeFilter = require('ui/filter_manager/lib/range');
 
     return function (agg, key) {
-      var start = moment(key);
-      var interval = agg.buckets.getInterval();
+      let start = moment(key);
+      let interval = agg.buckets.getInterval();
 
       return buildRangeFilter(agg.params.field, {
         gte: start.valueOf(),
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_range.js b/src/ui/public/agg_types/buckets/create_filter/date_range.js
index 9b075ee023f03..c5a5839bec6bc 100644
--- a/src/ui/public/agg_types/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/date_range.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var dateRange = require('ui/utils/date_range');
+  let dateRange = require('ui/utils/date_range');
 
   return function createDateRangeFilterProvider(config) {
-    var buildRangeFilter = require('ui/filter_manager/lib/range');
+    let buildRangeFilter = require('ui/filter_manager/lib/range');
 
     return function (agg, key) {
-      var range = dateRange.parse(key, config.get('dateFormat'));
+      let range = dateRange.parse(key, config.get('dateFormat'));
 
-      var filter = {};
+      let filter = {};
       if (range.from) filter.gte = +range.from;
       if (range.to) filter.lt = +range.to;
       if (range.to && range.from) filter.format = 'epoch_millis';
diff --git a/src/ui/public/agg_types/buckets/create_filter/filters.js b/src/ui/public/agg_types/buckets/create_filter/filters.js
index 89b22f6adc06c..e6b6fb844ac93 100644
--- a/src/ui/public/agg_types/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/buckets/create_filter/filters.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var buildQueryFilter = require('ui/filter_manager/lib/query');
-  var _ = require('lodash');
+  let buildQueryFilter = require('ui/filter_manager/lib/query');
+  let _ = require('lodash');
   return function CreateFilterFiltersProvider(Private) {
     return function (aggConfig, key) {
       // have the aggConfig write agg dsl params
-      var dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
-      var filter = dslFilters[key];
+      let dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
+      let filter = dslFilters[key];
 
       if (filter) {
         return buildQueryFilter(filter.query, aggConfig.vis.indexPattern.id);
diff --git a/src/ui/public/agg_types/buckets/create_filter/histogram.js b/src/ui/public/agg_types/buckets/create_filter/histogram.js
index c84883a8fd5b4..271d6c5a3ca1c 100644
--- a/src/ui/public/agg_types/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/buckets/create_filter/histogram.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var buildRangeFilter = require('ui/filter_manager/lib/range');
+  let buildRangeFilter = require('ui/filter_manager/lib/range');
 
   return function createHistogramFitlerProvider(Private) {
     return function (aggConfig, key) {
-      var value = parseInt(key, 10);
+      let value = parseInt(key, 10);
 
       return buildRangeFilter(
         aggConfig.params.field,
diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
index ccb21d517f4c9..cf08d36685155 100644
--- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var CidrMask = require('ui/utils/CidrMask');
-  var buildRangeFilter = require('ui/filter_manager/lib/range');
+  let CidrMask = require('ui/utils/CidrMask');
+  let buildRangeFilter = require('ui/filter_manager/lib/range');
   return function createIpRangeFilterProvider() {
     return function (aggConfig, key) {
-      var range;
+      let range;
       if (aggConfig.params.ipRangeType === 'mask') {
         range = new CidrMask(key).getRange();
       } else {
-        var addresses = key.split(/\-/);
+        let addresses = key.split(/\-/);
         range = {
           from: addresses[0],
           to: addresses[1]
diff --git a/src/ui/public/agg_types/buckets/create_filter/range.js b/src/ui/public/agg_types/buckets/create_filter/range.js
index 70af0a2c19097..ecec60143e036 100644
--- a/src/ui/public/agg_types/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/range.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var buildRangeFilter = require('ui/filter_manager/lib/range');
+  let buildRangeFilter = require('ui/filter_manager/lib/range');
   return function createRangeFilterProvider(Private) {
     return function (aggConfig, key) {
       return buildRangeFilter(
diff --git a/src/ui/public/agg_types/buckets/create_filter/terms.js b/src/ui/public/agg_types/buckets/create_filter/terms.js
index db2361bffe2f3..7ebc9a91e8497 100644
--- a/src/ui/public/agg_types/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/buckets/create_filter/terms.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var buildPhraseFilter = require('ui/filter_manager/lib/phrase');
+  let buildPhraseFilter = require('ui/filter_manager/lib/phrase');
   return function createTermsFilterProvider(Private) {
     return function (aggConfig, key) {
       return buildPhraseFilter(aggConfig.params.field, key, aggConfig.vis.indexPattern);
diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js
index a323e304850c5..e871b221bc097 100644
--- a/src/ui/public/agg_types/buckets/date_histogram.js
+++ b/src/ui/public/agg_types/buckets/date_histogram.js
@@ -1,19 +1,19 @@
 define(function (require) {
   return function DateHistogramAggType(timefilter, config, Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var tzDetect = require('jstimezonedetect').jstz;
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var TimeBuckets = Private(require('ui/time_buckets'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
-    var intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
-    var configDefaults = Private(require('ui/config/defaults'));
-
-    var detectedTimezone = tzDetect.determine().name();
-    var tzOffset = moment().format('Z');
+    let _ = require('lodash');
+    let moment = require('moment');
+    let tzDetect = require('jstimezonedetect').jstz;
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let TimeBuckets = Private(require('ui/time_buckets'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));
+    let intervalOptions = Private(require('ui/agg_types/buckets/_interval_options'));
+    let configDefaults = Private(require('ui/config/defaults'));
+
+    let detectedTimezone = tzDetect.determine().name();
+    let tzOffset = moment().format('Z');
 
     function getInterval(agg) {
-      var interval = _.get(agg, ['params', 'interval']);
+      let interval = _.get(agg, ['params', 'interval']);
       if (interval && interval.val === 'custom') interval = _.get(agg, ['params', 'customInterval']);
       return interval;
     }
@@ -34,13 +34,13 @@ define(function (require) {
         date: true
       },
       makeLabel: function (agg) {
-        var output = this.params.write(agg);
-        var params = output.params;
+        let output = this.params.write(agg);
+        let params = output.params;
         return params.field + ' per ' + (output.metricScaleText || output.bucketInterval.description);
       },
       createFilter: createFilter,
       decorateAggConfig: function () {
-        var buckets;
+        let buckets;
         return {
           buckets: {
             configurable: true,
@@ -76,7 +76,7 @@ define(function (require) {
           name: 'interval',
           type: 'optioned',
           deserialize: function (state) {
-            var interval = _.find(intervalOptions, {val: state});
+            let interval = _.find(intervalOptions, {val: state});
             return interval || _.find(intervalOptions, function (option) {
               // For upgrading from 4.0.x to 4.1.x - intervals are now stored as 'y' instead of 'year',
               // but this maps the old values to the new values
@@ -93,16 +93,16 @@ define(function (require) {
             setBounds(agg);
             agg.buckets.setInterval(getInterval(agg));
 
-            var interval = agg.buckets.getInterval();
+            let interval = agg.buckets.getInterval();
             output.bucketInterval = interval;
             output.params.interval = interval.expression;
 
-            var isDefaultTimezone = config.get('dateFormat:tz') === configDefaults['dateFormat:tz'].value;
+            let isDefaultTimezone = config.get('dateFormat:tz') === configDefaults['dateFormat:tz'].value;
             output.params.time_zone = isDefaultTimezone ?
               (detectedTimezone || tzOffset) :
               config.get('dateFormat:tz');
 
-            var scaleMetrics = interval.scaled && interval.scale < 1;
+            let scaleMetrics = interval.scaled && interval.scale < 1;
             if (scaleMetrics) {
               scaleMetrics = _.every(agg.vis.aggs.bySchemaGroup.metrics, function (agg) {
                 return agg.type && (agg.type.name === 'count' || agg.type.name === 'sum');
@@ -135,7 +135,7 @@ define(function (require) {
           name: 'extended_bounds',
           default: {},
           write: function (agg, output) {
-            var val = agg.params.extended_bounds;
+            let val = agg.params.extended_bounds;
 
             if (val.min != null || val.max != null) {
               output.params.extended_bounds = {
@@ -146,7 +146,7 @@ define(function (require) {
               return;
             }
 
-            var bounds = timefilter.getActiveBounds();
+            let bounds = timefilter.getActiveBounds();
             if (bounds) {
               output.params.extended_bounds = {
                 min: moment(bounds.min).valueOf(),
diff --git a/src/ui/public/agg_types/buckets/date_range.js b/src/ui/public/agg_types/buckets/date_range.js
index 9296485a425b2..a9144d66a1d5b 100644
--- a/src/ui/public/agg_types/buckets/date_range.js
+++ b/src/ui/public/agg_types/buckets/date_range.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  var moment = require('moment');
-  var dateRange = require('ui/utils/date_range');
+  let moment = require('moment');
+  let dateRange = require('ui/utils/date_range');
   require('ui/directives/validate_date_math');
 
   return function DateRangeAggDefinition(Private, config) {
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_range'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/date_range'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
 
     return new BucketAggType({
@@ -14,7 +14,7 @@ define(function (require) {
       title: 'Date Range',
       createFilter: createFilter,
       getKey: function (bucket, key, agg) {
-        var formatter = agg.fieldOwnFormatter('text', fieldFormats.getDefaultInstance('date'));
+        let formatter = agg.fieldOwnFormatter('text', fieldFormats.getDefaultInstance('date'));
         return dateRange.toString(bucket, formatter);
       },
       getFormat: function () {
diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js
index 4acee45b705f7..da31d270a0555 100644
--- a/src/ui/public/agg_types/buckets/filters.js
+++ b/src/ui/public/agg_types/buckets/filters.js
@@ -1,41 +1,42 @@
 define(function (require) {
   return function FiltersAggDefinition(Private, Notifier) {
-    var _ = require('lodash');
-    var angular = require('angular');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/filters'));
-    var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
-    var notif = new Notifier({ location: 'Filters Agg' });
+    let _ = require('lodash');
+    let angular = require('angular');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/filters'));
+    let decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
+    let notif = new Notifier({ location: 'Filters Agg' });
 
     return new BucketAggType({
       name: 'filters',
       title: 'Filters',
       createFilter: createFilter,
+      customLabels: false,
       params: [
         {
           name: 'filters',
           editor: require('ui/agg_types/controls/filters.html'),
           default: [ {input: {}, label: ''} ],
           write: function (aggConfig, output) {
-            var inFilters = aggConfig.params.filters;
+            let inFilters = aggConfig.params.filters;
             if (!_.size(inFilters)) return;
 
-            var outFilters = _.transform(inFilters, function (filters, filter) {
-              var input = filter.input;
+            let outFilters = _.transform(inFilters, function (filters, filter) {
+              let input = filter.input;
               if (!input) return notif.log('malformed filter agg params, missing "input" query');
 
-              var query = input.query;
+              let query = input.query;
               if (!query) return notif.log('malformed filter agg params, missing "query" on input');
 
               decorateQuery(query);
 
-              var label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
+              let label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
               filters[label] = input;
             }, {});
 
             if (!_.size(outFilters)) return;
 
-            var params = output.params || (output.params = {});
+            let params = output.params || (output.params = {});
             params.filters = outFilters;
           }
         }
diff --git a/src/ui/public/agg_types/buckets/geo_hash.js b/src/ui/public/agg_types/buckets/geo_hash.js
index 471b051fc7df6..9cb202c32c125 100644
--- a/src/ui/public/agg_types/buckets/geo_hash.js
+++ b/src/ui/public/agg_types/buckets/geo_hash.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function GeoHashAggDefinition(Private, config) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var defaultPrecision = 2;
+    let _ = require('lodash');
+    let moment = require('moment');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let defaultPrecision = 2;
 
     function getPrecision(precision) {
-      var maxPrecision = _.parseInt(config.get('visualization:tileMap:maxPrecision'));
+      let maxPrecision = _.parseInt(config.get('visualization:tileMap:maxPrecision'));
 
       precision = parseInt(precision, 10);
 
diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js
index 416b387d01620..13f67952607cc 100644
--- a/src/ui/public/agg_types/buckets/histogram.js
+++ b/src/ui/public/agg_types/buckets/histogram.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function HistogramAggDefinition(Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram'));
+    let _ = require('lodash');
+    let moment = require('moment');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram'));
 
     require('ui/validateDateInterval');
 
@@ -45,7 +45,7 @@ define(function (require) {
           default: {},
           editor: require('ui/agg_types/controls/extended_bounds.html'),
           write: function (aggConfig, output) {
-            var val = aggConfig.params.extended_bounds;
+            let val = aggConfig.params.extended_bounds;
 
             if (val.min != null || val.max != null) {
               output.params.extended_bounds = {
@@ -57,7 +57,7 @@ define(function (require) {
 
           // called from the editor
           shouldShow: function (aggConfig) {
-            var field = aggConfig.params.field;
+            let field = aggConfig.params.field;
             if (
               field
               && (field.type === 'number' || field.type === 'date')
diff --git a/src/ui/public/agg_types/buckets/ip_range.js b/src/ui/public/agg_types/buckets/ip_range.js
index 2eeee56bd0261..a8e4dc2822a78 100644
--- a/src/ui/public/agg_types/buckets/ip_range.js
+++ b/src/ui/public/agg_types/buckets/ip_range.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   require('ui/directives/validate_ip');
   require('ui/directives/validate_cidr_mask');
 
   return function RangeAggDefinition(Private) {
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/ip_range'));
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/ip_range'));
 
     return new BucketAggType({
       name: 'ip_range',
@@ -36,7 +36,7 @@ define(function (require) {
           },
           editor: require('ui/agg_types/controls/ip_ranges.html'),
           write: function (aggConfig, output) {
-            var ipRangeType = aggConfig.params.ipRangeType;
+            let ipRangeType = aggConfig.params.ipRangeType;
             output.params.ranges = aggConfig.params.ranges[ipRangeType];
           }
         }
diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js
index 8f5023f111c65..31fc2bd034494 100644
--- a/src/ui/public/agg_types/buckets/range.js
+++ b/src/ui/public/agg_types/buckets/range.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function RangeAggDefinition(Private) {
-    var _ = require('lodash');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/range'));
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
-    var RangeKey = Private(require('./RangeKey'));
+    let _ = require('lodash');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/range'));
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let RangeKey = Private(require('./RangeKey'));
 
-    var keyCaches = new WeakMap();
-    var formats = new WeakMap();
+    let keyCaches = new WeakMap();
+    let formats = new WeakMap();
 
     return new BucketAggType({
       name: 'range',
@@ -17,16 +17,16 @@ define(function (require) {
         return aggConfig.params.field.displayName + ' ranges';
       },
       getKey: function (bucket, key, agg) {
-        var keys = keyCaches.get(agg);
+        let keys = keyCaches.get(agg);
 
         if (!keys) {
           keys = new Map();
           keyCaches.set(agg, keys);
         }
 
-        var id = RangeKey.idBucket(bucket);
+        let id = RangeKey.idBucket(bucket);
 
-        var key = keys.get(id);
+        key = keys.get(id);
         if (!key) {
           key = new RangeKey(bucket);
           keys.set(id, key);
diff --git a/src/ui/public/agg_types/buckets/significant_terms.js b/src/ui/public/agg_types/buckets/significant_terms.js
index 65b833ea124c9..ebd74ebd83709 100644
--- a/src/ui/public/agg_types/buckets/significant_terms.js
+++ b/src/ui/public/agg_types/buckets/significant_terms.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function SignificantTermsAggDefinition(Private) {
-    var _ = require('lodash');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
+    let _ = require('lodash');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
 
     return new BucketAggType({
       name: 'significant_terms',
diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js
index c9eecec142e1b..1bfc5bbf48526 100644
--- a/src/ui/public/agg_types/buckets/terms.js
+++ b/src/ui/public/agg_types/buckets/terms.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function TermsAggDefinition(Private) {
-    var _ = require('lodash');
-    var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
-    var bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
-    var AggConfig = Private(require('ui/Vis/AggConfig'));
-    var Schemas = Private(require('ui/Vis/Schemas'));
-    var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
-
-    var orderAggSchema = (new Schemas([
+    let _ = require('lodash');
+    let BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
+    let bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between'));
+    let AggConfig = Private(require('ui/Vis/AggConfig'));
+    let Schemas = Private(require('ui/Vis/Schemas'));
+    let createFilter = Private(require('ui/agg_types/buckets/create_filter/terms'));
+
+    let orderAggSchema = (new Schemas([
       {
         group: 'none',
         name: 'orderAgg',
@@ -18,7 +18,7 @@ define(function (require) {
 
     function isNotType(type) {
       return function (agg) {
-        var field = agg.params.field;
+        let field = agg.params.field;
         return !field || field.type !== type;
       };
     }
@@ -27,7 +27,7 @@ define(function (require) {
       name: 'terms',
       title: 'Terms',
       makeLabel: function (agg) {
-        var params = agg.params;
+        let params = agg.params;
         return params.field.displayName + ': ' + params.order.display;
       },
       createFilter: createFilter,
@@ -67,7 +67,7 @@ define(function (require) {
           makeOrderAgg: function (termsAgg, state) {
             state = state || {};
             state.schema = orderAggSchema;
-            var orderAgg = new AggConfig(termsAgg.vis, state);
+            let orderAgg = new AggConfig(termsAgg.vis, state);
             orderAgg.id = termsAgg.id + '-orderAgg';
             return orderAgg;
           },
@@ -80,18 +80,18 @@ define(function (require) {
               }
             };
 
-            var INIT = {}; // flag to know when prevOrderBy has changed
-            var prevOrderBy = INIT;
+            let INIT = {}; // flag to know when prevOrderBy has changed
+            let prevOrderBy = INIT;
 
             $scope.$watch('responseValueAggs', updateOrderAgg);
             $scope.$watch('agg.params.orderBy', updateOrderAgg);
 
             function updateOrderAgg() {
-              var agg = $scope.agg;
-              var aggs = agg.vis.aggs;
-              var params = agg.params;
-              var orderBy = params.orderBy;
-              var paramDef = agg.type.params.byName.orderAgg;
+              let agg = $scope.agg;
+              let aggs = agg.vis.aggs;
+              let params = agg.params;
+              let orderBy = params.orderBy;
+              let paramDef = agg.type.params.byName.orderAgg;
 
               // setup the initial value of orderBy
               if (!orderBy && prevOrderBy === INIT) {
@@ -124,11 +124,11 @@ define(function (require) {
             }
           },
           write: function (agg, output) {
-            var vis = agg.vis;
-            var dir = agg.params.order.val;
-            var order = output.params.order = {};
+            let vis = agg.vis;
+            let dir = agg.params.order.val;
+            let order = output.params.order = {};
 
-            var orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
+            let orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
 
             // TODO: This works around an Elasticsearch bug the always casts terms agg scripts to strings
             // thus causing issues with filtering. This probably causes other issues since float might not
@@ -147,7 +147,7 @@ define(function (require) {
               return;
             }
 
-            var orderAggId = orderAgg.id;
+            let orderAggId = orderAgg.id;
             if (orderAgg.parentId) {
               orderAgg = vis.aggs.byId[orderAgg.parentId];
             }
diff --git a/src/ui/public/agg_types/controls/field.html b/src/ui/public/agg_types/controls/field.html
index 765c82533db38..8232015e6867f 100644
--- a/src/ui/public/agg_types/controls/field.html
+++ b/src/ui/public/agg_types/controls/field.html
@@ -9,7 +9,7 @@
   </span>
   <div class="hintbox" ng-show="showAnalyzedFieldWarning && agg.params.field.analyzed">
     <p>
-    <strong>Careful!</strong> The field selected contains analyzed strings. Analyzed strings are highly unique and can use a lot of memory to visualize. Values such as <i>foo-bar</i> will be broken into <i>foo</i> and <i>bar</i>. See <a href="http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-core-types.html" target="_blank">Mapping Core Types</a> for more information on setting this field as <i>not_analyzed</i>
+    <strong>Careful!</strong> The field selected contains analyzed strings. Analyzed strings are highly unique and can use a lot of memory to visualize. Values such as <i>foo-bar</i> will be broken into <i>foo</i> and <i>bar</i>. See <a href="http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html" target="_blank">Mapping Types</a> for more information on setting this field as <i>not_analyzed</i>
     </p>
 
     <p ng-show="indexedFields.byName[agg.params.field.name + '.raw'].analyzed == false">
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
index 16395c10f8aab..c50aad6aecaaf 100644
--- a/src/ui/public/agg_types/index.js
+++ b/src/ui/public/agg_types/index.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function AggTypeService(Private) {
-    var IndexedArray = require('ui/IndexedArray');
+    let IndexedArray = require('ui/IndexedArray');
 
-    var aggs = {
+    let aggs = {
       metrics: [
         Private(require('ui/agg_types/metrics/count')),
         Private(require('ui/agg_types/metrics/avg')),
diff --git a/src/ui/public/agg_types/metrics/MetricAggType.js b/src/ui/public/agg_types/metrics/MetricAggType.js
index 85c7c98abdc56..08a305843c1e2 100644
--- a/src/ui/public/agg_types/metrics/MetricAggType.js
+++ b/src/ui/public/agg_types/metrics/MetricAggType.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function MetricAggTypeProvider(Private) {
-    var _ = require('lodash');
-    var AggType = Private(require('ui/agg_types/AggType'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let _ = require('lodash');
+    let AggType = Private(require('ui/agg_types/AggType'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
     _.class(MetricAggType).inherits(AggType);
     function MetricAggType(config) {
@@ -19,10 +19,17 @@ define(function (require) {
     /**
      * Read the values for this metric from the
      * @param  {[type]} bucket [description]
-     * @return {[type]}        [description]
+     * @return {*}        [description]
      */
     MetricAggType.prototype.getValue = function (agg, bucket) {
-      return bucket[agg.id].value;
+      // Metric types where an empty set equals `zero`
+      let isSettableToZero = ['cardinality', 'sum'].indexOf(agg.__type.name) !== -1;
+
+      // Return proper values when no buckets are present
+      // `Count` handles empty sets properly
+      if (!bucket[agg.id] && isSettableToZero) return 0;
+
+      return bucket[agg.id] && bucket[agg.id].value;
     };
 
     /**
@@ -34,7 +41,7 @@ define(function (require) {
      * @return {FieldFromat}
      */
     MetricAggType.prototype.getFormat = function (agg) {
-      var field = agg.field();
+      let field = agg.field();
       return field ? field.format : fieldFormats.getDefaultInstance('number');
     };
 
diff --git a/src/ui/public/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js
index 1a7a1abb755c7..9059c9cf46ce5 100644
--- a/src/ui/public/agg_types/metrics/avg.js
+++ b/src/ui/public/agg_types/metrics/avg.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricAvgProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'avg',
diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
index f4eef38de8b42..556ef1d142dc8 100644
--- a/src/ui/public/agg_types/metrics/cardinality.js
+++ b/src/ui/public/agg_types/metrics/cardinality.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function AggTypeMetricCardinalityProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
     return new MetricAggType({
       name: 'cardinality',
diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
index a4d49d3084dcb..d455c974d7498 100644
--- a/src/ui/public/agg_types/metrics/count.js
+++ b/src/ui/public/agg_types/metrics/count.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function AggTypeMetricCountProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
     return new MetricAggType({
       name: 'count',
diff --git a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js b/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
index 69314d64a80b8..53ae902a3c704 100644
--- a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
+++ b/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function ResponseAggConfigProvider() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /**
      * Get the ResponseAggConfig class for an aggConfig,
@@ -31,7 +31,7 @@ define(function (require) {
         this.key = key;
         this.parentId = this.id;
 
-        var subId = String(key);
+        let subId = String(key);
         if (subId.indexOf('.') > -1) {
           this.id = this.parentId + '[\'' + subId.replace(/'/g, '\\\'') + '\']';
         } else {
diff --git a/src/ui/public/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js
index aef10513b421c..b1f26dfeafc20 100644
--- a/src/ui/public/agg_types/metrics/max.js
+++ b/src/ui/public/agg_types/metrics/max.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMaxProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'max',
diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js
index 9b8f982ded545..72d390d999749 100644
--- a/src/ui/public/agg_types/metrics/median.js
+++ b/src/ui/public/agg_types/metrics/median.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function AggTypeMetricMaxProvider(Private) {
-    var _ = require('lodash');
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
-    var percentiles = Private(require('ui/agg_types/metrics/percentiles'));
+    let _ = require('lodash');
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    let percentiles = Private(require('ui/agg_types/metrics/percentiles'));
 
     return new MetricAggType({
       name: 'median',
diff --git a/src/ui/public/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js
index 250a5001b1489..e12d0f547e8be 100644
--- a/src/ui/public/agg_types/metrics/min.js
+++ b/src/ui/public/agg_types/metrics/min.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricMinProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'min',
diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js
index 4e167c8016776..376b8fff62b86 100644
--- a/src/ui/public/agg_types/metrics/percentile_ranks.js
+++ b/src/ui/public/agg_types/metrics/percentile_ranks.js
@@ -1,19 +1,19 @@
 define(function (require) {
   return function AggTypeMetricPercentileRanksProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
-    var valuesEditor = require('ui/agg_types/controls/percentile_ranks.html');
+    let valuesEditor = require('ui/agg_types/controls/percentile_ranks.html');
     // required by the values editor
     require('ui/number_list');
 
-    var valueProps = {
+    let valueProps = {
       makeLabel: function () {
-        var field = this.field();
-        var format = (field && field.format) || fieldFormats.getDefaultInstance('number');
+        let field = this.field();
+        let format = (field && field.format) || fieldFormats.getDefaultInstance('number');
 
         return 'Percentile rank ' + format.convert(this.key, 'text') + ' of "' + this.fieldDisplayName() + '"';
       }
@@ -37,7 +37,7 @@ define(function (require) {
         }
       ],
       getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
+        let ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
 
         return agg.params.values.map(function (value) {
           return new ValueAggConfig(value);
@@ -49,7 +49,7 @@ define(function (require) {
       getValue: function (agg, bucket) {
         // values for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
         // parse the keys and respond with the value that matches
-        return _.find(bucket[agg.parentId].values, function (value, key) {
+        return _.find(bucket[agg.parentId] && bucket[agg.parentId].values, function (value, key) {
           return agg.key === parseFloat(key);
         }) / 100;
       }
diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js
index 101ee08318f61..10a244ea843c3 100644
--- a/src/ui/public/agg_types/metrics/percentiles.js
+++ b/src/ui/public/agg_types/metrics/percentiles.js
@@ -1,17 +1,17 @@
 define(function (require) {
   return function AggTypeMetricPercentilesProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
-    var ordinalSuffix = require('ui/utils/ordinal_suffix');
-    var fieldFormats = Private(require('ui/registry/field_formats'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    let ordinalSuffix = require('ui/utils/ordinal_suffix');
+    let fieldFormats = Private(require('ui/registry/field_formats'));
 
-    var percentsEditor = require('ui/agg_types/controls/percentiles.html');
+    let percentsEditor = require('ui/agg_types/controls/percentiles.html');
     // required by the percentiles editor
     require('ui/number_list');
 
-    var valueProps = {
+    let valueProps = {
       makeLabel: function () {
         return ordinalSuffix(this.key) + ' percentile of ' + this.fieldDisplayName();
       }
@@ -35,7 +35,7 @@ define(function (require) {
         }
       ],
       getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
+        let ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
 
         return agg.params.percents.map(function (percent) {
           return new ValueAggConfig(percent);
@@ -44,7 +44,7 @@ define(function (require) {
       getValue: function (agg, bucket) {
         // percentiles for 1, 5, and 10 will come back as 1.0, 5.0, and 10.0 so we
         // parse the keys and respond with the value that matches
-        return _.find(bucket[agg.parentId].values, function (value, key) {
+        return _.find(bucket[agg.parentId] && bucket[agg.parentId].values, function (value, key) {
           return agg.key === parseFloat(key);
         });
       }
diff --git a/src/ui/public/agg_types/metrics/stdDeviation.js b/src/ui/public/agg_types/metrics/stdDeviation.js
index 9a7a7ad27ddc5..5888715cb70d8 100644
--- a/src/ui/public/agg_types/metrics/stdDeviation.js
+++ b/src/ui/public/agg_types/metrics/stdDeviation.js
@@ -1,16 +1,16 @@
 define(function (require) {
   return function AggTypeMetricStandardDeviationProvider(Private) {
-    var _ = require('lodash');
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
-    var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
+    let _ = require('lodash');
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass'));
 
-    var responseAggConfigProps = {
+    let responseAggConfigProps = {
       valProp: function () {
-        var details = this.keyedDetails[this.key];
+        let details = this.keyedDetails[this.key];
         return details.valProp;
       },
       makeLabel: function () {
-        var details = this.keyedDetails[this.key];
+        let details = this.keyedDetails[this.key];
         return details.title + ' of ' + this.fieldDisplayName();
       },
       keyedDetails: {
@@ -44,7 +44,7 @@ define(function (require) {
       ],
 
       getResponseAggs: function (agg) {
-        var ValueAggConfig = getResponseAggConfigClass(agg, responseAggConfigProps);
+        let ValueAggConfig = getResponseAggConfigClass(agg, responseAggConfigProps);
 
         return [
           new ValueAggConfig('std_lower'),
diff --git a/src/ui/public/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js
index 5eced3aea75b8..75eb482d726bd 100644
--- a/src/ui/public/agg_types/metrics/sum.js
+++ b/src/ui/public/agg_types/metrics/sum.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function AggTypeMetricSumProvider(Private) {
-    var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
+    let MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType'));
 
     return new MetricAggType({
       name: 'sum',
diff --git a/src/ui/public/agg_types/param_types/base.js b/src/ui/public/agg_types/param_types/base.js
index e0be2ae5b13e6..19d8cfb331dbe 100644
--- a/src/ui/public/agg_types/param_types/base.js
+++ b/src/ui/public/agg_types/param_types/base.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function BaseAggParamFactory() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     function BaseAggParam(config) {
       _.assign(this, config);
diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js
index 8a697da80f9a3..0d6550867d638 100644
--- a/src/ui/public/agg_types/param_types/field.js
+++ b/src/ui/public/agg_types/param_types/field.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function FieldAggParamFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var editorHtml = require('ui/agg_types/controls/field.html');
-    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
-    var SavedObjectNotFound = require('ui/errors').SavedObjectNotFound;
+    let editorHtml = require('ui/agg_types/controls/field.html');
+    let BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    let SavedObjectNotFound = require('ui/errors').SavedObjectNotFound;
 
     _.class(FieldAggParam).inherits(BaseAggParam);
     function FieldAggParam(config) {
@@ -33,7 +33,7 @@ define(function (require) {
      * @return {field}
      */
     FieldAggParam.prototype.deserialize = function (fieldName, aggConfig) {
-      var field = aggConfig.vis.indexPattern.fields.byName[fieldName];
+      let field = aggConfig.vis.indexPattern.fields.byName[fieldName];
 
       if (!field) {
         throw new SavedObjectNotFound('index-pattern-field', fieldName);
@@ -53,7 +53,7 @@ define(function (require) {
      * @return {undefined}
      */
     FieldAggParam.prototype.write = function (aggConfig, output) {
-      var field = aggConfig.params.field;
+      let field = aggConfig.params.field;
 
       if (field.scripted) {
         output.params.script = field.script;
diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js
index 5d42ddf4e89bd..fd7e692d8c363 100644
--- a/src/ui/public/agg_types/param_types/optioned.js
+++ b/src/ui/public/agg_types/param_types/optioned.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function OptionedAggParamFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var IndexedArray = require('ui/IndexedArray');
-    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    let IndexedArray = require('ui/IndexedArray');
+    let BaseAggParam = Private(require('ui/agg_types/param_types/base'));
 
     _.class(OptionedAggParam).inherits(BaseAggParam);
     function OptionedAggParam(config) {
diff --git a/src/ui/public/agg_types/param_types/raw_json.js b/src/ui/public/agg_types/param_types/raw_json.js
index c338ee8feec34..ad4f2b48712a8 100644
--- a/src/ui/public/agg_types/param_types/raw_json.js
+++ b/src/ui/public/agg_types/param_types/raw_json.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function RawJSONAggParamFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
-    var editorHtml = require('ui/agg_types/controls/raw_json.html');
+    let BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    let editorHtml = require('ui/agg_types/controls/raw_json.html');
 
     _.class(RawJSONAggParam).inherits(BaseAggParam);
     function RawJSONAggParam(config) {
@@ -25,8 +25,8 @@ define(function (require) {
      * @return {undefined}
      */
     RawJSONAggParam.prototype.write = function (aggConfig, output) {
-      var paramJSON;
-      var param = aggConfig.params[this.name];
+      let paramJSON;
+      let param = aggConfig.params[this.name];
 
       if (!param) {
         return;
@@ -45,7 +45,7 @@ define(function (require) {
           .keys()
           .union(_.keys(b))
           .transform(function (dest, key) {
-            var val = compare(a[key], b[key]);
+            let val = compare(a[key], b[key]);
             if (val !== undefined) dest[key] = val;
           }, {})
           .value();
diff --git a/src/ui/public/agg_types/param_types/regex.js b/src/ui/public/agg_types/param_types/regex.js
index ea1a3165b5c40..9b5ef8cd64004 100644
--- a/src/ui/public/agg_types/param_types/regex.js
+++ b/src/ui/public/agg_types/param_types/regex.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function RegexAggParamFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
-    var editorHtml = require('ui/agg_types/controls/regular_expression.html');
+    let BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    let editorHtml = require('ui/agg_types/controls/regular_expression.html');
 
     _.class(RegexAggParam).inherits(BaseAggParam);
     function RegexAggParam(config) {
       // Java RegExp flags
-      var flags = [
+      let flags = [
         'CANON_EQ',
         'CASE_INSENSITIVE',
         'COMMENTS',
@@ -46,15 +46,15 @@ define(function (require) {
      * @return {undefined}
      */
     RegexAggParam.prototype.write = function (aggConfig, output) {
-      var param = aggConfig.params[this.name];
-      var paramType = aggConfig.type.params.byName[this.name];
+      let param = aggConfig.params[this.name];
+      let paramType = aggConfig.type.params.byName[this.name];
 
       // clear aggParam if pattern is not set or is disabled
       if (!param || !param.pattern || !param.pattern.length || paramType.disabled(aggConfig)) {
         return;
       }
 
-      var obj = {
+      let obj = {
         pattern: param.pattern
       };
 
diff --git a/src/ui/public/agg_types/param_types/string.js b/src/ui/public/agg_types/param_types/string.js
index e6135741e8971..76014d93d75e4 100644
--- a/src/ui/public/agg_types/param_types/string.js
+++ b/src/ui/public/agg_types/param_types/string.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function FieldAggParamFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var editorHtml = require('ui/agg_types/controls/string.html');
-    var BaseAggParam = Private(require('ui/agg_types/param_types/base'));
+    let editorHtml = require('ui/agg_types/controls/string.html');
+    let BaseAggParam = Private(require('ui/agg_types/param_types/base'));
 
     _.class(ScriptAggParam).inherits(BaseAggParam);
     function ScriptAggParam(config) {
diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js
index 34fbbbd395f19..da3f49636dcdd 100644
--- a/src/ui/public/bind/__tests__/bind.js
+++ b/src/ui/public/bind/__tests__/bind.js
@@ -1,10 +1,10 @@
 describe('$scope.$bind', function () {
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var $rootScope;
-  var $scope;
+  let $rootScope;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -16,7 +16,7 @@ describe('$scope.$bind', function () {
     expect($rootScope.$bind).to.be.a('function');
     expect($scope).to.have.property('$bind', $rootScope.$bind);
 
-    var $isoScope = $scope.$new(true);
+    let $isoScope = $scope.$new(true);
     expect($isoScope).to.have.property('$bind', $rootScope.$bind);
   });
 
@@ -33,7 +33,7 @@ describe('$scope.$bind', function () {
   });
 
   it('sets up a binding from the child to the parent scope', function () {
-    var stub = sinon.stub();
+    let stub = sinon.stub();
 
     $rootScope.val = 'foo';
     $scope.$bind('localVal', 'val');
@@ -47,8 +47,8 @@ describe('$scope.$bind', function () {
   });
 
   it('pulls from the scopes $parent by default', function () {
-    var $parent = $rootScope.$new();
-    var $self = $parent.$new();
+    let $parent = $rootScope.$new();
+    let $self = $parent.$new();
 
     $parent.val = 'foo';
     $self.val = 'bar';
@@ -58,8 +58,8 @@ describe('$scope.$bind', function () {
   });
 
   it('accepts an alternate scope to read from', function () {
-    var $parent = $rootScope.$new();
-    var $self = $parent.$new();
+    let $parent = $rootScope.$new();
+    let $self = $parent.$new();
 
     $parent.val = 'foo';
     $self.val = 'bar';
diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js
index fe229ad68adef..7863a202d3f4e 100644
--- a/src/ui/public/bind/bind.js
+++ b/src/ui/public/bind/bind.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   require('ui/modules').get('kibana')
   .config(function ($provide) {
@@ -27,26 +27,26 @@ define(function (require) {
        * @return {undefined}
        */
       $delegate.constructor.prototype.$bind = function (to, from, $sourceScope) {
-        var $source = $sourceScope || this.$parent;
-        var $target = this;
+        let $source = $sourceScope || this.$parent;
+        let $target = this;
 
         // parse expressions
-        var $to = $parse(to);
+        let $to = $parse(to);
         if (!$to.assign) errorNotAssignable(to, from);
-        var $from = $parse(from);
+        let $from = $parse(from);
 
         // bind scopes to expressions
-        var getTarget = function () { return $to($target); };
-        var setTarget = function (v) { return $to.assign($target, v); };
-        var getSource = function () { return $from($source); };
-        var setSource = function (v) { return $from.assignOrFail($source, v); };
+        let getTarget = function () { return $to($target); };
+        let setTarget = function (v) { return $to.assign($target, v); };
+        let getSource = function () { return $from($source); };
+        let setSource = function (v) { return $from.assignOrFail($source, v); };
 
         // to support writing from the child to the parent we need to know
         // which source has changed. Track the source value and anytime it
         // changes (even if the target value changed too) push from source
         // to target. If the source hasn't changed then the change is from
         // the target and push accordingly
-        var lastSourceVal = getSource();
+        let lastSourceVal = getSource();
 
         $from.assignOrFail = $from.assign || function () {
           // revert the change and throw an error, child writes aren't supported
@@ -55,19 +55,19 @@ define(function (require) {
         };
 
         // if we are syncing down a literal, then we use loose equality check
-        var strict = !$from.literal;
-        var compare = strict ? strictEquality : angular.equals;
+        let strict = !$from.literal;
+        let compare = strict ? strictEquality : angular.equals;
 
 
         // push the initial value down, start off in sync
         setTarget(lastSourceVal);
 
         $target.$watch(function () {
-          var sourceVal = getSource();
-          var targetVal = getTarget();
+          let sourceVal = getSource();
+          let targetVal = getTarget();
 
-          var outOfSync = !compare(sourceVal, targetVal);
-          var sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
+          let outOfSync = !compare(sourceVal, targetVal);
+          let sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
 
           if (sourceChanged) setTarget(sourceVal);
           else if (outOfSync) setSource(targetVal);
diff --git a/src/ui/public/bound_to_config_obj.js b/src/ui/public/bound_to_config_obj.js
index a16487835a6c1..9ca2e6b00f615 100644
--- a/src/ui/public/bound_to_config_obj.js
+++ b/src/ui/public/bound_to_config_obj.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function BoundToConfigObjProvider($rootScope, config) {
-    var _ = require('lodash');
+    const _ = require('lodash');
 
     /**
      * Create an object with properties that may be bound to config values.
@@ -17,7 +17,7 @@ define(function (require) {
      * @return {Object}
      */
     function BoundToConfigObj(input) {
-      var self = this;
+      const self = this;
 
       _.forOwn(input, function (val, prop) {
         if (!_.isString(val) || val.charAt(0) !== '=') {
@@ -25,7 +25,7 @@ define(function (require) {
           return;
         }
 
-        var configKey = val.substr(1);
+        const configKey = val.substr(1);
 
         update();
         $rootScope.$on('init:config', update);
diff --git a/src/ui/public/chrome/TabCollection.js b/src/ui/public/chrome/TabCollection.js
index 7287d1a0e7b6b..e8617319ef3d9 100644
--- a/src/ui/public/chrome/TabCollection.js
+++ b/src/ui/public/chrome/TabCollection.js
@@ -1,13 +1,13 @@
-var _ = require('lodash');
+let _ = require('lodash');
 var { startsWith, get, set, omit, wrap, pick } = require('lodash');
-var Tab = require('ui/chrome/Tab');
+let Tab = require('ui/chrome/Tab');
 var { parse } = require('url');
 
 function TabCollection(opts = {}) {
-  var tabs = [];
-  var specs = null;
-  var defaults = opts.defaults || {};
-  var activeTab = null;
+  let tabs = [];
+  let specs = null;
+  let defaults = opts.defaults || {};
+  let activeTab = null;
 
   this.set = function (_specs) {
     specs = _.cloneDeep([].concat(_specs || []));
diff --git a/src/ui/public/chrome/__tests__/nav_controls.js b/src/ui/public/chrome/__tests__/nav_controls.js
new file mode 100644
index 0000000000000..f9a513b81ccb5
--- /dev/null
+++ b/src/ui/public/chrome/__tests__/nav_controls.js
@@ -0,0 +1,73 @@
+import ngMock from 'ngMock';
+import $ from 'jquery';
+import expect from 'expect.js';
+
+import uiModules from 'ui/modules';
+import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
+import Registry from 'ui/registry/_registry';
+
+describe('chrome nav controls', function () {
+  let compile;
+  let stubRegistry;
+
+  beforeEach(ngMock.module('kibana', function (PrivateProvider) {
+    stubRegistry = new Registry({
+      order: ['order']
+    });
+
+    PrivateProvider.swap(chromeNavControlsRegistry, stubRegistry);
+  }));
+
+  beforeEach(ngMock.inject(function ($compile, $rootScope) {
+    compile = function () {
+      const $el = $('<div kbn-chrome-append-nav-controls>');
+      $rootScope.$apply();
+      $compile($el)($rootScope);
+      return $el;
+    };
+  }));
+
+  it('injects templates from the ui/registry/chrome_nav_controls registry', function () {
+    stubRegistry.register(function () {
+      return {
+        name: 'control',
+        order: 100,
+        template: `<span id="testTemplateEl"></span>`
+      };
+    });
+
+    let $el = compile();
+    expect($el.find('#testTemplateEl')).to.have.length(1);
+  });
+
+  it('renders controls in reverse order, assuming that each control will float:right', function () {
+    stubRegistry.register(function () {
+      return {
+        name: 'control2',
+        order: 2,
+        template: `<span id="2", class="testControl"></span>`
+      };
+    });
+    stubRegistry.register(function () {
+      return {
+        name: 'control1',
+        order: 1,
+        template: `<span id="1", class="testControl"></span>`
+      };
+    });
+    stubRegistry.register(function () {
+      return {
+        name: 'control3',
+        order: 3,
+        template: `<span id="3", class="testControl"></span>`
+      };
+    });
+
+    let $el = compile();
+    expect(
+      $el.find('.testControl')
+      .toArray()
+      .map(el => el.id)
+    ).to.eql(['3', '2', '1']);
+  });
+});
diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js
index e3c89deedd60b..2161c63d6ce7a 100644
--- a/src/ui/public/chrome/api/__tests__/nav.js
+++ b/src/ui/public/chrome/api/__tests__/nav.js
@@ -36,5 +36,10 @@ describe('chrome nav apis', function () {
       const chrome = getChrome();
       expect(chrome.addBasePath('http://github.com/elastic/kibana')).to.be('http://github.com/elastic/kibana');
     });
+
+    it('includes the query string', function () {
+      const chrome = getChrome();
+      expect(chrome.addBasePath('/app/kibana?a=b')).to.be(`${basePath}/app/kibana?a=b`);
+    });
   });
 });
diff --git a/src/ui/public/chrome/api/__tests__/xsrf.js b/src/ui/public/chrome/api/__tests__/xsrf.js
index 9603a0fe35f7a..326e2f2db84ec 100644
--- a/src/ui/public/chrome/api/__tests__/xsrf.js
+++ b/src/ui/public/chrome/api/__tests__/xsrf.js
@@ -5,43 +5,42 @@ import ngMock from 'ngMock';
 
 import xsrfChromeApi from '../xsrf';
 
-const xsrfHeader = 'kbn-xsrf-token';
-const xsrfToken = 'xsrfToken';
+const xsrfHeader = 'kbn-version';
+const { version } = require('../../../../../../package.json');
 
 describe('chrome xsrf apis', function () {
   describe('#getXsrfToken()', function () {
     it('exposes the token', function () {
       const chrome = {};
-      xsrfChromeApi(chrome, { xsrfToken });
-      expect(chrome.getXsrfToken()).to.be(xsrfToken);
+      xsrfChromeApi(chrome, { version });
+      expect(chrome.getXsrfToken()).to.be(version);
     });
   });
 
   context('jQuery support', function () {
     it('adds a global jQuery prefilter', function () {
       stub($, 'ajaxPrefilter');
-      xsrfChromeApi({}, {});
+      xsrfChromeApi({}, { version });
       expect($.ajaxPrefilter.callCount).to.be(1);
     });
 
     context('jQuery prefilter', function () {
       let prefilter;
-      const xsrfToken = 'xsrfToken';
 
       beforeEach(function () {
         stub($, 'ajaxPrefilter');
-        xsrfChromeApi({}, { xsrfToken });
+        xsrfChromeApi({}, { version });
         prefilter = $.ajaxPrefilter.args[0][0];
       });
 
-      it('sets the kbn-xsrf-token header', function () {
+      it(`sets the ${xsrfHeader} header`, function () {
         const setHeader = stub();
         prefilter({}, {}, { setRequestHeader: setHeader });
 
         expect(setHeader.callCount).to.be(1);
         expect(setHeader.args[0]).to.eql([
           xsrfHeader,
-          xsrfToken
+          version
         ]);
       });
 
@@ -60,7 +59,7 @@ describe('chrome xsrf apis', function () {
       beforeEach(function () {
         stub($, 'ajaxPrefilter');
         const chrome = {};
-        xsrfChromeApi(chrome, { xsrfToken });
+        xsrfChromeApi(chrome, { version });
         ngMock.module(chrome.$setupXsrfRequestInterceptor);
       });
 
@@ -78,9 +77,9 @@ describe('chrome xsrf apis', function () {
         $httpBackend.verifyNoOutstandingRequest();
       });
 
-      it('injects a kbn-xsrf-token header on every request', function () {
+      it(`injects a ${xsrfHeader} header on every request`, function () {
         $httpBackend.expectPOST('/api/test', undefined, function (headers) {
-          return headers[xsrfHeader] === xsrfToken;
+          return headers[xsrfHeader] === version;
         }).respond(200, '');
 
         $http.post('/api/test');
@@ -113,10 +112,10 @@ describe('chrome xsrf apis', function () {
         $httpBackend.flush();
       });
 
-      it('accepts alternate tokens to use', function () {
-        const customToken = `custom:${xsrfToken}`;
+      it('treats the kbnXsrfToken option as boolean-y', function () {
+        const customToken = `custom:${version}`;
         $httpBackend.expectPOST('/api/test', undefined, function (headers) {
-          return headers[xsrfHeader] === customToken;
+          return headers[xsrfHeader] === version;
         }).respond(200, '');
 
         $http({
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
index fa8671968f600..79af632c405b8 100644
--- a/src/ui/public/chrome/api/angular.js
+++ b/src/ui/public/chrome/api/angular.js
@@ -1,14 +1,10 @@
-var $ = require('jquery');
-var _ = require('lodash');
-
-require('../appSwitcher');
-var modules = require('ui/modules');
-var ConfigTemplate = require('ui/ConfigTemplate');
-require('ui/directives/config');
+let _ = require('lodash');
 
 module.exports = function (chrome, internals) {
+
   chrome.setupAngular = function () {
-    var kibana = modules.get('kibana');
+    let modules = require('ui/modules');
+    let kibana = modules.get('kibana');
 
     _.forOwn(chrome.getInjected(), function (val, name) {
       kibana.value(name, val);
@@ -20,57 +16,13 @@ module.exports = function (chrome, internals) {
     .value('buildSha', internals.buildSha)
     .value('sessionId', Date.now())
     .value('esUrl', (function () {
-      var a = document.createElement('a');
+      let a = document.createElement('a');
       a.href = chrome.addBasePath('/elasticsearch');
       return a.href;
     }()))
-    .config(chrome.$setupXsrfRequestInterceptor)
-    .directive('kbnChrome', function ($rootScope) {
-      return {
-        template: function ($el) {
-          var $content = $(require('ui/chrome/chrome.html'));
-          var $app = $content.find('.application');
-
-          if (internals.rootController) {
-            $app.attr('ng-controller', internals.rootController);
-          }
-
-          if (internals.rootTemplate) {
-            $app.removeAttr('ng-view');
-            $app.html(internals.rootTemplate);
-          }
-
-          return $content;
-        },
-        controllerAs: 'chrome',
-        controller: function ($scope, $rootScope, $location, $http) {
+    .config(chrome.$setupXsrfRequestInterceptor);
 
-          // are we showing the embedded version of the chrome?
-          internals.setVisibleDefault(!$location.search().embed);
-
-          // listen for route changes, propogate to tabs
-          var onRouteChange = function () {
-            let { href } = window.location;
-            let persist = chrome.getVisible();
-            internals.trackPossibleSubUrl(href);
-            internals.tabs.consumeRouteUpdate(href, persist);
-          };
-
-          $rootScope.$on('$routeChangeSuccess', onRouteChange);
-          $rootScope.$on('$routeUpdate', onRouteChange);
-          onRouteChange();
-
-          // and some local values
-          $scope.httpActive = $http.pendingRequests;
-          $scope.notifList = require('ui/notify')._notifs;
-          $scope.appSwitcherTemplate = new ConfigTemplate({
-            switcher: '<app-switcher></app-switcher>'
-          });
-
-          return chrome;
-        }
-      };
-    });
+    require('../directives')(chrome, internals);
 
     modules.link(kibana);
   };
diff --git a/src/ui/public/chrome/api/controls.js b/src/ui/public/chrome/api/controls.js
index 116e37411cff5..4473e23d0e957 100644
--- a/src/ui/public/chrome/api/controls.js
+++ b/src/ui/public/chrome/api/controls.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = function (chrome, internals) {
   /**
@@ -10,7 +10,7 @@ module.exports = function (chrome, internals) {
    *     determines if the Kibana chrome should be displayed
    */
 
-  var def = true;
+  let def = true;
   internals.setVisibleDefault = (_def) => def = Boolean(_def);
 
   /**
diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
index 3290010911513..75b9dca2d0469 100644
--- a/src/ui/public/chrome/api/nav.js
+++ b/src/ui/public/chrome/api/nav.js
@@ -15,10 +15,10 @@ export default function (chrome, internals) {
   };
 
   chrome.addBasePath = function (url) {
-    var isUrl = url && isString(url);
+    let isUrl = url && isString(url);
     if (!isUrl) return url;
 
-    var parsed = parse(url);
+    let parsed = parse(url, true);
     if (!parsed.host && parsed.pathname) {
       if (parsed.pathname[0] === '/') {
         parsed.pathname = chrome.getBasePath() + parsed.pathname;
@@ -46,7 +46,7 @@ export default function (chrome, internals) {
   internals.nav.forEach(link => {
     // convert all link urls to absolute urls
 
-    var a = document.createElement('a');
+    let a = document.createElement('a');
     a.setAttribute('href', link.url);
     link.url = a.href;
     link.lastSubUrl = chrome.getLastSubUrlFor(link.url);
diff --git a/src/ui/public/chrome/api/tabs.js b/src/ui/public/chrome/api/tabs.js
index 128f5ca8c267e..a88c2d4e3f1a3 100644
--- a/src/ui/public/chrome/api/tabs.js
+++ b/src/ui/public/chrome/api/tabs.js
@@ -1,5 +1,5 @@
-var _ = require('lodash');
-var TabCollection = require('../TabCollection');
+let _ = require('lodash');
+let TabCollection = require('../TabCollection');
 
 module.exports = function (chrome, internals) {
 
@@ -91,7 +91,7 @@ module.exports = function (chrome, internals) {
   // create a getter for properties of the active tab
   function activeGetter(prop) {
     return function (def) {
-      var active = chrome.getActiveTab();
+      let active = chrome.getActiveTab();
       return !active ? def : active[prop];
     };
   }
diff --git a/src/ui/public/chrome/api/template.js b/src/ui/public/chrome/api/template.js
index f45e3776caa88..32e39474163c3 100644
--- a/src/ui/public/chrome/api/template.js
+++ b/src/ui/public/chrome/api/template.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = function (chrome, internals) {
 
diff --git a/src/ui/public/chrome/api/theme.js b/src/ui/public/chrome/api/theme.js
index 59b2dea3b3c24..440ca2a55bc72 100644
--- a/src/ui/public/chrome/api/theme.js
+++ b/src/ui/public/chrome/api/theme.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
 module.exports = function (chrome, internals) {
   /**
@@ -66,7 +66,7 @@ module.exports = function (chrome, internals) {
    * @return {chrome}
    */
   chrome.addApplicationClass = function (val) {
-    var classes = internals.applicationClasses || [];
+    let classes = internals.applicationClasses || [];
     classes.push(val);
     classes = _.uniq(classes);
 
@@ -81,8 +81,8 @@ module.exports = function (chrome, internals) {
    * @return {chrome}
    */
   chrome.removeApplicationClass = function (val) {
-    var classesToRemove = [].concat(val || []);
-    var classes = internals.applicationClasses || [];
+    let classesToRemove = [].concat(val || []);
+    let classes = internals.applicationClasses || [];
     _.pull(classes, ...classesToRemove);
 
     internals.applicationClasses = classes;
diff --git a/src/ui/public/chrome/api/xsrf.js b/src/ui/public/chrome/api/xsrf.js
index 244f709a9eaaa..4d04f9954231d 100644
--- a/src/ui/public/chrome/api/xsrf.js
+++ b/src/ui/public/chrome/api/xsrf.js
@@ -4,12 +4,12 @@ import { set } from 'lodash';
 export default function (chrome, internals) {
 
   chrome.getXsrfToken = function () {
-    return internals.xsrfToken;
+    return internals.version;
   };
 
-  $.ajaxPrefilter(function ({ kbnXsrfToken = internals.xsrfToken }, originalOptions, jqXHR) {
+  $.ajaxPrefilter(function ({ kbnXsrfToken = true }, originalOptions, jqXHR) {
     if (kbnXsrfToken) {
-      jqXHR.setRequestHeader('kbn-xsrf-token', kbnXsrfToken);
+      jqXHR.setRequestHeader('kbn-version', internals.version);
     }
   });
 
@@ -17,9 +17,9 @@ export default function (chrome, internals) {
     $httpProvider.interceptors.push(function () {
       return {
         request: function (opts) {
-          const { kbnXsrfToken = internals.xsrfToken } = opts;
+          const { kbnXsrfToken = true } = opts;
           if (kbnXsrfToken) {
-            set(opts, ['headers', 'kbn-xsrf-token'], kbnXsrfToken);
+            set(opts, ['headers', 'kbn-version'], internals.version);
           }
           return opts;
         }
diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html
index 4105363a942e6..6e5cccbfdd497 100644
--- a/src/ui/public/chrome/chrome.html
+++ b/src/ui/public/chrome/chrome.html
@@ -22,7 +22,7 @@
     <!-- /Mobile navbar -->
 
     <!-- Full navbar -->
-    <div collapse="!showCollapsed" class="navbar-collapse">
+    <div collapse="!showCollapsed" class="navbar-collapse" kbn-chrome-append-nav-controls>
       <ul class="nav navbar-nav" role="navigation">
         <li
           ng-if="chrome.getBrand('logo')"
@@ -52,50 +52,11 @@
           </a>
         </li>
       </ul>
-
-      <ul ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
-        <li>
-          <a
-            ng-click="toggleRefresh()"
-            ng-show="timefilter.refreshInterval.value > 0">
-
-            <i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
-          </a>
-        </li>
-
-        <li
-          ng-class="{active: pickerTemplate.is('interval') }"
-          ng-show="timefilter.refreshInterval.value > 0 || !!pickerTemplate.current"
-          class="to-body">
-
-          <a ng-click="pickerTemplate.toggle('interval')" class="navbar-timepicker-auto-refresh-desc">
-            <span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
-            <span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
-          </a>
-
-        </li>
-
-        <li class="to-body" ng-class="{active: pickerTemplate.is('filter')}">
-          <a
-            ng-click="pickerTemplate.toggle('filter')"
-            aria-haspopup="true"
-            aria-expanded="false"
-            class="navbar-timepicker-time-desc">
-            <i aria-hidden="true" class="fa fa-clock-o"></i>
-            <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
-          </a>
-        </li>
-      </ul>
-
-      <ul class="nav navbar-nav navbar-right navbar-timepicker" >
-        <li ng-show="httpActive.length" class="navbar-text hidden-xs">
-          <div class="spinner"></div>
-        </li>
-      </ul>
     </div>
     <!-- /Full navbar -->
   </nav>
 
+  <!-- TODO: These config dropdowns shouldn't be hard coded -->
   <config
     config-template="appSwitcherTemplate"
     config-object="chrome"
diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js
index 62d353623c18d..d7bda2109c130 100644
--- a/src/ui/public/chrome/chrome.js
+++ b/src/ui/public/chrome/chrome.js
@@ -1,17 +1,17 @@
 require('babel/polyfill');
 
-var _ = require('lodash');
-var $ = require('jquery');
-var angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let angular = require('angular');
 
 require('ui/timefilter');
 require('ui/private');
 require('ui/promises');
 
-var metadata = require('ui/metadata');
+let metadata = require('ui/metadata');
 
-var chrome = {};
-var internals = _.defaults(
+let chrome = {};
+let internals = _.defaults(
   _.cloneDeep(metadata),
   {
     basePath: '',
diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js
index 5dd82caa70bde..96280e17d74f3 100644
--- a/src/ui/public/chrome/context.js
+++ b/src/ui/public/chrome/context.js
@@ -1,12 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var ConfigTemplate = require('ui/ConfigTemplate');
+  let _ = require('lodash');
+  let ConfigTemplate = require('ui/ConfigTemplate');
 
   require('ui/modules')
   .get('kibana')
+  // TODO: all of this really belongs in the timepicker
   .directive('chromeContext', function (timefilter, globalState) {
 
-    var listenForUpdates = _.once(function ($scope) {
+    let listenForUpdates = _.once(function ($scope) {
       $scope.$listen(timefilter, 'update', function (newVal, oldVal) {
         globalState.time = _.clone(timefilter.time);
         globalState.refreshInterval = _.clone(timefilter.refreshInterval);
diff --git a/src/ui/public/chrome/directives/active_http_spinner.html b/src/ui/public/chrome/directives/active_http_spinner.html
new file mode 100644
index 0000000000000..d7c9b64fbe3c6
--- /dev/null
+++ b/src/ui/public/chrome/directives/active_http_spinner.html
@@ -0,0 +1,5 @@
+<ul class="nav navbar-nav navbar-right navbar-timepicker" >
+  <li ng-show="chrome.httpActive.length" class="navbar-text hidden-xs">
+    <div class="spinner"></div>
+  </li>
+</ul>
diff --git a/src/ui/public/chrome/appSwitcher/__tests__/appSwitcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
similarity index 80%
rename from src/ui/public/chrome/appSwitcher/__tests__/appSwitcher.js
rename to src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
index 35c33c7ef1f45..68c7d53bd3ef6 100644
--- a/src/ui/public/chrome/appSwitcher/__tests__/appSwitcher.js
+++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
@@ -1,24 +1,24 @@
-var sinon = require('auto-release-sinon');
-var ngMock = require('ngMock');
-var $ = require('jquery');
-var expect = require('expect.js');
-var constant = require('lodash').constant;
-var set = require('lodash').set;
-var cloneDeep = require('lodash').cloneDeep;
-var indexBy = require('lodash').indexBy;
+let sinon = require('auto-release-sinon');
+let ngMock = require('ngMock');
+let $ = require('jquery');
+let expect = require('expect.js');
+let constant = require('lodash').constant;
+let set = require('lodash').set;
+let cloneDeep = require('lodash').cloneDeep;
+let indexBy = require('lodash').indexBy;
 
 require('ui/chrome');
-require('ui/chrome/appSwitcher');
-var DomLocationProvider = require('ui/domLocation');
+require('../app_switcher');
+let DomLocationProvider = require('ui/domLocation');
 
 describe('appSwitcher directive', function () {
-  var env;
+  let env;
 
   beforeEach(ngMock.module('kibana'));
 
   function setup(href, links) {
     return ngMock.inject(function ($window, $rootScope, $compile, Private) {
-      var domLocation = Private(DomLocationProvider);
+      let domLocation = Private(DomLocationProvider);
 
       $rootScope.chrome = {
         getNavLinks: constant(cloneDeep(links)),
@@ -46,14 +46,14 @@ describe('appSwitcher directive', function () {
   }
 
   context('when one link is for the active app', function () {
-    var myLink = {
+    let myLink = {
       active: true,
       title: 'myLink',
       url: 'http://localhost:555/app/myApp',
       lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
     };
 
-    var notMyLink = {
+    let notMyLink = {
       active: false,
       title: 'notMyLink',
       url: 'http://localhost:555/app/notMyApp',
@@ -63,27 +63,27 @@ describe('appSwitcher directive', function () {
     beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
 
     it('links to the inactive apps base url', function () {
-      var $myLink = env.$el.findTestSubject('appLink').eq(0);
+      let $myLink = env.$el.findTestSubject('appLink').eq(0);
       expect($myLink.prop('href')).to.be(myLink.url);
       expect($myLink.prop('href')).to.not.be(myLink.lastSubUrl);
     });
 
     it('links to the inactive apps last sub url', function () {
-      var $notMyLink = env.$el.findTestSubject('appLink').eq(1);
+      let $notMyLink = env.$el.findTestSubject('appLink').eq(1);
       expect($notMyLink.prop('href')).to.be(notMyLink.lastSubUrl);
       expect($notMyLink.prop('href')).to.not.be(notMyLink.url);
     });
   });
 
   context('when none of the links are for the active app', function () {
-    var myLink = {
+    let myLink = {
       active: false,
       title: 'myLink',
       url: 'http://localhost:555/app/myApp',
       lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
     };
 
-    var notMyLink = {
+    let notMyLink = {
       active: false,
       title: 'notMyLink',
       url: 'http://localhost:555/app/notMyApp',
@@ -93,9 +93,9 @@ describe('appSwitcher directive', function () {
     beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
 
     it('links to the lastSubUrl for each', function () {
-      var $links = env.$el.findTestSubject('appLink');
-      var $myLink = $links.eq(0);
-      var $notMyLink = $links.eq(1);
+      let $links = env.$el.findTestSubject('appLink');
+      let $myLink = $links.eq(0);
+      let $notMyLink = $links.eq(1);
 
       expect($myLink.prop('href')).to.be(myLink.lastSubUrl);
       expect($myLink.prop('href')).to.not.be(myLink.url);
@@ -106,19 +106,19 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link with matching href but missing hash', function () {
-    var url = 'http://localhost:555/app/myApp?query=1';
+    let url = 'http://localhost:555/app/myApp?query=1';
     beforeEach(setup(url + '#/lastSubUrl', [
       { url: url }
     ]));
 
     it('just prevents propogation (no reload)', function () {
-      var event = new $.Event('click');
+      let event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      var $link = env.$el.findTestSubject('appLink');
+      let $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(url);
       $link.trigger(event);
 
@@ -129,19 +129,19 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link that matches entire url', function () {
-    var url = 'http://localhost:555/app/myApp#/lastSubUrl';
+    let url = 'http://localhost:555/app/myApp#/lastSubUrl';
     beforeEach(setup(url, [
       { url: url }
     ]));
 
     it('calls window.location.reload and prevents propogation', function () {
-      var event = new $.Event('click');
+      let event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      var $link = env.$el.findTestSubject('appLink');
+      let $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(env.currentHref);
       $link.trigger(event);
 
@@ -152,21 +152,21 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link with matching href but changed hash', function () {
-    var rootUrl = 'http://localhost:555/app/myApp?query=1';
-    var url = rootUrl + '#/lastSubUrl2';
+    let rootUrl = 'http://localhost:555/app/myApp?query=1';
+    let url = rootUrl + '#/lastSubUrl2';
 
     beforeEach(setup(url + '#/lastSubUrl', [
       { url: url }
     ]));
 
     it('calls window.location.reload and prevents propogation', function () {
-      var event = new $.Event('click');
+      let event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      var $link = env.$el.findTestSubject('appLink');
+      let $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(url);
       $link.trigger(event);
 
@@ -185,7 +185,7 @@ describe('appSwitcher directive', function () {
     ]));
 
     it('allows click through', function () {
-      var event = new $.Event('click');
+      let event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isPropagationStopped()).to.be(false);
@@ -206,7 +206,7 @@ describe('appSwitcher directive', function () {
     ]));
 
     it('allows click through', function () {
-      var event = new $.Event('click');
+      let event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isPropagationStopped()).to.be(false);
diff --git a/src/ui/public/chrome/appSwitcher/appSwitcher.html b/src/ui/public/chrome/directives/app_switcher/app_switcher.html
similarity index 100%
rename from src/ui/public/chrome/appSwitcher/appSwitcher.html
rename to src/ui/public/chrome/directives/app_switcher/app_switcher.html
diff --git a/src/ui/public/chrome/appSwitcher/appSwitcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js
similarity index 70%
rename from src/ui/public/chrome/appSwitcher/appSwitcher.js
rename to src/ui/public/chrome/directives/app_switcher/app_switcher.js
index 61d2d6311381c..94ebb3c83e478 100644
--- a/src/ui/public/chrome/appSwitcher/appSwitcher.js
+++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js
@@ -1,18 +1,18 @@
-var parse = require('url').parse;
-var bindKey = require('lodash').bindKey;
+let parse = require('url').parse;
+let bindKey = require('lodash').bindKey;
 
-require('../appSwitcher/appSwitcher.less');
-var DomLocationProvider = require('ui/domLocation');
+require('../app_switcher/app_switcher.less');
+let DomLocationProvider = require('ui/domLocation');
 
 require('ui/modules')
 .get('kibana')
 .directive('appSwitcher', function () {
   return {
     restrict: 'E',
-    template: require('./appSwitcher.html'),
+    template: require('./app_switcher.html'),
     controllerAs: 'switcher',
     controller: function ($scope, Private) {
-      var domLocation = Private(DomLocationProvider);
+      let domLocation = Private(DomLocationProvider);
 
       // since we render this in an isolate scope we can't "require: ^chrome", but
       // rather than remove all helpfull checks we can just check here.
@@ -29,11 +29,11 @@ require('ui/modules')
           return;
         }
 
-        var toParsed = parse(event.delegateTarget.href);
-        var fromParsed = parse(domLocation.href);
-        var sameProto = toParsed.protocol === fromParsed.protocol;
-        var sameHost = toParsed.host === fromParsed.host;
-        var samePath = toParsed.path === fromParsed.path;
+        let toParsed = parse(event.delegateTarget.href);
+        let fromParsed = parse(domLocation.href);
+        let sameProto = toParsed.protocol === fromParsed.protocol;
+        let sameHost = toParsed.host === fromParsed.host;
+        let samePath = toParsed.path === fromParsed.path;
 
         if (sameProto && sameHost && samePath) {
           toParsed.hash && domLocation.reload();
diff --git a/src/ui/public/chrome/appSwitcher/appSwitcher.less b/src/ui/public/chrome/directives/app_switcher/app_switcher.less
similarity index 100%
rename from src/ui/public/chrome/appSwitcher/appSwitcher.less
rename to src/ui/public/chrome/directives/app_switcher/app_switcher.less
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
new file mode 100644
index 0000000000000..d37b9c6fe0a74
--- /dev/null
+++ b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -0,0 +1,34 @@
+import $ from 'jquery';
+
+import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
+import UiModules from 'ui/modules';
+import spinnerHtml from './active_http_spinner.html';
+
+const spinner = {
+  name: 'active http requests',
+  template: spinnerHtml
+};
+
+export default function (chrome, internals) {
+
+  UiModules
+  .get('kibana')
+  .directive('kbnChromeAppendNavControls', function (Private) {
+    return {
+      template: function ($element) {
+        const parts = [$element.html()];
+        const controls = Private(chromeNavControlsRegistry);
+
+        for (const control of [spinner, ...controls.inOrder]) {
+          parts.unshift(
+            `<!-- nav control ${control.name} -->`,
+            control.template
+          );
+        }
+
+        return parts.join('\n');
+      }
+    };
+  });
+
+}
diff --git a/src/ui/public/chrome/directives/index.js b/src/ui/public/chrome/directives/index.js
new file mode 100644
index 0000000000000..530646292d388
--- /dev/null
+++ b/src/ui/public/chrome/directives/index.js
@@ -0,0 +1,10 @@
+import 'ui/directives/config';
+
+import './app_switcher';
+import kbnChromeProv from './kbn_chrome';
+import kbnChromeNavControlsProv from './append_nav_controls';
+
+export default function (chrome, internals) {
+  kbnChromeProv(chrome, internals);
+  kbnChromeNavControlsProv(chrome, internals);
+}
diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
new file mode 100644
index 0000000000000..e06b373a3c15b
--- /dev/null
+++ b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -0,0 +1,58 @@
+import $ from 'jquery';
+
+import UiModules from 'ui/modules';
+import ConfigTemplate from 'ui/ConfigTemplate';
+
+export default function (chrome, internals) {
+
+  UiModules
+  .get('kibana')
+  .directive('kbnChrome', function ($rootScope) {
+    return {
+      template($el) {
+        const $content = $(require('ui/chrome/chrome.html'));
+        const $app = $content.find('.application');
+
+        if (internals.rootController) {
+          $app.attr('ng-controller', internals.rootController);
+        }
+
+        if (internals.rootTemplate) {
+          $app.removeAttr('ng-view');
+          $app.html(internals.rootTemplate);
+        }
+
+        return $content;
+      },
+
+      controllerAs: 'chrome',
+      controller($scope, $rootScope, $location, $http) {
+
+        // are we showing the embedded version of the chrome?
+        internals.setVisibleDefault(!$location.search().embed);
+
+        // listen for route changes, propogate to tabs
+        const onRouteChange = function () {
+          let { href } = window.location;
+          let persist = chrome.getVisible();
+          internals.trackPossibleSubUrl(href);
+          internals.tabs.consumeRouteUpdate(href, persist);
+        };
+
+        $rootScope.$on('$routeChangeSuccess', onRouteChange);
+        $rootScope.$on('$routeUpdate', onRouteChange);
+        onRouteChange();
+
+        // and some local values
+        chrome.httpActive = $http.pendingRequests;
+        $scope.notifList = require('ui/notify')._notifs;
+        $scope.appSwitcherTemplate = new ConfigTemplate({
+          switcher: '<app-switcher></app-switcher>'
+        });
+
+        return chrome;
+      }
+    };
+  });
+
+}
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
index b880ebfbf37c6..269faf797a9ee 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
@@ -1,22 +1,22 @@
 define(function (require) {
   require('ui/collapsible_sidebar/collapsible_sidebar.less');
 
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
   require('ui/modules')
   .get('kibana')
   .directive('collapsibleSidebar', function () {
     // simply a list of all of all of angulars .col-md-* classes except 12
-    var listOfWidthClasses = _.times(11, function (i) { return 'col-md-' + i; });
+    let listOfWidthClasses = _.times(11, function (i) { return 'col-md-' + i; });
 
     return {
       restrict: 'C',
       link: function ($scope, $elem) {
-        var $collapser = $('<div class="sidebar-collapser"><div class="chevron-cont"></div></div>');
-        var $siblings = $elem.siblings();
+        let $collapser = $('<div class="sidebar-collapser"><div class="chevron-cont"></div></div>');
+        let $siblings = $elem.siblings();
 
-        var siblingsClass = listOfWidthClasses.reduce(function (prev, className) {
+        let siblingsClass = listOfWidthClasses.reduce(function (prev, className) {
           if (prev) return prev;
           return $siblings.hasClass(className) && className;
         }, false);
diff --git a/src/ui/public/compile_recursive_directive.js b/src/ui/public/compile_recursive_directive.js
index 87220985823e7..0de7bfa3c5f40 100644
--- a/src/ui/public/compile_recursive_directive.js
+++ b/src/ui/public/compile_recursive_directive.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  const _ = require('lodash');
 
   /**
    * Angular can't render directives that render themselves recursively:
@@ -25,8 +25,8 @@ define(function (require) {
         }
 
         // Break the recursion loop by removing the contents
-        var contents = element.contents().remove();
-        var compiledContents;
+        const contents = element.contents().remove();
+        let compiledContents;
         return {
           pre: (link && link.pre) ? link.pre : null,
           /**
diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js
index ad0cfc8401b08..2a47b55c95d27 100644
--- a/src/ui/public/config/__tests__/config.js
+++ b/src/ui/public/config/__tests__/config.js
@@ -1,9 +1,9 @@
 describe('config component', function () {
-  var $scope;
-  var config;
-  var defaults;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let $scope;
+  let config;
+  let defaults;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -19,8 +19,8 @@ describe('config component', function () {
     });
 
     it('reads from the defaults', function () {
-      var initial = config.get('dateFormat');
-      var newDefault = initial + '- new';
+      let initial = config.get('dateFormat');
+      let newDefault = initial + '- new';
       defaults.dateFormat.value = newDefault;
       expect(config.get('dateFormat')).to.be(newDefault);
     });
@@ -30,7 +30,7 @@ describe('config component', function () {
   describe('#set', function () {
 
     it('stores a value in the config val set', function () {
-      var initial = config.get('dateFormat');
+      let initial = config.get('dateFormat');
       config.set('dateFormat', 'notaformat');
       expect(config.get('dateFormat')).to.be('notaformat');
     });
@@ -40,21 +40,21 @@ describe('config component', function () {
   describe('#$bind', function () {
 
     it('binds a config key to a $scope property', function () {
-      var dateFormat = config.get('dateFormat');
+      let dateFormat = config.get('dateFormat');
       config.$bind($scope, 'dateFormat');
       expect($scope).to.have.property('dateFormat', dateFormat);
     });
 
     it('alows overriding the property name', function () {
-      var dateFormat = config.get('dateFormat');
+      let dateFormat = config.get('dateFormat');
       config.$bind($scope, 'dateFormat', 'defaultDateFormat');
       expect($scope).to.not.have.property('dateFormat');
       expect($scope).to.have.property('defaultDateFormat', dateFormat);
     });
 
     it('keeps the property up to date', function () {
-      var dateFormat = config.get('dateFormat');
-      var newDateFormat = dateFormat + ' NEW NEW NEW!';
+      let dateFormat = config.get('dateFormat');
+      let newDateFormat = dateFormat + ' NEW NEW NEW!';
       config.$bind($scope, 'dateFormat');
 
       expect($scope).to.have.property('dateFormat', dateFormat);
diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js
index ef8ce8798a1a4..b6d82869c4b5e 100644
--- a/src/ui/public/config/_delayed_updater.js
+++ b/src/ui/public/config/_delayed_updater.js
@@ -1,16 +1,16 @@
 define(function (require) {
   return function DelayedUpdaterFactory(Private, $rootScope, Promise, Notifier) {
-    var notify = new Notifier();
-    var _ = require('lodash');
-    var angular = require('angular');
+    let notify = new Notifier();
+    let _ = require('lodash');
+    let angular = require('angular');
 
-    var vals = Private(require('ui/config/_vals'));
+    let vals = Private(require('ui/config/_vals'));
 
     return function DelayedUpdater(doc) {
-      var updater = this;
-      var queue = [];
-      var log = {};
-      var timer;
+      let updater = this;
+      let queue = [];
+      let log = {};
+      let timer;
 
       updater.fire = function () {
         clearTimeout(timer);
@@ -19,10 +19,10 @@ define(function (require) {
         if (updater.fired) return;
         updater.fired = true;
 
-        var method;
-        var body;
-        var updated = [];
-        var deleted = [];
+        let method;
+        let body;
+        let updated = [];
+        let deleted = [];
 
         // seperate the log into lists
         Object.keys(log).forEach(function (key) {
@@ -53,8 +53,8 @@ define(function (require) {
       };
 
       updater.update = function (key, val, silentAndLocal) {
-        var newVal = val;
-        var oldVal = vals[key];
+        let newVal = val;
+        let oldVal = vals[key];
 
         if (angular.equals(newVal, oldVal)) {
           return Promise.resolve();
@@ -70,7 +70,7 @@ define(function (require) {
 
         if (silentAndLocal) return Promise.resolve();
 
-        var defer = Promise.defer();
+        let defer = Promise.defer();
         queue.push(defer);
         notify.log('config change: ' + key + ': ' + oldVal + ' -> ' + newVal);
         $rootScope.$broadcast('change:config.' + key, newVal, oldVal);
diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
index 7b84b90bf00df..15c7757a8e264 100644
--- a/src/ui/public/config/config.js
+++ b/src/ui/public/config/config.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana/config', [
+  let module = require('ui/modules').get('kibana/config', [
     'kibana/notify'
   ]);
 
@@ -9,24 +9,24 @@ define(function (require) {
 
   // service for delivering config variables to everywhere else
   module.service('config', function (Private, Notifier, kbnVersion, kbnIndex, $rootScope, buildNum) {
-    var config = this;
+    let config = this;
 
-    var angular = require('angular');
-    var _ = require('lodash');
-    var defaults = Private(require('ui/config/defaults'));
-    var DelayedUpdater = Private(require('ui/config/_delayed_updater'));
-    var vals = Private(require('ui/config/_vals'));
+    let angular = require('angular');
+    let _ = require('lodash');
+    let defaults = Private(require('ui/config/defaults'));
+    let DelayedUpdater = Private(require('ui/config/_delayed_updater'));
+    let vals = Private(require('ui/config/_vals'));
 
-    var notify = new Notifier({
+    let notify = new Notifier({
       location: 'Config'
     });
 
     // active or previous instance of DelayedUpdater. This will log and then process an
     // update once it is requested by calling #set() or #clear().
-    var updater;
+    let updater;
 
-    var DocSource = Private(require('ui/courier/data_source/doc_source'));
-    var doc = (new DocSource())
+    let DocSource = Private(require('ui/courier/data_source/doc_source'));
+    let doc = (new DocSource())
       .index(kbnIndex)
       .type('config')
       .id(kbnVersion);
@@ -42,13 +42,13 @@ define(function (require) {
      * @return {Promise} - Resolved when the config loads initially
      */
     config.init = _.once(function () {
-      var complete = notify.lifecycle('config init');
+      let complete = notify.lifecycle('config init');
 
       return (function getDoc() {
 
         // used to apply an entire es response to the vals, silentAndLocal will prevent
         // event/notifications/writes from occuring.
-        var applyMassUpdate = function (resp, silentAndLocal) {
+        let applyMassUpdate = function (resp, silentAndLocal) {
           _.union(_.keys(resp._source), _.keys(vals)).forEach(function (key) {
             change(key, resp._source[key], silentAndLocal);
           });
@@ -77,7 +77,7 @@ define(function (require) {
     });
 
     config.get = function (key, defaultVal) {
-      var keyVal;
+      let keyVal;
 
       if (vals[key] == null) {
         if (defaultVal == null) {
@@ -127,7 +127,7 @@ define(function (require) {
     config.$bind = function ($scope, key, property) {
       if (!property) property = key;
 
-      var update = function () {
+      let update = function () {
         $scope[property] = config.get(key);
       };
 
diff --git a/src/ui/public/config/defaults.js b/src/ui/public/config/defaults.js
index 43fd4cfd55978..7122b56366c53 100644
--- a/src/ui/public/config/defaults.js
+++ b/src/ui/public/config/defaults.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var moment = require('moment-timezone');
-  var _ = require('lodash');
+  let moment = require('moment-timezone');
+  let _ = require('lodash');
 
   return function configDefaultsProvider() {
     // wraped in provider so that a new instance is given to each app/test
@@ -33,7 +33,7 @@ define(function (require) {
         type: 'json',
         value:
           '[\n' +
-          '  ["", "hh:mm:ss.SSS"],\n' +
+          '  ["", "HH:mm:ss.SSS"],\n' +
           '  ["PT1S", "HH:mm:ss"],\n' +
           '  ["PT1M", "HH:mm"],\n' +
           '  ["PT1H",\n' +
@@ -176,6 +176,11 @@ define(function (require) {
         value: '($0,0.[00])',
         description: 'Default numeral format for the "currency" format'
       },
+      'savedObjects:perPage': {
+        type: 'number',
+        value: 5,
+        description: 'Number of objects to show per page in the load dialog'
+      },
       'timepicker:timeDefaults': {
         type: 'json',
         value: [
diff --git a/src/ui/public/courier/_redirect_when_missing.js b/src/ui/public/courier/_redirect_when_missing.js
index b7d9d4770d34f..f208e01f89add 100644
--- a/src/ui/public/courier/_redirect_when_missing.js
+++ b/src/ui/public/courier/_redirect_when_missing.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var errors = require('ui/errors');
+  let errors = require('ui/errors');
 
   return function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promise) {
-    var SavedObjectNotFound = errors.SavedObjectNotFound;
+    let SavedObjectNotFound = errors.SavedObjectNotFound;
 
-    var notify = new Notifier();
+    let notify = new Notifier();
 
     /**
      * Creates an error handler that will redirect to a url when a SavedObjectNotFound
@@ -23,7 +23,7 @@ define(function (require) {
         // if this error is not "404", rethrow
         if (!(err instanceof SavedObjectNotFound)) throw err;
 
-        var url = mapping[err.savedObjectType] || mapping['*'];
+        let url = mapping[err.savedObjectType] || mapping['*'];
         if (!url) url = '/';
 
         url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${err.savedObjectType}`;
diff --git a/src/ui/public/courier/_request_queue.js b/src/ui/public/courier/_request_queue.js
index e6dcf78957c66..f4e99c1a1696d 100644
--- a/src/ui/public/courier/_request_queue.js
+++ b/src/ui/public/courier/_request_queue.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function PendingRequestList() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /**
      * Queue of pending requests, requests are removed as
      * they are processed by fetch.[sourceType]().
      * @type {Array}
      */
-    var queue = [];
+    let queue = [];
 
     queue.getInactive = function (/* strategies */) {
       return queue.get.apply(queue, arguments)
@@ -22,7 +22,7 @@ define(function (require) {
 
     queue.get = function (...strategies) {
       return queue.filter(function (req) {
-        var strategyMatch = !strategies.length;
+        let strategyMatch = !strategies.length;
         if (!strategyMatch) {
           strategyMatch = strategies.some(function (strategy) {
             return req.strategy === strategy;
diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js
index a9caf469089d3..5ccfeedbb4815 100644
--- a/src/ui/public/courier/courier.js
+++ b/src/ui/public/courier/courier.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var errors = require('ui/errors');
-  var _ = require('lodash');
+  let errors = require('ui/errors');
+  let _ = require('lodash');
 
   require('ui/es');
   require('ui/promises');
@@ -10,18 +10,18 @@ define(function (require) {
   require('ui/modules').get('kibana/courier')
   .service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) {
     function Courier() {
-      var self = this;
+      let self = this;
 
-      var DocSource = Private(require('ui/courier/data_source/doc_source'));
-      var SearchSource = Private(require('ui/courier/data_source/search_source'));
-      var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+      let DocSource = Private(require('ui/courier/data_source/doc_source'));
+      let SearchSource = Private(require('ui/courier/data_source/search_source'));
+      let searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
 
-      var requestQueue = Private(require('ui/courier/_request_queue'));
-      var errorHandlers = Private(require('ui/courier/_error_handlers'));
+      let requestQueue = Private(require('ui/courier/_request_queue'));
+      let errorHandlers = Private(require('ui/courier/_error_handlers'));
 
-      var fetch = Private(require('ui/courier/fetch/fetch'));
-      var docLooper = self.docLooper = Private(require('ui/courier/looper/doc'));
-      var searchLooper = self.searchLooper = Private(require('ui/courier/looper/search'));
+      let fetch = Private(require('ui/courier/fetch/fetch'));
+      let docLooper = self.docLooper = Private(require('ui/courier/looper/doc'));
+      let searchLooper = self.searchLooper = Private(require('ui/courier/looper/search'));
 
       // expose some internal modules
       self.setRootSearchSource = Private(require('ui/courier/data_source/_root_search_source')).set;
@@ -33,7 +33,7 @@ define(function (require) {
       self.DocSource = DocSource;
       self.SearchSource = SearchSource;
 
-      var HastyRefresh = errors.HastyRefresh;
+      let HastyRefresh = errors.HastyRefresh;
 
       /**
        * update the time between automatic search requests
@@ -121,8 +121,8 @@ define(function (require) {
 
       // Listen for refreshInterval changes
       $rootScope.$watchCollection('timefilter.refreshInterval', function () {
-        var refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
-        var refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
+        let refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
+        let refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
         if (_.isNumber(refreshValue) && !refreshPause) {
           self.fetchInterval(refreshValue);
         } else {
@@ -130,7 +130,7 @@ define(function (require) {
         }
       });
 
-      var onFatalDefer = Promise.defer();
+      let onFatalDefer = Promise.defer();
       onFatalDefer.promise.then(self.close);
       Notifier.fatalCallbacks.push(onFatalDefer.resolve);
     }
diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js
index 138e16ef937a7..9967f086234d9 100644
--- a/src/ui/public/courier/data_source/__tests__/decorate_query.js
+++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js
@@ -1,23 +1,23 @@
-var moment = require('moment');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let moment = require('moment');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Query decorator', function () {
 
-  var _ = require('lodash');
-  var config;
+  let _ = require('lodash');
+  let config;
 
-  var indexPattern;
+  let indexPattern;
 
-  var getComputedFields;
+  let getComputedFields;
 
-  var fn;
+  let fn;
   beforeEach(ngMock.module(
     'kibana',
     function ($provide) {
       // Super simple config stub
       $provide.service('config', function () {
-        var keys = {};
+        let keys = {};
         return {
           get: function (key) { return keys[key]; },
           set: function (key, value) { keys[key] = value; }
diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
index a3560f3f91fa9..80e922fd3e02a 100644
--- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
@@ -2,12 +2,12 @@
 describe('SearchSource#normalizeSortRequest', function () {
   require('ui/private');
 
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var normalizeSortRequest;
-  var indexPattern;
-  var normalizedSort;
+  let normalizeSortRequest;
+  let indexPattern;
+  let normalizedSort;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -23,8 +23,8 @@ describe('SearchSource#normalizeSortRequest', function () {
   }));
 
   it('should return an array', function () {
-    var sortable = { someField: 'desc'};
-    var result = normalizeSortRequest(sortable, indexPattern);
+    let sortable = { someField: 'desc'};
+    let result = normalizeSortRequest(sortable, indexPattern);
     expect(result).to.be.an(Array);
     expect(result).to.eql(normalizedSort);
     // ensure object passed in is not mutated
@@ -33,27 +33,27 @@ describe('SearchSource#normalizeSortRequest', function () {
   });
 
   it('should make plain string sort into the more verbose format', function () {
-    var result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
+    let result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
     expect(result).to.eql(normalizedSort);
   });
 
   it('should append default sort options', function () {
-    var sortState = [{
+    let sortState = [{
       someField: {
         order: 'desc',
         unmapped_type: 'boolean'
       }
     }];
-    var result = normalizeSortRequest(sortState, indexPattern);
+    let result = normalizeSortRequest(sortState, indexPattern);
     expect(result).to.eql(normalizedSort);
   });
 
   it('should enable script based sorting', function () {
-    var fieldName = 'script string';
-    var direction = 'desc';
-    var indexField = indexPattern.fields.byName[fieldName];
+    let fieldName = 'script string';
+    let direction = 'desc';
+    let indexField = indexPattern.fields.byName[fieldName];
 
-    var sortState = {};
+    let sortState = {};
     sortState[fieldName] = direction;
     normalizedSort = {
       _script: {
@@ -63,7 +63,7 @@ describe('SearchSource#normalizeSortRequest', function () {
       }
     };
 
-    var result = normalizeSortRequest(sortState, indexPattern);
+    let result = normalizeSortRequest(sortState, indexPattern);
     expect(result).to.eql([normalizedSort]);
 
     sortState[fieldName] = { order: direction };
@@ -72,18 +72,18 @@ describe('SearchSource#normalizeSortRequest', function () {
   });
 
   it('should use script based sorting only on sortable types', function () {
-    var fieldName = 'script murmur3';
-    var direction = 'asc';
-    var indexField = indexPattern.fields.byName[fieldName];
+    let fieldName = 'script murmur3';
+    let direction = 'asc';
+    let indexField = indexPattern.fields.byName[fieldName];
 
-    var sortState = {};
+    let sortState = {};
     sortState[fieldName] = direction;
     normalizedSort = {};
     normalizedSort[fieldName] = {
       order: direction,
       unmapped_type: 'boolean'
     };
-    var result = normalizeSortRequest([sortState], indexPattern);
+    let result = normalizeSortRequest([sortState], indexPattern);
 
     expect(result).to.eql([normalizedSort]);
   });
diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js
index f66996048e1c4..cbd13a879d7a7 100644
--- a/src/ui/public/courier/data_source/_abstract.js
+++ b/src/ui/public/courier/data_source/_abstract.js
@@ -1,14 +1,14 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   return function SourceAbstractFactory(Private, Promise, PromiseEmitter) {
-    var requestQueue = Private(require('ui/courier/_request_queue'));
-    var errorHandlers = Private(require('ui/courier/_error_handlers'));
-    var courierFetch = Private(require('ui/courier/fetch/fetch'));
+    let requestQueue = Private(require('ui/courier/_request_queue'));
+    let errorHandlers = Private(require('ui/courier/_error_handlers'));
+    let courierFetch = Private(require('ui/courier/fetch/fetch'));
 
     function SourceAbstract(initialState, strategy) {
-      var self = this;
+      let self = this;
       self._instanceid = _.uniqueId('data_source');
 
       self._state = (function () {
@@ -51,7 +51,7 @@ define(function (require) {
      * @return {any} - the value found
      */
     SourceAbstract.prototype.get = function (name) {
-      var self = this;
+      let self = this;
       while (self) {
         if (self._state[name] !== void 0) return self._state[name];
         self = self.getParent();
@@ -73,7 +73,7 @@ define(function (require) {
      *   string of the state value to set
      */
     SourceAbstract.prototype.set = function (state, val) {
-      var self = this;
+      let self = this;
 
       if (typeof state === 'string') {
         // the getter and setter methods check for undefined explicitly
@@ -119,7 +119,7 @@ define(function (require) {
      * @return {Promise}
      */
     SourceAbstract.prototype.onResults = function (handler) {
-      var self = this;
+      let self = this;
 
       return new PromiseEmitter(function (resolve, reject) {
         const defer = Promise.defer();
@@ -143,7 +143,7 @@ define(function (require) {
      * @return {Promise}
      */
     SourceAbstract.prototype.onError = function (handler) {
-      var self = this;
+      let self = this;
 
       return new PromiseEmitter(function (resolve, reject) {
         const defer = Promise.defer();
@@ -166,8 +166,8 @@ define(function (require) {
      * @async
      */
     SourceAbstract.prototype.fetch = function () {
-      var self = this;
-      var req = _.first(self._myStartableQueued());
+      let self = this;
+      let req = _.first(self._myStartableQueued());
 
       if (!req) {
         req = self._createRequest();
@@ -226,16 +226,16 @@ define(function (require) {
      * @resolved {Object|null} - the flat state of the SourceAbstract
      */
     SourceAbstract.prototype._flatten = function () {
-      var type = this._getType();
+      let type = this._getType();
 
       // the merged state of this dataSource and it's ancestors
-      var flatState = {};
+      let flatState = {};
 
       // function used to write each property from each state object in the chain to flat state
-      var root = this;
+      let root = this;
 
       // start the chain at this source
-      var current = this;
+      let current = this;
 
       // call the ittr and return it's promise
       return (function ittr() {
@@ -249,12 +249,12 @@ define(function (require) {
             });
           }
 
-          var prom = root._mergeProp(flatState, value, key);
+          let prom = root._mergeProp(flatState, value, key);
           return Promise.is(prom) ? prom : null;
         }))
         .then(function () {
           // move to this sources parent
-          var parent = current.getParent();
+          let parent = current.getParent();
           // keep calling until we reach the top parent
           if (parent) {
             current = parent;
@@ -265,7 +265,7 @@ define(function (require) {
       .then(function () {
         if (type === 'search') {
           // This is down here to prevent the circular dependency
-          var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
+          let decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
 
           flatState.body = flatState.body || {};
 
@@ -279,7 +279,7 @@ define(function (require) {
           if (flatState.body.size === 0) {
             flatState.search_type = 'count';
           } else {
-            var computedFields = flatState.index.getComputedFields();
+            let computedFields = flatState.index.getComputedFields();
             flatState.body.fields = computedFields.fields;
             flatState.body.script_fields = flatState.body.script_fields || {};
             flatState.body.fielddata_fields = flatState.body.fielddata_fields || [];
@@ -297,7 +297,7 @@ define(function (require) {
            *                          through otherwise it will filter out
            * @returns {function}
            */
-          var filterNegate = function (reverse) {
+          let filterNegate = function (reverse) {
             return function (filter) {
               if (_.isUndefined(filter.meta) || _.isUndefined(filter.meta.negate)) return !reverse;
               return filter.meta && filter.meta.negate === reverse;
@@ -309,7 +309,7 @@ define(function (require) {
            * @param {object} filter The filter to clean
            * @returns {object}
            */
-          var cleanFilter = function (filter) {
+          let cleanFilter = function (filter) {
             return _.omit(filter, ['meta']);
           };
 
diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js
index 45038fe0f4480..6a12ebe3a7dd0 100644
--- a/src/ui/public/courier/data_source/_decorate_query.js
+++ b/src/ui/public/courier/data_source/_decorate_query.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function DecorateQuery(config) {
     /**
      * Decorate queries with default parameters
@@ -7,7 +7,7 @@ define(function (require) {
      * @returns {object}
      */
     return function (query) {
-      var queryOptions = config.get('query:queryString:options');
+      let queryOptions = config.get('query:queryString:options');
 
       if (_.has(query, 'query_string.query')) {
         _.extend(query.query_string, queryOptions);
diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js
index 57b0dca60ea6c..c01c46f6ffc37 100644
--- a/src/ui/public/courier/data_source/_doc_send_to_es.js
+++ b/src/ui/public/courier/data_source/_doc_send_to_es.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var _ = require('lodash');
-  var errors = require('ui/errors');
+  let _ = require('lodash');
+  let errors = require('ui/errors');
 
   return function (Promise, Private, es) {
-    var requestQueue = Private(require('ui/courier/_request_queue'));
-    var courierFetch = Private(require('ui/courier/fetch/fetch'));
+    let requestQueue = Private(require('ui/courier/_request_queue'));
+    let courierFetch = Private(require('ui/courier/fetch/fetch'));
 
     /**
      * Backend for doUpdate and doIndex
@@ -14,9 +14,9 @@ define(function (require) {
      * @param  {String} body - HTTP request body
      */
     return function (method, validateVersion, body, ignore) {
-      var doc = this;
+      let doc = this;
       // straight assignment will causes undefined values
-      var params = _.pick(this._state, ['id', 'type', 'index']);
+      let params = _.pick(this._state, ['id', 'type', 'index']);
       params.body = body;
       params.ignore = ignore || [409];
 
@@ -31,7 +31,7 @@ define(function (require) {
         doc._storeVersion(resp._version);
         doc.id(resp._id);
 
-        var docFetchProm;
+        let docFetchProm;
         if (method !== 'index') {
           docFetchProm = doc.fetch();
         } else {
@@ -49,13 +49,13 @@ define(function (require) {
         // notify pending request for this same document that we have updates
         docFetchProm.then(function (fetchResp) {
           // use the key to compair sources
-          var key = doc._versionKey();
+          let key = doc._versionKey();
 
           // clear the queue and filter out the removed items, pushing the
           // unmatched ones back in.
-          var respondTo = requestQueue.splice(0).filter(function (req) {
-            var isDoc = req.source._getType() === 'doc';
-            var keyMatches = isDoc && req.source._versionKey() === key;
+          let respondTo = requestQueue.splice(0).filter(function (req) {
+            let isDoc = req.source._getType() === 'doc';
+            let keyMatches = isDoc && req.source._versionKey() === key;
 
             // put some request back into the queue
             if (!keyMatches) {
diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js
index 31030774fd7dc..37313291e4548 100644
--- a/src/ui/public/courier/data_source/_normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/_normalize_sort_request.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function normalizeSortRequest(config) {
-    var defaultSortOptions = config.get('sort:options');
+    let defaultSortOptions = config.get('sort:options');
 
     /**
      * Decorate queries with default parameters
@@ -9,7 +9,7 @@ define(function (require) {
      * @returns {object}
      */
     return function (sortObject, indexPattern) {
-      var normalizedSort = [];
+      let normalizedSort = [];
 
       // [].concat({}) -> [{}], [].concat([{}]) -> [{}]
       return [].concat(sortObject).map(function (sortable) {
@@ -22,13 +22,13 @@ define(function (require) {
       { someField: "desc" } into { someField: { "order": "desc"}}
     */
     function normalize(sortable, indexPattern) {
-      var normalized = {};
-      var sortField = _.keys(sortable)[0];
-      var sortValue = sortable[sortField];
-      var indexField = indexPattern.fields.byName[sortField];
+      let normalized = {};
+      let sortField = _.keys(sortable)[0];
+      let sortValue = sortable[sortField];
+      let indexField = indexPattern.fields.byName[sortField];
 
       if (indexField && indexField.scripted && indexField.sortable) {
-        var direction;
+        let direction;
         if (_.isString(sortValue)) direction = sortValue;
         if (_.isObject(sortValue) && sortValue.order) direction = sortValue.order;
 
diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js
index 1c53f6771dd46..fb68bef72d9fd 100644
--- a/src/ui/public/courier/data_source/_root_search_source.js
+++ b/src/ui/public/courier/data_source/_root_search_source.js
@@ -1,17 +1,17 @@
 define(function (require) {
   return function RootSearchSource(Private, $rootScope, timefilter, Notifier) {
-    var SearchSource = Private(require('ui/courier/data_source/search_source'));
+    let SearchSource = Private(require('ui/courier/data_source/search_source'));
 
-    var notify = new Notifier({ location: 'Root Search Source' });
+    let notify = new Notifier({ location: 'Root Search Source' });
 
-    var globalSource = new SearchSource();
+    let globalSource = new SearchSource();
     globalSource.inherits(false); // this is the final source, it has no parents
     globalSource.filter(function (globalSource) {
       // dynamic time filter will be called in the _flatten phase of things
       return timefilter.get(globalSource.get('index'));
     });
 
-    var appSource; // set in setAppSource()
+    let appSource; // set in setAppSource()
     resetAppSource();
 
     // when the route changes, clear the appSource
@@ -34,7 +34,7 @@ define(function (require) {
 
       // walk the parent chain until we get to the global source or nothing
       // that's where we will attach to the globalSource
-      var literalRoot = source;
+      let literalRoot = source;
       while (literalRoot._parent && literalRoot._parent !== globalSource) {
         literalRoot = literalRoot._parent;
       }
diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js
index f6f32eeddf286..6c60d87f97998 100644
--- a/src/ui/public/courier/data_source/doc_source.js
+++ b/src/ui/public/courier/data_source/doc_source.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function DocSourceFactory(Private, Promise, es, sessionStorage) {
-    var sendToEs = Private(require('ui/courier/data_source/_doc_send_to_es'));
-    var SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
-    var DocRequest = Private(require('ui/courier/fetch/request/doc'));
-    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
+    let sendToEs = Private(require('ui/courier/data_source/_doc_send_to_es'));
+    let SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
+    let DocRequest = Private(require('ui/courier/fetch/request/doc'));
+    let docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
 
     _.class(DocSource).inherits(SourceAbstract);
     function DocSource(initialState) {
@@ -92,7 +92,7 @@ define(function (require) {
      * @return {string}
      */
     DocSource.prototype._versionKey = function () {
-      var state = this._state;
+      let state = this._state;
 
       if (!state.index || !state.type || !state.id) return;
       return 'DocVersion:' + (
@@ -118,10 +118,10 @@ define(function (require) {
      * @return {[type]} [description]
      */
     DocSource.prototype._getStoredVersion = function () {
-      var key = this._versionKey();
+      let key = this._versionKey();
       if (!key) return;
 
-      var v = sessionStorage.get(key);
+      let v = sessionStorage.get(key);
       this._version = v ? _.parseInt(v) : void 0;
       return this._version;
     };
@@ -134,7 +134,7 @@ define(function (require) {
     DocSource.prototype._storeVersion = function (version) {
       if (!version) return this._clearVersion();
 
-      var key = this._versionKey();
+      let key = this._versionKey();
       if (!key) return;
       this._version = version;
       sessionStorage.set(key, version);
@@ -144,7 +144,7 @@ define(function (require) {
      * Clears the stored version for a DocSource
      */
     DocSource.prototype._clearVersion = function () {
-      var key = this._versionKey();
+      let key = this._versionKey();
       if (!key) return;
       sessionStorage.remove(key);
     };
diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js
index 6deaa47f23952..63aee24643725 100644
--- a/src/ui/public/courier/data_source/search_source.js
+++ b/src/ui/public/courier/data_source/search_source.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function SearchSourceFactory(Promise, Private) {
-    var _ = require('lodash');
-    var SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
-    var SearchRequest = Private(require('ui/courier/fetch/request/search'));
-    var SegmentedRequest = Private(require('ui/courier/fetch/request/segmented'));
-    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
-    var normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request'));
-    var rootSearchSource = require('ui/courier/data_source/_root_search_source');
+    let _ = require('lodash');
+    let SourceAbstract = Private(require('ui/courier/data_source/_abstract'));
+    let SearchRequest = Private(require('ui/courier/fetch/request/search'));
+    let SegmentedRequest = Private(require('ui/courier/fetch/request/segmented'));
+    let searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    let normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request'));
+    let rootSearchSource = require('ui/courier/data_source/_root_search_source');
 
     _.class(SearchSource).inherits(SourceAbstract);
     function SearchSource(initialState) {
@@ -65,7 +65,7 @@ define(function (require) {
      * @return {undefined|searchSource}
      */
     SearchSource.prototype.getParent = function (onlyHardLinked) {
-      var self = this;
+      let self = this;
       if (self._parent === false) return;
       if (self._parent) return self._parent;
       return onlyHardLinked ? undefined : Private(rootSearchSource).get();
@@ -86,9 +86,9 @@ define(function (require) {
     };
 
     SearchSource.prototype.onBeginSegmentedFetch = function (initFunction) {
-      var self = this;
+      let self = this;
       return Promise.try(function addRequest() {
-        var req = new SegmentedRequest(self, Promise.defer(), initFunction);
+        let req = new SegmentedRequest(self, Promise.defer(), initFunction);
 
         // return promises created by the completion handler so that
         // errors will bubble properly
@@ -133,7 +133,7 @@ define(function (require) {
      */
     SearchSource.prototype._mergeProp = function (state, val, key) {
       if (typeof val === 'function') {
-        var source = this;
+        let source = this;
         return Promise.cast(val(this))
         .then(function (newVal) {
           return source._mergeProp(state, newVal, key);
diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js
index 9f07a05f05994..3c1195b843bab 100644
--- a/src/ui/public/courier/fetch/__tests__/doc.js
+++ b/src/ui/public/courier/fetch/__tests__/doc.js
@@ -1,20 +1,20 @@
 
 describe('Courier DocFetchRequest class', function () {
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var storage;
-  var source;
-  var defer;
-  var req;
+  let storage;
+  let source;
+  let defer;
+  let req;
 
-  var setVersion;
+  let setVersion;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, Promise, $injector) {
-    var DocSource = Private(require('ui/courier/data_source/doc_source'));
-    var DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));
+    let DocSource = Private(require('ui/courier/data_source/doc_source'));
+    let DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));
 
     storage =
     $injector.get('localStorage').store =
diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js
index bb9efe5c589fa..823b2e7b69216 100644
--- a/src/ui/public/courier/fetch/__tests__/fetch_these.js
+++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js
@@ -52,6 +52,13 @@ describe('ui/courier/fetch/_fetch_these', () => {
       $rootScope.$apply();
       expect(fakeResponses.callCount).to.be(3);
     });
+
+    it('invokes request failure handler if starting fails', () => {
+      request.start = sinon.stub().returns(Promise.reject('some error'));
+      fetchThese(requests);
+      $rootScope.$apply();
+      sinon.assert.calledWith(request.handleFailure, 'some error');
+    });
   });
 
   context('when request has already started', () => {
@@ -69,6 +76,12 @@ describe('ui/courier/fetch/_fetch_these', () => {
       $rootScope.$apply();
       expect(fakeResponses.callCount).to.be(3);
     });
+    it('invokes request failure handler if continuing fails', () => {
+      request.continue = sinon.stub().returns(Promise.reject('some error'));
+      fetchThese(requests);
+      $rootScope.$apply();
+      sinon.assert.calledWith(request.handleFailure, 'some error');
+    });
   });
 
   function mockRequest() {
@@ -76,6 +89,7 @@ describe('ui/courier/fetch/_fetch_these', () => {
       strategy: 'mock',
       started: true,
       aborted: false,
+      handleFailure: sinon.spy(),
       retry: sinon.spy(function () { return this; }),
       continue: sinon.spy(function () { return this; }),
       start: sinon.spy(function () { return this; })
diff --git a/src/ui/public/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/_call_client.js
index 1cec794512c33..75f24d891b82d 100644
--- a/src/ui/public/courier/fetch/_call_client.js
+++ b/src/ui/public/courier/fetch/_call_client.js
@@ -1,27 +1,29 @@
 define(function (require) {
   return function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var isRequest = Private(require('ui/courier/fetch/_is_request'));
-    var mergeDuplicateRequests = Private(require('ui/courier/fetch/_merge_duplicate_requests'));
+    let isRequest = Private(require('ui/courier/fetch/_is_request'));
+    let mergeDuplicateRequests = Private(require('ui/courier/fetch/_merge_duplicate_requests'));
 
-    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
-    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
+    let ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    let DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
 
     function callClient(strategy, requests) {
       // merging docs can change status to DUPLICATE, capture new statuses
-      var statuses = mergeDuplicateRequests(requests);
+      let statuses = mergeDuplicateRequests(requests);
 
       // get the actual list of requests that we will be fetching
-      var executable = statuses.filter(isRequest);
-      var execCount = executable.length;
+      let executable = statuses.filter(isRequest);
+      let execCount = executable.length;
+
+      if (!execCount) return Promise.resolve([]);
 
       // resolved by respond()
-      var esPromise;
-      var defer = Promise.defer();
+      let esPromise;
+      let defer = Promise.defer();
 
       // for each respond with either the response or ABORTED
-      var respond = function (responses) {
+      let respond = function (responses) {
         responses = responses || [];
         return Promise.map(requests, function (req, i) {
           switch (statuses[i]) {
@@ -41,7 +43,7 @@ define(function (require) {
 
 
       // handle a request being aborted while being fetched
-      var requestWasAborted = Promise.method(function (req, i) {
+      let requestWasAborted = Promise.method(function (req, i) {
         if (statuses[i] === ABORTED) {
           defer.reject(new Error('Request was aborted twice?'));
         }
diff --git a/src/ui/public/courier/fetch/_call_response_handlers.js b/src/ui/public/courier/fetch/_call_response_handlers.js
index 15fcd8bf9cf8e..0e75a13742e6a 100644
--- a/src/ui/public/courier/fetch/_call_response_handlers.js
+++ b/src/ui/public/courier/fetch/_call_response_handlers.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function CourierFetchCallResponseHandlers(Private, Promise) {
-    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
-    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
-    var notify = Private(require('ui/courier/fetch/_notifier'));
+    let ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    let INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+    let notify = Private(require('ui/courier/fetch/_notifier'));
 
-    var SearchTimeout = require('ui/errors').SearchTimeout;
-    var RequestFailure = require('ui/errors').RequestFailure;
-    var ShardFailure = require('ui/errors').ShardFailure;
+    let SearchTimeout = require('ui/errors').SearchTimeout;
+    let RequestFailure = require('ui/errors').RequestFailure;
+    let ShardFailure = require('ui/errors').ShardFailure;
 
     function callResponseHandlers(requests, responses) {
       return Promise.map(requests, function (req, i) {
@@ -14,7 +14,7 @@ define(function (require) {
           return ABORTED;
         }
 
-        var resp = responses[i];
+        let resp = responses[i];
 
         if (resp.timed_out) {
           notify.warning(new SearchTimeout());
diff --git a/src/ui/public/courier/fetch/_continue_incomplete.js b/src/ui/public/courier/fetch/_continue_incomplete.js
index 45f911c691527..30b3853e2b578 100644
--- a/src/ui/public/courier/fetch/_continue_incomplete.js
+++ b/src/ui/public/courier/fetch/_continue_incomplete.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function CourierFetchContinueIncompleteRequests(Private) {
-    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+    let INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
 
     function continueIncompleteRequests(strategy, requests, responses, fetchWithStrategy) {
-      var incomplete = [];
+      let incomplete = [];
 
       responses.forEach(function (resp, i) {
         if (resp === INCOMPLETE) {
diff --git a/src/ui/public/courier/fetch/_fetch_these.js b/src/ui/public/courier/fetch/_fetch_these.js
index be1dcf63920d7..2858cad846ed4 100644
--- a/src/ui/public/courier/fetch/_fetch_these.js
+++ b/src/ui/public/courier/fetch/_fetch_these.js
@@ -1,16 +1,16 @@
 define(function (require) {
   return function FetchTheseProvider(Private, Promise) {
-    var notify = Private(require('ui/courier/fetch/_notifier'));
-    var forEachStrategy = Private(require('ui/courier/fetch/_for_each_strategy'));
+    let notify = Private(require('ui/courier/fetch/_notifier'));
+    let forEachStrategy = Private(require('ui/courier/fetch/_for_each_strategy'));
 
     // core tasks
-    var callClient = Private(require('ui/courier/fetch/_call_client'));
-    var callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
-    var continueIncomplete = Private(require('ui/courier/fetch/_continue_incomplete'));
+    let callClient = Private(require('ui/courier/fetch/_call_client'));
+    let callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
+    let continueIncomplete = Private(require('ui/courier/fetch/_continue_incomplete'));
 
-    var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
-    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
-    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+    let ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED;
+    let DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
+    let INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
 
     function fetchThese(requests) {
       return forEachStrategy(requests, function (strategy, reqsForStrategy) {
@@ -23,22 +23,26 @@ define(function (require) {
     }
 
     function fetchWithStrategy(strategy, requests) {
+      function replaceAbortedRequests() {
+        requests = requests.map(r => r.aborted ? ABORTED : r);
+      }
 
-      requests = requests.map(function (req) {
-        return req.aborted ? ABORTED : req;
-      });
-
+      replaceAbortedRequests();
       return startRequests(requests)
       .then(function () {
+        replaceAbortedRequests();
         return callClient(strategy, requests);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return callResponseHandlers(requests, responses);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return continueIncomplete(strategy, requests, responses, fetchWithStrategy);
       })
       .then(function (responses) {
+        replaceAbortedRequests();
         return responses.map(function (resp) {
           switch (resp) {
             case ABORTED:
@@ -60,9 +64,10 @@ define(function (require) {
         }
 
         return new Promise(function (resolve) {
-          var action = req.started ? req.continue : req.start;
+          let action = req.started ? req.continue : req.start;
           resolve(action.call(req));
-        });
+        })
+        .catch(err => req.handleFailure(err));
       });
     }
 
diff --git a/src/ui/public/courier/fetch/_for_each_strategy.js b/src/ui/public/courier/fetch/_for_each_strategy.js
index cc13fe2381249..269da403f09fc 100644
--- a/src/ui/public/courier/fetch/_for_each_strategy.js
+++ b/src/ui/public/courier/fetch/_for_each_strategy.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function FetchForEachRequestStrategy(Private, Promise) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     function forEachStrategy(requests, block) {
       block = Promise.method(block);
-      var sets = [];
+      let sets = [];
 
       requests.forEach(function (req) {
-        var strategy = req.strategy;
-        var set = _.find(sets, { 0: strategy });
+        let strategy = req.strategy;
+        let set = _.find(sets, { 0: strategy });
         if (set) set[1].push(req);
         else sets.push([strategy, [req]]);
       });
diff --git a/src/ui/public/courier/fetch/_is_request.js b/src/ui/public/courier/fetch/_is_request.js
index 4a0eab4019cfa..64c34eeec85b9 100644
--- a/src/ui/public/courier/fetch/_is_request.js
+++ b/src/ui/public/courier/fetch/_is_request.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function CourierFetchIsRequestProvider(Private) {
-    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+    let AbstractRequest = Private(require('ui/courier/fetch/request/request'));
 
     return function isRequest(obj) {
       return obj instanceof AbstractRequest;
diff --git a/src/ui/public/courier/fetch/_merge_duplicate_requests.js b/src/ui/public/courier/fetch/_merge_duplicate_requests.js
index fb79e6bf6148d..b1d9237032f77 100644
--- a/src/ui/public/courier/fetch/_merge_duplicate_requests.js
+++ b/src/ui/public/courier/fetch/_merge_duplicate_requests.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function FetchMergeDuplicateRequests(Private) {
-    var isRequest = Private(require('ui/courier/fetch/_is_request'));
-    var DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
+    let isRequest = Private(require('ui/courier/fetch/_is_request'));
+    let DUPLICATE = Private(require('ui/courier/fetch/_req_status')).DUPLICATE;
 
     function mergeDuplicateRequests(requests) {
       // dedupe requests
-      var index = {};
+      let index = {};
       return requests.map(function (req) {
         if (!isRequest(req)) return req;
 
-        var iid = req.source._instanceid;
+        let iid = req.source._instanceid;
         if (!index[iid]) {
           // this request is unique so far
           index[iid] = req;
diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js
index adf1871bb4253..e7095c49b8fce 100644
--- a/src/ui/public/courier/fetch/fetch.js
+++ b/src/ui/public/courier/fetch/fetch.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function fetchService(Private, Promise) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var requestQueue = Private(require('ui/courier/_request_queue'));
-    var fetchThese = Private(require('ui/courier/fetch/_fetch_these'));
+    let requestQueue = Private(require('ui/courier/_request_queue'));
+    let fetchThese = Private(require('ui/courier/fetch/_fetch_these'));
 
-    var callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
-    var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
+    let callResponseHandlers = Private(require('ui/courier/fetch/_call_response_handlers'));
+    let INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE;
 
     function fetchQueued(strategy) {
-      var requests = requestQueue.getStartable(strategy);
+      let requests = requestQueue.getStartable(strategy);
       if (!requests.length) return Promise.resolve();
       else return fetchThese(requests);
     }
@@ -17,7 +17,7 @@ define(function (require) {
     this.fetchQueued = fetchQueued;
 
     function fetchASource(source, strategy) {
-      var defer = Promise.defer();
+      let defer = Promise.defer();
 
       fetchThese([
         source._createRequest(defer)
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js
index 8c7745d47bed1..a3882bc82fbbb 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js
@@ -29,9 +29,7 @@ describe('ui/courier/fetch/request/segmented', () => {
       expect(returned.then).to.be.Function;
     });
 
-    it('does not call super.start() until promise is resolved', () => {
-      expect(searchReqStart.called).to.be(false);
-      $rootScope.$apply();
+    it('calls super.start() synchronously', () => {
       expect(searchReqStart.called).to.be(true);
     });
   });
@@ -47,9 +45,12 @@ describe('ui/courier/fetch/request/segmented', () => {
   }
 
   function mockIndexPattern() {
-    const queue = [1, 2, 3];
     return {
-      toIndexList: sinon.stub().returns(Promise.resolve(queue))
+      toDetailedIndexList: sinon.stub().returns(Promise.resolve([
+        { index: 1, min: 0, max: 1 },
+        { index: 2, min: 0, max: 1 },
+        { index: 3, min: 0, max: 1 },
+      ]))
     };
   }
 });
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmentedCreateQueue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
similarity index 79%
rename from src/ui/public/courier/fetch/request/__tests__/segmentedCreateQueue.js
rename to src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
index 11a05589a3cee..c2fd182e41add 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmentedCreateQueue.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
@@ -28,17 +28,17 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => {
     const req = new SegmentedReq(new MockSource());
     req._queueCreated = null;
 
-    var promise = req._createQueue();
+    let promise = req._createQueue();
     expect(req._queueCreated).to.be(false);
     await promise;
     expect(req._queueCreated).to.be(true);
   });
 
-  it('relies on indexPattern.toIndexList to generate queue', async function () {
+  it('relies on indexPattern.toDetailedIndexList to generate queue', async function () {
     const source = new MockSource();
     const ip = source.get('index');
     const indices = [1,2,3];
-    sinon.stub(ip, 'toIndexList').returns(Promise.resolve(indices));
+    sinon.stub(ip, 'toDetailedIndexList').returns(Promise.resolve(indices));
 
     const req = new SegmentedReq(source);
     const output = await req._createQueue();
@@ -49,14 +49,14 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => {
     const source = new MockSource();
     const ip = source.get('index');
     const req = new SegmentedReq(source);
-    sinon.stub(ip, 'toIndexList').returns(Promise.resolve([1,2,3]));
+    sinon.stub(ip, 'toDetailedIndexList').returns(Promise.resolve([1,2,3]));
 
     req.setDirection('asc');
     await req._createQueue();
-    expect(ip.toIndexList.lastCall.args[2]).to.be('asc');
+    expect(ip.toDetailedIndexList.lastCall.args[2]).to.be('asc');
 
     req.setDirection('desc');
     await req._createQueue();
-    expect(ip.toIndexList.lastCall.args[2]).to.be('desc');
+    expect(ip.toDetailedIndexList.lastCall.args[2]).to.be('desc');
   });
 });
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
new file mode 100644
index 0000000000000..1e5131fbe248c
--- /dev/null
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
@@ -0,0 +1,129 @@
+import ngMock from 'ngMock';
+import expect from 'expect.js';
+import { times } from 'lodash';
+import sinon from 'auto-release-sinon';
+
+import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn';
+import NoDigestPromises from 'testUtils/noDigestPromises';
+
+describe('Segmented Request Index Selection', function () {
+  let Promise;
+  let $rootScope;
+  let SegmentedReq;
+  let MockSource;
+  let HitSortFn;
+
+  NoDigestPromises.activateForSuite();
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject((Private, $injector) => {
+    Promise = $injector.get('Promise');
+    HitSortFn = Private(HitSortFnProv);
+    $rootScope = $injector.get('$rootScope');
+    SegmentedReq = Private(require('ui/courier/fetch/request/segmented'));
+
+    const StubbedSearchSourceProvider = require('fixtures/stubbed_search_source');
+    MockSource = class {
+      constructor() {
+        return $injector.invoke(StubbedSearchSourceProvider);
+      }
+    };
+  }));
+
+  it('queries with size until all 500 docs returned', async function () {
+    const search = new MockSource();
+    const indexPattern = search.get('index');
+    sinon.stub(indexPattern, 'toDetailedIndexList').returns(Promise.resolve([
+      { index: 'one', min: 0, max: 1 },
+      { index: 'two', min: 0, max: 1 },
+      { index: 'three', min: 0, max: 1 },
+      { index: 'four', min: 0, max: 1 },
+      { index: 'five', min: 0, max: 1 },
+    ]));
+
+    const req = new SegmentedReq(search);
+    req._handle.setDirection('desc');
+    req._handle.setSortFn(new HitSortFn('desc'));
+    req._handle.setSize(500);
+    await req.start();
+
+    // first 200
+    expect((await req.getFetchParams()).body.size).to.be(500);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(200, (i) => ({ i })) }
+    });
+
+    // total = 400
+    expect((await req.getFetchParams()).body.size).to.be(500);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(200, (i) => ({ i })) }
+    });
+
+    // total = 600
+    expect((await req.getFetchParams()).body.size).to.be(500);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(200, (i) => ({ i })) }
+    });
+
+    expect((await req.getFetchParams()).body.size).to.be(0);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(200, (i) => ({ i })) }
+    });
+
+    expect((await req.getFetchParams()).body.size).to.be(0);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(200, (i) => ({ i })) }
+    });
+  });
+
+  it(`sets size 0 for indices that couldn't procude hits`, async function () {
+    const search = new MockSource();
+    const indexPattern = search.get('index');
+
+    // the segreq is looking for 10 documents, and we will give it ten docs with time:5 in the first response.
+    // on the second index it should still request 10 documents because it could produce documents with time:5.
+    // the next two indexes will get size 0, since they couldn't produce documents with the time:5
+    // the final index will get size:10, because it too can produce docs with time:5
+    sinon.stub(indexPattern, 'toDetailedIndexList').returns(Promise.resolve([
+      { index: 'one', min: 0, max: 10 },
+      { index: 'two', min: 0, max: 10 },
+      { index: 'three', min: 12, max: 20 },
+      { index: 'four', min: 15, max: 20 },
+      { index: 'five', min: 5, max: 50 },
+    ]));
+
+    const req = new SegmentedReq(search);
+    req._handle.setDirection('desc');
+    req._handle.setSortFn(new HitSortFn('desc'));
+    req._handle.setSize(10);
+    await req.start();
+
+    // first 10
+    expect((await req.getFetchParams()).body.size).to.be(10);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(10, () => ({ _source: { time: 5 } })) }
+    });
+
+    // total = 400
+    expect((await req.getFetchParams()).body.size).to.be(10);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(10, () => ({ _source: { time: 5 } })) }
+    });
+
+    // total = 600
+    expect((await req.getFetchParams()).body.size).to.be(0);
+    await req.handleResponse({
+      hits: { total: 1000, hits: [] }
+    });
+
+    expect((await req.getFetchParams()).body.size).to.be(0);
+    await req.handleResponse({
+      hits: { total: 1000, hits: [] }
+    });
+
+    expect((await req.getFetchParams()).body.size).to.be(10);
+    await req.handleResponse({
+      hits: { total: 1000, hits: times(10, () => ({ _source: { time: 5 } })) }
+    });
+  });
+});
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
new file mode 100644
index 0000000000000..68a153bde3292
--- /dev/null
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
@@ -0,0 +1,55 @@
+import ngMock from 'ngMock';
+import expect from 'expect.js';
+import { times } from 'lodash';
+import sinon from 'auto-release-sinon';
+
+import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn';
+import NoDigestPromises from 'testUtils/noDigestPromises';
+
+describe('Segmented Request Size Picking', function () {
+  let Promise;
+  let $rootScope;
+  let SegmentedReq;
+  let MockSource;
+  let HitSortFn;
+
+  NoDigestPromises.activateForSuite();
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject((Private, $injector) => {
+    Promise = $injector.get('Promise');
+    HitSortFn = Private(HitSortFnProv);
+    $rootScope = $injector.get('$rootScope');
+    SegmentedReq = Private(require('ui/courier/fetch/request/segmented'));
+
+    const StubbedSearchSourceProvider = require('fixtures/stubbed_search_source');
+    MockSource = class {
+      constructor() {
+        return $injector.invoke(StubbedSearchSourceProvider);
+      }
+    };
+  }));
+
+  context('without a size', function () {
+    it('does not set the request size', async function () {
+      const req = new SegmentedReq(new MockSource());
+      req._handle.setDirection('desc');
+      req._handle.setSortFn(new HitSortFn('desc'));
+      await req.start();
+
+      expect((await req.getFetchParams()).body).to.not.have.property('size');
+    });
+  });
+
+  context('with a size', function () {
+    it('sets the request size to the entire desired size', async function () {
+      const req = new SegmentedReq(new MockSource());
+      req._handle.setDirection('desc');
+      req._handle.setSize(555);
+      req._handle.setSortFn(new HitSortFn('desc'));
+      await req.start();
+
+      expect((await req.getFetchParams()).body).to.have.property('size', 555);
+    });
+  });
+});
diff --git a/src/ui/public/courier/fetch/request/_error_handler.js b/src/ui/public/courier/fetch/request/_error_handler.js
index 85516b5d04d42..220d651250600 100644
--- a/src/ui/public/courier/fetch/request/_error_handler.js
+++ b/src/ui/public/courier/fetch/request/_error_handler.js
@@ -1,20 +1,20 @@
 define(function (require) {
   return function RequestErrorHandlerFactory(Private, Notifier) {
-    var errHandlers = Private(require('ui/courier/_error_handlers'));
+    let errHandlers = Private(require('ui/courier/_error_handlers'));
 
-    var notify = new Notifier({
+    let notify = new Notifier({
       location: 'Courier Fetch Error'
     });
 
     function handleError(req, error) {
-      var myHandlers = [];
+      let myHandlers = [];
 
       errHandlers.splice(0).forEach(function (handler) {
         (handler.source === req.source ? myHandlers : errHandlers).push(handler);
       });
 
       if (!myHandlers.length) {
-        notify.fatal(new Error('unhandled error ' + (error.stack || error.message)));
+        notify.fatal(new Error(`unhandled courier request error: ${ notify.describeError(error) }`));
       } else {
         myHandlers.forEach(function (handler) {
           handler.defer.resolve(error);
diff --git a/src/ui/public/courier/fetch/request/_segmented_handle.js b/src/ui/public/courier/fetch/request/_segmented_handle.js
index d12b5a10679b3..e83c6858e5760 100644
--- a/src/ui/public/courier/fetch/request/_segmented_handle.js
+++ b/src/ui/public/courier/fetch/request/_segmented_handle.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function CourierSegmentedReqHandle(Private) {
-    var _ = require('lodash');
-    var Events = Private(require('ui/events'));
+    let _ = require('lodash');
+    let Events = Private(require('ui/events'));
 
 
     /**
@@ -22,6 +22,7 @@ define(function (require) {
       this.setDirection = _.bindKey(req, 'setDirection');
       this.setSize = _.bindKey(req, 'setSize');
       this.setMaxSegments = _.bindKey(req, 'setMaxSegments');
+      this.setSortFn = _.bindKey(req, 'setSortFn');
     }
 
     return SegmentedHandle;
diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js
index b135fc2366ed2..487b570d390b9 100644
--- a/src/ui/public/courier/fetch/request/doc.js
+++ b/src/ui/public/courier/fetch/request/doc.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function DocRequestProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
-    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+    let docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
+    let AbstractRequest = Private(require('ui/courier/fetch/request/request'));
 
     _.class(DocRequest).inherits(AbstractRequest);
     function DocRequest(source, defer) {
@@ -14,15 +14,15 @@ define(function (require) {
     }
 
     DocRequest.prototype.canStart = function () {
-      var parent = DocRequest.Super.prototype.canStart.call(this);
+      let parent = DocRequest.Super.prototype.canStart.call(this);
       if (!parent) return false;
 
-      var version = this.source._version;
-      var storedVersion = this.source._getStoredVersion();
+      let version = this.source._version;
+      let storedVersion = this.source._getStoredVersion();
 
       // conditions that equal "fetch This DOC!"
-      var unknown = !version && !storedVersion;
-      var mismatch = version !== storedVersion;
+      let unknown = !version && !storedVersion;
+      let mismatch = version !== storedVersion;
 
       return Boolean(mismatch || (unknown && !this.started));
     };
diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js
index 30d72080fea0e..0173803875234 100644
--- a/src/ui/public/courier/fetch/request/request.js
+++ b/src/ui/public/courier/fetch/request/request.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function AbstractReqProvider(Private, Promise) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var errors = require('ui/errors');
-    var requestQueue = Private(require('ui/courier/_request_queue'));
-    var requestErrorHandler = Private(require('ui/courier/fetch/request/_error_handler'));
+    let _ = require('lodash');
+    let moment = require('moment');
+    let errors = require('ui/errors');
+    let requestQueue = Private(require('ui/courier/_request_queue'));
+    let requestErrorHandler = Private(require('ui/courier/fetch/request/_error_handler'));
 
     function AbstractReq(source, defer) {
       if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) {
@@ -29,7 +29,7 @@ define(function (require) {
       this.started = true;
       this.moment = moment();
 
-      var source = this.source;
+      let source = this.source;
       if (source.activeFetchCount) {
         source.activeFetchCount += 1;
       } else {
@@ -72,7 +72,7 @@ define(function (require) {
     };
 
     AbstractReq.prototype.retry = function () {
-      var clone = this.clone();
+      let clone = this.clone();
       this.abort();
       return clone;
     };
diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js
index ad2eca53e9af0..f13c6df0bbb39 100644
--- a/src/ui/public/courier/fetch/request/search.js
+++ b/src/ui/public/courier/fetch/request/search.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function SearchReqProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
-    var AbstractRequest = Private(require('ui/courier/fetch/request/request'));
+    let searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    let AbstractRequest = Private(require('ui/courier/fetch/request/request'));
 
     _.class(SearchReq).inherits(AbstractRequest);
-    var Super = SearchReq.Super;
+    let Super = SearchReq.Super;
     function SearchReq(source, defer) {
       Super.call(this, source, defer);
 
diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js
index a2291b3b99c6b..142da71ebf2c8 100644
--- a/src/ui/public/courier/fetch/request/segmented.js
+++ b/src/ui/public/courier/fetch/request/segmented.js
@@ -1,10 +1,11 @@
 define(function (require) {
   return function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) {
-    var _ = require('lodash');
-    var SearchReq = Private(require('ui/courier/fetch/request/search'));
-    var SegmentedHandle = Private(require('ui/courier/fetch/request/_segmented_handle'));
+    let _ = require('lodash');
+    let isNumber = require('lodash').isNumber;
+    let SearchReq = Private(require('ui/courier/fetch/request/search'));
+    let SegmentedHandle = Private(require('ui/courier/fetch/request/_segmented_handle'));
 
-    var notify = new Notifier({
+    let notify = new Notifier({
       location: 'Segmented Fetch'
     });
 
@@ -16,13 +17,16 @@ define(function (require) {
 
       // segmented request specific state
       this._initFn = initFn;
-      this._desiredSize = false;
+
+      this._desiredSize = null;
       this._maxSegments = config.get('courier:maxSegmentCount');
-      this._hitsReceived = 0;
       this._direction = 'desc';
+      this._sortFn = null;
       this._queueCreated = false;
       this._handle = new SegmentedHandle(this);
 
+      this._hitWindow = null;
+
       // prevent the source from changing between requests,
       // all calls will return the same promise
       this._getFlattenedSource = _.once(this._getFlattenedSource);
@@ -33,7 +37,9 @@ define(function (require) {
      *********/
 
     SegmentedReq.prototype.start = function () {
-      var self = this;
+      let self = this;
+
+      SearchReq.prototype.start.call(this);
 
       this._complete = [];
       this._active = null;
@@ -54,12 +60,12 @@ define(function (require) {
       // parameters via the handle
       if (_.isFunction(this._initFn)) this._initFn(this._handle);
       return this._createQueue().then(function (queue) {
+        if (self.stopped) return;
+
         self._all = queue.slice(0);
 
         // Send the initial fetch status
         self._reportStatus();
-
-        return SearchReq.prototype.start.call(self);
       });
     };
 
@@ -68,23 +74,24 @@ define(function (require) {
     };
 
     SegmentedReq.prototype.getFetchParams = function () {
-      var self = this;
+      let self = this;
 
-      return self._getFlattenedSource()
-      .then(function (flatSource) {
-        var params = _.cloneDeep(flatSource);
+      return self._getFlattenedSource().then(function (flatSource) {
+        let params = _.cloneDeep(flatSource);
 
         // calculate the number of indices to fetch in this request in order to prevent
         // more than self._maxSegments requests. We use Math.max(1, n) to ensure that each request
         // has at least one index pattern, and Math.floor() to make sure that if the
         // number of indices does not round out evenly the extra index is tacked onto the last
         // request, making sure the first request returns faster.
-        var remainingSegments = self._maxSegments - self._segments.length;
-        var indexCount = Math.max(1, Math.floor(self._queue.length / remainingSegments));
-        params.index = self._active = self._queue.splice(0, indexCount);
+        let remainingSegments = self._maxSegments - self._segments.length;
+        let indexCount = Math.max(1, Math.floor(self._queue.length / remainingSegments));
+
+        let indices = self._active = self._queue.splice(0, indexCount);
+        params.index = _.pluck(indices, 'index');
 
-        if (self._desiredSize !== false) {
-          params.body.size = Math.max(self._desiredSize - self._hitsReceived, 0);
+        if (isNumber(self._desiredSize)) {
+          params.body.size = self._pickSizeForIndices(indices);
         }
 
         if (params.body.size === 0) params.search_type = 'count';
@@ -105,8 +112,8 @@ define(function (require) {
     };
 
     SegmentedReq.prototype.isIncomplete = function () {
-      var queueNotCreated = !this._queueCreated;
-      var queueNotEmpty = this._queue.length > 0;
+      let queueNotCreated = !this._queueCreated;
+      let queueNotEmpty = this._queue.length > 0;
       return queueNotCreated || queueNotEmpty;
     };
 
@@ -149,6 +156,15 @@ define(function (require) {
       }
     };
 
+    /**
+     * Set the function that will be used to sort the rows
+     *
+     * @param {fn}
+     */
+    SegmentedReq.prototype.setSortFn = function (sortFn) {
+      this._sortFn = sortFn;
+    };
+
     /**
      * Set the sort total number of documents to
      * emit
@@ -160,16 +176,17 @@ define(function (require) {
      * @param {number|false}
      */
     SegmentedReq.prototype.setSize = function (totalSize) {
-      this._desiredSize = _.parseInt(totalSize) || false;
+      this._desiredSize = _.parseInt(totalSize);
+      if (isNaN(this._desiredSize)) this._desiredSize = null;
     };
 
     SegmentedReq.prototype._createQueue = function () {
-      var self = this;
-      var timeBounds = timefilter.getBounds();
-      var indexPattern = self.source.get('index');
+      let self = this;
+      let timeBounds = timefilter.getBounds();
+      let indexPattern = self.source.get('index');
       self._queueCreated = false;
 
-      return indexPattern.toIndexList(timeBounds.min, timeBounds.max, self._direction)
+      return indexPattern.toDetailedIndexList(timeBounds.min, timeBounds.max, self._direction)
       .then(function (queue) {
         if (!_.isArray(queue)) queue = [queue];
 
@@ -194,33 +211,54 @@ define(function (require) {
     };
 
     SegmentedReq.prototype._consumeSegment = function (seg) {
-      var index = this._active;
+      let index = this._active;
       this._complete.push(index);
       if (!seg) return; // segment was ignored/filtered, don't store it
 
-      var hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0;
-      var gotHits = _.get(seg, 'hits.hits.length') > 0;
-      var firstHits = !hadHits && gotHits;
-      var haveHits = hadHits || gotHits;
+      let hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0;
+      let gotHits = _.get(seg, 'hits.hits.length') > 0;
+      let firstHits = !hadHits && gotHits;
+      let haveHits = hadHits || gotHits;
 
       this._mergeSegment(seg);
       this.resp = _.omit(this._mergedResp, '_bucketIndex');
-      this._hitsReceived += seg.hits.hits.length;
 
       if (firstHits) this._handle.emit('first', seg);
       if (gotHits)   this._handle.emit('segment', seg);
       if (haveHits)  this._handle.emit('mergedSegment', this.resp);
     };
 
+    SegmentedReq.prototype._mergeHits = function (hits) {
+      let mergedHits = this._mergedResp.hits.hits;
+      let desiredSize = this._desiredSize;
+      let sortFn = this._sortFn;
+
+      _.pushAll(hits, mergedHits);
+
+      if (sortFn) {
+        notify.event('resort rows', function () {
+          mergedHits.sort(sortFn);
+        });
+      }
+
+      if (isNumber(desiredSize)) {
+        mergedHits = this._mergedResp.hits.hits = mergedHits.slice(0, desiredSize);
+      }
+    };
+
     SegmentedReq.prototype._mergeSegment = notify.timed('merge response segment', function (seg) {
-      var merged = this._mergedResp;
+      let merged = this._mergedResp;
 
       this._segments.push(seg);
 
       merged.took += seg.took;
       merged.hits.total += seg.hits.total;
       merged.hits.max_score = Math.max(merged.hits.max_score, seg.hits.max_score);
-      [].push.apply(merged.hits.hits, seg.hits.hits);
+
+      if (_.size(seg.hits.hits)) {
+        this._mergeHits(seg.hits.hits);
+        this._detectHitsWindow(merged.hits.hits);
+      }
 
       if (!seg.aggregations) return;
 
@@ -239,7 +277,7 @@ define(function (require) {
         }
 
         seg.aggregations[aggKey].buckets.forEach(function (bucket) {
-          var mbucket = merged._bucketIndex[bucket.key];
+          let mbucket = merged._bucketIndex[bucket.key];
           if (mbucket) {
             mbucket.doc_count += bucket.doc_count;
             return;
@@ -251,6 +289,51 @@ define(function (require) {
       });
     });
 
+    SegmentedReq.prototype._detectHitsWindow = function (hits) {
+      hits = hits || [];
+      let indexPattern = this.source.get('index');
+      let desiredSize = this._desiredSize;
+
+      let size = _.size(hits);
+      if (!isNumber(desiredSize) || size < desiredSize) {
+        this._hitWindow = {
+          size: size,
+          min: -Infinity,
+          max: Infinity
+        };
+        return;
+      }
+
+      let min;
+      let max;
+
+      hits.forEach(function (deepHit) {
+        let hit = indexPattern.flattenHit(deepHit);
+        let time = hit[indexPattern.timeFieldName];
+        if (min == null || time < min) min = time;
+        if (max == null || time > max) max = time;
+      });
+
+      this._hitWindow = { size, min, max };
+    };
+
+    SegmentedReq.prototype._pickSizeForIndices = function (indices) {
+      let hitWindow = this._hitWindow;
+      let desiredSize = this._desiredSize;
+
+      if (!isNumber(desiredSize)) return null;
+      // we don't have any hits yet, get us more info!
+      if (!hitWindow) return desiredSize;
+      // the order of documents isn't important, just get us more
+      if (!this._sortFn) return Math.max(desiredSize - hitWindow.size, 0);
+      // if all of the documents in every index fall outside of our current doc set, we can ignore them.
+      let someOverlap = indices.some(function (index) {
+        return index.min <= hitWindow.max && hitWindow.min <= index.max;
+      });
+
+      return someOverlap ? desiredSize : 0;
+    };
+
     return SegmentedReq;
   };
 });
diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js
index f097281c740c6..e3903eb1c4b9e 100644
--- a/src/ui/public/courier/fetch/strategy/__tests__/search.js
+++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js
@@ -52,11 +52,11 @@ describe('ui/courier/fetch/strategy/search', () => {
     context('when indexList is empty', () => {
       beforeEach(() => reqsFetchParams[0].index = []);
 
-      it('explicitly negates any indexes', () => {
+      it('queries .kibana-devnull instead', () => {
         let value;
         search.reqsFetchParamsToBody(reqsFetchParams).then(val => value = val);
         $rootScope.$apply();
-        expect(_.includes(value, '"index":["-*"]')).to.be(true);
+        expect(_.includes(value, '"index":[".kibana-devnull"]')).to.be(true);
       });
     });
   });
diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js
index a785199181b70..434ad86da7ddf 100644
--- a/src/ui/public/courier/fetch/strategy/search.js
+++ b/src/ui/public/courier/fetch/strategy/search.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function FetchStrategyForSearch(Private, Promise, timefilter) {
-    var _ = require('lodash');
-    var angular = require('angular');
-    var toJson = require('ui/utils/aggressive_parse').toJson;
+    let _ = require('lodash');
+    let angular = require('angular');
+    let toJson = require('ui/utils/aggressive_parse').toJson;
 
     return {
       clientMethod: 'msearch',
@@ -21,7 +21,7 @@ define(function (require) {
               return indexList;
             }
 
-            var timeBounds = timefilter.getBounds();
+            let timeBounds = timefilter.getBounds();
             return indexList.toIndexList(timeBounds.min, timeBounds.max);
           })
           .then(function (indexList) {
@@ -34,7 +34,7 @@ define(function (require) {
             // handle that request by querying *all* indexes, which is the
             // opposite of what we want in this case.
             if (_.isArray(indexList) && indexList.length === 0) {
-              indexList.push('-*');
+              indexList.push('.kibana-devnull');
             }
             return angular.toJson({
               index: indexList,
diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js
index 8a980ad10ef3d..0df02c698809a 100644
--- a/src/ui/public/courier/looper/_looper.js
+++ b/src/ui/public/courier/looper/_looper.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function LooperFactory($timeout, Notifier, Promise) {
-    var _ = require('lodash');
-    var notify = new Notifier();
+    let _ = require('lodash');
+    let notify = new Notifier();
 
     function Looper(ms, fn) {
       this._fn = fn;
@@ -127,7 +127,7 @@ define(function (require) {
      * @return {undefined}
      */
     Looper.prototype._loopTheLoop = function () {
-      var self = this;
+      let self = this;
 
       if (self.active) {
         self.onHastyLoop();
diff --git a/src/ui/public/courier/looper/doc.js b/src/ui/public/courier/looper/doc.js
index 1bb9bf23ae5e7..1ecbc838d4172 100644
--- a/src/ui/public/courier/looper/doc.js
+++ b/src/ui/public/courier/looper/doc.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function DocLooperService(Private) {
-    var fetch = Private(require('ui/courier/fetch/fetch'));
-    var Looper = Private(require('ui/courier/looper/_looper'));
-    var docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
+    let fetch = Private(require('ui/courier/fetch/fetch'));
+    let Looper = Private(require('ui/courier/looper/_looper'));
+    let docStrategy = Private(require('ui/courier/fetch/strategy/doc'));
 
     /**
      * The Looper which will manage the doc fetch interval
      * @type {Looper}
      */
-    var docLooper = new Looper(1500, function () {
+    let docLooper = new Looper(1500, function () {
       fetch.fetchQueued(docStrategy);
     });
 
diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js
index 11ddc5f2fa1b2..41cc8edfb38ac 100644
--- a/src/ui/public/courier/looper/search.js
+++ b/src/ui/public/courier/looper/search.js
@@ -1,17 +1,17 @@
 define(function (require) {
   return function SearchLooperService(Private, Promise, Notifier, $rootScope) {
-    var fetch = Private(require('ui/courier/fetch/fetch'));
-    var searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
-    var requestQueue = Private(require('ui/courier/_request_queue'));
+    let fetch = Private(require('ui/courier/fetch/fetch'));
+    let searchStrategy = Private(require('ui/courier/fetch/strategy/search'));
+    let requestQueue = Private(require('ui/courier/_request_queue'));
 
-    var Looper = Private(require('ui/courier/looper/_looper'));
-    var notif = new Notifier({ location: 'Search Looper' });
+    let Looper = Private(require('ui/courier/looper/_looper'));
+    let notif = new Notifier({ location: 'Search Looper' });
 
     /**
      * The Looper which will manage the doc fetch interval
      * @type {Looper}
      */
-    var searchLooper = new Looper(null, function () {
+    let searchLooper = new Looper(null, function () {
       $rootScope.$broadcast('courier:searchRefresh');
       return fetch.these(
         requestQueue.getInactive(searchStrategy)
diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js
index 439a805fd45f4..077ba04845b53 100644
--- a/src/ui/public/courier/saved_object/saved_object.js
+++ b/src/ui/public/courier/saved_object/saved_object.js
@@ -1,42 +1,42 @@
 define(function (require) {
   return function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) {
-    var angular = require('angular');
-    var errors = require('ui/errors');
-    var _ = require('lodash');
-    var slugifyId = require('ui/utils/slugify_id');
+    let angular = require('angular');
+    let errors = require('ui/errors');
+    let _ = require('lodash');
+    let slugifyId = require('ui/utils/slugify_id');
 
-    var DocSource = Private(require('ui/courier/data_source/doc_source'));
-    var SearchSource = Private(require('ui/courier/data_source/search_source'));
-    var mappingSetup = Private(require('ui/utils/mapping_setup'));
+    let DocSource = Private(require('ui/courier/data_source/doc_source'));
+    let SearchSource = Private(require('ui/courier/data_source/search_source'));
+    let mappingSetup = Private(require('ui/utils/mapping_setup'));
 
     function SavedObject(config) {
       if (!_.isObject(config)) config = {};
 
       // save an easy reference to this
-      var self = this;
+      let self = this;
 
       /************
        * Initialize config vars
        ************/
       // the doc which is used to store this object
-      var docSource = new DocSource();
+      let docSource = new DocSource();
 
       // type name for this object, used as the ES-type
-      var type = config.type;
+      let type = config.type;
 
       // Create a notifier for sending alerts
-      var notify = new Notifier({
+      let notify = new Notifier({
         location: 'Saved ' + type
       });
 
       // mapping definition for the fields that this object will expose
-      var mapping = mappingSetup.expandShorthand(config.mapping);
+      let mapping = mappingSetup.expandShorthand(config.mapping);
 
       // default field values, assigned when the source is loaded
-      var defaults = config.defaults || {};
+      let defaults = config.defaults || {};
 
-      var afterESResp = config.afterESResp || _.noop;
-      var customInit = config.init || _.noop;
+      let afterESResp = config.afterESResp || _.noop;
+      let customInit = config.init || _.noop;
 
       // optional search source which this object configures
       self.searchSource = config.searchSource && new SearchSource();
@@ -108,7 +108,7 @@ define(function (require) {
 
         if (resp.found != null && !resp.found) throw new errors.SavedObjectNotFound(type, self.id);
 
-        var meta = resp._source.kibanaSavedObjectMeta || {};
+        let meta = resp._source.kibanaSavedObjectMeta || {};
         delete resp._source.kibanaSavedObjectMeta;
 
         if (!config.indexPattern && self._source.indexPattern) {
@@ -146,15 +146,15 @@ define(function (require) {
         if (!self.searchSource) return;
 
         // if we have a searchSource, set its state based on the searchSourceJSON field
-        var state;
+        let state;
         try {
           state = JSON.parse(searchSourceJson);
         } catch (e) {
           state = {};
         }
 
-        var oldState = self.searchSource.toJSON();
-        var fnProps = _.transform(oldState, function (dynamic, val, name) {
+        let oldState = self.searchSource.toJSON();
+        let fnProps = _.transform(oldState, function (dynamic, val, name) {
           if (_.isFunction(val)) dynamic[name] = val;
         }, {});
 
@@ -171,7 +171,7 @@ define(function (require) {
         return Promise.try(function () {
           if (self.searchSource) {
 
-            var index = config.indexPattern || self.searchSource.getOwn('index');
+            let index = config.indexPattern || self.searchSource.getOwn('index');
             if (!index) return;
             if (config.clearSavedIndexPattern) {
               self.searchSource.set('index', undefined);
@@ -195,7 +195,7 @@ define(function (require) {
        * @return {Object}
        */
       self.serialize = function () {
-        var body = {};
+        let body = {};
 
         _.forOwn(mapping, function (fieldMapping, fieldName) {
           if (self[fieldName] != null) {
@@ -222,7 +222,7 @@ define(function (require) {
        */
       self.save = function () {
 
-        var body = self.serialize();
+        let body = self.serialize();
 
         // Slugify the object id
         self.id = slugifyId(self.id);
@@ -235,7 +235,7 @@ define(function (require) {
       };
 
       self.saveSource = function (source) {
-        var finish = function (id) {
+        let finish = function (id) {
           self.id = id;
           return es.indices.refresh({
             index: kbnIndex
@@ -250,7 +250,7 @@ define(function (require) {
         .catch(function (err) {
           // record exists, confirm overwriting
           if (_.get(err, 'origError.status') === 409) {
-            var confirmMessage = 'Are you sure you want to overwrite ' + self.title + '?';
+            let confirmMessage = 'Are you sure you want to overwrite ' + self.title + '?';
 
             return safeConfirm(confirmMessage).then(
               function () {
diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js
index 596b8ca7456e2..6c12ed22c6981 100644
--- a/src/ui/public/debounce/__tests__/debounce.js
+++ b/src/ui/public/debounce/__tests__/debounce.js
@@ -1,11 +1,11 @@
 
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var debounce;
-var $timeout;
-var $timeoutSpy;
+let debounce;
+let $timeout;
+let $timeoutSpy;
 
 function init() {
   ngMock.module('kibana');
@@ -19,7 +19,7 @@ function init() {
 }
 
 describe('debounce service', function () {
-  var spy;
+  let spy;
   beforeEach(function () {
     spy = sinon.spy(function () {});
     init();
@@ -27,14 +27,14 @@ describe('debounce service', function () {
 
   describe('API', function () {
     it('should have a cancel method', function () {
-      var bouncer = debounce(function () {}, 100);
+      let bouncer = debounce(function () {}, 100);
       expect(bouncer).to.have.property('cancel');
     });
   });
 
   describe('delayed execution', function () {
     it('should delay execution', function () {
-      var bouncer = debounce(spy, 100);
+      let bouncer = debounce(spy, 100);
       bouncer();
       expect(spy.callCount).to.be(0);
       $timeout.flush();
@@ -42,7 +42,7 @@ describe('debounce service', function () {
     });
 
     it('should fire on leading edge', function () {
-      var bouncer = debounce(spy, 100, { leading: true });
+      let bouncer = debounce(spy, 100, { leading: true });
       bouncer();
       expect(spy.callCount).to.be(1);
       $timeout.flush();
@@ -50,7 +50,7 @@ describe('debounce service', function () {
     });
 
     it('should only fire on leading edge', function () {
-      var bouncer = debounce(spy, 100, { leading: true, trailing: false });
+      let bouncer = debounce(spy, 100, { leading: true, trailing: false });
       bouncer();
       expect(spy.callCount).to.be(1);
       $timeout.flush();
@@ -58,8 +58,8 @@ describe('debounce service', function () {
     });
 
     it('should reset delayed execution', function (done) {
-      var cancelSpy = sinon.spy($timeout, 'cancel');
-      var bouncer = debounce(spy, 100);
+      let cancelSpy = sinon.spy($timeout, 'cancel');
+      let bouncer = debounce(spy, 100);
       bouncer();
       setTimeout(function () {
         bouncer();
@@ -74,8 +74,8 @@ describe('debounce service', function () {
 
   describe('cancel', function () {
     it('should cancel the $timeout', function () {
-      var cancelSpy = sinon.spy($timeout, 'cancel');
-      var bouncer = debounce(spy, 100);
+      let cancelSpy = sinon.spy($timeout, 'cancel');
+      let bouncer = debounce(spy, 100);
       bouncer();
       bouncer.cancel();
       expect(cancelSpy.callCount).to.be(1);
diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js
index 0f1fe8e092f9c..a5b375099aa6c 100644
--- a/src/ui/public/debounce/debounce.js
+++ b/src/ui/public/debounce/debounce.js
@@ -2,15 +2,15 @@
 // borrowed heavily from https://github.com/shahata/angular-debounce
 
 define(function (require) {
-  var _ = require('lodash');
-  var module = require('ui/modules').get('kibana');
+  let _ = require('lodash');
+  let module = require('ui/modules').get('kibana');
 
   module.service('debounce', ['$timeout', function ($timeout) {
     return function (func, wait, options) {
-      var timeout;
-      var args;
-      var self;
-      var result;
+      let timeout;
+      let args;
+      let self;
+      let result;
       options = _.defaults(options || {}, {
         leading: false,
         trailing: true
@@ -20,14 +20,14 @@ define(function (require) {
         self = this;
         args = arguments;
 
-        var later = function () {
+        let later = function () {
           timeout = null;
           if (!options.leading || options.trailing) {
             result = func.apply(self, args);
           }
         };
 
-        var callNow = options.leading && !timeout;
+        let callNow = options.leading && !timeout;
 
         if (timeout) {
           $timeout.cancel(timeout);
diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
index 893ac280e347a..4d79e96a5aa45 100644
--- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js
+++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
@@ -1,22 +1,22 @@
 
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/directives/auto_select_if_only_one');
 
 describe('Auto-select if only one directive', function () {
-  var $compile;
-  var $rootScope;
-  var zeroOptions = [];
-  var oneOption = [{label: 'foo'}];
-  var multiOptions = [{label: 'foo'}, {label: 'bar'}];
+  let $compile;
+  let $rootScope;
+  let zeroOptions = [];
+  let oneOption = [{label: 'foo'}];
+  let multiOptions = [{label: 'foo'}, {label: 'bar'}];
 
   beforeEach(ngMock.module('kibana'));
 
   beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
     $compile = _$compile_;
     $rootScope = _$rootScope_;
-    var html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
+    let html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
     $compile(html)($rootScope);
     $rootScope.value = null;
   }));
@@ -41,7 +41,7 @@ describe('Auto-select if only one directive', function () {
 
   it('should still auto select if the collection contains 2 items but is filtered to 1', function () {
     $rootScope.options = multiOptions;
-    var html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
+    let html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
     'auto-select-if-only-one="options | filter:{label:\'bar\'}"></select>';
     $compile(html)($rootScope);
     $rootScope.value = null;
diff --git a/src/ui/public/directives/__tests__/config.js b/src/ui/public/directives/__tests__/config.js
index ba587e6d3ae9b..b0c5d39c2fdb6 100644
--- a/src/ui/public/directives/__tests__/config.js
+++ b/src/ui/public/directives/__tests__/config.js
@@ -1,14 +1,14 @@
-var ngMock = require('ngMock');
-var $ = require('jquery');
-var assign = require('lodash').assign;
-var expect = require('expect.js');
+let ngMock = require('ngMock');
+let $ = require('jquery');
+let assign = require('lodash').assign;
+let expect = require('expect.js');
 
 describe('Config Directive', function () {
 
-  var build = function () {};
+  let build = function () {};
 
   beforeEach(ngMock.module('kibana', function ($compileProvider) {
-    var renderCount = 0;
+    let renderCount = 0;
     $compileProvider.directive('renderCounter', function () {
       return {
         link: function ($scope, $el) {
@@ -21,8 +21,8 @@ describe('Config Directive', function () {
   beforeEach(ngMock.inject(function ($compile, $rootScope) {
 
     build = function (attrs, scopeVars) {
-      var $el = $('<config>').attr(attrs);
-      var $scope = $rootScope.$new();
+      let $el = $('<config>').attr(attrs);
+      let $scope = $rootScope.$new();
       assign($scope, scopeVars || {});
       $compile($el)($scope);
       $scope.$digest();
@@ -32,12 +32,12 @@ describe('Config Directive', function () {
   }));
 
   it('renders it\'s config template', function () {
-    var $config = build({ 'config-template': '"<uniqel></uniqel>"' });
+    let $config = build({ 'config-template': '"<uniqel></uniqel>"' });
     expect($config.find('uniqel').size()).to.be(1);
   });
 
   it('exposes an object a config object using it\'s name', function () {
-    var $config = build(
+    let $config = build(
       {
         'config-template': '"<uniqel>{{ controller.name }}</uniqel>"',
         'config-object': 'controller',
@@ -53,7 +53,7 @@ describe('Config Directive', function () {
   });
 
   it('only renders the config-template once', function () {
-    var $config = build({ 'config-template': '"<div render-counter></div>"' });
+    let $config = build({ 'config-template': '"<div render-counter></div>"' });
     expect($config.find('[render-counter]').text()).to.be('1');
   });
 });
diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js
index 90b464db9759b..8f104db3613e9 100644
--- a/src/ui/public/directives/__tests__/confirm-click.js
+++ b/src/ui/public/directives/__tests__/confirm-click.js
@@ -1,19 +1,19 @@
-var angular = require('angular');
-var $ = require('jquery');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let $ = require('jquery');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/directives/confirm_click');
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
-var init = function (text) {
+let init = function (text) {
   // Load the application
   ngMock.module('kibana');
 
@@ -47,7 +47,7 @@ describe('confirmClick directive', function () {
 
 
   describe('event handlers', function () {
-    var events;
+    let events;
 
     beforeEach(function () {
       init();
@@ -71,7 +71,7 @@ describe('confirmClick directive', function () {
 
 
   describe('confirmed', function () {
-    var confirmed;
+    let confirmed;
 
     beforeEach(function () {
       init();
@@ -98,7 +98,7 @@ describe('confirmClick directive', function () {
   });
 
   describe('not confirmed', function () {
-    var confirmed;
+    let confirmed;
 
     beforeEach(function () {
       init();
diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js
index 31c05c7409085..310f4f8a5badc 100644
--- a/src/ui/public/directives/__tests__/css_truncate.js
+++ b/src/ui/public/directives/__tests__/css_truncate.js
@@ -1,16 +1,16 @@
-var angular = require('angular');
-var $ = require('jquery');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let $ = require('jquery');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixedScroll.js
index 357cb3e9800d8..431ba3f041738 100644
--- a/src/ui/public/directives/__tests__/fixedScroll.js
+++ b/src/ui/public/directives/__tests__/fixedScroll.js
@@ -1,15 +1,15 @@
 
 require('ui/fixedScroll');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('FixedScroll directive', function () {
-  var $ = require('jquery');
-  var sinon = require('auto-release-sinon');
-  var Promise = require('bluebird');
+  let $ = require('jquery');
+  let sinon = require('auto-release-sinon');
+  let Promise = require('bluebird');
 
-  var compile;
-  var trash = [];
+  let compile;
+  let trash = [];
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($compile, $rootScope) {
@@ -19,7 +19,7 @@ describe('FixedScroll directive', function () {
 
       // since the directive works at the sibling level we create a
       // parent for everything to happen in
-      var $parent = $('<div>').css({
+      let $parent = $('<div>').css({
         position: 'fixed',
         top: 0,
         left: 0,
@@ -30,12 +30,12 @@ describe('FixedScroll directive', function () {
       $parent.appendTo(document.body);
       trash.push($parent);
 
-      var $el = $('<div fixed-scroll></div>').css({
+      let $el = $('<div fixed-scroll></div>').css({
         'overflow-x': 'auto',
         'width': $parent.width()
       }).appendTo($parent);
 
-      var $content = $('<div>').css({
+      let $content = $('<div>').css({
         width: $parent.width() * ratioX,
         height: $parent.height() * ratioY
       }).appendTo($el);
@@ -59,7 +59,7 @@ describe('FixedScroll directive', function () {
   });
 
   it('does nothing when not needed', function () {
-    var els = compile(0.5, 1.5);
+    let els = compile(0.5, 1.5);
     expect(els.$scroller).to.have.length(0);
 
     els = compile(1.5, 0.5);
@@ -67,26 +67,26 @@ describe('FixedScroll directive', function () {
   });
 
   it('attaches a scroller below the element when the content is larger then the container', function () {
-    var els = compile(1.5);
+    let els = compile(1.5);
     expect(els.$scroller).to.have.length(1);
   });
 
   it('copies the width of the container', function () {
-    var els = compile(1.5);
+    let els = compile(1.5);
     expect(els.$scroller.width()).to.be(els.$container.width());
   });
 
   it('mimics the scrollWidth of the element', function () {
-    var els = compile(1.5);
+    let els = compile(1.5);
     expect(els.$scroller.prop('scrollWidth')).to.be(els.$container.prop('scrollWidth'));
   });
 
   describe('scroll event handling / tug of war prevention', function () {
     it('listens when needed, unlistens when not needed', function () {
-      var on = sinon.spy($.fn, 'on');
-      var off = sinon.spy($.fn, 'off');
+      let on = sinon.spy($.fn, 'on');
+      let off = sinon.spy($.fn, 'off');
 
-      var els = compile(1.5);
+      let els = compile(1.5);
       expect(on.callCount).to.be(2);
       checkThisVals('$.fn.on', on);
 
@@ -112,10 +112,10 @@ describe('FixedScroll directive', function () {
       { from: '$scroller', to: '$container' }
     ].forEach(function (names) {
       describe('scroll events ' + JSON.stringify(names), function () {
-        var spy;
-        var els;
-        var $from;
-        var $to;
+        let spy;
+        let els;
+        let $from;
+        let $to;
 
         beforeEach(function () {
           spy = sinon.spy($.fn, 'scrollLeft');
@@ -130,12 +130,12 @@ describe('FixedScroll directive', function () {
           expect(spy.callCount).to.be(2);
 
           // first call should read the scrollLeft from the $container
-          var firstCall = spy.getCall(0);
+          let firstCall = spy.getCall(0);
           expect(firstCall.thisValue.is($from)).to.be(true);
           expect(firstCall.args).to.eql([]);
 
           // second call should be setting the scrollLeft on the $scroller
-          var secondCall = spy.getCall(1);
+          let secondCall = spy.getCall(1);
           expect(secondCall.thisValue.is($to)).to.be(true);
           expect(secondCall.args).to.eql([firstCall.returnValue]);
         });
diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js
index ce852af58d25e..f005f0c842429 100644
--- a/src/ui/public/directives/__tests__/inequality.js
+++ b/src/ui/public/directives/__tests__/inequality.js
@@ -1,12 +1,12 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/directives/inequality');
 
 describe('greater_than model validator directive', function () {
-  var $compile;
-  var $rootScope;
-  var html;
+  let $compile;
+  let $rootScope;
+  let html;
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('greater_than model validator directive', function () {
 
   // no value is the same as 0
   describe('without value', function () {
-    var element;
+    let element;
     beforeEach(function () {
       html = '<input type="text" ng-model="value" greater-than />';
       element = $compile(html)($rootScope);
@@ -44,7 +44,7 @@ describe('greater_than model validator directive', function () {
 
   [0, 1, 10, 42, -12].forEach(function (num) {
     describe('with value ' + num, function () {
-      var element;
+      let element;
       beforeEach(function () {
         html = '<input type="text" ng-model="value" greater-than="' + num + '" />';
         element = $compile(html)($rootScope);
diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js
index a291a0b9c8a53..8955454b016d0 100644
--- a/src/ui/public/directives/__tests__/input_focus.js
+++ b/src/ui/public/directives/__tests__/input_focus.js
@@ -1,18 +1,18 @@
-var angular = require('angular');
-var $ = require('jquery');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let $ = require('jquery');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/directives/input_focus');
 
 describe('Input focus directive', function () {
-  var $compile;
-  var $rootScope;
-  var $timeout;
-  var element;
-  var $el;
-  var selectedEl;
-  var selectedText;
-  var inputValue = 'Input Text Value';
+  let $compile;
+  let $rootScope;
+  let $timeout;
+  let element;
+  let $el;
+  let selectedEl;
+  let selectedText;
+  let inputValue = 'Input Text Value';
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
diff --git a/src/ui/public/directives/__tests__/input_whole_number.js b/src/ui/public/directives/__tests__/input_whole_number.js
index f55831152e1ae..a69389a2f5c8d 100644
--- a/src/ui/public/directives/__tests__/input_whole_number.js
+++ b/src/ui/public/directives/__tests__/input_whole_number.js
@@ -1,12 +1,12 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/directives/input_whole_number');
 
 describe('Whole number input directive', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input type="text" ng-model="value" input-whole-number />';
+  let $compile;
+  let $rootScope;
+  let html = '<input type="text" ng-model="value" input-whole-number />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -16,7 +16,7 @@ describe('Whole number input directive', function () {
   }));
 
   it('should allow whole numbers', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '123';
     $rootScope.$digest();
@@ -32,7 +32,7 @@ describe('Whole number input directive', function () {
   });
 
   it('should disallow numbers with decimals', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '123.0';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js
index 28def76b46bf7..4bf3920c85e9e 100644
--- a/src/ui/public/directives/__tests__/json_input.js
+++ b/src/ui/public/directives/__tests__/json_input.js
@@ -1,14 +1,14 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/directives/json_input');
 
 describe('JSON input validation', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input ng-model="value" json-input require-keys=true />';
-  var element;
+  let $compile;
+  let $rootScope;
+  let html = '<input ng-model="value" json-input require-keys=true />';
+  let element;
 
   beforeEach(ngMock.module('kibana'));
 
@@ -28,8 +28,8 @@ describe('JSON input validation', function () {
   });
 
   it('should be able to not require keys', function () {
-    var html = '<input ng-model="value" json-input require-keys=false />';
-    var element = $compile(html)($rootScope);
+    let html = '<input ng-model="value" json-input require-keys=false />';
+    let element = $compile(html)($rootScope);
 
     element.val('{}');
     element.trigger('input');
diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js
index 3f3bc12fe9b06..799cd7c8ce38a 100644
--- a/src/ui/public/directives/__tests__/parse_query.js
+++ b/src/ui/public/directives/__tests__/parse_query.js
@@ -1,26 +1,26 @@
-var angular = require('angular');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 // Load the kibana app dependencies.
 require('ui/parse_query');
 
-var $rootScope;
-var $timeout;
-var $compile;
-var Promise;
-var Private;
-var config;
-var $elemScope;
-var $elem;
-
-var cycleIndex = 0;
-var markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
-var fromUser;
-var toUser = require('ui/parse_query/lib/to_user');
-
-var init = function () {
+let $rootScope;
+let $timeout;
+let $compile;
+let Promise;
+let Private;
+let config;
+let $elemScope;
+let $elem;
+
+let cycleIndex = 0;
+let markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
+let fromUser;
+let toUser = require('ui/parse_query/lib/to_user');
+
+let init = function () {
   // Load the application
   ngMock.module('kibana');
 
@@ -40,7 +40,7 @@ var init = function () {
   });
 };
 
-var compile = function () {
+let compile = function () {
   $rootScope.mockModel = 'cycle' + cycleIndex++;
   $rootScope.mockQueryInput = undefined;
 
@@ -101,7 +101,7 @@ describe('parse-query directive', function () {
 
   describe('model presentation formatter', function () {
     it('should present undefined as empty string', function () {
-      var notDefined;
+      let notDefined;
       expect(toUser(notDefined)).to.be('');
     });
 
diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js
index 3bbde6a37af68..6f561b4cf2d55 100644
--- a/src/ui/public/directives/__tests__/spinner.js
+++ b/src/ui/public/directives/__tests__/spinner.js
@@ -1,17 +1,17 @@
-var angular = require('angular');
-var $ = require('jquery');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let $ = require('jquery');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
-var init = function () {
+let init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
index 590c6604a5753..65c8293707336 100644
--- a/src/ui/public/directives/__tests__/timepicker.js
+++ b/src/ui/public/directives/__tests__/timepicker.js
@@ -1,10 +1,10 @@
-var angular = require('angular');
-var moment = require('moment');
-var expect = require('expect.js');
-var _ = require('lodash');
-var $ = require('jquery');
-var sinon = require('auto-release-sinon');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let moment = require('moment');
+let expect = require('expect.js');
+let _ = require('lodash');
+let $ = require('jquery');
+let sinon = require('auto-release-sinon');
+let ngMock = require('ngMock');
 
 require('plugins/kibana/visualize/index');
 require('plugins/kibana/dashboard/index');
@@ -12,15 +12,15 @@ require('plugins/kibana/dashboard/index');
 // TODO: This should not be needed, timefilter is only included here, it should move
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
-var anchor = '2014-01-01T06:06:06.666Z';
-var clock;
+let $elem;
+let anchor = '2014-01-01T06:06:06.666Z';
+let clock;
 
-var init = function () {
+let init = function () {
   // Load the application
   ngMock.module('kibana');
 
@@ -34,7 +34,7 @@ var init = function () {
     $parentScope = $rootScope;
 
     // Add some parameters to it
-    var timefilter = {
+    let timefilter = {
       time : {
         from: moment().subtract(15, 'minutes'),
         to: moment(),
@@ -85,7 +85,7 @@ describe('timepicker directive', function () {
   });
 
   describe('refresh interval', function () {
-    var $courier;
+    let $courier;
     beforeEach(function () {
       init();
       ngMock.inject(function (courier, $rootScope) {
@@ -174,7 +174,7 @@ describe('timepicker directive', function () {
       expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick');
 
       // Each of the 3 modes
-      var modes = ['absolute', 'relative', 'quick'];
+      let modes = ['absolute', 'relative', 'quick'];
       _.each(modes, function (mode) {
         $scope.setMode(mode);
         $scope.$digest();
@@ -215,7 +215,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a preview of the "from" input', function (done) {
-      var preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
+      let preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
       expect(preview.text()).to.be(moment().subtract(15, 'minutes').format($scope.format));
       done();
     });
@@ -226,13 +226,13 @@ describe('timepicker directive', function () {
     });
 
     it('has a submit handler', function (done) {
-      var form = $elem.find('form[ng-submit="applyRelative()"]');
+      let form = $elem.find('form[ng-submit="applyRelative()"]');
       expect(form.length).to.be(1);
       done();
     });
 
     it('disables the submit button if the form is invalid', function (done) {
-      var button;
+      let button;
       button = $elem.find('button[disabled]');
       expect(button.length).to.be(0);
 
@@ -247,7 +247,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a dropdown bound to relative.unit that contains all of the intervals', function (done) {
-      var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+      let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
       expect(select.length).to.be(1);
       expect(select.find('option').length).to.be(7);
 
@@ -259,7 +259,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a checkbox that is checked when rounding is enabled', function (done) {
-      var checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
+      let checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
       expect(checkbox.length).to.be(1);
 
       // Rounding is disabled by default
@@ -335,8 +335,8 @@ describe('timepicker directive', function () {
     });
 
     it('updates the input fields when the scope variables are changed', function (done) {
-      var input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
-      var select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+      let input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
+      let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
 
       $scope.relative.count = 5;
       $scope.$digest();
@@ -359,7 +359,7 @@ describe('timepicker directive', function () {
 
   describe('absolute mode', function () {
 
-    var inputs;
+    let inputs;
 
     beforeEach(function () {
       init();
diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js
index 071a5743fe539..bd09e09befdd3 100644
--- a/src/ui/public/directives/__tests__/truncate.js
+++ b/src/ui/public/directives/__tests__/truncate.js
@@ -1,17 +1,17 @@
-var angular = require('angular');
-var $ = require('jquery');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let $ = require('jquery');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 
-var $parentScope;
+let $parentScope;
 
-var $scope;
+let $scope;
 
-var $elem;
+let $elem;
 
-var init = function (text) {
+let init = function (text) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js
index a2a666015be6a..331e9300ce41b 100644
--- a/src/ui/public/directives/__tests__/typeahead.js
+++ b/src/ui/public/directives/__tests__/typeahead.js
@@ -1,28 +1,28 @@
-var angular = require('angular');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/typeahead');
 
 // TODO: This should not be needed, timefilter is only included here, it should move
 require('plugins/kibana/discover/index');
 
-var typeaheadHistoryCount = 10;
-var typeaheadName = 'unittest';
-var $parentScope;
-var $typeaheadScope;
-var $elem;
-var $typeaheadInputScope;
-var typeaheadCtrl;
-var PersistedLog;
+let typeaheadHistoryCount = 10;
+let typeaheadName = 'unittest';
+let $parentScope;
+let $typeaheadScope;
+let $elem;
+let $typeaheadInputScope;
+let typeaheadCtrl;
+let PersistedLog;
 
-var markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
+let markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
   '<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +
   '<kbn-typeahead-items></kbn-typeahead-items>' +
   '</div>';
-var typeaheadItems = ['abc', 'def', 'ghi'];
+let typeaheadItems = ['abc', 'def', 'ghi'];
 
-var init = function () {
+let init = function () {
   // Load the application
   ngMock.module('kibana');
 
@@ -64,7 +64,7 @@ var init = function () {
 describe('typeahead directive', function () {
   describe('typeahead requirements', function () {
     describe('missing input', function () {
-      var goodMarkup = markup;
+      let goodMarkup = markup;
 
       before(function () {
         markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
@@ -99,9 +99,9 @@ describe('typeahead directive', function () {
       });
 
       it('should not save empty entries', function () {
-        var entries = typeaheadItems.slice(0);
+        let entries = typeaheadItems.slice(0);
         entries.push('', 'jkl');
-        for (var i = 0; i < entries.length; i++) {
+        for (let i = 0; i < entries.length; i++) {
           $typeaheadScope.inputModel.$setViewValue(entries[i]);
           typeaheadCtrl.persistEntry();
         }
@@ -129,14 +129,14 @@ describe('typeahead directive', function () {
       });
 
       it('should order fitlered results', function () {
-        var entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
-        var allEntries = typeaheadItems.concat(entries);
-        var startMatches = allEntries.filter(function (item) {
+        let entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
+        let allEntries = typeaheadItems.concat(entries);
+        let startMatches = allEntries.filter(function (item) {
           return /^a/.test(item);
         });
         typeaheadCtrl.history.add.returns(allEntries);
 
-        for (var i = 0; i < entries.length; i++) {
+        for (let i = 0; i < entries.length; i++) {
           $typeaheadScope.inputModel.$setViewValue(entries[i]);
           typeaheadCtrl.persistEntry();
         }
@@ -144,7 +144,7 @@ describe('typeahead directive', function () {
         typeaheadCtrl.filterItemsByQuery('a');
 
         expect($typeaheadScope.filteredItems).to.contain('phantogram');
-        var nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
+        let nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
 
         startMatches.forEach(function (item) {
           expect($typeaheadScope.filteredItems).to.contain(item);
diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js
index 63572114b7eb2..6b37b972907ce 100644
--- a/src/ui/public/directives/__tests__/validate_cidr_mask.js
+++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/directives/validate_cidr_mask');
 
 describe('Validate CIDR mask directive', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input type="text" ng-model="value" validate-cidr-mask />';
+  let $compile;
+  let $rootScope;
+  let html = '<input type="text" ng-model="value" validate-cidr-mask />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('Validate CIDR mask directive', function () {
   }));
 
   it('should allow empty input', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
@@ -33,7 +33,7 @@ describe('Validate CIDR mask directive', function () {
   });
 
   it('should allow valid CIDR masks', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '0.0.0.0/1';
     $rootScope.$digest();
@@ -53,7 +53,7 @@ describe('Validate CIDR mask directive', function () {
   });
 
   it('should disallow invalid CIDR masks', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js
index 5514ef2dd8666..fdd3805bcf984 100644
--- a/src/ui/public/directives/__tests__/validate_date_math.js
+++ b/src/ui/public/directives/__tests__/validate_date_math.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/directives/validate_date_math');
 
 describe('Validate date math directive', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input type="text" ng-model="value" validate-date-math />';
+  let $compile;
+  let $rootScope;
+  let html = '<input type="text" ng-model="value" validate-date-math />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('Validate date math directive', function () {
   }));
 
   it('should allow valid date math', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = 'now';
     $rootScope.$digest();
@@ -41,7 +41,7 @@ describe('Validate date math directive', function () {
   });
 
   it('should disallow invalid date math', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
@@ -61,7 +61,7 @@ describe('Validate date math directive', function () {
   });
 
   it('should allow empty values', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js
index 50a00f3561947..d658b1b03a9a8 100644
--- a/src/ui/public/directives/__tests__/validate_index_name.js
+++ b/src/ui/public/directives/__tests__/validate_index_name.js
@@ -1,14 +1,14 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 // Load the kibana app dependencies.
 require('ui/directives/validate_index_name');
 
 describe('Validate index name directive', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input type="text" ng-model="indexName" validate-index-name />';
+  let $compile;
+  let $rootScope;
+  let html = '<input type="text" ng-model="indexName" validate-index-name />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -19,12 +19,12 @@ describe('Validate index name directive', function () {
 
   function checkPattern(input) {
     $rootScope.indexName = input;
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
     $rootScope.$digest();
     return element;
   }
 
-  var badPatterns = [
+  let badPatterns = [
     null,
     undefined,
     '',
@@ -41,7 +41,7 @@ describe('Validate index name directive', function () {
     'foo,bar',
   ];
 
-  var goodPatterns = [
+  let goodPatterns = [
     '...',
     'foo',
     'foo.bar',
@@ -53,7 +53,7 @@ describe('Validate index name directive', function () {
 
   badPatterns.forEach(function (pattern) {
     it('should not accept index pattern: ' + pattern, function () {
-      var element = checkPattern(pattern);
+      let element = checkPattern(pattern);
       expect(element.hasClass('ng-invalid')).to.be(true);
       expect(element.hasClass('ng-valid')).to.not.be(true);
     });
@@ -61,7 +61,7 @@ describe('Validate index name directive', function () {
 
   goodPatterns.forEach(function (pattern) {
     it('should accept index pattern: ' + pattern, function () {
-      var element = checkPattern(pattern);
+      let element = checkPattern(pattern);
       expect(element.hasClass('ng-invalid')).to.not.be(true);
       expect(element.hasClass('ng-valid')).to.be(true);
     });
diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js
index 36fa6330b811d..018ba99ce08ff 100644
--- a/src/ui/public/directives/__tests__/validate_ip.js
+++ b/src/ui/public/directives/__tests__/validate_ip.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/directives/validate_ip');
 
 describe('Validate IP directive', function () {
-  var $compile;
-  var $rootScope;
-  var html = '<input type="text" ng-model="value" validate-ip />';
+  let $compile;
+  let $rootScope;
+  let html = '<input type="text" ng-model="value" validate-ip />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('Validate IP directive', function () {
   }));
 
   it('should allow empty input', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
@@ -33,7 +33,7 @@ describe('Validate IP directive', function () {
   });
 
   it('should allow valid IP addresses', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = '0.0.0.0';
     $rootScope.$digest();
@@ -53,7 +53,7 @@ describe('Validate IP directive', function () {
   });
 
   it('should disallow invalid IP addresses', function () {
-    var element = $compile(html)($rootScope);
+    let element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js
index 83c99ab2a323e..e7c217895fc1e 100644
--- a/src/ui/public/directives/__tests__/validate_json.js
+++ b/src/ui/public/directives/__tests__/validate_json.js
@@ -1,30 +1,30 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 // Load the kibana app dependencies.
 require('ui/directives/validate_json');
 
-var $parentScope;
-var $elemScope;
-var $elem;
-var mockScope = '';
+let $parentScope;
+let $elemScope;
+let $elem;
+let mockScope = '';
 
-var input = {
+let input = {
   valid: '{ "test": "json input" }',
   invalid: 'strings are not json'
 };
 
-var markup = {
+let markup = {
   textarea: '<textarea ng-model="mockModel" validate-json></textarea>',
   input: '<input type="text" ng-model="mockModel" validate-json>'
 };
 
-var init = function (type) {
+let init = function (type) {
   // Load the application
   ngMock.module('kibana');
   type = type || 'input';
-  var elMarkup = markup[type];
+  let elMarkup = markup[type];
 
   // Create the scope
   ngMock.inject(function ($injector, $rootScope, $compile) {
@@ -39,7 +39,7 @@ var init = function (type) {
 };
 
 describe('validate-json directive', function () {
-  var checkValid = function (inputVal, className) {
+  let checkValid = function (inputVal, className) {
     $parentScope.mockModel = inputVal;
     $elem.scope().$digest();
     expect($elem.hasClass(className)).to.be(true);
diff --git a/src/ui/public/directives/auto_select_if_only_one.js b/src/ui/public/directives/auto_select_if_only_one.js
index f0b62d32c96ff..0e46737d41284 100644
--- a/src/ui/public/directives/auto_select_if_only_one.js
+++ b/src/ui/public/directives/auto_select_if_only_one.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.directive('autoSelectIfOnlyOne', function ($parse) {
     return {
@@ -7,7 +7,7 @@ define(function (require) {
       require: 'ngModel',
       link: function (scope, element, attributes, ngModelCtrl) {
         attributes.$observe('autoSelectIfOnlyOne', function (result) {
-          var options = $parse(result)(scope);
+          let options = $parse(result)(scope);
           if (options && options.length === 1) {
             ngModelCtrl.$setViewValue(options[0]);
             ngModelCtrl.$render();
diff --git a/src/ui/public/directives/click_focus.js b/src/ui/public/directives/click_focus.js
index d996664e069f4..e005afd2cf97b 100644
--- a/src/ui/public/directives/click_focus.js
+++ b/src/ui/public/directives/click_focus.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let module = require('ui/modules').get('kibana');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
   module.directive('clickFocus', function () {
     return {
@@ -11,7 +11,7 @@ define(function (require) {
       restrict: 'A',
       link: function ($scope, $elem) {
         function handler() {
-          var focusElem = $.find('input[name=' + $scope.clickFocus + ']');
+          let focusElem = $.find('input[name=' + $scope.clickFocus + ']');
           if (focusElem[0]) focusElem[0].focus();
         }
 
diff --git a/src/ui/public/directives/config.js b/src/ui/public/directives/config.js
index a8f69b28ca5e7..44ae5a102a3e7 100644
--- a/src/ui/public/directives/config.js
+++ b/src/ui/public/directives/config.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   require('ui/watch_multi');
-  var ConfigTemplate = require('ui/ConfigTemplate');
-  var angular = require('angular');
-  var module = require('ui/modules').get('kibana');
+  let ConfigTemplate = require('ui/ConfigTemplate');
+  let angular = require('angular');
+  let module = require('ui/modules').get('kibana');
 
   require('ui/directives/input_focus');
 
@@ -26,13 +26,13 @@ define(function (require) {
         configObject: '='
       },
       link: function ($scope, element, attr) {
-        var tmpScope = $scope.$new();
+        let tmpScope = $scope.$new();
 
         $scope.$watch('configObject', function (newVal) {
           $scope[attr.configObject] = $scope.configObject;
         });
 
-        var wrapTmpl = function (tmpl) {
+        let wrapTmpl = function (tmpl) {
           if ($scope.configSubmit) {
             return '<form role="form" class="container-fluid" ng-submit="configSubmit()">' + tmpl + '</form>';
           } else {
@@ -44,7 +44,7 @@ define(function (require) {
           'configSubmit',
           'configTemplate.current || configTemplate'
         ], function () {
-          var tmpl = $scope.configTemplate;
+          let tmpl = $scope.configTemplate;
           if (tmpl instanceof ConfigTemplate) {
             tmpl = tmpl.toString();
           }
@@ -52,7 +52,7 @@ define(function (require) {
           tmpScope.$destroy();
           tmpScope = $scope.$new();
 
-          var html = '';
+          let html = '';
           if (tmpl) {
             html = $compile('' +
               '<div class="config" ng-show="configTemplate">' +
diff --git a/src/ui/public/directives/confirm_click.js b/src/ui/public/directives/confirm_click.js
index c4f10462948de..b2e710740cf09 100644
--- a/src/ui/public/directives/confirm_click.js
+++ b/src/ui/public/directives/confirm_click.js
@@ -6,9 +6,9 @@ define(function (require) {
       restrict: 'A',
       link: function ($scope, $elem, attrs) {
         $elem.bind('click', function () {
-          var message = attrs.confirmation || 'Are you sure?';
+          let message = attrs.confirmation || 'Are you sure?';
           if (window.confirm(message)) { // eslint-disable-line no-alert
-            var action = attrs.confirmClick;
+            let action = attrs.confirmClick;
             if (action) {
               $scope.$apply($scope.$eval(action));
             }
diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js
index 1b6afcdd2d07e..13c38b7c11b60 100644
--- a/src/ui/public/directives/css_truncate.js
+++ b/src/ui/public/directives/css_truncate.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var $ = require('jquery');
-  var _ = require('lodash');
+  let module = require('ui/modules').get('kibana');
+  let $ = require('jquery');
+  let _ = require('lodash');
 
   module.directive('cssTruncate', function ($timeout) {
     return {
diff --git a/src/ui/public/directives/field_name.js b/src/ui/public/directives/field_name.js
index 21bf398c825f1..b6fa45fb0e447 100644
--- a/src/ui/public/directives/field_name.js
+++ b/src/ui/public/directives/field_name.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
   require('ui/filters/short_dots');
 
   module.directive('fieldName', function ($compile, $rootScope, $filter) {
@@ -12,7 +12,7 @@ define(function (require) {
       },
       link: function ($scope, $el) {
 
-        var typeIcon = function (fieldType) {
+        let typeIcon = function (fieldType) {
           switch (fieldType) {
             case 'source':
               return '<i class="fa fa-file-text-o "></i>';
@@ -44,12 +44,12 @@ define(function (require) {
           'field.rowCount'
         ], function () {
 
-          var type = $scope.field ? $scope.field.type : $scope.fieldType;
-          var name = $scope.field ? $scope.field.name : $scope.fieldName;
-          var results = $scope.field ? !$scope.field.rowCount && !$scope.field.scripted : false;
-          var scripted = $scope.field ? $scope.field.scripted : false;
+          let type = $scope.field ? $scope.field.type : $scope.fieldType;
+          let name = $scope.field ? $scope.field.name : $scope.fieldName;
+          let results = $scope.field ? !$scope.field.rowCount && !$scope.field.scripted : false;
+          let scripted = $scope.field ? $scope.field.scripted : false;
 
-          var displayName = $filter('shortDots')(name);
+          let displayName = $filter('shortDots')(name);
 
           $el
             .text(displayName)
diff --git a/src/ui/public/directives/file_upload.js b/src/ui/public/directives/file_upload.js
index c9cb4a9f669bc..0bb64bc000bd9 100644
--- a/src/ui/public/directives/file_upload.js
+++ b/src/ui/public/directives/file_upload.js
@@ -1,25 +1,25 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var $ = require('jquery');
+  let module = require('ui/modules').get('kibana');
+  let $ = require('jquery');
 
   module.directive('fileUpload', function ($parse) {
     return {
       restrict: 'A',
       link: function ($scope, $elem, attrs) {
-        var onUpload = $parse(attrs.fileUpload);
+        let onUpload = $parse(attrs.fileUpload);
 
-        var $fileInput = $('<input type="file" style="opacity: 0" id="testfile" />');
+        let $fileInput = $('<input type="file" style="opacity: 0" id="testfile" />');
         $elem.after($fileInput);
 
         $fileInput.on('change', function (e) {
-          var reader = new FileReader();
+          let reader = new FileReader();
           reader.onload = function (e) {
             $scope.$apply(function () {
               onUpload($scope, {fileContents: e.target.result});
             });
           };
 
-          var target = e.srcElement || e.target;
+          let target = e.srcElement || e.target;
           if (target && target.files && target.files.length) reader.readAsText(target.files[0]);
         });
 
diff --git a/src/ui/public/directives/inequality.js b/src/ui/public/directives/inequality.js
index 68e83ed378d05..71d3b1b0df6f6 100644
--- a/src/ui/public/directives/inequality.js
+++ b/src/ui/public/directives/inequality.js
@@ -5,8 +5,8 @@ define(function (require) {
       return {
         require: 'ngModel',
         link: function ($scope, $el, $attr, ngModel) {
-          var getBound = function () { return $parse($attr[id])(); };
-          var defaultVal = {
+          let getBound = function () { return $parse($attr[id])(); };
+          let defaultVal = {
             'greaterThan': -Infinity,
             'lessThan': Infinity
           }[id];
@@ -19,8 +19,8 @@ define(function (require) {
           });
 
           function validate(val) {
-            var bound = !isNaN(getBound()) ? +getBound() : defaultVal;
-            var valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
+            let bound = !isNaN(getBound()) ? +getBound() : defaultVal;
+            let valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
             ngModel.$setValidity(id, valid);
             return val;
           }
diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js
index f079bc09729b2..52b1479634f74 100644
--- a/src/ui/public/directives/infinite_scroll.js
+++ b/src/ui/public/directives/infinite_scroll.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var $ = require('jquery');
+  let module = require('ui/modules').get('kibana');
+  let $ = require('jquery');
 
   module.directive('kbnInfiniteScroll', function () {
     return {
@@ -9,20 +9,20 @@ define(function (require) {
         more: '='
       },
       link: function ($scope, $element, attrs) {
-        var $window = $(window);
-        var checkTimer;
+        let $window = $(window);
+        let checkTimer;
 
         function onScroll() {
           if (!$scope.more) return;
 
-          var winHeight = $window.height();
-          var winBottom = winHeight + $window.scrollTop();
-          var elTop = $element.offset().top;
-          var remaining = elTop - winBottom;
+          let winHeight = $window.height();
+          let winBottom = winHeight + $window.scrollTop();
+          let elTop = $element.offset().top;
+          let remaining = elTop - winBottom;
 
           if (remaining <= winHeight * 0.50) {
             $scope[$scope.$$phase ? '$eval' : '$apply'](function () {
-              var more = $scope.more();
+              let more = $scope.more();
             });
           }
         }
diff --git a/src/ui/public/directives/info.js b/src/ui/public/directives/info.js
index a9a69f8a1482d..7e47e63155024 100644
--- a/src/ui/public/directives/info.js
+++ b/src/ui/public/directives/info.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var html = require('ui/partials/info.html');
+  let html = require('ui/partials/info.html');
 
   require('ui/modules')
     .get('kibana')
diff --git a/src/ui/public/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js
index c37aa31318cf9..77cb5669778e9 100644
--- a/src/ui/public/directives/input_datetime.js
+++ b/src/ui/public/directives/input_datetime.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var moment = require('moment');
+  let module = require('ui/modules').get('kibana');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let moment = require('moment');
 
   module.directive('inputDatetime', function () {
     return {
@@ -10,18 +10,18 @@ define(function (require) {
       require: 'ngModel',
       link: function ($scope, $elem, attrs, ngModel) {
 
-        var format = 'YYYY-MM-DD HH:mm:ss.SSS';
+        let format = 'YYYY-MM-DD HH:mm:ss.SSS';
 
         $elem.after('<div class="input-datetime-format">' + format + '</div>');
 
         // What should I make with the input from the user?
-        var fromUser = function (text) {
-          var parsed = moment(text, format);
+        let fromUser = function (text) {
+          let parsed = moment(text, format);
           return parsed.isValid() ? parsed : undefined;
         };
 
         // How should I present the data back to the user in the input field?
-        var toUser = function (datetime) {
+        let toUser = function (datetime) {
           return moment(datetime).format(format);
         };
 
diff --git a/src/ui/public/directives/input_focus.js b/src/ui/public/directives/input_focus.js
index 99cf9dd5d0854..0202e38cf144a 100644
--- a/src/ui/public/directives/input_focus.js
+++ b/src/ui/public/directives/input_focus.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.directive('inputFocus', function ($timeout) {
     return {
diff --git a/src/ui/public/directives/input_whole_number.js b/src/ui/public/directives/input_whole_number.js
index 1b77b66772ab7..a7307cd1374a0 100644
--- a/src/ui/public/directives/input_whole_number.js
+++ b/src/ui/public/directives/input_whole_number.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.directive('inputWholeNumber', function () {
     return {
diff --git a/src/ui/public/directives/json_input.js b/src/ui/public/directives/json_input.js
index a8351ed1c7fa4..48cedb5e5dece 100644
--- a/src/ui/public/directives/json_input.js
+++ b/src/ui/public/directives/json_input.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   require('ui/modules')
   .get('kibana')
@@ -15,7 +15,7 @@ define(function (require) {
         function fromJSON(value) {
           try {
             value = JSON.parse(value);
-            var validity = !scope.$eval(attrs.requireKeys) ? true : _.keys(value).length > 0;
+            let validity = !scope.$eval(attrs.requireKeys) ? true : _.keys(value).length > 0;
             ngModelCntrl.$setValidity('json', validity);
           } catch (e) {
             ngModelCntrl.$setValidity('json', false);
diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js
index 0430a2ad5e03d..8f4110a49b33b 100644
--- a/src/ui/public/directives/paginate.js
+++ b/src/ui/public/directives/paginate.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
-  var PER_PAGE_DEFAULT = 10;
+  let PER_PAGE_DEFAULT = 10;
 
   require('ui/modules').get('kibana')
   .directive('paginate', function ($parse, $compile) {
@@ -21,7 +21,7 @@ define(function (require) {
             $el.prepend($compile('<paginate-controls class="paginate-top">')($scope));
           }
 
-          var paginate = $scope.paginate;
+          let paginate = $scope.paginate;
 
           // add some getters to the controller powered by attributes
           paginate.getList = $parse(attrs.list);
@@ -41,8 +41,8 @@ define(function (require) {
       },
       controllerAs: 'paginate',
       controller: function ($scope) {
-        var self = this;
-        var ALL = 0;
+        let self = this;
+        let ALL = 0;
 
         self.sizeOptions = [
           { title: '10', value: 10 },
@@ -61,8 +61,8 @@ define(function (require) {
             self.perPageProp,
             self.otherWidthGetter
           ], function (vals, oldVals) {
-            var intChanges = vals[0] !== oldVals[0];
-            var extChanges = vals[1] !== oldVals[1];
+            let intChanges = vals[0] !== oldVals[0];
+            let extChanges = vals[1] !== oldVals[1];
 
             if (intChanges) {
               if (!setPerPage(self.perPage)) {
@@ -101,14 +101,14 @@ define(function (require) {
           $scope.pages = [];
           if (!$scope.list) return;
 
-          var perPage = _.parseInt(self.perPage);
-          var count = perPage ? Math.ceil($scope.list.length / perPage) : 1;
+          let perPage = _.parseInt(self.perPage);
+          let count = perPage ? Math.ceil($scope.list.length / perPage) : 1;
 
           _.times(count, function (i) {
-            var page;
+            let page;
 
             if (perPage) {
-              var start = perPage * i;
+              let start = perPage * i;
               page = $scope.list.slice(start, start + perPage);
             } else {
               page = $scope.list.slice(0);
@@ -143,9 +143,9 @@ define(function (require) {
 
           // setup the list of the other pages to link to
           $scope.otherPages = [];
-          var width = +self.otherWidthGetter($scope) || 5;
-          var left = page.i - Math.round((width - 1) / 2);
-          var right = left + width - 1;
+          let width = +self.otherWidthGetter($scope) || 5;
+          let left = page.i - Math.round((width - 1) / 2);
+          let right = left + width - 1;
 
           // shift neg count from left to right
           if (left < 0) {
@@ -154,14 +154,14 @@ define(function (require) {
           }
 
           // shift extra right nums to left
-          var lastI = page.count - 1;
+          let lastI = page.count - 1;
           if (right > lastI) {
             right = lastI;
             left = right - width + 1;
           }
 
-          for (var i = left; i <= right; i++) {
-            var other = $scope.pages[i];
+          for (let i = left; i <= right; i++) {
+            let other = $scope.pages[i];
 
             if (!other) continue;
 
@@ -172,7 +172,7 @@ define(function (require) {
         };
 
         function setPerPage(val) {
-          var $ppParent = $scope;
+          let $ppParent = $scope;
 
           while ($ppParent && !_.has($ppParent, self.perPageProp)) {
             $ppParent = $ppParent.$parent;
diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
index ff15fa456ed69..0706c47bf39f1 100644
--- a/src/ui/public/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var _ = require('lodash');
-  var dateMath = require('ui/utils/dateMath');
-  var moment = require('moment');
+  let module = require('ui/modules').get('kibana');
+  let _ = require('lodash');
+  let dateMath = require('ui/utils/dateMath');
+  let moment = require('moment');
 
   require('ui/timepicker/quick_ranges');
   require('ui/timepicker/time_units');
@@ -15,24 +15,24 @@ define(function (require) {
         to: '='
       },
       link: function ($scope, $elem) {
-        var dateFormat = config.get('dateFormat');
+        let dateFormat = config.get('dateFormat');
 
-        var lookupByRange = {};
+        let lookupByRange = {};
         _.each(quickRanges, function (frame) {
           lookupByRange[frame.from + ' to ' + frame.to] = frame;
         });
 
         function stringify() {
-          var text;
+          let text;
           // If both parts are date math, try to look up a reasonable string
           if ($scope.from && $scope.to && !moment.isMoment($scope.from) && !moment.isMoment($scope.to)) {
-            var tryLookup = lookupByRange[$scope.from.toString() + ' to ' + $scope.to.toString()];
+            let tryLookup = lookupByRange[$scope.from.toString() + ' to ' + $scope.to.toString()];
             if (tryLookup) {
               $elem.text(tryLookup.display);
             } else {
-              var fromParts = $scope.from.toString().split('-');
+              let fromParts = $scope.from.toString().split('-');
               if ($scope.to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
-                var rounded = fromParts[1].split('/');
+                let rounded = fromParts[1].split('/');
                 text = 'Last ' + rounded[0];
                 if (rounded[1]) {
                   text = text + ' rounded to the ' + timeUnits[rounded[1]];
@@ -49,7 +49,7 @@ define(function (require) {
         };
 
         function cantLookup() {
-          var display = {};
+          let display = {};
           _.each(['from', 'to'], function (time) {
             if (moment.isMoment($scope[time])) {
               display[time] = $scope[time].format(dateFormat);
@@ -57,7 +57,7 @@ define(function (require) {
               if ($scope[time] === 'now') {
                 display[time] = 'now';
               } else {
-                var tryParse = dateMath.parse($scope[time], time === 'to' ? true : false);
+                let tryParse = dateMath.parse($scope[time], time === 'to' ? true : false);
                 display[time] = moment.isMoment(tryParse) ? '~ ' + tryParse.fromNow() : $scope[time];
               }
             }
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
index dc29d33389083..55479a376648b 100644
--- a/src/ui/public/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -1,25 +1,25 @@
 define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var module = require('ui/modules').get('kibana');
-  var AggConfigResult = require('ui/Vis/AggConfigResult');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let module = require('ui/modules').get('kibana');
+  let AggConfigResult = require('ui/Vis/AggConfigResult');
 
   module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) {
-    var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
+    let filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
     return {
       restrict: 'A',
       link: function ($scope, $el, attr) {
         function addCell($tr, contents) {
-          var $cell = $(document.createElement('td'));
+          let $cell = $(document.createElement('td'));
 
           // TODO: It would be better to actually check the type of the field, but we don't have
           // access to it here. This may become a problem with the switch to BigNumber
           if (_.isNumeric(contents)) $cell.addClass('numeric-value');
 
-          var createAggConfigResultCell = function (aggConfigResult) {
-            var $cell = $(document.createElement('td'));
-            var $state = getAppState();
-            var clickHandler = filterBarClickHandler($state);
+          let createAggConfigResultCell = function (aggConfigResult) {
+            let $cell = $(document.createElement('td'));
+            let $state = getAppState();
+            let clickHandler = filterBarClickHandler($state);
             $cell.scope = $scope.$new();
             $cell.addClass('cell-hover');
             $cell.attr('ng-click', 'clickHandler($event)');
@@ -70,19 +70,19 @@ define(function (require) {
           attr.kbnRows,
           attr.kbnRowsMin
         ], function (vals) {
-          var rows = vals[0];
-          var min = vals[1];
+          let rows = vals[0];
+          let min = vals[1];
 
           $el.empty();
 
           if (!_.isArray(rows)) rows = [];
-          var width = rows.reduce(maxRowSize, 0);
+          let width = rows.reduce(maxRowSize, 0);
 
           if (isFinite(min) && rows.length < min) {
             // clone the rows so that we can add elements to it without upsetting the original
             rows = _.clone(rows);
             // crate the empty row which will be pushed into the row list over and over
-            var emptyRow = new Array(width);
+            let emptyRow = new Array(width);
             // fill the empty row with values
             _.times(width, function (i) { emptyRow[i] = ''; });
             // push as many empty rows into the row array as needed
@@ -90,7 +90,7 @@ define(function (require) {
           }
 
           rows.forEach(function (row) {
-            var $tr = $(document.createElement('tr')).appendTo($el);
+            let $tr = $(document.createElement('tr')).appendTo($el);
             row.forEach(function (cell) {
               addCell($tr, cell);
             });
diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
index 9167cfaa38f1a..3b2ae43a2aebd 100644
--- a/src/ui/public/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var _ = require('lodash');
-  var rison = require('ui/utils/rison');
-  var keymap = require('ui/utils/key_map');
+  let module = require('ui/modules').get('kibana');
+  let _ = require('lodash');
+  let rison = require('ui/utils/rison');
+  let keymap = require('ui/utils/key_map');
 
-  module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Private) {
+  module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Private, config) {
 
-    var services = Private(require('ui/saved_objects/saved_object_registry')).byLoaderPropertiesName;
+    let services = Private(require('ui/saved_objects/saved_object_registry')).byLoaderPropertiesName;
 
     return {
       restrict: 'E',
@@ -21,19 +21,22 @@ define(function (require) {
       template: require('ui/partials/saved_object_finder.html'),
       controllerAs: 'finder',
       controller: function ($scope, $element, $timeout) {
-        var self = this;
+        let self = this;
+
+        // The number of items to show in the list
+        $scope.perPage = config.get('savedObjects:perPage');
 
         // the text input element
-        var $input = $element.find('input[ng-model=filter]');
+        let $input = $element.find('input[ng-model=filter]');
 
         // the list that will hold the suggestions
-        var $list = $element.find('ul');
+        let $list = $element.find('ul');
 
         // the current filter string, used to check that returned results are still useful
-        var currentFilter = $scope.filter;
+        let currentFilter = $scope.filter;
 
         // the most recently entered search/filter
-        var prevSearch;
+        let prevSearch;
 
         // the list of hits, used to render display
         self.hits = [];
@@ -73,7 +76,7 @@ define(function (require) {
             $scope.userOnChoose(hit, $event);
           }
 
-          var url = self.makeUrl(hit);
+          let url = self.makeUrl(hit);
           if (!url || url === '#' || url.charAt(0) !== '#') return;
 
           $event.preventDefault();
@@ -111,7 +114,7 @@ define(function (require) {
             case 'enter':
               if (self.hitCount !== 1) return;
 
-              var hit = self.hits[0];
+              let hit = self.hits[0];
               if (!hit) return;
 
               self.onChoose(hit, $event);
@@ -184,8 +187,8 @@ define(function (require) {
             case 'enter':
               if (!self.selector.enabled) break;
 
-              var hitIndex = ((page.number - 1) * paginate.perPage) + self.selector.index;
-              var hit = self.hits[hitIndex];
+              let hitIndex = ((page.number - 1) * paginate.perPage) + self.selector.index;
+              let hit = self.hits[hitIndex];
               if (!hit) break;
 
               self.onChoose(hit, $event);
@@ -227,7 +230,7 @@ define(function (require) {
           // but ensure that we don't search for the same
           // thing twice. This is called from multiple places
           // and needs to be smart about when it actually searches
-          var filter = currentFilter;
+          let filter = currentFilter;
           if (prevSearch === filter) return;
 
           prevSearch = filter;
@@ -243,7 +246,7 @@ define(function (require) {
         }
 
         function scrollIntoView($element, snapTop) {
-          var el = $element[0];
+          let el = $element[0];
 
           if (!el) return;
 
diff --git a/src/ui/public/directives/spinner.js b/src/ui/public/directives/spinner.js
index 504cd89de8b4a..f96fb9a8935cb 100644
--- a/src/ui/public/directives/spinner.js
+++ b/src/ui/public/directives/spinner.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var html = '<div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div>';
-  var module = require('ui/modules').get('kibana');
+  let html = '<div class="bounce1"></div> <div class="bounce2"></div> <div class="bounce3"></div>';
+  let module = require('ui/modules').get('kibana');
 
   module.directive('spinner', function () {
     return {
diff --git a/src/ui/public/directives/truncated.js b/src/ui/public/directives/truncated.js
index 7ae46defff414..ef6882b77585d 100644
--- a/src/ui/public/directives/truncated.js
+++ b/src/ui/public/directives/truncated.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
-  var $ = require('jquery');
+  let module = require('ui/modules').get('kibana');
+  let $ = require('jquery');
 
   module.directive('kbnTruncated', function ($compile) {
     return {
@@ -10,14 +10,14 @@ define(function (require) {
         length: '@'
       },
       template: function ($element, attrs) {
-        var template = '<span>{{text}}</span>';
+        let template = '<span>{{text}}</span>';
         template += '<span ng-if="orig.length > length"> <a ng-click="toggle()">{{action}}</a></span>';
         return template;
       },
       link: function ($scope, $element, attrs) {
 
-        var fullText = $scope.orig;
-        var truncated = fullText.substring(0, $scope.length);
+        let fullText = $scope.orig;
+        let truncated = fullText.substring(0, $scope.length);
 
         if (fullText === truncated) {
           $scope.text = fullText;
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
index 64295872a6377..c8d4e2b6838ea 100644
--- a/src/ui/public/directives/validate_cidr_mask.js
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var CidrMask = require('ui/utils/CidrMask');
+  let _ = require('lodash');
+  let CidrMask = require('ui/utils/CidrMask');
 
   require('ui/modules').get('kibana').directive('validateCidrMask', function () {
     return {
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
index 9ab572b59d60b..89e9c920d0786 100644
--- a/src/ui/public/directives/validate_date_math.js
+++ b/src/ui/public/directives/validate_date_math.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var dateMath = require('ui/utils/dateMath');
+  let _ = require('lodash');
+  let dateMath = require('ui/utils/dateMath');
 
   require('ui/modules').get('kibana').directive('validateDateMath', function () {
     return {
@@ -19,7 +19,7 @@ define(function (require) {
             return null;
           }
 
-          var moment = dateMath.parse(input);
+          let moment = dateMath.parse(input);
           ngModel.$setValidity('validDateMath', moment != null && moment.isValid());
           return input;
         }
diff --git a/src/ui/public/directives/validate_index_name.js b/src/ui/public/directives/validate_index_name.js
index 6f5248a7c4c68..84149f50b5024 100644
--- a/src/ui/public/directives/validate_index_name.js
+++ b/src/ui/public/directives/validate_index_name.js
@@ -1,6 +1,6 @@
 // See https://github.com/elastic/elasticsearch/issues/6736
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
     .get('kibana')
@@ -12,11 +12,11 @@ define(function (require) {
           'ngModel': '='
         },
         link: function ($scope, elem, attr, ngModel) {
-          var illegalCharacters = ['\\', '/', '?', '"', '<', '>', '|', ' ', ','];
-          var isValid = function (input) {
+          let illegalCharacters = ['\\', '/', '?', '"', '<', '>', '|', ' ', ','];
+          let isValid = function (input) {
             if (input == null || input === '' || input === '.' || input === '..') return false;
 
-            var match = _.find(illegalCharacters, function (character) {
+            let match = _.find(illegalCharacters, function (character) {
               return input.indexOf(character) >= 0;
             });
             return !match;
@@ -24,7 +24,7 @@ define(function (require) {
 
           // From User
           ngModel.$parsers.unshift(function (value) {
-            var valid = isValid(value);
+            let valid = isValid(value);
             ngModel.$setValidity('indexNameInput', valid);
             return valid ? value : undefined;
           });
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index 6306adaa54ae7..1049603f74c74 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var Ipv4Address = require('ui/utils/Ipv4Address');
+  let _ = require('lodash');
+  let Ipv4Address = require('ui/utils/Ipv4Address');
 
   require('ui/modules')
     .get('kibana')
diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js
index 7c429745e4500..c542eb95c3944 100644
--- a/src/ui/public/directives/validate_json.js
+++ b/src/ui/public/directives/validate_json.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.directive('validateJson', function ($compile) {
     return {
diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js
index 4ff421e86c804..edabaf924d9df 100644
--- a/src/ui/public/doc_table/__tests__/doc_table.js
+++ b/src/ui/public/doc_table/__tests__/doc_table.js
@@ -1,28 +1,28 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var $ = require('jquery');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var searchResponse = require('fixtures/search_response');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let $ = require('jquery');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let searchResponse = require('fixtures/search_response');
+let ngMock = require('ngMock');
 
 // Load the kibana app dependencies.
 require('ui/private');
 require('ui/doc_table');
 
 
-var $parentScope;
+let $parentScope;
 
 
-var $scope;
+let $scope;
 
 
-var $timeout;
+let $timeout;
 
 
-var searchSource;
+let searchSource;
 
-var init = function ($elem, props) {
+let init = function ($elem, props) {
   ngMock.inject(function ($rootScope, $compile, _$timeout_) {
     $timeout = _$timeout_;
     $parentScope = $rootScope;
@@ -40,13 +40,13 @@ var init = function ($elem, props) {
   });
 };
 
-var destroy = function () {
+let destroy = function () {
   $scope.$destroy();
   $parentScope.$destroy();
 };
 
 describe('docTable', function () {
-  var $elem;
+  let $elem;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(function () {
diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js
index 5a4cdb7259d04..956314dad3171 100644
--- a/src/ui/public/doc_table/__tests__/lib/get_sort.js
+++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js
@@ -1,8 +1,8 @@
-var getSort = require('ui/doc_table/lib/get_sort');
-var defaultSort = {time: 'desc'};
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var indexPattern;
+let getSort = require('ui/doc_table/lib/get_sort');
+let defaultSort = {time: 'desc'};
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let indexPattern;
 
 describe('docTable', function () {
   beforeEach(ngMock.module('kibana'));
diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
index 4a7a5a309d9b5..75b5a2a7e7930 100644
--- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js
+++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
@@ -1,22 +1,22 @@
-var angular = require('angular');
-var $ = require('jquery');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var getFakeRow = require('fixtures/fake_row');
+let angular = require('angular');
+let $ = require('jquery');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let getFakeRow = require('fixtures/fake_row');
 
 describe('Doc Table', function () {
   require('plugins/kibana/discover/index');
 
-  var $parentScope;
+  let $parentScope;
 
-  var $scope;
+  let $scope;
 
-  var config;
+  let config;
 
   // Stub out a minimal mapping of 4 fields
-  var mapping;
+  let mapping;
 
   beforeEach(ngMock.module('kibana', 'apps/discover'));
   beforeEach(ngMock.inject(function (_config_, $rootScope, Private) {
@@ -27,7 +27,7 @@ describe('Doc Table', function () {
   }));
 
   // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
-  var init = function ($elem, props) {
+  let init = function ($elem, props) {
     ngMock.inject(function ($compile) {
       _.assign($parentScope, props);
       $compile($elem)($parentScope);
@@ -36,23 +36,23 @@ describe('Doc Table', function () {
     });
   };
 
-  var destroy = function () {
+  let destroy = function () {
     $scope.$destroy();
     $parentScope.$destroy();
   };
 
   // For testing column removing/adding for the header and the rows
   //
-  var columnTests = function (elemType, parentElem) {
+  let columnTests = function (elemType, parentElem) {
 
     it('should create a time column if the timefield is defined', function (done) {
-      var childElems = parentElem.find(elemType);
+      let childElems = parentElem.find(elemType);
       expect(childElems.length).to.be(2);
       done();
     });
 
     it('should be able to add and remove columns', function (done) {
-      var childElems;
+      let childElems;
       // Should include a column for toggling and the time column by default
       $parentScope.columns = ['bytes'];
       parentElem.scope().$digest();
@@ -78,7 +78,7 @@ describe('Doc Table', function () {
       delete parentElem.scope().indexPattern.timeFieldName;
       parentElem.scope().$digest();
 
-      var childElems = parentElem.find(elemType);
+      let childElems = parentElem.find(elemType);
       expect(childElems.length).to.be(1);
       done();
     });
@@ -88,7 +88,7 @@ describe('Doc Table', function () {
 
   describe('kbnTableHeader', function () {
 
-    var $elem = angular.element(
+    let $elem = angular.element(
       '<thead kbn-table-header columns="columns" index-pattern="indexPattern" sort="sort"></thead>'
     );
 
@@ -119,7 +119,7 @@ describe('Doc Table', function () {
       });
 
       it('should sort asc by default, then by desc if already sorting', function (done) {
-        var fields = ['bytes', '@timestamp'];
+        let fields = ['bytes', '@timestamp'];
 
         // Should not be sorted at first
         expect($scope.sorting).to.eql(undefined);
@@ -200,7 +200,7 @@ describe('Doc Table', function () {
   });
 
   describe('kbnTableRow', function () {
-    var $elem = angular.element(
+    let $elem = angular.element(
       '<tr kbn-table-row="row" ' +
       'columns="columns" ' +
       'sorting="sorting"' +
@@ -244,7 +244,7 @@ describe('Doc Table', function () {
       });
 
       describe('expanded', function () {
-        var $details;
+        let $details;
         beforeEach(function () {
           // Open the row
           $scope.toggleRow();
@@ -269,7 +269,7 @@ describe('Doc Table', function () {
 
   describe('kbnTableRow meta', function () {
 
-    var $elem = angular.element(
+    let $elem = angular.element(
         '<tr kbn-table-row="row" ' +
         'columns="columns" ' +
         'sorting="sorting"' +
@@ -277,10 +277,10 @@ describe('Doc Table', function () {
         'index-pattern="indexPattern"' +
         '></tr>'
     );
-    var $details;
+    let $details;
 
     beforeEach(function () {
-      var row = getFakeRow(0, mapping);
+      let row = getFakeRow(0, mapping);
       mapping._id = {indexed: true, type: 'string'};
       row._source._id = 'foo';
 
@@ -311,10 +311,10 @@ describe('Doc Table', function () {
   });
 
   describe('row diffing', function () {
-    var $row;
-    var $scope;
-    var $root;
-    var $before;
+    let $row;
+    let $scope;
+    let $root;
+    let $before;
 
     beforeEach(ngMock.inject(function ($rootScope, $compile, Private) {
       $root = $rootScope;
@@ -353,7 +353,7 @@ describe('Doc Table', function () {
       $root.columns.push('bytes');
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -366,7 +366,7 @@ describe('Doc Table', function () {
       $root.columns.push('request_body');
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(5);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -384,7 +384,7 @@ describe('Doc Table', function () {
       ];
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -399,7 +399,7 @@ describe('Doc Table', function () {
       _.pull($root.columns, '_source');
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(2);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -410,14 +410,14 @@ describe('Doc Table', function () {
       $root.columns.push('@timestamp');
       $root.$apply();
 
-      var $mid = $row.find('td');
+      let $mid = $row.find('td');
       expect($mid).to.have.length(4);
 
       $root.columns.pop();
       $root.columns.pop();
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(2);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -428,7 +428,7 @@ describe('Doc Table', function () {
       $root.columns.push('@timestamp', 'bytes');
       $root.$apply();
 
-      var $mid = $row.find('td');
+      let $mid = $row.find('td');
       expect($mid).to.have.length(5);
 
       $root.columns[0] = false; // _source
@@ -436,7 +436,7 @@ describe('Doc Table', function () {
       $root.columns = $root.columns.filter(Boolean);
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(3);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -450,7 +450,7 @@ describe('Doc Table', function () {
       $root.columns.push('request_body');
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after.eq(2).text().trim()).to.match(/^bytes_formatted/);
       expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
@@ -460,13 +460,13 @@ describe('Doc Table', function () {
       $root.columns.push('bytes');
       $root.$apply();
 
-      var $mid = $row.find('td');
+      let $mid = $row.find('td');
       expect($mid).to.have.length(4);
 
       $root.columns.reverse();
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -478,13 +478,13 @@ describe('Doc Table', function () {
       $root.columns.push('bytes', 'response', '@timestamp');
       $root.$apply();
 
-      var $mid = $row.find('td');
+      let $mid = $row.find('td');
       expect($mid).to.have.length(6);
 
       $root.columns.reverse();
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -498,7 +498,7 @@ describe('Doc Table', function () {
       $root.columns.push('bytes', 'bytes', 'bytes');
       $root.$apply();
 
-      var $after = $row.find('td');
+      let $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
diff --git a/src/ui/public/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js
index 9f6de699c32c5..f1f131b7923a0 100644
--- a/src/ui/public/doc_table/components/table_header.js
+++ b/src/ui/public/doc_table/components/table_header.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
-  var module = require('ui/modules').get('app/discover');
+  let _ = require('lodash');
+  let module = require('ui/modules').get('app/discover');
 
   require('ui/filters/short_dots');
 
   module.directive('kbnTableHeader', function (shortDotsFilter) {
-    var headerHtml = require('ui/doc_table/components/table_header.html');
+    let headerHtml = require('ui/doc_table/components/table_header.html');
     return {
       restrict: 'A',
       scope: {
@@ -16,9 +16,9 @@ define(function (require) {
       template: headerHtml,
       controller: function ($scope) {
 
-        var sortableField = function (field) {
+        let sortableField = function (field) {
           if (!$scope.indexPattern) return;
-          var sortable = _.get($scope.indexPattern.fields.byName[field], 'sortable');
+          let sortable = _.get($scope.indexPattern.fields.byName[field], 'sortable');
           return sortable;
         };
 
@@ -34,22 +34,22 @@ define(function (require) {
         $scope.headerClass = function (column) {
           if (!sortableField(column)) return;
 
-          var sorting = $scope.sorting;
-          var defaultClass = ['fa', 'fa-sort-up', 'table-header-sortchange'];
+          let sorting = $scope.sorting;
+          let defaultClass = ['fa', 'fa-sort-up', 'table-header-sortchange'];
 
           if (!sorting || column !== sorting[0]) return defaultClass;
           return ['fa', sorting[1] === 'asc' ? 'fa-sort-up' : 'fa-sort-down'];
         };
 
         $scope.moveLeft = function (column) {
-          var index = _.indexOf($scope.columns, column);
+          let index = _.indexOf($scope.columns, column);
           if (index === 0) return;
 
           _.move($scope.columns, index, --index);
         };
 
         $scope.moveRight = function (column) {
-          var index = _.indexOf($scope.columns, column);
+          let index = _.indexOf($scope.columns, column);
           if (index === $scope.columns.length - 1) return;
 
           _.move($scope.columns, index, ++index);
@@ -62,9 +62,9 @@ define(function (require) {
         $scope.sort = function (column) {
           if (!column || !sortableField(column)) return;
 
-          var sorting = $scope.sorting = $scope.sorting || [];
+          let sorting = $scope.sorting = $scope.sorting || [];
 
-          var direction = sorting[1] || 'asc';
+          let direction = sorting[1] || 'asc';
           if (sorting[0] !== column) {
             direction = 'asc';
           } else {
diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js
index a3acb0f33e922..4b50b42705550 100644
--- a/src/ui/public/doc_table/components/table_row.js
+++ b/src/ui/public/doc_table/components/table_row.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var addWordBreaks = require('ui/utils/add_word_breaks');
-  var module = require('ui/modules').get('app/discover');
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let addWordBreaks = require('ui/utils/add_word_breaks');
+  let module = require('ui/modules').get('app/discover');
 
   require('ui/highlight');
   require('ui/highlight/highlight_tags');
@@ -12,7 +12,7 @@ define(function (require) {
 
 
   // guesstimate at the minimum number of chars wide cells in the table should be
-  var MIN_LINE_LENGTH = 20;
+  let MIN_LINE_LENGTH = 20;
 
   /**
    * kbnTableRow directive
@@ -23,11 +23,11 @@ define(function (require) {
    * ```
    */
   module.directive('kbnTableRow', function ($compile) {
-    var noWhiteSpace = require('ui/utils/no_white_space');
-    var openRowHtml = require('ui/doc_table/components/table_row/open.html');
-    var detailsHtml = require('ui/doc_table/components/table_row/details.html');
-    var cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html')));
-    var truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html')));
+    let noWhiteSpace = require('ui/utils/no_white_space');
+    let openRowHtml = require('ui/doc_table/components/table_row/open.html');
+    let detailsHtml = require('ui/doc_table/components/table_row/details.html');
+    let cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html')));
+    let truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html')));
 
     return {
       restrict: 'A',
@@ -41,19 +41,19 @@ define(function (require) {
         $el.after('<tr>');
         $el.empty();
 
-        var init = function () {
+        let init = function () {
           createSummaryRow($scope.row, $scope.row._id);
         };
 
         // when we compile the details, we use this $scope
-        var $detailsScope;
+        let $detailsScope;
 
         // when we compile the toggle button in the summary, we use this $scope
-        var $toggleScope;
+        let $toggleScope;
 
         // toggle display of the rows details, a full list of the fields from each row
         $scope.toggleRow = function () {
-          var $detailsTr = $el.next();
+          let $detailsTr = $el.next();
 
           $scope.open = !$scope.open;
 
@@ -90,10 +90,10 @@ define(function (require) {
 
         // create a tr element that lists the value for each *column*
         function createSummaryRow(row) {
-          var indexPattern = $scope.indexPattern;
+          let indexPattern = $scope.indexPattern;
 
           // We just create a string here because its faster.
-          var newHtmls = [
+          let newHtmls = [
             openRowHtml
           ];
 
@@ -112,18 +112,18 @@ define(function (require) {
             }));
           });
 
-          var $cells = $el.children();
+          let $cells = $el.children();
           newHtmls.forEach(function (html, i) {
-            var $cell = $cells.eq(i);
+            let $cell = $cells.eq(i);
             if ($cell.data('discover:html') === html) return;
 
-            var reuse = _.find($cells.slice(i + 1), function (cell) {
+            let reuse = _.find($cells.slice(i + 1), function (cell) {
               return $.data(cell, 'discover:html') === html;
             });
 
-            var $target = reuse ? $(reuse).detach() : $(html);
+            let $target = reuse ? $(reuse).detach() : $(html);
             $target.data('discover:html', html);
-            var $before = $cells.eq(i - 1);
+            let $before = $cells.eq(i - 1);
             if ($before.size()) {
               $before.after($target);
             } else {
@@ -151,8 +151,8 @@ define(function (require) {
          * Fill an element with the value of a field
          */
         function _displayField(row, fieldName, breakWords) {
-          var indexPattern = $scope.indexPattern;
-          var text = indexPattern.formatField(row, fieldName);
+          let indexPattern = $scope.indexPattern;
+          let text = indexPattern.formatField(row, fieldName);
 
           if (breakWords) {
             text = addWordBreaks(text, MIN_LINE_LENGTH);
diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js
index 4bebced3c9743..cba9b87d09391 100644
--- a/src/ui/public/doc_table/doc_table.js
+++ b/src/ui/public/doc_table/doc_table.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
-  var html = require('ui/doc_table/doc_table.html');
-  var getSort = require('ui/doc_table/lib/get_sort');
+  let html = require('ui/doc_table/doc_table.html');
+  let getSort = require('ui/doc_table/lib/get_sort');
 
   require('ui/doc_table/doc_table.less');
   require('ui/directives/truncated');
@@ -25,15 +25,15 @@ define(function (require) {
         filter: '=?',
       },
       link: function ($scope) {
-        var notify = new Notifier();
+        let notify = new Notifier();
         $scope.limit = 50;
         $scope.persist = {
           sorting: $scope.sorting,
           columns: $scope.columns
         };
 
-        var prereq = (function () {
-          var fns = [];
+        let prereq = (function () {
+          let fns = [];
 
           return function register(fn) {
             fns.push(fn);
@@ -59,7 +59,7 @@ define(function (require) {
         $scope.$watch('columns', function (columns) {
           if (columns.length !== 0) return;
 
-          var $state = getAppState();
+          let $state = getAppState();
           $scope.columns.push('_source');
           if ($state) $state.replace();
         });
diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js
index 14ad92645cd91..1d8a7fea158a9 100644
--- a/src/ui/public/doc_table/lib/get_sort.js
+++ b/src/ui/public/doc_table/lib/get_sort.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * Take a sorting array and make it into an object
@@ -8,9 +8,9 @@ define(function (require) {
    * @returns {object} a sort object suitable for returning to elasticsearch
    */
   function getSort(sort, indexPattern) {
-    var sortObj = {};
-    var field;
-    var direction;
+    let sortObj = {};
+    let field;
+    let direction;
 
     function isSortable(field) {
       return (indexPattern.fields.byName[field] && indexPattern.fields.byName[field].sortable);
diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js
index e24ae006d7aaa..0f8c2190b4194 100644
--- a/src/ui/public/doc_title/__tests__/doc_title.js
+++ b/src/ui/public/doc_title/__tests__/doc_title.js
@@ -1,14 +1,14 @@
 
 describe('docTitle Service', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var initialDocTitle;
-  var MAIN_TITLE = 'Kibana 4';
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let initialDocTitle;
+  let MAIN_TITLE = 'Kibana 4';
 
-  var docTitle;
-  var $rootScope;
+  let docTitle;
+  let $rootScope;
 
   beforeEach(function () {
     initialDocTitle = document.title;
@@ -35,9 +35,9 @@ describe('docTitle Service', function () {
 
   describe('setup', function () {
     it('resets the title when a route change begins', function () {
-      var spy = $rootScope.$on;
+      let spy = $rootScope.$on;
 
-      var found = spy.args.some(function (args) {
+      let found = spy.args.some(function (args) {
         return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
       });
 
@@ -60,7 +60,7 @@ describe('docTitle Service', function () {
   });
 
   describe('#change', function () {
-    var getActiveTabStub;
+    let getActiveTabStub;
 
     beforeEach(function () {
       getActiveTabStub = sinon.stub(require('ui/chrome'), 'getActiveTab');
diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js
index 85e118f90d660..b5f5e6c8a2c77 100644
--- a/src/ui/public/doc_title/doc_title.js
+++ b/src/ui/public/doc_title/doc_title.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var chrome = require('ui/chrome');
+  let _ = require('lodash');
+  let chrome = require('ui/chrome');
 
   require('ui/modules').get('kibana')
   .run(function ($rootScope, docTitle) {
@@ -11,16 +11,16 @@ define(function (require) {
     $rootScope.$watch(_.bindKey(chrome, 'getActiveTabTitle'), docTitle.update);
   })
   .service('docTitle', function ($rootScope) {
-    var baseTitle = document.title;
-    var self = this;
+    let baseTitle = document.title;
+    let self = this;
 
-    var lastChange;
+    let lastChange;
 
     function render() {
       lastChange = lastChange || [];
 
-      var parts = [lastChange[0]];
-      var activeTabTitle = chrome.getActiveTabTitle();
+      let parts = [lastChange[0]];
+      let activeTabTitle = chrome.getActiveTabTitle();
 
       if (activeTabTitle) parts.push(activeTabTitle);
 
diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
index 09e0123a24fbb..f5aebab855cef 100644
--- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js
+++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
@@ -1,10 +1,10 @@
-var angular = require('angular');
-var $ = require('jquery');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var hit = {
+let angular = require('angular');
+let $ = require('jquery');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let hit = {
   '_index': 'logstash-2014.09.09',
   '_type': 'apache',
   '_id': '61',
@@ -24,18 +24,18 @@ require('ui/private');
 require('ui/doc_viewer');
 
 
-var $parentScope;
+let $parentScope;
 
 
-var $scope;
+let $scope;
 
 
-var indexPattern;
+let indexPattern;
 
 
-var flattened;
+let flattened;
 
-var init = function ($elem, props) {
+let init = function ($elem, props) {
   ngMock.inject(function ($rootScope, $compile) {
     $parentScope = $rootScope;
     _.assign($parentScope, props);
@@ -45,13 +45,13 @@ var init = function ($elem, props) {
   });
 };
 
-var destroy = function () {
+let destroy = function () {
   $scope.$destroy();
   $parentScope.$destroy();
 };
 
 describe('docViewer', function () {
-  var $elem;
+  let $elem;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(function () {
@@ -73,7 +73,7 @@ describe('docViewer', function () {
 
   describe('Table mode', function () {
     it('should have a row for each field', function () {
-      var rows = $elem.find('tr');
+      let rows = $elem.find('tr');
       expect($elem.find('tr').length).to.be(_.keys(flattened).length);
     });
 
@@ -85,7 +85,7 @@ describe('docViewer', function () {
 
     it('should have the a value for each field', function () {
       _.each(_.keys(flattened), function (field) {
-        var cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
+        let cellValue = $elem.find('td[title="' + field + '"]').siblings().find('.doc-viewer-value').text();
 
         // This sucks, but testing the filter chain is too hairy ATM
         expect(cellValue.length).to.be.greaterThan(0);
@@ -95,7 +95,7 @@ describe('docViewer', function () {
 
     describe('filtering', function () {
       it('should apply a filter when clicking filterable fields', function () {
-        var cell = $elem.find('td[title="bytes"]').next();
+        let cell = $elem.find('td[title="bytes"]').next();
 
         cell.find('.fa-search-plus').first().click();
         expect($scope.filter.calledOnce).to.be(true);
@@ -104,7 +104,7 @@ describe('docViewer', function () {
       });
 
       it('should NOT apply a filter when clicking non-filterable fields', function () {
-        var cell = $elem.find('td[title="area"]').next();
+        let cell = $elem.find('td[title="area"]').next();
 
         cell.find('.fa-search-plus').first().click();
         expect($scope.filter.calledOnce).to.be(false);
@@ -115,21 +115,21 @@ describe('docViewer', function () {
 
     describe('warnings', function () {
       it('displays a warning about field name starting with underscore', function () {
-        var cells = $elem.find('td[title="_underscore"]').siblings();
+        let cells = $elem.find('td[title="_underscore"]').siblings();
         expect(cells.find('.doc-viewer-underscore').length).to.be(1);
         expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
         expect(cells.find('.doc-viewer-object-array').length).to.be(0);
       });
 
       it('displays a warning about missing mappings', function () {
-        var cells = $elem.find('td[title="noMapping"]').siblings();
+        let cells = $elem.find('td[title="noMapping"]').siblings();
         expect(cells.find('.doc-viewer-underscore').length).to.be(0);
         expect(cells.find('.doc-viewer-no-mapping').length).to.be(1);
         expect(cells.find('.doc-viewer-object-array').length).to.be(0);
       });
 
       it('displays a warning about objects in arrays', function () {
-        var cells = $elem.find('td[title="objectArray"]').siblings();
+        let cells = $elem.find('td[title="objectArray"]').siblings();
         expect(cells.find('.doc-viewer-underscore').length).to.be(0);
         expect(cells.find('.doc-viewer-no-mapping').length).to.be(0);
         expect(cells.find('.doc-viewer-object-array').length).to.be(1);
@@ -152,8 +152,8 @@ describe('docViewer', function () {
     });
 
     it('should contain the same code as hitJson', function () {
-      var editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
-      var code = editor.getSession().getValue();
+      let editor = window.ace.edit($elem.find('div[id="json-ace"]')[0]);
+      let code = editor.getSession().getValue();
       expect(code).to.equal($scope.hitJson);
     });
   });
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
index d1359605c846b..2378127b35bff 100644
--- a/src/ui/public/doc_viewer/doc_viewer.js
+++ b/src/ui/public/doc_viewer/doc_viewer.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
   require('ace');
 
-  var html = require('ui/doc_viewer/doc_viewer.html');
+  let html = require('ui/doc_viewer/doc_viewer.html');
   require('ui/doc_viewer/doc_viewer.less');
 
   require('ui/modules').get('kibana')
@@ -38,7 +38,7 @@ define(function (require) {
           };
 
           $scope.showArrayInObjectsWarning = function (row, field) {
-            var value = $scope.flattened[field];
+            let value = $scope.flattened[field];
             return _.isArray(value) && typeof value[0] === 'object';
           };
         }
diff --git a/src/ui/public/elastic_textarea.js b/src/ui/public/elastic_textarea.js
index 8ae6372b09c2e..e0be2b95566ae 100644
--- a/src/ui/public/elastic_textarea.js
+++ b/src/ui/public/elastic_textarea.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var NL_RE = /\n/g;
-  var events = 'keydown keypress keyup change';
+  const _ = require('lodash');
+  const NL_RE = /\n/g;
+  const events = 'keydown keypress keyup change';
 
   require('ui/modules').get('kibana')
   .directive('elasticTextarea', function () {
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
index ab7cb6c125552..98efdc613e0c2 100644
--- a/src/ui/public/errors.js
+++ b/src/ui/public/errors.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  const _ = require('lodash');
+  const angular = require('angular');
 
-  var canStack = (function () {
-    var err = new Error();
+  const canStack = (function () {
+    const err = new Error();
     return !!err.stack;
   }());
 
-  var errors = {};
+  const errors = {};
 
   // abstract error class
   function KbnError(msg, constructor) {
@@ -120,7 +120,7 @@ define(function (require) {
    * @param {String} field - the fields which contains the conflict
    */
   errors.RestrictedMapping = function RestrictedMapping(field, index) {
-    var msg = field + ' is a restricted field name';
+    let msg = field + ' is a restricted field name';
     if (index) msg += ', found it while attempting to fetch mapping for index pattern: ' + index;
 
     KbnError.call(this, msg, errors.RestrictedMapping);
@@ -166,7 +166,7 @@ define(function (require) {
   errors.SavedObjectNotFound = function SavedObjectNotFound(type, id) {
     this.savedObjectType = type;
     this.savedObjectId = id;
-    var idMsg = id ? ' (id: ' + id + ')' : '';
+    const idMsg = id ? ' (id: ' + id + ')' : '';
     KbnError.call(this,
       'Could not locate that ' + type + idMsg,
       errors.SavedObjectNotFound);
diff --git a/src/ui/public/es.js b/src/ui/public/es.js
index a3a44b7796663..bb561c0974178 100644
--- a/src/ui/public/es.js
+++ b/src/ui/public/es.js
@@ -1,17 +1,17 @@
 define(function (require) {
   require('elasticsearch-browser/elasticsearch.angular.js');
-  var _ = require('lodash');
+  const _ = require('lodash');
 
-  var es; // share the client amoungst all apps
+  let es; // share the client amoungst all apps
   require('ui/modules')
     .get('kibana', ['elasticsearch', 'kibana/config'])
-    .service('es', function (esFactory, esUrl, $q, esApiVersion) {
+    .service('es', function (esFactory, esUrl, $q, esApiVersion, esRequestTimeout) {
       if (es) return es;
 
       es = esFactory({
         host: esUrl,
         log: 'info',
-        requestTimeout: 0,
+        requestTimeout: esRequestTimeout,
         apiVersion: esApiVersion,
         plugins: [function (Client, config) {
 
diff --git a/src/ui/public/events.js b/src/ui/public/events.js
index d4133c704d3d1..bb9b287adf961 100644
--- a/src/ui/public/events.js
+++ b/src/ui/public/events.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var _ = require('lodash');
-  var Notifier = require('ui/notify/Notifier');
+  const _ = require('lodash');
+  const Notifier = require('ui/notify/notifier');
 
   return function EventsProvider(Private, Promise) {
-    var SimpleEmitter = require('ui/utils/SimpleEmitter');
-    var notify = new Notifier({ location: 'EventEmitter' });
+    const SimpleEmitter = require('ui/utils/SimpleEmitter');
+    const notify = new Notifier({ location: 'EventEmitter' });
 
     _.class(Events).inherits(SimpleEmitter);
     function Events() {
@@ -24,7 +24,7 @@ define(function (require) {
         this._listeners[name] = [];
       }
 
-      var listener = {
+      const listener = {
         handler: handler
       };
       this._listeners[name].push(listener);
@@ -76,8 +76,8 @@ define(function (require) {
      * @returns {Promise}
      */
     Events.prototype.emit = function (name) {
-      var self = this;
-      var args = _.rest(arguments);
+      const self = this;
+      const args = _.rest(arguments);
 
       if (!self._listeners[name]) {
         return self._emitChain;
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
index 90829e31de907..6c858a4156d3f 100644
--- a/src/ui/public/factories/__tests__/base_object.js
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var _ = require('lodash');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let _ = require('lodash');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/private');
 
 describe('Base Object', function () {
-  var $rootScope;
-  var BaseObject;
+  let $rootScope;
+  let BaseObject;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$rootScope_, Private) {
@@ -16,31 +16,31 @@ describe('Base Object', function () {
   }));
 
   it('should take an inital set of values', function () {
-    var baseObject = new BaseObject({ message: 'test' });
+    let baseObject = new BaseObject({ message: 'test' });
     expect(baseObject).to.have.property('message', 'test');
   });
 
   it('should serialize _attributes to RISON', function () {
-    var baseObject = new BaseObject();
+    let baseObject = new BaseObject();
     baseObject.message = 'Testing... 1234';
-    var rison = baseObject.toRISON();
+    let rison = baseObject.toRISON();
     expect(rison).to.equal('(message:\'Testing... 1234\')');
   });
 
   it('should not serialize $$attributes to RISON', function () {
-    var baseObject = new BaseObject();
+    let baseObject = new BaseObject();
     baseObject.$$attributes = { foo: 'bar' };
     baseObject.message = 'Testing... 1234';
-    var rison = baseObject.toRISON();
+    let rison = baseObject.toRISON();
     expect(rison).to.equal('(message:\'Testing... 1234\')');
   });
 
   it('should serialize _attributes for JSON', function () {
-    var baseObject = new BaseObject();
+    let baseObject = new BaseObject();
     baseObject.message = 'Testing... 1234';
     baseObject._private = 'foo';
     baseObject.$private = 'stuff';
-    var json = JSON.stringify(baseObject);
+    let json = JSON.stringify(baseObject);
     expect(json).to.equal('{"message":"Testing... 1234"}');
   });
 
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
index d0f6e773a43f9..87cb225b287b6 100644
--- a/src/ui/public/factories/__tests__/events.js
+++ b/src/ui/public/factories/__tests__/events.js
@@ -1,18 +1,18 @@
 
-var angular = require('angular');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/private');
 
 describe('Events', function () {
   require('testUtils/noDigestPromises').activateForSuite();
 
-  var $rootScope;
-  var Events;
-  var Notifier;
-  var Promise;
+  let $rootScope;
+  let Events;
+  let Notifier;
+  let Promise;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
@@ -23,8 +23,8 @@ describe('Events', function () {
   }));
 
   it('should handle on events', function () {
-    var obj = new Events();
-    var prom = obj.on('test', function (message) {
+    let obj = new Events();
+    let prom = obj.on('test', function (message) {
       expect(message).to.equal('Hello World');
     });
 
@@ -38,9 +38,9 @@ describe('Events', function () {
     function MyEventedObject() {
       MyEventedObject.Super.call(this);
     }
-    var obj = new MyEventedObject();
+    let obj = new MyEventedObject();
 
-    var prom = obj.on('test', function (message) {
+    let prom = obj.on('test', function (message) {
       expect(message).to.equal('Hello World');
     });
 
@@ -50,7 +50,7 @@ describe('Events', function () {
   });
 
   it('should clear events when off is called', function () {
-    var obj = new Events();
+    let obj = new Events();
     obj.on('test', _.noop);
     expect(obj._listeners).to.have.property('test');
     expect(obj._listeners.test).to.have.length(1);
@@ -59,9 +59,9 @@ describe('Events', function () {
   });
 
   it('should clear a specific handler when off is called for an event', function () {
-    var obj = new Events();
-    var handler1 = sinon.stub();
-    var handler2 = sinon.stub();
+    let obj = new Events();
+    let handler1 = sinon.stub();
+    let handler2 = sinon.stub();
     obj.on('test', handler1);
     obj.on('test', handler2);
     expect(obj._listeners).to.have.property('test');
@@ -75,8 +75,8 @@ describe('Events', function () {
   });
 
   it('should clear a all handlers when off is called for an event', function () {
-    var obj = new Events();
-    var handler1 = sinon.stub();
+    let obj = new Events();
+    let handler1 = sinon.stub();
     obj.on('test', handler1);
     expect(obj._listeners).to.have.property('test');
     obj.off('test');
@@ -89,11 +89,11 @@ describe('Events', function () {
   });
 
   it('should handle mulitple identical emits in the same tick', function () {
-    var obj = new Events();
-    var handler1 = sinon.stub();
+    let obj = new Events();
+    let handler1 = sinon.stub();
 
     obj.on('test', handler1);
-    var emits = [
+    let emits = [
       obj.emit('test', 'one'),
       obj.emit('test', 'two'),
       obj.emit('test', 'three')
@@ -110,9 +110,9 @@ describe('Events', function () {
   });
 
   it('should handle emits from the handler', function () {
-    var obj = new Events();
-    var secondEmit = Promise.defer();
-    var handler1 = sinon.spy(function () {
+    let obj = new Events();
+    let secondEmit = Promise.defer();
+    let handler1 = sinon.spy(function () {
       if (handler1.calledTwice) {
         return;
       }
@@ -132,12 +132,12 @@ describe('Events', function () {
   });
 
   it('should only emit to handlers registered before emit is called', function () {
-    var obj = new Events();
-    var handler1 = sinon.stub();
-    var handler2 = sinon.stub();
+    let obj = new Events();
+    let handler1 = sinon.stub();
+    let handler2 = sinon.stub();
 
     obj.on('test', handler1);
-    var emits = [
+    let emits = [
       obj.emit('test', 'one'),
       obj.emit('test', 'two'),
       obj.emit('test', 'three')
@@ -149,7 +149,7 @@ describe('Events', function () {
 
       obj.on('test', handler2);
 
-      var emits2 = [
+      let emits2 = [
         obj.emit('test', 'four'),
         obj.emit('test', 'five'),
         obj.emit('test', 'six')
@@ -164,9 +164,9 @@ describe('Events', function () {
   });
 
   it('should pass multiple arguments from the emitter', function () {
-    var obj = new Events();
-    var handler = sinon.stub();
-    var payload = [
+    let obj = new Events();
+    let handler = sinon.stub();
+    let payload = [
       'one',
       { hello: 'tests' },
       null
@@ -182,9 +182,9 @@ describe('Events', function () {
   });
 
   it('should preserve the scope of the handler', function () {
-    var obj = new Events();
-    var expected = 'some value';
-    var testValue;
+    let obj = new Events();
+    let expected = 'some value';
+    let testValue;
 
     function handler(arg1, arg2) {
       testValue = this.getVal();
@@ -199,9 +199,9 @@ describe('Events', function () {
   });
 
   it('should always emit in the same order', function () {
-    var handler = sinon.stub();
+    let handler = sinon.stub();
 
-    var obj = new Events();
+    let obj = new Events();
     obj.on('block', _.partial(handler, 'block'));
     obj.on('last', _.partial(handler, 'last'));
 
diff --git a/src/ui/public/fancy_forms/KbnFormController.js b/src/ui/public/fancy_forms/KbnFormController.js
index fea19be244844..673b551d459a2 100644
--- a/src/ui/public/fancy_forms/KbnFormController.js
+++ b/src/ui/public/fancy_forms/KbnFormController.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * Extension of Angular's FormController class
@@ -8,7 +8,7 @@ define(function (require) {
    * @param {$scope} $scope
    */
   function KbnFormController($scope, $element) {
-    var self = this;
+    let self = this;
 
     self.errorCount = function (predicate) {
       return self.$$invalidModels().length;
@@ -22,14 +22,14 @@ define(function (require) {
     };
 
     self.describeErrors = function () {
-      var count = self.softErrorCount();
+      let count = self.softErrorCount();
       return count + ' Error' + (count === 1 ? '' : 's');
     };
 
     self.$$invalidModels = function (predicate) {
       predicate = _.callback(predicate);
 
-      var invalid = [];
+      let invalid = [];
 
       _.forOwn(self.$error, function collect(models) {
         if (!models) return;
@@ -41,7 +41,7 @@ define(function (require) {
           } else {
             if (predicate(model)) {
               // prevent dups
-              var len = invalid.length;
+              let len = invalid.length;
               while (len--) if (invalid[len] === model) return;
 
               invalid.push(model);
diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
index a57dd5cf50da5..ca28ff5e3f132 100644
--- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js
+++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
@@ -1,14 +1,14 @@
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('fancy forms', function () {
-  var $el;
-  var $scope;
-  var $compile;
-  var $rootScope;
-  var ngForm;
-  var ngModel;
+  let $el;
+  let $scope;
+  let $compile;
+  let $rootScope;
+  let ngForm;
+  let ngModel;
 
   function generateEl() {
     return $('<form>').html(
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
index 99a700ecd0b52..6b10d2d9110c7 100644
--- a/src/ui/public/fancy_forms/fancy_forms.js
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
-  var KbnFormController = require('ui/fancy_forms/KbnFormController');
+  let KbnFormController = require('ui/fancy_forms/KbnFormController');
 
   require('ui/modules')
   .get('kibana')
@@ -12,16 +12,16 @@ define(function (require) {
         // directive providers are arrays
         $delegate.forEach(function (directive) {
           // get metadata about all init fns
-          var chain = [directive.controller, DecorativeController].map(function (fn) {
-            var deps = $injector.annotate(fn);
+          let chain = [directive.controller, DecorativeController].map(function (fn) {
+            let deps = $injector.annotate(fn);
             return { deps: deps, fn: _.isArray(fn) ? _.last(fn) : fn };
           });
 
           // replace the controller with one that will setup the actual controller
           directive.controller = function stub() {
-            var allDeps = _.toArray(arguments);
+            let allDeps = _.toArray(arguments);
             return chain.reduce(function (controller, link, i) {
-              var deps = allDeps.splice(0, link.deps.length);
+              let deps = allDeps.splice(0, link.deps.length);
               return link.fn.apply(controller, deps) || controller;
             }, this);
           };
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
index 9ff77b928129b..c66ea8951effb 100644
--- a/src/ui/public/field_editor/__tests__/field_editor.js
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -1,15 +1,15 @@
 describe('FieldEditor directive', function () {
-  var $ = require('jquery');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let $ = require('jquery');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var Field;
-  var StringFormat;
-  var $rootScope;
+  let Field;
+  let StringFormat;
+  let $rootScope;
 
-  var compile;
-  var $scope;
-  var $el;
+  let compile;
+  let $scope;
+  let $el;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($compile, $injector, Private) {
@@ -38,13 +38,13 @@ describe('FieldEditor directive', function () {
 
     it('exposes $scope.editor, a controller for the editor', function () {
       compile();
-      var editor = $scope.editor;
+      let editor = $scope.editor;
       expect(editor).to.be.an('object');
     });
   });
 
   describe('$scope.editor', function () {
-    var editor;
+    let editor;
 
     beforeEach(function () {
       compile();
@@ -60,8 +60,8 @@ describe('FieldEditor directive', function () {
     });
 
     describe('editor.field', function () {
-      var field;
-      var actual;
+      let field;
+      let actual;
 
       beforeEach(function () {
         field = editor.field;
@@ -78,8 +78,8 @@ describe('FieldEditor directive', function () {
       });
 
       it('reflects changes to the index patterns field', function () {
-        var a = {};
-        var b = {};
+        let a = {};
+        let b = {};
 
         actual.script = a;
         expect(field.script).to.be(a);
@@ -89,7 +89,7 @@ describe('FieldEditor directive', function () {
       });
 
       it('is fully mutable, unlike the index patterns field', function () {
-        var origName = actual.name;
+        let origName = actual.name;
         actual.name = 'john';
         expect(actual.name).to.not.be('john');
         expect(actual.name).to.be(origName);
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index f62ea74ef1e0a..64d88339fd741 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -7,11 +7,11 @@ define(function (require) {
   require('ui/modules')
   .get('kibana', ['colorpicker.module'])
   .directive('fieldEditor', function (Private, $sce) {
-    var _ = require('lodash');
-    var fieldFormats = Private(require('ui/registry/field_formats'));
-    var Field = Private(require('ui/index_patterns/_field'));
-    var scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html'));
-    var scriptingWarning = $sce.trustAsHtml(require('ui/field_editor/scripting_warning.html'));
+    let _ = require('lodash');
+    let fieldFormats = Private(require('ui/registry/field_formats'));
+    let Field = Private(require('ui/index_patterns/_field'));
+    let scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html'));
+    let scriptingWarning = $sce.trustAsHtml(require('ui/field_editor/scripting_warning.html'));
 
     return {
       restrict: 'E',
@@ -22,8 +22,8 @@ define(function (require) {
       },
       controllerAs: 'editor',
       controller: function ($scope, Notifier, kbnUrl) {
-        var self = this;
-        var notify = new Notifier({ location: 'Field Editor' });
+        let self = this;
+        let notify = new Notifier({ location: 'Field Editor' });
 
         self.scriptingInfo = scriptingInfo;
         self.scriptingWarning = scriptingWarning;
@@ -40,9 +40,9 @@ define(function (require) {
 
         self.cancel = redirectAway;
         self.save = function () {
-          var indexPattern = self.indexPattern;
-          var fields = indexPattern.fields;
-          var field = self.field.toActualField();
+          let indexPattern = self.indexPattern;
+          let fields = indexPattern.fields;
+          let field = self.field.toActualField();
 
           fields.remove({ name: field.name });
           fields.push(field);
@@ -61,8 +61,8 @@ define(function (require) {
         };
 
         self.delete = function () {
-          var indexPattern = self.indexPattern;
-          var field = self.field;
+          let indexPattern = self.indexPattern;
+          let field = self.field;
 
           indexPattern.fields.remove({ name: field.name });
           return indexPattern.save()
@@ -73,9 +73,9 @@ define(function (require) {
         };
 
         $scope.$watch('editor.selectedFormatId', function (cur, prev) {
-          var format = self.field.format;
-          var changedFormat = cur !== prev;
-          var missingFormat = cur && (!format || format.type.id !== cur);
+          let format = self.field.format;
+          let changedFormat = cur !== prev;
+          let missingFormat = cur && (!format || format.type.id !== cur);
 
           if (!changedFormat || !missingFormat) return;
 
@@ -84,15 +84,15 @@ define(function (require) {
         });
 
         $scope.$watch('editor.formatParams', function () {
-          var FieldFormat = getFieldFormatType();
+          let FieldFormat = getFieldFormatType();
           self.field.format = new FieldFormat(self.formatParams);
         }, true);
 
         // copy the defined properties of the field to a plain object
         // which is mutable, and capture the changed seperately.
         function shadowCopy(field) {
-          var changes = {};
-          var shadowProps = {
+          let changes = {};
+          let shadowProps = {
             toActualField: {
               // bring the shadow copy out of the shadows
               value: function toActualField() {
@@ -102,7 +102,7 @@ define(function (require) {
           };
 
           Object.getOwnPropertyNames(field).forEach(function (prop) {
-            var desc = Object.getOwnPropertyDescriptor(field, prop);
+            let desc = Object.getOwnPropertyDescriptor(field, prop);
             shadowProps[prop] = {
               enumerable: desc.enumerable,
               get: function () {
@@ -127,7 +127,7 @@ define(function (require) {
         }
 
         function initDefaultFormat() {
-          var def = Object.create(fieldFormats.getDefaultType(self.field.type));
+          let def = Object.create(fieldFormats.getDefaultType(self.field.type));
 
           // explicitly set to undefined to prevent inheritting the prototypes id
           def.id = undefined;
diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
index 88e7fc4ad65cd..16157d7ec0e62 100644
--- a/src/ui/public/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
   require('ui/modules')
   .get('app/settings')
@@ -13,7 +13,7 @@ define(function (require) {
       },
       controllerAs: 'editor',
       controller: function ($scope) {
-        var self = this;
+        let self = this;
 
         // bind the scope values to the controller, down with $scope.values
         $scope.editor = this;
@@ -40,7 +40,7 @@ define(function (require) {
          * @return {undefined}
          */
         $scope.$watch('editor.field.format.type', function (FieldFormat) {
-          var opts = FieldFormat && FieldFormat.editor;
+          let opts = FieldFormat && FieldFormat.editor;
 
           if (!opts) {
             delete self.$$pseudoDirective;
@@ -67,14 +67,14 @@ define(function (require) {
 
       },
       link: function ($scope, $el) {
-        var scopesToTeardown = [];
+        let scopesToTeardown = [];
 
         function setupScope(opts) {
           if (typeof opts !== 'object') {
             return scopesToTeardown[scopesToTeardown.push($scope.$new()) - 1];
           }
 
-          var isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
+          let isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
           _.forOwn(opts, function (from, to) {
             isolate.$bind(to, from, $scope);
           });
@@ -88,21 +88,21 @@ define(function (require) {
           if (!directive) return $el.hide();
           else $el.show();
 
-          var askedForChild = !!directive.scope;
-          var reuseScope = !askedForChild && !directive.controller;
+          let askedForChild = !!directive.scope;
+          let reuseScope = !askedForChild && !directive.controller;
 
-          var $formatEditor = $('<div>').html(directive.template);
-          var $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
+          let $formatEditor = $('<div>').html(directive.template);
+          let $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
 
           if (directive.controller) {
             // bind the controller to the injected element
-            var cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
+            let cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
             $formatEditorScope.Controller = directive.controller;
             $formatEditor.attr('ng-controller', 'Controller' + cntrlAs);
           }
 
-          var attrs = {};
-          var linkFns = directive.compile && directive.compile($el, attrs);
+          let attrs = {};
+          let linkFns = directive.compile && directive.compile($el, attrs);
           if (!linkFns || _.isFunction(linkFns)) {
             linkFns = {
               pre: _.noop,
diff --git a/src/ui/public/field_format_editor/pattern/pattern.js b/src/ui/public/field_format_editor/pattern/pattern.js
index cbe7d9b730494..394878899f0cb 100644
--- a/src/ui/public/field_format_editor/pattern/pattern.js
+++ b/src/ui/public/field_format_editor/pattern/pattern.js
@@ -10,7 +10,7 @@ define(function (require) {
       require: ['ngModel', '^fieldEditor'],
       scope: true,
       link: function ($scope, $el, attrs, cntrls) {
-        var ngModelCntrl = cntrls[0];
+        let ngModelCntrl = cntrls[0];
 
         $scope.$bind('inputs', attrs.inputs);
         $scope.$bind('placeholder', attrs.placeholder);
diff --git a/src/ui/public/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js
index 08f6293a446e9..a5cca2c02d154 100644
--- a/src/ui/public/field_format_editor/samples/samples.js
+++ b/src/ui/public/field_format_editor/samples/samples.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
   .get('kibana')
@@ -10,7 +10,7 @@ define(function (require) {
       require: ['?^ngModel', '^fieldEditor'],
       scope: true,
       link: function ($scope, $el, attrs, cntrls) {
-        var ngModelCntrl = cntrls[0];
+        let ngModelCntrl = cntrls[0];
 
         $scope.samples = null;
         $scope.$bind('inputs', attrs.inputs);
@@ -20,14 +20,14 @@ define(function (require) {
           '[]inputs'
         ], function () {
           $scope.samples = null;
-          var field = $scope.editor.field;
+          let field = $scope.editor.field;
 
           if (!field || !field.format) {
             return;
           }
 
           Promise.try(function () {
-            var converter = field.format.getConverterFor('html');
+            let converter = field.format.getConverterFor('html');
             $scope.samples = _.map($scope.inputs, function (input) {
               return [input, $sce.trustAsHtml(converter(input))];
             });
diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_addFilters.js
index 15b7a9491421b..21891dac34fad 100644
--- a/src/ui/public/filter_bar/__tests__/_addFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_addFilters.js
@@ -1,18 +1,18 @@
 describe('add filters', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var filters;
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let filters;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -87,7 +87,7 @@ describe('add filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      var emitSpy = sinon.spy(queryFilter, 'emit');
+      let emitSpy = sinon.spy(queryFilter, 'emit');
 
       // set up the watchers, add new filters, and crank the digest loop
       $rootScope.$digest();
@@ -108,7 +108,7 @@ describe('add filters', function () {
 
   describe('filter reconciliation', function () {
     it('should de-dupe appState filters being added', function () {
-      var newFilter = _.cloneDeep(filters[1]);
+      let newFilter = _.cloneDeep(filters[1]);
       appState.filters = filters;
       $rootScope.$digest();
       expect(appState.filters.length).to.be(3);
@@ -119,7 +119,7 @@ describe('add filters', function () {
     });
 
     it('should de-dupe globalState filters being added', function () {
-      var newFilter = _.cloneDeep(filters[1]);
+      let newFilter = _.cloneDeep(filters[1]);
       globalState.filters = filters;
       $rootScope.$digest();
       expect(globalState.filters.length).to.be(3);
@@ -130,16 +130,16 @@ describe('add filters', function () {
     });
 
     it('should mutate global filters on appState filter changes', function () {
-      var idx = 1;
+      let idx = 1;
       globalState.filters = filters;
       $rootScope.$digest();
 
-      var appFilter = _.cloneDeep(filters[idx]);
+      let appFilter = _.cloneDeep(filters[idx]);
       appFilter.meta.negate = true;
       queryFilter.addFilters(appFilter);
       $rootScope.$digest();
 
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res).to.have.length(3);
       _.each(res, function (filter, i) {
         expect(filter.$state.store).to.be('globalState');
diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_getFilters.js
index c3b492f564229..a98bfab41444a 100644
--- a/src/ui/public/filter_bar/__tests__/_getFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_getFilters.js
@@ -1,16 +1,16 @@
 describe('get filters', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -34,12 +34,13 @@ describe('get filters', function () {
   }));
 
   describe('getFilters method', function () {
-    var filters;
+    let filters;
 
     beforeEach(function () {
       filters = [
         { query: { match: { extension: { query: 'jpg', type: 'phrase' } } } },
-        { query: { match: { '@tags': { query: 'info', type: 'phrase' } } } }
+        { query: { match: { '@tags': { query: 'info', type: 'phrase' } } } },
+        null
       ];
     });
 
@@ -48,12 +49,12 @@ describe('get filters', function () {
       globalState.filters = [filters[1]];
 
       // global filters should be listed first
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res[0]).to.eql(filters[1]);
       expect(res[1]).to.eql(filters[0]);
 
       // should return updated version of filters
-      var newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
+      let newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
       appState.filters.push(newFilter);
 
       res = queryFilter.getFilters();
@@ -64,27 +65,51 @@ describe('get filters', function () {
       appState.filters = [filters[0]];
       globalState.filters = [filters[1]];
 
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res[0].$state.store).to.be(storeNames.global);
       expect(res[1].$state.store).to.be(storeNames.app);
     });
 
-    it('should return filters from specific states', function () {
-      var states = [
+    it('should return non-null filters from specific states', function () {
+      let states = [
         [ globalState, queryFilter.getGlobalFilters ],
         [ appState, queryFilter.getAppFilters ],
       ];
 
       _.each(states, function (state) {
-        state[0].filters = filters;
-        var res = state[1]();
+        state[0].filters = filters.slice(0);
+        expect(state[0].filters).to.contain(null);
+
+        let res = state[1]();
         expect(res.length).to.be(state[0].filters.length);
+        expect(state[0].filters).to.not.contain(null);
+      });
+    });
+
+    it('should replace the state, not save it', function () {
+      let states = [
+        [ globalState, queryFilter.getGlobalFilters ],
+        [ appState, queryFilter.getAppFilters ],
+      ];
+
+      expect(appState.save.called).to.be(false);
+      expect(appState.replace.called).to.be(false);
+
+
+      _.each(states, function (state) {
+        expect(state[0].save.called).to.be(false);
+        expect(state[0].replace.called).to.be(false);
+
+        state[0].filters = filters.slice(0);
+        let res = state[1]();
+        expect(state[0].save.called).to.be(false);
+        expect(state[0].replace.called).to.be(true);
       });
     });
   });
 
   describe('filter reconciliation', function () {
-    var filters;
+    let filters;
 
     beforeEach(function () {
       filters = [
@@ -105,11 +130,11 @@ describe('get filters', function () {
 
     it('should skip appState filters that match globalState filters', function () {
       globalState.filters = filters;
-      var appFilter = _.cloneDeep(filters[1]);
+      let appFilter = _.cloneDeep(filters[1]);
       appState.filters.push(appFilter);
 
       // global filters should be listed first
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res).to.have.length(3);
       _.each(res, function (filter) {
         expect(filter.$state.store).to.be('globalState');
@@ -118,12 +143,12 @@ describe('get filters', function () {
 
     it('should append conflicting appState filters', function () {
       globalState.filters = filters;
-      var appFilter = _.cloneDeep(filters[1]);
+      let appFilter = _.cloneDeep(filters[1]);
       appFilter.meta.negate = true;
       appState.filters.push(appFilter);
 
       // global filters should be listed first
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res).to.have.length(4);
       expect(res.filter(function (filter) {
         return filter.$state.store === storeNames.global;
@@ -136,17 +161,17 @@ describe('get filters', function () {
     it('should not affect disabled filters', function () {
       // test adding to globalState
       globalState.filters = _.map(filters, function (filter) {
-        var f = _.cloneDeep(filter);
+        let f = _.cloneDeep(filter);
         f.meta.disabled = true;
         return f;
       });
       _.each(filters, function (filter) { globalState.filters.push(filter); });
-      var res = queryFilter.getFilters();
+      let res = queryFilter.getFilters();
       expect(res).to.have.length(6);
 
       // test adding to appState
       globalState.filters = _.map(filters, function (filter) {
-        var f = _.cloneDeep(filter);
+        let f = _.cloneDeep(filter);
         f.meta.disabled = true;
         return f;
       });
diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invertFilters.js
index 3f3a5ba52d813..52c94a35b75b1 100644
--- a/src/ui/public/filter_bar/__tests__/_invertFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_invertFilters.js
@@ -1,18 +1,18 @@
 describe('invert filters', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var filters;
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let filters;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -75,7 +75,7 @@ describe('invert filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      var emitSpy = sinon.spy(queryFilter, 'emit');
+      let emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
 
       // set up the watchers
diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pinFilters.js
index dd45be09df790..f31800bda48e0 100644
--- a/src/ui/public/filter_bar/__tests__/_pinFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_pinFilters.js
@@ -1,18 +1,18 @@
 describe('pin filters', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var filters;
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let filters;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -86,7 +86,7 @@ describe('pin filters', function () {
     });
 
     it('should move filter from appState to globalState', function () {
-      var filter = appState.filters[1];
+      let filter = appState.filters[1];
 
       queryFilter.pinFilter(filter);
       expect(globalState.filters).to.contain(filter);
@@ -95,7 +95,7 @@ describe('pin filters', function () {
     });
 
     it('should move filter from globalState to appState', function () {
-      var filter = globalState.filters[1];
+      let filter = globalState.filters[1];
 
       queryFilter.pinFilter(filter);
       expect(appState.filters).to.contain(filter);
@@ -105,8 +105,8 @@ describe('pin filters', function () {
 
 
     it('should only fire the update event', function () {
-      var emitSpy = sinon.spy(queryFilter, 'emit');
-      var filter = appState.filters[1];
+      let emitSpy = sinon.spy(queryFilter, 'emit');
+      let filter = appState.filters[1];
       $rootScope.$digest();
 
       queryFilter.pinFilter(filter);
@@ -130,8 +130,8 @@ describe('pin filters', function () {
     });
 
     it('should swap the filters in both states', function () {
-      var appSample = _.sample(appState.filters);
-      var globalSample = _.sample(globalState.filters);
+      let appSample = _.sample(appState.filters);
+      let globalSample = _.sample(globalState.filters);
 
       queryFilter.pinAll();
       expect(globalState.filters).to.have.length(5);
diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_removeFilters.js
index 672e02f702842..fe9943e5c3ef5 100644
--- a/src/ui/public/filter_bar/__tests__/_removeFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_removeFilters.js
@@ -1,18 +1,18 @@
 describe('remove filters', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var filters;
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let filters;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -68,7 +68,7 @@ describe('remove filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      var emitSpy = sinon.spy(queryFilter, 'emit');
+      let emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
       $rootScope.$digest();
 
@@ -115,7 +115,7 @@ describe('remove filters', function () {
       appState.filters.push(filters[2]);
       $rootScope.$digest();
 
-      var missedFilter = _.cloneDeep(filters[0]);
+      let missedFilter = _.cloneDeep(filters[0]);
       missedFilter.meta = {
         negate: !filters[0].meta.negate
       };
diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggleFilters.js
index 0855ba00e5f39..4825bec1793a9 100644
--- a/src/ui/public/filter_bar/__tests__/_toggleFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_toggleFilters.js
@@ -1,18 +1,18 @@
 describe('toggle filters', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var sinon = require('auto-release-sinon');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var filters;
-  var queryFilter;
-  var $rootScope;
-  var appState;
-  var globalState;
+  let filters;
+  let queryFilter;
+  let $rootScope;
+  let appState;
+  let globalState;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -74,7 +74,7 @@ describe('toggle filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      var emitSpy = sinon.spy(queryFilter, 'emit');
+      let emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
       $rootScope.$digest();
 
diff --git a/src/ui/public/filter_bar/__tests__/_updateFilters.js b/src/ui/public/filter_bar/__tests__/_updateFilters.js
index d7bec65389633..d5f3ceb074480 100644
--- a/src/ui/public/filter_bar/__tests__/_updateFilters.js
+++ b/src/ui/public/filter_bar/__tests__/_updateFilters.js
@@ -1,17 +1,17 @@
 describe('update filters', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var MockState = require('fixtures/mock_state');
-  var storeNames = {
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let MockState = require('fixtures/mock_state');
+  let storeNames = {
     app: 'appState',
     global: 'globalState'
   };
-  var queryFilter;
-  var appState;
-  var globalState;
-  var $rootScope;
+  let queryFilter;
+  let appState;
+  let globalState;
+  let $rootScope;
 
   beforeEach(ngMock.module(
     'kibana',
@@ -38,8 +38,8 @@ describe('update filters', function () {
   }));
 
   describe('updating', function () {
-    var currentFilter;
-    var newFilter;
+    let currentFilter;
+    let newFilter;
 
     beforeEach(function () {
       newFilter = _.cloneDeep({
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index 5b102de7043f6..aa8901116473d 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -1,23 +1,23 @@
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
-var sinon = require('sinon');
+let angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
+let sinon = require('sinon');
 
 require('ui/filter_bar');
-var MockState = require('fixtures/mock_state');
+let MockState = require('fixtures/mock_state');
 
 describe('Filter Bar Directive', function () {
-  var $rootScope;
-  var $compile;
-  var $timeout;
-  var Promise;
-  var appState;
-  var queryFilter;
-  var mapFilter;
-  var $el;
-  var $scope;
+  let $rootScope;
+  let $compile;
+  let $timeout;
+  let Promise;
+  let appState;
+  let queryFilter;
+  let mapFilter;
+  let $el;
+  let $scope;
   // require('testUtils/noDigestPromises').activateForSuite();
 
   beforeEach(ngMock.module('kibana/global_state', function ($provide) {
@@ -41,7 +41,7 @@ describe('Filter Bar Directive', function () {
       Promise = $injector.get('Promise');
       mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
 
-      var queryFilter = Private(require('ui/filter_bar/query_filter'));
+      let queryFilter = Private(require('ui/filter_bar/query_filter'));
       queryFilter.getFilters = function () {
         return appState.filters;
       };
@@ -50,7 +50,7 @@ describe('Filter Bar Directive', function () {
 
   describe('Element rendering', function () {
     beforeEach(function (done) {
-      var filters = [
+      let filters = [
         { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } },
         { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'nginx' } } } },
         { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } },
@@ -64,7 +64,7 @@ describe('Filter Bar Directive', function () {
         $scope = $el.isolateScope();
       });
 
-      var off = $rootScope.$on('filterbar:updated', function () {
+      let off = $rootScope.$on('filterbar:updated', function () {
         off();
         // force a nextTick so it continues *after* the $digest loop completes
         setTimeout(done, 0);
@@ -75,7 +75,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should render all the filters in state', function () {
-      var filters = $el.find('.filter');
+      let filters = $el.find('.filter');
       expect(filters).to.have.length(5);
       expect($(filters[0]).find('span')[0].innerHTML).to.equal('_type:');
       expect($(filters[0]).find('span')[1].innerHTML).to.equal('"apache"');
@@ -88,7 +88,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should be able to set an alias', function () {
-      var filter = $el.find('.filter')[4];
+      let filter = $el.find('.filter')[4];
       expect($(filter).find('span')[0].innerHTML).to.equal('foo');
     });
 
diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js
index 1bd2c689d217b..e465602bb46cd 100644
--- a/src/ui/public/filter_bar/__tests__/push_filter.js
+++ b/src/ui/public/filter_bar/__tests__/push_filter.js
@@ -1,9 +1,9 @@
 describe('Filter Bar pushFilter()', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var pushFilterFn;
+  let pushFilterFn;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -20,9 +20,9 @@ describe('Filter Bar pushFilter()', function () {
   });
 
   describe('pushFilter($state)()', function () {
-    var $state;
-    var pushFilter;
-    var filter;
+    let $state;
+    let pushFilter;
+    let filter;
 
     beforeEach(ngMock.inject(function (Private, $injector) {
       $state = {filters:[]};
@@ -31,7 +31,7 @@ describe('Filter Bar pushFilter()', function () {
     }));
 
     it('should create the filters property it needed', function () {
-      var altState = {};
+      let altState = {};
       pushFilterFn(altState)(filter);
       expect(altState.filters).to.be.an(Array);
     });
@@ -39,7 +39,7 @@ describe('Filter Bar pushFilter()', function () {
     it('should replace the filters property instead of modifying it', function () {
       // If we push directly instead of using pushFilter a $watch('filters') does not trigger
 
-      var oldFilters;
+      let oldFilters;
 
       oldFilters = $state.filters;
       $state.filters.push(filter);
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
index c9b8bc9fb3e47..8752084e258dd 100644
--- a/src/ui/public/filter_bar/__tests__/query_filter.js
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -1,9 +1,9 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var queryFilter;
-var EventEmitter;
-var $rootScope;
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let queryFilter;
+let EventEmitter;
+let $rootScope;
 
 describe('Query Filter', function () {
   describe('Module', function () {
@@ -39,7 +39,9 @@ describe('Query Filter', function () {
         expect(queryFilter.pinFilter).to.be.a('function');
         expect(queryFilter.pinAll).to.be.a('function');
       });
+
     });
+
   });
 
   describe('Actions', function () {
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
index 9d6fd4be6ddfa..a6ea2510120d7 100644
--- a/src/ui/public/filter_bar/filter_bar.js
+++ b/src/ui/public/filter_bar/filter_bar.js
@@ -1,21 +1,21 @@
 define(function (require) {
-  var _ = require('lodash');
-  var module = require('ui/modules').get('kibana');
-  var template = require('ui/filter_bar/filter_bar.html');
-  var moment = require('moment');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let module = require('ui/modules').get('kibana');
+  let template = require('ui/filter_bar/filter_bar.html');
+  let moment = require('moment');
+  let angular = require('angular');
 
   require('ui/directives/json_input');
 
   module.directive('filterBar', function (Private, Promise, getAppState) {
-    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
-    var mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
-    var extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
-    var filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
-    var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
-    var changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var privateFilterFieldRegex = /(^\$|meta)/;
+    let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+    let mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters'));
+    let extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter'));
+    let filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter'));
+    let filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
+    let changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter'));
+    let queryFilter = Private(require('ui/filter_bar/query_filter'));
+    let privateFilterFieldRegex = /(^\$|meta)/;
 
     return {
       restrict: 'E',
@@ -42,7 +42,7 @@ define(function (require) {
 
         $scope.aceLoaded = function (editor) {
           editor.$blockScrolling = Infinity;
-          var session = editor.getSession();
+          let session = editor.getSession();
           session.setTabSize(2);
           session.setUseSoftTabs(true);
         };
@@ -135,7 +135,7 @@ define(function (require) {
         }
 
         function updateFilters() {
-          var filters = queryFilter.getFilters();
+          let filters = queryFilter.getFilters();
           mapAndFlattenFilters(filters).then(function (results) {
             // used to display the current filters in the state
             $scope.filters = _.sortBy(results, function (filter) {
diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js
index 6a5c7bbf18854..373d3607db2ba 100644
--- a/src/ui/public/filter_bar/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/filter_bar_click_handler.js
@@ -1,26 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
-  var dedupFilters = require('./lib/dedupFilters');
-  var uniqFilters = require('./lib/uniqFilters');
-
-  // given an object or array of objects, return the value of the passed param
-  // if the param is missing, return undefined
-  function findByParam(values, param) {
-    if (_.isArray(values)) { // point series chart
-      var index = _.findIndex(values, param);
-      if (index === -1) return;
-      return values[index][param];
-    }
-    return values[param]; // pie chart
-  }
+  let _ = require('lodash');
+  let dedupFilters = require('./lib/dedupFilters');
+  let uniqFilters = require('./lib/uniqFilters');
+  let findByParam = require('ui/utils/find_by_param');
 
   return function (Notifier) {
     return function ($state) {
-      return function (event) {
-        var notify = new Notifier({
+      return function (event, simulate) {
+        let notify = new Notifier({
           location: 'Filter bar'
         });
-        var aggConfigResult;
+        let aggConfigResult;
 
         // Hierarchical and tabular data set their aggConfigResult parameter
         // differently because of how the point is rewritten between the two. So
@@ -34,18 +24,18 @@ define(function (require) {
         }
 
         if (aggConfigResult) {
-          var isLegendLabel = !!event.point.values;
-          var aggBuckets = _.filter(aggConfigResult.getPath(), { type: 'bucket' });
+          let isLegendLabel = !!event.point.values;
+          let aggBuckets = _.filter(aggConfigResult.getPath(), { type: 'bucket' });
 
           // For legend clicks, use the last bucket in the path
           if (isLegendLabel) {
             // series data has multiple values, use aggConfig on the first
             // hierarchical data values is an object with the addConfig
-            var aggConfig = findByParam(event.point.values, 'aggConfig');
+            let aggConfig = findByParam(event.point.values, 'aggConfig');
             aggBuckets = aggBuckets.filter((result) => result.aggConfig && result.aggConfig === aggConfig);
           }
 
-          var filters = _(aggBuckets)
+          let filters = _(aggBuckets)
           .map(function (result) {
             try {
               return result.createFilter();
@@ -58,9 +48,20 @@ define(function (require) {
 
           if (!filters.length) return;
 
+          if (event.negate) {
+            _.each(filters, function (filter) {
+              filter.meta = filter.meta || {};
+              filter.meta.negate = true;
+            });
+          }
+
           filters = dedupFilters($state.filters, uniqFilters(filters));
           // We need to add a bunch of filter deduping here.
-          $state.$newFilters = filters;
+          if (!simulate) {
+            $state.$newFilters = filters;
+          }
+
+          return filters;
         }
       };
     };
diff --git a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js
index 8764f5982f084..d80dc7075174c 100644
--- a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js
@@ -1,13 +1,13 @@
 
-var moment = require('moment');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let moment = require('moment');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 describe('Filter Bar Directive', function () {
   describe('changeTimeFilter()', function () {
 
-    var changeTimeFilter;
+    let changeTimeFilter;
 
-    var timefilter;
+    let timefilter;
 
     beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +17,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should change the timefilter to match the range gt/lt', function () {
-      var filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
+      let filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
       changeTimeFilter(filter);
       expect(timefilter.time.mode).to.be('absolute');
       expect(moment.isMoment(timefilter.time.to)).to.be(true);
@@ -27,7 +27,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should change the timefilter to match the range gte/lte', function () {
-      var filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
+      let filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
       changeTimeFilter(filter);
       expect(timefilter.time.mode).to.be('absolute');
       expect(moment.isMoment(timefilter.time.to)).to.be(true);
diff --git a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js b/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js
index c6be24bc7e069..0f398364b8b46 100644
--- a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js
@@ -1,46 +1,46 @@
-var dedupFilters = require('ui/filter_bar/lib/dedupFilters');
-var expect = require('expect.js');
+let dedupFilters = require('ui/filter_bar/lib/dedupFilters');
+let expect = require('expect.js');
 describe('Filter Bar Directive', function () {
   describe('dedupFilters(existing, filters)', function () {
 
     it('should return only filters which are not in the existing', function () {
-      var existing = [
+      let existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var filters = [
+      let filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var results = dedupFilters(existing, filters);
+      let results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
 
     it('should ignore the disabed attribute when comparing ', function () {
-      var existing = [
+      let existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { meta: { disabled: true }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var filters = [
+      let filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var results = dedupFilters(existing, filters);
+      let results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
 
     it('should ignore $state attribute', function () {
-      var existing = [
+      let existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { $state: { store: 'appState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var filters = [
+      let filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { $state: { store: 'globalState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      var results = dedupFilters(existing, filters);
+      let results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
diff --git a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js
index 8f7245fd3790c..71852e6a05d41 100644
--- a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('extractTimeFilter()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var extractTimeFilter;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let extractTimeFilter;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the matching filter for the defualt time field', function (done) {
-      var filters = [
+      let filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
@@ -33,7 +33,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should not return the non-matching filter for the defualt time field', function (done) {
-      var filters = [
+      let filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
diff --git a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js
index 29756016910ea..3837e6f6520a7 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js
@@ -1,15 +1,15 @@
-var expect = require('expect.js');
-var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
+let expect = require('expect.js');
+let filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap');
 describe('Filter Bar Directive', function () {
   describe('filterAppliedAndUnwrap()', function () {
 
-    var filters = [
+    let filters = [
       { meta: { apply: true }, exists: { field: '_type' } },
       { meta: { apply: false }, query: { query_string: { query: 'foo:bar' } } }
     ];
 
     it('should filter the applied and unwrap the filter', function () {
-      var results = filterAppliedAndUnwrap(filters);
+      let results = filterAppliedAndUnwrap(filters);
       expect(results).to.have.length(1);
       expect(results[0]).to.eql(filters[0]);
     });
diff --git a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js
index 3b12ef06d9d44..6d1d8dc3a872b 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js
@@ -2,11 +2,11 @@
 describe('Filter Bar Directive', function () {
   describe('filterOutTimeBasedFilter()', function () {
 
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var sinon = require('auto-release-sinon');
-    var filterOutTimeBasedFilter;
-    var $rootScope;
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let sinon = require('auto-release-sinon');
+    let filterOutTimeBasedFilter;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -22,7 +22,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the matching filter for the defualt time field', function (done) {
-      var filters = [
+      let filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
diff --git a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js b/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js
index e73ec155e167e..e671b15f0cf7d 100644
--- a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js
+++ b/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js
@@ -1,14 +1,14 @@
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Filter Bar Directive', function () {
   describe('generateMappingChain()', function () {
 
-    var generateMappingChain;
+    let generateMappingChain;
 
-    var $rootScope;
-    var Promise;
+    let $rootScope;
+    let Promise;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, _$rootScope_, _Promise_) {
       $rootScope = _$rootScope_;
@@ -18,13 +18,13 @@ describe('Filter Bar Directive', function () {
 
 
     it('should create a chaning function which calls the next function if the promise is rejected', function (done) {
-      var filter = {};
-      var mapping = sinon.stub();
+      let filter = {};
+      let mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      var mappingChainFn = generateMappingChain(mapping);
-      var next = sinon.stub();
+      let mappingChainFn = generateMappingChain(mapping);
+      let next = sinon.stub();
       next.returns(Promise.resolve('good'));
-      var chain = mappingChainFn(next);
+      let chain = mappingChainFn(next);
       chain(filter).then(function (result) {
         expect(result).to.be('good');
         sinon.assert.calledOnce(next);
@@ -34,12 +34,12 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should create a chaning function which DOES NOT call the next function if the result is resolved', function (done) {
-      var mapping = sinon.stub();
+      let mapping = sinon.stub();
       mapping.returns(Promise.resolve('good'));
-      var mappingChainFn = generateMappingChain(mapping);
-      var next = sinon.stub();
+      let mappingChainFn = generateMappingChain(mapping);
+      let next = sinon.stub();
       next.returns(Promise.resolve('bad'));
-      var chain = mappingChainFn(next);
+      let chain = mappingChainFn(next);
       chain({}).then(function (result) {
         expect(result).to.be('good');
         sinon.assert.notCalled(next);
@@ -49,11 +49,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should resolve result for the mapping function', function (done) {
-      var mapping = sinon.stub();
+      let mapping = sinon.stub();
       mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      var mappingChainFn = generateMappingChain(mapping);
-      var next = sinon.stub();
-      var chain = mappingChainFn(next);
+      let mappingChainFn = generateMappingChain(mapping);
+      let next = sinon.stub();
+      let chain = mappingChainFn(next);
       chain({}).then(function (result) {
         sinon.assert.notCalled(next);
         expect(result).to.eql({ key: 'test', value: 'example' });
@@ -63,11 +63,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should call the mapping function with the argument to the chain', function (done) {
-      var mapping = sinon.stub();
+      let mapping = sinon.stub();
       mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      var mappingChainFn = generateMappingChain(mapping);
-      var next = sinon.stub();
-      var chain = mappingChainFn(next);
+      let mappingChainFn = generateMappingChain(mapping);
+      let next = sinon.stub();
+      let chain = mappingChainFn(next);
       chain({ test: 'example' }).then(function (result) {
         sinon.assert.calledOnce(mapping);
         expect(mapping.args[0][0]).to.eql({ test: 'example' });
@@ -79,13 +79,13 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should resolve result for the next function', function (done) {
-      var filter = {};
-      var mapping = sinon.stub();
+      let filter = {};
+      let mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      var mappingChainFn = generateMappingChain(mapping);
-      var next = sinon.stub();
+      let mappingChainFn = generateMappingChain(mapping);
+      let next = sinon.stub();
       next.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      var chain = mappingChainFn(next);
+      let chain = mappingChainFn(next);
       chain(filter).then(function (result) {
         sinon.assert.calledOnce(mapping);
         sinon.assert.calledOnce(next);
@@ -96,11 +96,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should reject with an error if no functions match', function (done) {
-      var filter = {};
-      var mapping = sinon.stub();
+      let filter = {};
+      let mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      var mappingChainFn = generateMappingChain(mapping);
-      var chain = mappingChainFn();
+      let mappingChainFn = generateMappingChain(mapping);
+      let chain = mappingChainFn();
       chain(filter).catch(function (err) {
         expect(err).to.be.an(Error);
         expect(err.message).to.be('No mappings have been found for filter.');
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js
index db93d8d124872..d8cc2e278d4b5 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('mapAndFlattenFilters()', function () {
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var sinon = require('auto-release-sinon');
-    var mapAndFlattenFilters;
-    var $rootScope;
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let sinon = require('auto-release-sinon');
+    let mapAndFlattenFilters;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -20,7 +20,7 @@ describe('Filter Bar Directive', function () {
       $rootScope = _$rootScope_;
     }));
 
-    var filters = [
+    let filters = [
       null,
       [
         { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js
index 83f603e83d5ed..9686adb1c14c1 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js
@@ -1,10 +1,10 @@
 describe('Filter Bar Directive', function () {
   describe('mapDefault()', function () {
 
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapDefault;
-    var $rootScope;
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapDefault;
+    let $rootScope;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       $rootScope = _$rootScope_;
@@ -12,7 +12,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = { query: { match_all: {} } };
+      let filter = { query: { match_all: {} } };
       mapDefault(filter).then(function (result) {
         expect(result).to.have.property('key', 'query');
         expect(result).to.have.property('value', '{"match_all":{}}');
@@ -22,7 +22,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should work with undefined filter types', function (done) {
-      var filter = {
+      let filter = {
         'bool': {
           'must': {
             'term': {
@@ -40,7 +40,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined if there is no valid key', function (done) {
-      var filter = { meta: {} };
+      let filter = { meta: {} };
       mapDefault(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapExists.js b/src/ui/public/filter_bar/lib/__tests__/mapExists.js
index f77774d7b154d..04355a06a0533 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapExists.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapExists.js
@@ -1,10 +1,10 @@
 describe('Filter Bar Directive', function () {
   describe('mapExists()', function () {
 
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapExists;
-    var $rootScope;
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapExists;
+    let $rootScope;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       $rootScope = _$rootScope_;
@@ -12,7 +12,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = { exists: { field: '_type' } };
+      let filter = { exists: { field: '_type' } };
       mapExists(filter).then(function (result) {
         expect(result).to.have.property('key', 'exists');
         expect(result).to.have.property('value', '_type');
@@ -22,7 +22,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { query: { match: { query: 'foo' } } };
+      let filter = { query: { match: { query: 'foo' } } };
       mapExists(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js
index 3bf771a8d0247..a051361581e75 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js
@@ -1,10 +1,10 @@
 
 describe('Filter Bar Directive', function () {
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var mapFilter;
-  var $rootScope;
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let mapFilter;
+  let $rootScope;
 
 
   beforeEach(ngMock.module(
@@ -22,7 +22,7 @@ describe('Filter Bar Directive', function () {
 
   describe('mapFilter()', function () {
     it('should map query filters', function (done) {
-      var before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
+      let before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', '_type');
@@ -35,7 +35,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map exists filters', function (done) {
-      var before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
+      let before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'exists');
@@ -48,7 +48,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map missing filters', function (done) {
-      var before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
+      let before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'missing');
@@ -61,7 +61,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map json filter', function (done) {
-      var before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
+      let before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'query');
@@ -74,7 +74,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should finish with a catch', function (done) {
-      var before = { meta: { index: 'logstash-*' }};
+      let before = { meta: { index: 'logstash-*' }};
       mapFilter(before).catch(function (error) {
         expect(error).to.be.an(Error);
         expect(error.message).to.be('No mappings have been found for filter.');
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js
index adaa34a789651..8356d5397106a 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js
@@ -1,12 +1,12 @@
 
-var _ = require('lodash');
+let _ = require('lodash');
 describe('Filter Bar Directive', function () {
   describe('mapFlattenAndWrapFilters()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapFlattenAndWrapFilters;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapFlattenAndWrapFilters;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
       $rootScope = _$rootScope_;
     }));
 
-    var filters = [
+    let filters = [
       null,
       [
         { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js
index 931ee06c09d87..788d09d404d21 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('mapGeoBoundingBox()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapGeoBoundingBox;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapGeoBoundingBox;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters with bounds', function (done) {
-      var filter = {
+      let filter = {
         meta: {
           index: 'logstash-*'
         },
@@ -49,7 +49,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapGeoBoundingBox(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js b/src/ui/public/filter_bar/lib/__tests__/mapMissing.js
index fe0d9cab3a0da..6dee62919df6a 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapMissing.js
@@ -1,11 +1,11 @@
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 describe('Filter Bar Directive', function () {
   describe('mapMissing()', function () {
 
-    var mapMissing;
+    let mapMissing;
 
-    var $rootScope;
+    let $rootScope;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       $rootScope = _$rootScope_;
@@ -13,7 +13,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = { missing: { field: '_type' } };
+      let filter = { missing: { field: '_type' } };
       mapMissing(filter).then(function (result) {
         expect(result).to.have.property('key', 'missing');
         expect(result).to.have.property('value', '_type');
@@ -23,7 +23,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { query: { match: { query: 'foo' } } };
+      let filter = { query: { match: { query: 'foo' } } };
       mapMissing(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js
index 57683d3c1276b..259ad99c292d4 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js
@@ -1,9 +1,9 @@
 describe('Filter Bar Directive', function () {
   describe('mapQueryString()', function () {
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapQueryString;
-    var $rootScope;
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapQueryString;
+    let $rootScope;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       $rootScope = _$rootScope_;
@@ -11,7 +11,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = { query: { query_string: { query: 'foo:bar' } } };
+      let filter = { query: { query_string: { query: 'foo:bar' } } };
       mapQueryString(filter).then(function (result) {
         expect(result).to.have.property('key', 'query');
         expect(result).to.have.property('value', 'foo:bar');
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { query: { match: { query: 'foo' } } };
+      let filter = { query: { match: { query: 'foo' } } };
       mapQueryString(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapRange.js b/src/ui/public/filter_bar/lib/__tests__/mapRange.js
index dba4b114cad03..96c0f8332f97e 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapRange.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapRange.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('mapRange()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapRange;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapRange;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters with gt/lt', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
+      let filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
         expect(result).to.have.property('value', '1,024 to 2,048');
@@ -31,7 +31,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return the key and value for matching filters with gte/lte', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
+      let filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
         expect(result).to.have.property('value', '1,024 to 2,048');
@@ -41,7 +41,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapRange(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapScript.js b/src/ui/public/filter_bar/lib/__tests__/mapScript.js
index 2c2876aa03883..8a2f09d8bd7ad 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapScript.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapScript.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('mapScript()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapScript;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapScript;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = {
+      let filter = {
         meta: { index: 'logstash-*', field: 'script number' },
         script: { script: 'doc["script number"].value * 5', params: { value: 35}}
       };
@@ -34,7 +34,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapScript(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js
index d3f2634c6bbd6..8f902ed536eaf 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js
+++ b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js
@@ -1,11 +1,11 @@
 
 describe('Filter Bar Directive', function () {
   describe('mapTerms()', function () {
-    var sinon = require('auto-release-sinon');
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
-    var mapTerms;
-    var $rootScope;
+    let sinon = require('auto-release-sinon');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
+    let mapTerms;
+    let $rootScope;
 
     beforeEach(ngMock.module(
       'kibana',
@@ -21,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
+      let filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
       mapTerms(filter).then(function (result) {
         expect(result).to.have.property('key', '_type');
         expect(result).to.have.property('value', 'apache');
@@ -31,7 +31,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      var filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapTerms(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js b/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js
index fc6ba1ecb5dfd..ce0fe0d543007 100644
--- a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js
+++ b/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js
@@ -1,74 +1,74 @@
-var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
-var expect = require('expect.js');
+let onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
+let expect = require('expect.js');
 describe('Filter Bar Directive', function () {
   describe('onlyDisabled()', function () {
 
     it('should return true if all filters are disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      var newFilters = [{ meta: { disabled: true } }];
+      let newFilters = [{ meta: { disabled: true } }];
       expect(onlyDisabled(newFilters, filters)).to.be(true);
     });
 
     it('should return false if all filters are not disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      var newFilters = [{ meta: { disabled: false } }];
+      let newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false if only old filters are disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      var newFilters = [{ meta: { disabled: false } }];
+      let newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false if new filters are not disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      var newFilters = [{ meta: { disabled: true } }];
+      let newFilters = [{ meta: { disabled: true } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return true when all removed filters were disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      var newFilters = [];
+      let newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(true);
     });
 
     it('should return false when all removed filters were not disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      var newFilters = [];
+      let newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return true if all changed filters are disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: true, negate: false } },
         { meta: { disabled: true, negate: false } }
       ];
-      var newFilters = [
+      let newFilters = [
         { meta: { disabled: true, negate: true } },
         { meta: { disabled: true, negate: true } }
       ];
@@ -76,31 +76,31 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return false if all filters remove were not disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: true } }
       ];
-      var newFilters = [{ meta: { disabled: false } }];
+      let newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false when all removed filters are not disabled', function () {
-      var filters = [
+      let filters = [
         { meta: { disabled: true } },
         { meta: { disabled: false } },
         { meta: { disabled: true } }
       ];
-      var newFilters = [];
+      let newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should not throw with null filters', function () {
-      var filters = [
+      let filters = [
         null,
         { meta: { disabled: true } }
       ];
-      var newFilters = [];
+      let newFilters = [];
       expect(function () {
         onlyDisabled(newFilters, filters);
       }).to.not.throwError();
diff --git a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js b/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js
index 3cfbd6554aa2f..7d223314d78b4 100644
--- a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js
@@ -1,19 +1,19 @@
-var uniqFilters = require('ui/filter_bar/lib/uniqFilters');
-var expect = require('expect.js');
+let uniqFilters = require('ui/filter_bar/lib/uniqFilters');
+let expect = require('expect.js');
 describe('Filter Bar Directive', function () {
   describe('uniqFilter', function () {
 
     it('should filter out dups', function () {
-      var before = [
+      let before = [
         { query: { _type: { match: { query: 'apache', type: 'phrase' } } } },
         { query: { _type: { match: { query: 'apache', type: 'phrase' } } } }
       ];
-      var results = uniqFilters(before);
+      let results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
 
     it('should filter out duplicates, ignoring meta attributes', function () {
-      var before = [
+      let before = [
         {
           meta: { negate: true },
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
@@ -23,12 +23,12 @@ describe('Filter Bar Directive', function () {
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
         }
       ];
-      var results = uniqFilters(before);
+      let results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
 
     it('should filter out duplicates, ignoring $state attributes', function () {
-      var before = [
+      let before = [
         {
           $state: { store: 'appState' },
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
@@ -38,7 +38,7 @@ describe('Filter Bar Directive', function () {
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
         }
       ];
-      var results = uniqFilters(before);
+      let results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
   });
diff --git a/src/ui/public/filter_bar/lib/changeTimeFilter.js b/src/ui/public/filter_bar/lib/changeTimeFilter.js
index d59f878a18063..ae822117b5652 100644
--- a/src/ui/public/filter_bar/lib/changeTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/changeTimeFilter.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var moment = require('moment');
-  var _ = require('lodash');
+  let moment = require('moment');
+  let _ = require('lodash');
   return function changeTimeFilterProvider(timefilter) {
     return function (filter) {
-      var key = _.keys(filter.range)[0];
-      var values = filter.range[key];
+      let key = _.keys(filter.range)[0];
+      let values = filter.range[key];
       timefilter.time.from = moment(values.gt || values.gte);
       timefilter.time.to = moment(values.lt || values.lte);
       timefilter.time.mode = 'absolute';
diff --git a/src/ui/public/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compareFilters.js
index 8e29a236ae977..ed2e3503f7be5 100644
--- a/src/ui/public/filter_bar/lib/compareFilters.js
+++ b/src/ui/public/filter_bar/lib/compareFilters.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var excludedAttributes;
-  var comparators;
+  let _ = require('lodash');
+  let angular = require('angular');
+  let excludedAttributes;
+  let comparators;
 
   /**
    * Compare two filters to see if they match
@@ -25,7 +25,7 @@ define(function (require) {
   };
 
   function mapFilter(filter) {
-    var cleaned = _.omit(filter, excludedAttributes);
+    let cleaned = _.omit(filter, excludedAttributes);
     if (comparators.negate) cleaned.negate = filter.meta && !!filter.meta.negate;
     if (comparators.disabled) cleaned.disabled = filter.meta && !!filter.meta.disabled;
     return cleaned;
diff --git a/src/ui/public/filter_bar/lib/dedupFilters.js b/src/ui/public/filter_bar/lib/dedupFilters.js
index 35de867a9f3b6..0c6163374ca23 100644
--- a/src/ui/public/filter_bar/lib/dedupFilters.js
+++ b/src/ui/public/filter_bar/lib/dedupFilters.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var compareFilters = require('ui/filter_bar/lib/compareFilters');
+  let _ = require('lodash');
+  let angular = require('angular');
+  let compareFilters = require('ui/filter_bar/lib/compareFilters');
 
   /**
    * Combine 2 filter collections, removing duplicates
diff --git a/src/ui/public/filter_bar/lib/extractTimeFilter.js b/src/ui/public/filter_bar/lib/extractTimeFilter.js
index 485df1ab61bbe..c2d23226500fd 100644
--- a/src/ui/public/filter_bar/lib/extractTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/extractTimeFilter.js
@@ -1,15 +1,15 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function extractTimeFilterProvider(courier, Promise) {
     return Promise.method(function (filters) {
       // Assume all the index patterns are the same since they will be added
       // from the same visualization.
-      var id = _.get(filters, '[0].meta.index');
+      let id = _.get(filters, '[0].meta.index');
       if (id == null) return;
 
       return courier.indexPatterns.get(id).then(function (indexPattern) {
-        var filter = _.find(filters, function (obj) {
-          var key = _.keys(obj.range)[0];
+        let filter = _.find(filters, function (obj) {
+          let key = _.keys(obj.range)[0];
           return key === indexPattern.timeFieldName;
         });
         if (filter && filter.range) {
diff --git a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
index 51c877d2181ba..b103408ecc2c7 100644
--- a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
+++ b/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function (filters) {
     return _.filter(filters, 'meta.apply');
   };
diff --git a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
index 998e17988fac0..effe4598fcd0c 100644
--- a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
+++ b/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function filterOutTimeBaseFilter(courier, Promise) {
     return Promise.method(function (filters) {
-      var id = _.get(filters, '[0].meta.index');
+      let id = _.get(filters, '[0].meta.index');
       if (id == null) return;
 
       return courier.indexPatterns.get(id).then(function (indexPattern) {
diff --git a/src/ui/public/filter_bar/lib/generateMappingChain.js b/src/ui/public/filter_bar/lib/generateMappingChain.js
index 092a14e21f4fc..d1bf9bcc21d08 100644
--- a/src/ui/public/filter_bar/lib/generateMappingChain.js
+++ b/src/ui/public/filter_bar/lib/generateMappingChain.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function generateMappingChainProvider(Promise) {
 
-    var noop = function () {
+    let noop = function () {
       return Promise.reject(new Error('No mappings have been found for filter.'));
     };
 
diff --git a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
index 1214e204c648d..452f313f2a508 100644
--- a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
+++ b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function mapAndFlattenFiltersProvider(Private, Promise) {
-    var mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
+    let mapFilter = Private(require('ui/filter_bar/lib/mapFilter'));
     return function (filters) {
       return _(filters)
       .flatten()
diff --git a/src/ui/public/filter_bar/lib/mapDefault.js b/src/ui/public/filter_bar/lib/mapDefault.js
index 2b93eb54c770c..69ea89f685725 100644
--- a/src/ui/public/filter_bar/lib/mapDefault.js
+++ b/src/ui/public/filter_bar/lib/mapDefault.js
@@ -1,17 +1,17 @@
 define(function (require) {
   return function mapDefaultProvider(Promise) {
-    var angular = require('angular');
-    var _ = require('lodash');
+    let angular = require('angular');
+    let _ = require('lodash');
 
-    var metaProperty = /(^\$|meta)/;
+    let metaProperty = /(^\$|meta)/;
 
     return function (filter) {
-      var key = _.find(_.keys(filter), function (key) {
+      let key = _.find(_.keys(filter), function (key) {
         return !key.match(metaProperty);
       });
 
       if (key) {
-        var value = angular.toJson(filter[key]);
+        let value = angular.toJson(filter[key]);
         return Promise.resolve({ key: key, value: value });
       }
       return Promise.reject(filter);
diff --git a/src/ui/public/filter_bar/lib/mapExists.js b/src/ui/public/filter_bar/lib/mapExists.js
index 93c458a95318e..d52519e01016f 100644
--- a/src/ui/public/filter_bar/lib/mapExists.js
+++ b/src/ui/public/filter_bar/lib/mapExists.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function mapExistsProvider(Promise) {
     return function (filter) {
-      var key;
-      var value;
+      let key;
+      let value;
       if (filter.exists) {
         key = 'exists';
         value = filter.exists.field;
diff --git a/src/ui/public/filter_bar/lib/mapFilter.js b/src/ui/public/filter_bar/lib/mapFilter.js
index 8261909ed67a7..ef20f62c309c2 100644
--- a/src/ui/public/filter_bar/lib/mapFilter.js
+++ b/src/ui/public/filter_bar/lib/mapFilter.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function mapFilterProvider(Promise, Private) {
 
-    var generateMappingChain = Private(require('./generateMappingChain'));
+    let generateMappingChain = Private(require('./generateMappingChain'));
 
     /** Mappers **/
 
@@ -20,7 +20,7 @@ define(function (require) {
     // To create a new mapper you just need to create a function
     // that either handles the mapping operation or not
     // and add it here. ProTip: These are executed in order listed
-    var mappers = [
+    let mappers = [
       Private(require('./mapMatchAll')),
       Private(require('./mapTerms')),
       Private(require('./mapRange')),
@@ -32,14 +32,14 @@ define(function (require) {
       Private(require('./mapDefault'))
     ];
 
-    var noop = function () {
+    let noop = function () {
       return Promise.reject(new Error('No mappings have been found for filter.'));
     };
 
     // Create a chain of responsibility by reducing all the
     // mappers down into one function.
-    var mapFn = _.reduceRight(mappers, function (memo, map) {
-      var filterChainFn = generateMappingChain(map);
+    let mapFn = _.reduceRight(mappers, function (memo, map) {
+      let filterChainFn = generateMappingChain(map);
       return filterChainFn(memo);
     }, noop);
 
diff --git a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
index 4eeec597d2806..cf782ae889149 100644
--- a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
+++ b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function mapFlattenAndWrapFilters(Private) {
-    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+    let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
     return function (filters) {
       return mapAndFlattenFilters(filters).then(function (filters) {
         return _.map(filters, function (filter) {
diff --git a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
index 9687c928c93c8..fa7913e330b69 100644
--- a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
+++ b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function mapGeoBoundBoxProvider(Promise, courier) {
     return function (filter) {
-      var key;
-      var value;
-      var topLeft;
-      var bottomRight;
-      var field;
+      let key;
+      let value;
+      let topLeft;
+      let bottomRight;
+      let field;
       if (filter.geo_bounding_box) {
         return courier
         .indexPatterns
diff --git a/src/ui/public/filter_bar/lib/mapMissing.js b/src/ui/public/filter_bar/lib/mapMissing.js
index 245831c995d0e..55c50d8570a6e 100644
--- a/src/ui/public/filter_bar/lib/mapMissing.js
+++ b/src/ui/public/filter_bar/lib/mapMissing.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function mapMissingProvider(Promise) {
     return function (filter) {
-      var key;
-      var value;
+      let key;
+      let value;
       if (filter.missing) {
         key = 'missing';
         value = filter.missing.field;
diff --git a/src/ui/public/filter_bar/lib/mapQueryString.js b/src/ui/public/filter_bar/lib/mapQueryString.js
index 57a141aa59cd0..c4dfe924a11fc 100644
--- a/src/ui/public/filter_bar/lib/mapQueryString.js
+++ b/src/ui/public/filter_bar/lib/mapQueryString.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function mapQueryStringProvider(Promise) {
     return function (filter) {
-      var key;
-      var value;
+      let key;
+      let value;
       if (filter.query && filter.query.query_string) {
         key = 'query';
         value = filter.query.query_string.query;
diff --git a/src/ui/public/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/mapRange.js
index a0d0c5bd18eed..dd89d0d65c427 100644
--- a/src/ui/public/filter_bar/lib/mapRange.js
+++ b/src/ui/public/filter_bar/lib/mapRange.js
@@ -8,14 +8,14 @@ define(function (require) {
       .indexPatterns
       .get(filter.meta.index)
       .then(function (indexPattern) {
-        var key = Object.keys(filter.range)[0];
-        var convert = indexPattern.fields.byName[key].format.getConverterFor('text');
-        var range = filter.range[key];
+        let key = Object.keys(filter.range)[0];
+        let convert = indexPattern.fields.byName[key].format.getConverterFor('text');
+        let range = filter.range[key];
 
-        var left = has(range, 'gte') ? range.gte : range.gt;
+        let left = has(range, 'gte') ? range.gte : range.gt;
         if (left == null) left = -Infinity;
 
-        var right = has(range, 'lte') ? range.lte : range.lt;
+        let right = has(range, 'lte') ? range.lte : range.lt;
         if (right == null) right = Infinity;
 
         return {
diff --git a/src/ui/public/filter_bar/lib/mapScript.js b/src/ui/public/filter_bar/lib/mapScript.js
index b25835b21cf4e..dd4f7a6cb6b0d 100644
--- a/src/ui/public/filter_bar/lib/mapScript.js
+++ b/src/ui/public/filter_bar/lib/mapScript.js
@@ -1,9 +1,9 @@
 define(function () {
   return function mapScriptProvider(Promise, courier) {
     return function (filter) {
-      var key;
-      var value;
-      var field;
+      let key;
+      let value;
+      let field;
       if (filter.script) {
         return courier
         .indexPatterns
diff --git a/src/ui/public/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/mapTerms.js
index 313dda7ac3c99..b99ac9b14a6de 100644
--- a/src/ui/public/filter_bar/lib/mapTerms.js
+++ b/src/ui/public/filter_bar/lib/mapTerms.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function mapTermsProvider(Promise, courier) {
     return function (filter) {
-      var key;
-      var value;
-      var field;
+      let key;
+      let value;
+      let field;
       if (filter.query && filter.query.match) {
         return courier
         .indexPatterns
diff --git a/src/ui/public/filter_bar/lib/onlyDisabled.js b/src/ui/public/filter_bar/lib/onlyDisabled.js
index 76078741bd556..f6c45d3e9d1d2 100644
--- a/src/ui/public/filter_bar/lib/onlyDisabled.js
+++ b/src/ui/public/filter_bar/lib/onlyDisabled.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
-  var pluckDisabled = function (filter) {
+  let pluckDisabled = function (filter) {
     return _.get(filter, 'meta.disabled');
   };
 
diff --git a/src/ui/public/filter_bar/lib/onlyStateChanged.js b/src/ui/public/filter_bar/lib/onlyStateChanged.js
index 777a4327eae68..17bcdcb9b6295 100644
--- a/src/ui/public/filter_bar/lib/onlyStateChanged.js
+++ b/src/ui/public/filter_bar/lib/onlyStateChanged.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var compareFilters = require('ui/filter_bar/lib/compareFilters');
-  var compareOptions = { disabled: true, negate: true };
+  let _ = require('lodash');
+  let compareFilters = require('ui/filter_bar/lib/compareFilters');
+  let compareOptions = { disabled: true, negate: true };
 
   /**
    * Checks to see if only disabled filters have been changed
@@ -9,7 +9,7 @@ define(function (require) {
    */
   return function (newFilters, oldFilters) {
     return _.every(newFilters, function (newFilter, i) {
-      var match = _.find(oldFilters, function (oldFilter) {
+      let match = _.find(oldFilters, function (oldFilter) {
         return compareFilters(newFilter, oldFilter, compareOptions);
       });
       return !!match;
diff --git a/src/ui/public/filter_bar/lib/uniqFilters.js b/src/ui/public/filter_bar/lib/uniqFilters.js
index 66023b9ecd203..9e2cb233c2371 100644
--- a/src/ui/public/filter_bar/lib/uniqFilters.js
+++ b/src/ui/public/filter_bar/lib/uniqFilters.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var dedupFilters = require('ui/filter_bar/lib/dedupFilters');
+  let _ = require('lodash');
+  let dedupFilters = require('ui/filter_bar/lib/dedupFilters');
 
   /**
    * Remove duplicate filters from an array of filters
@@ -8,7 +8,7 @@ define(function (require) {
    * @returns {object} The original filters array with duplicates removed
    */
   return function (filters, comparatorOptions) {
-    var results = [];
+    let results = [];
     _.each(filters, function (filter) {
       results = _.union(results, dedupFilters(results, [filter], comparatorOptions));
     });
diff --git a/src/ui/public/filter_bar/push_filter.js b/src/ui/public/filter_bar/push_filter.js
index 9e664b910a001..a6f5bd054678a 100644
--- a/src/ui/public/filter_bar/push_filter.js
+++ b/src/ui/public/filter_bar/push_filter.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function () {
     return function ($state) {
@@ -8,8 +8,8 @@ define(function (require) {
         // Hierarchical and tabular data set their aggConfigResult parameter
         // differently because of how the point is rewritten between the two. So
         // we need to check if the point.orig is set, if not use try the point.aggConfigResult
-        var filters = _.clone($state.filters || []);
-        var pendingFilter = { meta: { negate: negate, index: index }};
+        let filters = _.clone($state.filters || []);
+        let pendingFilter = { meta: { negate: negate, index: index }};
         _.extend(pendingFilter, filter);
         filters.push(pendingFilter);
         $state.filters = filters;
diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js
index b25d86943a7ab..9eb2e10dd431a 100644
--- a/src/ui/public/filter_bar/query_filter.js
+++ b/src/ui/public/filter_bar/query_filter.js
@@ -1,33 +1,41 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function (Private, $rootScope, getAppState, globalState) {
-    var EventEmitter = Private(require('ui/events'));
-    var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
-    var onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged');
-    var uniqFilters = require('ui/filter_bar/lib/uniqFilters');
-    var compareFilters = require('ui/filter_bar/lib/compareFilters');
-    var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
-    var angular = require('angular');
+    let EventEmitter = Private(require('ui/events'));
+    let onlyDisabled = require('ui/filter_bar/lib/onlyDisabled');
+    let onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged');
+    let uniqFilters = require('ui/filter_bar/lib/uniqFilters');
+    let compareFilters = require('ui/filter_bar/lib/compareFilters');
+    let mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters'));
+    let angular = require('angular');
 
-    var queryFilter = new EventEmitter();
+    let queryFilter = new EventEmitter();
 
     queryFilter.getFilters = function () {
-      var compareOptions = { disabled: true, negate: true };
-      var appFilters = queryFilter.getAppFilters();
-      var globalFilters = queryFilter.getGlobalFilters();
+      let compareOptions = { disabled: true, negate: true };
+      let appFilters = queryFilter.getAppFilters();
+      let globalFilters = queryFilter.getGlobalFilters();
 
       return uniqFilters(globalFilters.concat(appFilters), compareOptions);
     };
 
     queryFilter.getAppFilters = function () {
-      var appState = getAppState();
+      let appState = getAppState();
       if (!appState || !appState.filters) return [];
+
+      // Work around for https://github.com/elastic/kibana/issues/5896
+      appState.filters = validateStateFilters(appState);
+
       return (appState.filters) ? _.map(appState.filters, appendStoreType('appState')) : [];
     };
 
     queryFilter.getGlobalFilters = function () {
       if (!globalState.filters) return [];
+
+      // Work around for https://github.com/elastic/kibana/issues/5896
+      globalState.filters = validateStateFilters(globalState);
+
       return _.map(globalState.filters, appendStoreType('globalState'));
     };
 
@@ -38,8 +46,8 @@ define(function (require) {
      * @retuns {Promise} filter map promise
      */
     queryFilter.addFilters = function (filters, global) {
-      var appState = getAppState();
-      var state = (global) ? globalState : appState;
+      let appState = getAppState();
+      let state = (global) ? globalState : appState;
 
       if (!_.isArray(filters)) {
         filters = [filters];
@@ -62,10 +70,10 @@ define(function (require) {
      * @param {object} matchFilter The filter to remove
      */
     queryFilter.removeFilter = function (matchFilter) {
-      var appState = getAppState();
-      var filter = _.omit(matchFilter, ['$$hashKey']);
-      var state;
-      var index;
+      let appState = getAppState();
+      let filter = _.omit(matchFilter, ['$$hashKey']);
+      let state;
+      let index;
 
       // check for filter in appState
       if (appState) {
@@ -91,11 +99,11 @@ define(function (require) {
     * @returns {object} Promise that resolves to the new filter on a successful merge
     */
     queryFilter.updateFilter = function (filter) {
-      var mergedFilter = _.assign({}, filter.source, filter.model);
+      let mergedFilter = _.assign({}, filter.source, filter.model);
       mergedFilter.meta.alias = filter.alias;
       //If the filter type is changed we want to discard the old type
       //when merging changes back in
-      var filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
+      let filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
       if (filterTypeReplaced) {
         delete mergedFilter[filter.type];
       }
@@ -107,7 +115,7 @@ define(function (require) {
      * Removes all filters
      */
     queryFilter.removeAll = function () {
-      var appState = getAppState();
+      let appState = getAppState();
       appState.filters = [];
       globalState.filters = [];
     };
@@ -120,7 +128,7 @@ define(function (require) {
      */
     queryFilter.toggleFilter = function (filter, force) {
       // Toggle the disabled flag
-      var disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
+      let disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
       filter.meta.disabled = disabled;
       return filter;
     };
@@ -165,20 +173,20 @@ define(function (require) {
      * @returns {object} updated filter
      */
     queryFilter.pinFilter = function (filter, force) {
-      var appState = getAppState();
+      let appState = getAppState();
       if (!appState) return filter;
 
       // ensure that both states have a filters property
       if (!_.isArray(globalState.filters)) globalState.filters = [];
       if (!_.isArray(appState.filters)) appState.filters = [];
 
-      var appIndex = _.indexOf(appState.filters, filter);
+      let appIndex = _.indexOf(appState.filters, filter);
 
       if (appIndex !== -1 && force !== false) {
         appState.filters.splice(appIndex, 1);
         globalState.filters.push(filter);
       } else {
-        var globalIndex = _.indexOf(globalState.filters, filter);
+        let globalIndex = _.indexOf(globalState.filters, filter);
 
         if (globalIndex === -1 || force === true) return filter;
 
@@ -205,12 +213,25 @@ define(function (require) {
 
     return queryFilter;
 
+    /**
+     * Rids filter list of null values and replaces state if any nulls are found
+     */
+    function validateStateFilters(state) {
+      let compacted = _.compact(state.filters);
+      if (state.filters.length !== compacted.length) {
+        state.filters = compacted;
+        state.replace();
+      }
+      return state.filters;
+    }
+
+
     /**
      * Saves both app and global states, ensuring filters are persisted
      * @returns {object} Resulting filter list, app and global combined
      */
     function saveState() {
-      var appState = getAppState();
+      let appState = getAppState();
       if (appState) appState.save();
       globalState.save();
     }
@@ -226,9 +247,9 @@ define(function (require) {
 
     // helper to run a function on all filters in all states
     function executeOnFilters(fn) {
-      var appState = getAppState();
-      var globalFilters = [];
-      var appFilters = [];
+      let appState = getAppState();
+      let globalFilters = [];
+      let appFilters = [];
 
       if (globalState.filters) globalFilters = globalState.filters;
       if (appState && appState.filters) appFilters = appState.filters;
@@ -238,13 +259,13 @@ define(function (require) {
 
     function mergeStateFilters(gFilters, aFilters, compareOptions) {
       // ensure we don't mutate the filters passed in
-      var globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
-      var appFilters = aFilters ? _.cloneDeep(aFilters) : [];
+      let globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
+      let appFilters = aFilters ? _.cloneDeep(aFilters) : [];
       compareOptions = _.defaults(compareOptions || {}, { disabled: true });
 
       // existing globalFilters should be mutated by appFilters
       _.each(appFilters, function (filter, i) {
-        var match = _.find(globalFilters, function (globalFilter) {
+        let match = _.find(globalFilters, function (globalFilter) {
           return compareFilters(globalFilter, filter, compareOptions);
         });
 
@@ -267,7 +288,7 @@ define(function (require) {
      * @returns {void}
      */
     function initWatchers() {
-      var removeAppStateWatchers;
+      let removeAppStateWatchers;
 
       $rootScope.$watch(getAppState, function () {
         removeAppStateWatchers && removeAppStateWatchers();
@@ -276,7 +297,7 @@ define(function (require) {
 
       function initAppStateWatchers() {
         // multi watch on the app and global states
-        var stateWatchers = [{
+        let stateWatchers = [{
           fn: $rootScope.$watch,
           deep: true,
           get: queryFilter.getGlobalFilters
@@ -291,18 +312,18 @@ define(function (require) {
           // prevent execution on watcher instantiation
           if (_.isEqual(next, prev)) return;
 
-          var doUpdate = false;
-          var doFetch = false;
+          let doUpdate = false;
+          let doFetch = false;
 
           // reconcile filter in global and app states
-          var filters = mergeStateFilters(next[0], next[1]);
-          var globalFilters = filters[0];
-          var appFilters = filters[1];
-          var appState = getAppState();
+          let filters = mergeStateFilters(next[0], next[1]);
+          let globalFilters = filters[0];
+          let appFilters = filters[1];
+          let appState = getAppState();
 
           // save the state, as it may have updated
-          var globalChanged = !_.isEqual(next[0], globalFilters);
-          var appChanged = !_.isEqual(next[1], appFilters);
+          let globalChanged = !_.isEqual(next[0], globalFilters);
+          let appChanged = !_.isEqual(next[1], appFilters);
 
           // the filters were changed, apply to state (re-triggers this watcher)
           if (globalChanged || appChanged) {
@@ -325,12 +346,12 @@ define(function (require) {
 
           // iterate over each state type, checking for changes
           function getActions() {
-            var newFilters = [];
-            var oldFilters = [];
+            let newFilters = [];
+            let oldFilters = [];
 
             stateWatchers.forEach(function (watcher, i) {
-              var nextVal = next[i];
-              var prevVal = prev[i];
+              let nextVal = next[i];
+              let prevVal = prev[i];
               newFilters = newFilters.concat(nextVal);
               oldFilters = oldFilters.concat(prevVal);
 
diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js
index d3114d562a34d..73f16fb6e1f9e 100644
--- a/src/ui/public/filter_manager/__tests__/filter_manager.js
+++ b/src/ui/public/filter_manager/__tests__/filter_manager.js
@@ -1,16 +1,16 @@
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var MockState = require('fixtures/mock_state');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var $rootScope;
-var queryFilter;
-var filterManager;
-var appState;
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let MockState = require('fixtures/mock_state');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let $rootScope;
+let queryFilter;
+let filterManager;
+let appState;
 
 function checkAddFilters(length, comps, idx) {
   idx = idx || 0;
-  var filters = queryFilter.addFilters.getCall(idx).args[0];
+  let filters = queryFilter.addFilters.getCall(idx).args[0];
 
   expect(filters.length).to.be(length);
   if (!_.isArray(comps)) return;
@@ -112,7 +112,7 @@ describe('Filter Manager', function () {
     checkAddFilters(0, null, 3);
     expect(appState.filters).to.have.length(2);
 
-    var scriptedField = {name: 'scriptedField', scripted: true, script: 1};
+    let scriptedField = {name: 'scriptedField', scripted: true, script: 1};
     filterManager.add(scriptedField, 1, '+', 'myIndex');
     checkAddFilters(1, [{
       meta: {index: 'myIndex', negate: false, field: 'scriptedField'},
diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js
index 497fc49983ac3..d9bbc8859a520 100644
--- a/src/ui/public/filter_manager/filter_manager.js
+++ b/src/ui/public/filter_manager/filter_manager.js
@@ -1,22 +1,22 @@
 // Adds a filter to a passed state
 define(function (require) {
   return function (Private) {
-    var _ = require('lodash');
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var filterManager = {};
+    let _ = require('lodash');
+    let queryFilter = Private(require('ui/filter_bar/query_filter'));
+    let filterManager = {};
 
     filterManager.add = function (field, values, operation, index) {
       values = _.isArray(values) ? values : [values];
-      var fieldName = _.isObject(field) ? field.name : field;
-      var filters = _.flatten([queryFilter.getAppFilters()]);
-      var newFilters = [];
+      let fieldName = _.isObject(field) ? field.name : field;
+      let filters = _.flatten([queryFilter.getAppFilters()]);
+      let newFilters = [];
 
-      var negate = (operation === '-');
+      let negate = (operation === '-');
 
       // TODO: On array fields, negating does not negate the combination, rather all terms
       _.each(values, function (value) {
-        var filter;
-        var existing = _.find(filters, function (filter) {
+        let filter;
+        let existing = _.find(filters, function (filter) {
           if (!filter) return;
 
           if (fieldName === '_exists_' && filter.exists) {
diff --git a/src/ui/public/filter_manager/lib/__tests__/phrase.js b/src/ui/public/filter_manager/lib/__tests__/phrase.js
index 1bdd62c2417e8..948a231e1cc3e 100644
--- a/src/ui/public/filter_manager/lib/__tests__/phrase.js
+++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js
@@ -1,10 +1,10 @@
 
-var fn = require('ui/filter_manager/lib/phrase');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var indexPattern;
-var expected;
+let fn = require('ui/filter_manager/lib/phrase');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let indexPattern;
+let expected;
 describe('Filter Manager', function () {
   describe('Phrase filter builder', function () {
     beforeEach(ngMock.module('kibana'));
diff --git a/src/ui/public/filter_manager/lib/__tests__/query.js b/src/ui/public/filter_manager/lib/__tests__/query.js
index 19a81f2d80bdb..5cea0036568b7 100644
--- a/src/ui/public/filter_manager/lib/__tests__/query.js
+++ b/src/ui/public/filter_manager/lib/__tests__/query.js
@@ -1,10 +1,10 @@
 
-var fn = require('ui/filter_manager/lib/query');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var indexPattern;
-var expected;
+let fn = require('ui/filter_manager/lib/query');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let indexPattern;
+let expected;
 describe('Filter Manager', function () {
   describe('Phrase filter builder', function () {
     beforeEach(ngMock.module('kibana'));
diff --git a/src/ui/public/filter_manager/lib/__tests__/range.js b/src/ui/public/filter_manager/lib/__tests__/range.js
index 8145a9a3a0212..56d75fbe71707 100644
--- a/src/ui/public/filter_manager/lib/__tests__/range.js
+++ b/src/ui/public/filter_manager/lib/__tests__/range.js
@@ -1,10 +1,10 @@
 
-var fn = require('ui/filter_manager/lib/range');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var indexPattern;
-var expected;
+let fn = require('ui/filter_manager/lib/range');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let indexPattern;
+let expected;
 describe('Filter Manager', function () {
   describe('Range filter builder', function () {
     beforeEach(ngMock.module('kibana'));
@@ -53,9 +53,9 @@ describe('Filter Manager', function () {
 
     it('to use the right operator for each of gte, gt, lt and lte', function () {
       _.each({gte: '>=', gt: '>', lte: '<=', lt: '<'}, function (operator, key) {
-        var params = {};
+        let params = {};
         params[key] = 5;
-        var filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
+        let filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
 
         expect(filter.script.script).to.be('(' + indexPattern.fields.byName['script number'].script + ')' + operator + key);
         expect(filter.script.params[key]).to.be(5);
diff --git a/src/ui/public/filter_manager/lib/phrase.js b/src/ui/public/filter_manager/lib/phrase.js
index 98fcabca07bcb..3b9286f308e5e 100644
--- a/src/ui/public/filter_manager/lib/phrase.js
+++ b/src/ui/public/filter_manager/lib/phrase.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function buildPhraseFilter(field, value, indexPattern) {
-    var filter = { meta: { index: indexPattern.id} };
+    let filter = { meta: { index: indexPattern.id} };
 
     if (field.scripted) {
       filter.script = {
diff --git a/src/ui/public/filter_manager/lib/query.js b/src/ui/public/filter_manager/lib/query.js
index c32cb8c117975..3352307797542 100644
--- a/src/ui/public/filter_manager/lib/query.js
+++ b/src/ui/public/filter_manager/lib/query.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function buildQueryFilter(query, index) {
     return {
       query: query,
diff --git a/src/ui/public/filters/__tests__/commaList.js b/src/ui/public/filters/__tests__/commaList.js
index 461f3e2aeec76..a6a491a491c61 100644
--- a/src/ui/public/filters/__tests__/commaList.js
+++ b/src/ui/public/filters/__tests__/commaList.js
@@ -1,10 +1,10 @@
 require('ui/filters/commaList');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Comma-List filter', function () {
 
-  var commaList;
+  let commaList;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js
index 3a70397c5712a..c6b6cf2475907 100644
--- a/src/ui/public/filters/__tests__/field_type.js
+++ b/src/ui/public/filters/__tests__/field_type.js
@@ -1,15 +1,15 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
 require('plugins/kibana/discover/index');
 require('ui/filters/field_type');
 
-var filter;
+let filter;
 
-var types;
+let types;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
@@ -59,7 +59,7 @@ describe('fieldType array filter', function () {
   });
 
   it('should allow negation', function () {
-    var resultNames = _.pluck(filter(types, '!string'), 'name');
+    let resultNames = _.pluck(filter(types, '!string'), 'name');
     expect(resultNames).to.eql(['n1', 'n2', 'i1', 'd1']);
   });
 });
diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js
index 802614fc149ba..2d5946f0b6f1a 100644
--- a/src/ui/public/filters/__tests__/label.js
+++ b/src/ui/public/filters/__tests__/label.js
@@ -1,15 +1,15 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var _ = require('lodash');
-var faker = require('faker');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let _ = require('lodash');
+let faker = require('faker');
+let ngMock = require('ngMock');
 
 // Load kibana and its applications
 require('plugins/kibana/discover/index');
 
-var filter;
+let filter;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js
index b2b1259a07e75..48260c0f14f40 100644
--- a/src/ui/public/filters/__tests__/moment.js
+++ b/src/ui/public/filters/__tests__/moment.js
@@ -1,18 +1,18 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var sinon = require('auto-release-sinon');
-var moment = require('moment');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let sinon = require('auto-release-sinon');
+let moment = require('moment');
+let ngMock = require('ngMock');
 
 require('ui/filters/moment');
 
-var filter;
+let filter;
 
-var config;
-var anchor = '2014-01-01T06:06:06.666';
-var clock;
+let config;
+let anchor = '2014-01-01T06:06:06.666';
+let clock;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js
index 7da99317b682e..6ac1b76a577b8 100644
--- a/src/ui/public/filters/__tests__/rison.js
+++ b/src/ui/public/filters/__tests__/rison.js
@@ -1,14 +1,14 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 // Load kibana and its applications
 require('plugins/kibana/discover/index');
 
-var rison;
-var risonDecode;
+let rison;
+let risonDecode;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
@@ -20,13 +20,13 @@ var init = function (expandable) {
 };
 
 describe('rison filters', function () {
-  var testObj = {
+  let testObj = {
     time: {
       from: 'now-15m',
       to: 'now'
     }
   };
-  var testRison = '(time:(from:now-15m,to:now))';
+  let testRison = '(time:(from:now-15m,to:now))';
 
   beforeEach(function () {
     init();
diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js
index 242224d90cff9..ad069fc99f3ee 100644
--- a/src/ui/public/filters/__tests__/short_dots.js
+++ b/src/ui/public/filters/__tests__/short_dots.js
@@ -1,16 +1,16 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 require('ui/filters/short_dots');
 
-var filter;
+let filter;
 
-var config;
+let config;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js
index fbb94552c761c..90d6f7da98a60 100644
--- a/src/ui/public/filters/__tests__/start_from.js
+++ b/src/ui/public/filters/__tests__/start_from.js
@@ -1,12 +1,12 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 require('ui/filters/start_from');
 
-var filter;
+let filter;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js
index 5d09813c909b8..149395e9be725 100644
--- a/src/ui/public/filters/__tests__/uriescape.js
+++ b/src/ui/public/filters/__tests__/uriescape.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var _ = require('lodash');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
 
 require('plugins/kibana/discover/index');
 
-var filter;
+let filter;
 
-var init = function (expandable) {
+let init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/_prop_filter.js b/src/ui/public/filters/_prop_filter.js
index 6423c55f025de..564cfcfd47ff3 100644
--- a/src/ui/public/filters/_prop_filter.js
+++ b/src/ui/public/filters/_prop_filter.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * Filters out a list by a given filter. This is currently used to impelment:
@@ -24,9 +24,9 @@ define(function (require) {
       if (!_.isArray(filters)) filters = filters.split(',');
       if (_.contains(filters, '*')) return list;
 
-      var options = filters.reduce(function (options, filter) {
-        var type = 'include';
-        var value = filter;
+      let options = filters.reduce(function (options, filter) {
+        let type = 'include';
+        let value = filter;
 
         if (filter.charAt(0) === '!') {
           type = 'exclude';
@@ -39,12 +39,12 @@ define(function (require) {
       }, {});
 
       return list.filter(function (item) {
-        var value = item[prop];
+        let value = item[prop];
 
-        var excluded = options.exclude && _.contains(options.exclude, value);
+        let excluded = options.exclude && _.contains(options.exclude, value);
         if (excluded) return false;
 
-        var included = !options.include || _.contains(options.include, value);
+        let included = !options.include || _.contains(options.include, value);
         if (included) return true;
 
         return false;
diff --git a/src/ui/public/filters/commaList.js b/src/ui/public/filters/commaList.js
index 7967ce1eb3668..44b3abdafe9cb 100644
--- a/src/ui/public/filters/commaList.js
+++ b/src/ui/public/filters/commaList.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
   .get('kibana')
@@ -13,12 +13,12 @@ define(function (require) {
      * @return {String}
      */
     return function (input, inclusive) {
-      var list = _.commaSeperatedList(input);
+      let list = _.commaSeperatedList(input);
       if (list.length < 2) {
         return list.join('');
       }
 
-      var conj = inclusive ? ' and ' : ' or ';
+      let conj = inclusive ? ' and ' : ' or ';
       return list.slice(0, -1).join(', ') + conj + _.last(list);
 
     };
diff --git a/src/ui/public/filters/field_type.js b/src/ui/public/filters/field_type.js
index c1a9cda407992..c682a5346b2ac 100644
--- a/src/ui/public/filters/field_type.js
+++ b/src/ui/public/filters/field_type.js
@@ -2,8 +2,8 @@
 // You may also pass "*" to get all types
 // Or an array of types to get all fields of that type
 define(function (require) {
-  var _ = require('lodash');
-  var propFilter = require('ui/filters/_prop_filter');
+  let _ = require('lodash');
+  let propFilter = require('ui/filters/_prop_filter');
 
   require('ui/modules')
   .get('kibana')
diff --git a/src/ui/public/filters/label.js b/src/ui/public/filters/label.js
index 50c8aec3662ca..22d98bf51a984 100644
--- a/src/ui/public/filters/label.js
+++ b/src/ui/public/filters/label.js
@@ -3,14 +3,14 @@ define(function (require) {
     .get('kibana')
     .filter('label', function () {
       return function (str) {
-        var words = str.split(' ');
+        let words = str.split(' ');
         return words.map(capFirst).join(' ');
       };
     });
 
   function capFirst(str) {
-    var i = str[0];
-    var r = new RegExp(i, 'i');
+    let i = str[0];
+    let r = new RegExp(i, 'i');
     return str.replace(r, i.toUpperCase());
   }
 });
diff --git a/src/ui/public/filters/match_any.js b/src/ui/public/filters/match_any.js
index 2bc196543c0ad..821f05cb43f1c 100644
--- a/src/ui/public/filters/match_any.js
+++ b/src/ui/public/filters/match_any.js
@@ -2,7 +2,7 @@
 // You may also pass "*" to get all types
 // Or an array of types to get all fields of that type
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
   .get('kibana')
@@ -13,7 +13,7 @@ define(function (require) {
       }
 
       return _.filter(items, function (item) {
-        for (var i = 0; i < rules.length; i++) {
+        for (let i = 0; i < rules.length; i++) {
           if (_.some([item], rules[i])) {
             return true;
           }
diff --git a/src/ui/public/filters/moment.js b/src/ui/public/filters/moment.js
index 4dc1afa2cc722..89b2b1f715763 100644
--- a/src/ui/public/filters/moment.js
+++ b/src/ui/public/filters/moment.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  var moment = require('moment');
-  var _ = require('lodash');
+  let moment = require('moment');
+  let _ = require('lodash');
 
   require('ui/modules')
     .get('kibana')
     .filter('moment', function (config) {
       return function (datetime) {
-        var format = config.get('dateFormat');
+        let format = config.get('dateFormat');
         if (moment.isMoment(datetime)) return datetime.format(format);
         if (_.isDate(datetime)) return moment(datetime).format(format);
         return datetime;
diff --git a/src/ui/public/filters/rison.js b/src/ui/public/filters/rison.js
index 764382ea879c2..3274ddaf01bfc 100644
--- a/src/ui/public/filters/rison.js
+++ b/src/ui/public/filters/rison.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var rison = require('ui/utils/rison');
-  var module = require('ui/modules').get('kibana');
+  let rison = require('ui/utils/rison');
+  let module = require('ui/modules').get('kibana');
 
   module.filter('rison', function () {
     return function (str) {
diff --git a/src/ui/public/filters/short_dots.js b/src/ui/public/filters/short_dots.js
index 0496dd64c33e7..4275da15f3e6f 100644
--- a/src/ui/public/filters/short_dots.js
+++ b/src/ui/public/filters/short_dots.js
@@ -2,7 +2,7 @@
 // eg: foo.bar.baz becomes f.b.baz
 // 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';});
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
     .get('kibana')
@@ -11,7 +11,7 @@ define(function (require) {
     });
 
   function shortDotsFilterProvider(config, $rootScope) {
-    var filter;
+    let filter;
 
     function updateFilter() {
       filter = config.get('shortDots:enable') ? _.shortenDottedString : _.identity;
diff --git a/src/ui/public/filters/trust_as_html.js b/src/ui/public/filters/trust_as_html.js
index 2b2700e2301f3..25d2615232a10 100644
--- a/src/ui/public/filters/trust_as_html.js
+++ b/src/ui/public/filters/trust_as_html.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var angular = require('angular');
-  var module = require('ui/modules').get('kibana');
+  let angular = require('angular');
+  let module = require('ui/modules').get('kibana');
 
   // Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller
   // (See http://goo.gl/mpj9o2)
diff --git a/src/ui/public/filters/unique.js b/src/ui/public/filters/unique.js
index ec3a4d171f448..7cbafa2130b30 100644
--- a/src/ui/public/filters/unique.js
+++ b/src/ui/public/filters/unique.js
@@ -1,12 +1,12 @@
 // Filters out all duplicate items in an array
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules')
     .get('kibana')
     .filter('unique', function () {
       return function (arr) {
-        var list = _.unique(arr);
+        let list = _.unique(arr);
         return list;
       };
     });
diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixedScroll.js
index ad2a7f85e15d8..9892ebc6d28d6 100644
--- a/src/ui/public/fixedScroll.js
+++ b/src/ui/public/fixedScroll.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
+  const $ = require('jquery');
+  const _ = require('lodash');
 
-  var SCROLLER_HEIGHT = 20;
+  const SCROLLER_HEIGHT = 20;
 
   require('ui/modules')
   .get('kibana')
@@ -10,15 +10,15 @@ define(function (require) {
     return {
       restrict: 'A',
       link: function ($scope, $el) {
-        var $window = $(window);
-        var $scroller = $('<div class="fixed-scroll-scroller">').height(SCROLLER_HEIGHT);
+        let $window = $(window);
+        let $scroller = $('<div class="fixed-scroll-scroller">').height(SCROLLER_HEIGHT);
 
 
         /**
          * Remove the listeners bound in listen()
          * @type {function}
          */
-        var unlisten = _.noop;
+        let unlisten = _.noop;
 
         /**
          * Listen for scroll events on the $scroller and the $el, sets unlisten()
@@ -36,7 +36,7 @@ define(function (require) {
             throw new Error('fixedScroll listeners were not cleaned up properly before re-listening!');
           }
 
-          var blockTo;
+          let blockTo;
           function bind($from, $to) {
             function handler() {
               if (blockTo === $to) return (blockTo = null);
@@ -74,15 +74,15 @@ define(function (require) {
         function setup() {
           cleanUp();
 
-          var containerWidth = $el.width();
-          var contentWidth = $el.prop('scrollWidth');
-          var containerHorizOverflow = contentWidth - containerWidth;
+          const containerWidth = $el.width();
+          const contentWidth = $el.prop('scrollWidth');
+          const containerHorizOverflow = contentWidth - containerWidth;
 
-          var elTop = $el.offset().top - $window.scrollTop();
-          var elBottom = elTop + $el.height();
-          var windowVertOverflow = elBottom - $window.height();
+          const elTop = $el.offset().top - $window.scrollTop();
+          const elBottom = elTop + $el.height();
+          const windowVertOverflow = elBottom - $window.height();
 
-          var requireScroller = containerHorizOverflow > 0 && windowVertOverflow > 0;
+          const requireScroller = containerHorizOverflow > 0 && windowVertOverflow > 0;
           if (!requireScroller) return;
 
           // push the content away from the scroller
diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js
index fff63f1e33325..38a455ef588bd 100644
--- a/src/ui/public/highlight/__tests__/highlight.js
+++ b/src/ui/public/highlight/__tests__/highlight.js
@@ -1,13 +1,13 @@
 
 describe('Highlight', function () {
-  var angular = require('angular');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let angular = require('angular');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
   require('ui/highlight');
 
-  var filter;
+  let filter;
 
-  var tags;
+  let tags;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (highlightFilter, highlightTags) {
@@ -15,7 +15,7 @@ describe('Highlight', function () {
     tags = highlightTags;
   }));
 
-  var text = '' +
+  let text = '' +
     'Bacon ipsum dolor amet pork loin pork cow pig beef chuck ground round shankle sirloin landjaeger kevin ' +
     'venison sausage ribeye tongue. Chicken bacon ball tip pork. Brisket pork capicola spare ribs pastrami rump ' +
     'sirloin, t-bone ham shoulder jerky turducken bresaola. Chicken cow beef picanha. Picanha hamburger alcatra ' +
@@ -28,27 +28,27 @@ describe('Highlight', function () {
   });
 
   it('should highlight a single result', function () {
-    var highlights = [
+    let highlights = [
       tags.pre + 'hamburger' + tags.post + ' alcatra cupim. Salami capicola boudin pork belly shank picanha.'
     ];
-    var result = filter(text, highlights);
+    let result = filter(text, highlights);
     expect(result.indexOf('<mark>hamburger</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>hamburger</mark>').length).to.be(text.split('hamburger').length);
   });
 
   it('should highlight multiple results', function () {
-    var highlights = [
+    let highlights = [
       'kevin venison sausage ribeye tongue. ' + tags.pre + 'Chicken' + tags.post + ' bacon ball tip pork. Brisket ' +
       'pork capicola spare ribs pastrami rump sirloin, t-bone ham shoulder jerky turducken bresaola. ' + tags.pre +
       'Chicken' + tags.post + ' cow beef picanha. Picanha'
     ];
-    var result = filter(text, highlights);
+    let result = filter(text, highlights);
     expect(result.indexOf('<mark>Chicken</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>Chicken</mark>').length).to.be(text.split('Chicken').length);
   });
 
   it('should highlight multiple hits in a result', function () {
-    var highlights = [
+    let highlights = [
       'Bacon ipsum dolor amet ' + tags.pre + 'pork' + tags.post + ' loin ' +
         '' + tags.pre + 'pork' + tags.post + ' cow pig beef chuck ground round shankle ' +
         'sirloin landjaeger',
@@ -58,14 +58,14 @@ describe('Highlight', function () {
       'hamburger alcatra cupim. Salami capicola boudin ' + tags.pre + 'pork' + tags.post + ' ' +
         'belly shank picanha.'
     ];
-    var result = filter(text, highlights);
+    let result = filter(text, highlights);
     expect(result.indexOf('<mark>pork</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>pork</mark>').length).to.be(text.split('pork').length);
   });
 
   it('should accept an object and return a string containing its properties', function () {
-    var obj = {foo: 1, bar: 2};
-    var result = filter(obj, null);
+    let obj = {foo: 1, bar: 2};
+    let result = filter(obj, null);
     expect(result.indexOf('' + obj)).to.be(-1);
     expect(result.indexOf('foo')).to.be.greaterThan(-1);
     expect(result.indexOf('bar')).to.be.greaterThan(-1);
diff --git a/src/ui/public/highlight/highlight.js b/src/ui/public/highlight/highlight.js
index 6953f2e9a460c..b2384ee0e7b0f 100644
--- a/src/ui/public/highlight/highlight.js
+++ b/src/ui/public/highlight/highlight.js
@@ -1,9 +1,9 @@
 define(function (require) {
   require('ui/highlight/highlight_tags');
 
-  var _ = require('lodash');
-  var angular = require('angular');
-  var module = require('ui/modules').get('kibana');
+  let _ = require('lodash');
+  let angular = require('angular');
+  let module = require('ui/modules').get('kibana');
 
   module.filter('highlight', function (highlightTags) {
     return function (formatted, highlight) {
@@ -13,12 +13,12 @@ define(function (require) {
         section = _.escape(section);
 
         // Strip out the highlight tags to compare against the formatted string
-        var untagged = section
+        let untagged = section
           .split(highlightTags.pre).join('')
           .split(highlightTags.post).join('');
 
         // Replace all highlight tags with proper html tags
-        var tagged = section
+        let tagged = section
           .split(highlightTags.pre).join('<mark>')
           .split(highlightTags.post).join('</mark>');
 
diff --git a/src/ui/public/highlight/highlight_tags.js b/src/ui/public/highlight/highlight_tags.js
index 2f6aea6db1402..90da61d6320ab 100644
--- a/src/ui/public/highlight/highlight_tags.js
+++ b/src/ui/public/highlight/highlight_tags.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   // By default, ElasticSearch surrounds matched values in <em></em>. This is not ideal because it is possible that
   // the value could contain <em></em> in the value. We define these custom tags that we would never expect to see
diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_FieldFormat.js
index 6863573b8ec1a..c42386550a232 100644
--- a/src/ui/public/index_patterns/__tests__/_FieldFormat.js
+++ b/src/ui/public/index_patterns/__tests__/_FieldFormat.js
@@ -1,10 +1,10 @@
 describe('FieldFormat class', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var FieldFormat;
-  var TestFormat;
+  let FieldFormat;
+  let TestFormat;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -23,14 +23,14 @@ describe('FieldFormat class', function () {
 
   describe('params', function () {
     it('accepts its params via the constructor', function () {
-      var f = new TestFormat({ foo: 'bar' });
+      let f = new TestFormat({ foo: 'bar' });
       expect(f.param('foo')).to.be('bar');
     });
 
     it('allows reading a clone of the params', function () {
-      var params = { foo: 'bar' };
-      var f = new TestFormat(params);
-      var output = f.params();
+      let params = { foo: 'bar' };
+      let f = new TestFormat(params);
+      let output = f.params();
       expect(output).to.eql(params);
       expect(output).to.not.be(params);
     });
@@ -38,29 +38,29 @@ describe('FieldFormat class', function () {
 
   describe('type', function () {
     it('links the constructor class to instances as the `type`', function () {
-      var f = new TestFormat();
+      let f = new TestFormat();
       expect(f.type).to.be(TestFormat);
     });
   });
 
   describe('toJSON', function () {
     it('serializes to a version a basic id and param pair', function () {
-      var f = new TestFormat({ foo: 'bar' });
-      var ser = JSON.parse(JSON.stringify(f));
+      let f = new TestFormat({ foo: 'bar' });
+      let ser = JSON.parse(JSON.stringify(f));
       expect(ser).to.eql({ id: 'test-format', params: { foo: 'bar' } });
     });
 
     it('removes param values that match the defaults', function () {
       TestFormat.paramDefaults = { foo: 'bar' };
 
-      var f = new TestFormat({ foo: 'bar', baz: 'bar' });
-      var ser = JSON.parse(JSON.stringify(f));
+      let f = new TestFormat({ foo: 'bar', baz: 'bar' });
+      let ser = JSON.parse(JSON.stringify(f));
       expect(ser.params).to.eql({ baz: 'bar' });
     });
 
     it('removes the params entirely if they are empty', function () {
-      var f = new TestFormat();
-      var ser = JSON.parse(JSON.stringify(f));
+      let f = new TestFormat();
+      let ser = JSON.parse(JSON.stringify(f));
       expect(ser).to.not.have.property('params');
     });
   });
@@ -68,7 +68,7 @@ describe('FieldFormat class', function () {
   describe('converters', function () {
     describe('#getConverterFor', function () {
       it('returns a converter for a specific content type', function () {
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.getConverterFor('html')()).to.be.a('string');
         expect(f.getConverterFor('text')()).to.be.a('string');
       });
@@ -80,9 +80,9 @@ describe('FieldFormat class', function () {
           return 'formatted';
         };
 
-        var f = new TestFormat();
-        var text = f.getConverterFor('text');
-        var html = f.getConverterFor('html');
+        let f = new TestFormat();
+        let text = f.getConverterFor('text');
+        let html = f.getConverterFor('html');
         expect(text).to.not.be(html);
         expect(text()).to.be('formatted');
         expect(html()).to.be('formatted');
@@ -94,9 +94,9 @@ describe('FieldFormat class', function () {
           html: _.constant('formatted html'),
         };
 
-        var f = new TestFormat();
-        var text = f.getConverterFor('text');
-        var html = f.getConverterFor('html');
+        let f = new TestFormat();
+        let text = f.getConverterFor('text');
+        let html = f.getConverterFor('html');
         expect(text).to.not.be(html);
         expect(text()).to.be('formatted text');
         expect(html()).to.be('formatted html');
@@ -104,13 +104,13 @@ describe('FieldFormat class', function () {
 
       it('does not escape the output of the text converter', function () {
         TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.convert('', 'text')).to.contain('<');
       });
 
       it('does escape the output of the text converter if used in an html context', function () {
         TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.convert('', 'html')).to.not.contain('<');
       });
 
@@ -120,7 +120,7 @@ describe('FieldFormat class', function () {
           html: _.constant('<img>'),
         };
 
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.convert('', 'text')).to.be('<img>');
         expect(f.convert('', 'html')).to.be('<img>');
       });
@@ -133,7 +133,7 @@ describe('FieldFormat class', function () {
           html: _.constant('html'),
         };
 
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.convert('val')).to.be('text');
       });
 
@@ -143,7 +143,7 @@ describe('FieldFormat class', function () {
           html: _.constant('html'),
         };
 
-        var f = new TestFormat();
+        let f = new TestFormat();
         expect(f.convert('val', 'html')).to.be('html');
       });
     });
diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
index 1c18a8f7f942f..06dedda19c2a7 100644
--- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
@@ -1,10 +1,10 @@
 describe('type normalizer (castMappingType)', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var fn;
-  var fields;
+  let fn;
+  let fields;
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
     fn = Private(require('ui/index_patterns/_cast_mapping_type'));
@@ -19,7 +19,7 @@ describe('type normalizer (castMappingType)', function () {
   });
 
   it('should cast numeric types to "number"', function () {
-    var types = [
+    let types = [
       'float',
       'double',
       'integer',
@@ -35,7 +35,7 @@ describe('type normalizer (castMappingType)', function () {
   });
 
   it('should treat non-numeric known types as what they are', function () {
-    var types = [
+    let types = [
       'date',
       'boolean',
       'ip',
diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
index 96f814df4312d..a54dd44e550b9 100644
--- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
+++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
@@ -1,13 +1,13 @@
 describe('get computed fields', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var indexPattern;
+  let indexPattern;
 
-  var getComputedFields;
+  let getComputedFields;
 
-  var fn;
+  let fn;
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
index d3aad1ec16ec6..6f394b903df31 100644
--- a/src/ui/public/index_patterns/__tests__/_index_pattern.js
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -1,23 +1,23 @@
 describe('index pattern', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var Promise = require('bluebird');
-  var errors = require('ui/errors');
-  var IndexedArray = require('ui/IndexedArray');
-  var IndexPattern;
-  var mapper;
-  var mappingSetup;
-  var mockLogstashFields;
-  var DocSource;
-  var config;
-  var docSourceResponse;
-  var indexPatternId = 'test-pattern';
-  var indexPattern;
-  var calculateIndices;
-  var $rootScope;
-  var intervals;
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let Promise = require('bluebird');
+  let errors = require('ui/errors');
+  let IndexedArray = require('ui/IndexedArray');
+  let IndexPattern;
+  let mapper;
+  let mappingSetup;
+  let mockLogstashFields;
+  let DocSource;
+  let config;
+  let docSourceResponse;
+  let indexPatternId = 'test-pattern';
+  let indexPattern;
+  let calculateIndices;
+  let $rootScope;
+  let intervals;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector, _config_) {
@@ -44,13 +44,19 @@ describe('index pattern', function () {
 
     // stub calculateIndices
     calculateIndices = sinon.spy(function () {
-      return $injector.get('Promise').resolve(['foo', 'bar']);
+      return $injector.get('Promise').resolve([
+        { index: 'foo', max: Infinity, min: -Infinity },
+        { index: 'bar', max: Infinity, min: -Infinity }
+      ]);
     });
     Private.stub(require('ui/index_patterns/_calculate_indices'), calculateIndices);
 
     // spy on intervals
     intervals = Private(require('ui/index_patterns/_intervals'));
-    sinon.stub(intervals, 'toIndexList').returns(['foo', 'bar']);
+    sinon.stub(intervals, 'toIndexList').returns([
+      { index: 'foo', max: Infinity, min: -Infinity },
+      { index: 'bar', max: Infinity, min: -Infinity }
+    ]);
 
     IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
   }));
@@ -64,7 +70,7 @@ describe('index pattern', function () {
 
   // helper function to create index patterns
   function create(id, payload) {
-    var indexPattern = new IndexPattern(id);
+    let indexPattern = new IndexPattern(id);
     DocSource.prototype.doIndex.returns(Promise.resolve(id));
     payload = _.defaults(payload || {}, docSourceResponse(id));
     setDocsourcePayload(payload);
@@ -117,16 +123,16 @@ describe('index pattern', function () {
 
   describe('getScriptedFields', function () {
     it('should return all scripted fields', function () {
-      var scriptedNames = _(mockLogstashFields).where({ scripted: true }).pluck('name').value();
-      var respNames = _.pluck(indexPattern.getScriptedFields(), 'name');
+      let scriptedNames = _(mockLogstashFields).where({ scripted: true }).pluck('name').value();
+      let respNames = _.pluck(indexPattern.getScriptedFields(), 'name');
       expect(respNames).to.eql(scriptedNames);
     });
   });
 
   describe('getNonScriptedFields', function () {
     it('should return all non-scripted fields', function () {
-      var notScriptedNames = _(mockLogstashFields).where({ scripted: false }).pluck('name').value();
-      var respNames = _.pluck(indexPattern.getNonScriptedFields(), 'name');
+      let notScriptedNames = _(mockLogstashFields).where({ scripted: false }).pluck('name').value();
+      let respNames = _.pluck(indexPattern.getNonScriptedFields(), 'name');
       expect(respNames).to.eql(notScriptedNames);
     });
 
@@ -135,10 +141,10 @@ describe('index pattern', function () {
   describe('refresh fields', function () {
     // override the default indexPattern, with a truncated field list
     require('testUtils/noDigestPromises').activateForSuite();
-    var indexPatternId = 'test-pattern';
-    var indexPattern;
-    var fieldLength;
-    var truncatedFields;
+    let indexPatternId = 'test-pattern';
+    let indexPattern;
+    let fieldLength;
+    let truncatedFields;
 
     beforeEach(function () {
       fieldLength = mockLogstashFields.length;
@@ -169,8 +175,8 @@ describe('index pattern', function () {
         indexPattern.refreshFields(),
       ])
       .then(function (data) {
-        var expected = data[0]; // just the fields in the index
-        var fields = indexPattern.getNonScriptedFields(); // get all but scripted fields
+        let expected = data[0]; // just the fields in the index
+        let fields = indexPattern.getNonScriptedFields(); // get all but scripted fields
 
         expect(_.pluck(fields, 'name')).to.eql(_.pluck(expected, 'name'));
       });
@@ -181,15 +187,15 @@ describe('index pattern', function () {
       setDocsourcePayload(docSourceResponse(indexPatternId));
 
       // add spy to indexPattern.getScriptedFields
-      var scriptedFieldsSpy = sinon.spy(indexPattern, 'getScriptedFields');
+      let scriptedFieldsSpy = sinon.spy(indexPattern, 'getScriptedFields');
 
       // refresh fields, which will fetch
       return indexPattern.refreshFields().then(function () {
         // called to append scripted fields to the response from mapper.getFieldsForIndexPattern
         expect(scriptedFieldsSpy.callCount).to.equal(1);
 
-        var scripted = _.where(mockLogstashFields, { scripted: true });
-        var expected = _.filter(indexPattern.fields, { scripted: true });
+        let scripted = _.where(mockLogstashFields, { scripted: true });
+        let expected = _.filter(indexPattern.fields, { scripted: true });
         expect(_.pluck(expected, 'name')).to.eql(_.pluck(scripted, 'name'));
       });
     });
@@ -198,11 +204,11 @@ describe('index pattern', function () {
   describe('add and remove scripted fields', function () {
     it('should append the scripted field', function () {
       // keep a copy of the current scripted field count
-      var saveSpy = sinon.spy(indexPattern, 'save');
-      var oldCount = indexPattern.getScriptedFields().length;
+      let saveSpy = sinon.spy(indexPattern, 'save');
+      let oldCount = indexPattern.getScriptedFields().length;
 
       // add a new scripted field
-      var scriptedField = {
+      let scriptedField = {
         name: 'new scripted field',
         script: 'false',
         type: 'boolean'
@@ -210,17 +216,17 @@ describe('index pattern', function () {
       indexPattern.addScriptedField(scriptedField.name, scriptedField.script, scriptedField.type);
       indexPattern._indexFields(); // normally triggered by docSource.onUpdate()
 
-      var scriptedFields = indexPattern.getScriptedFields();
+      let scriptedFields = indexPattern.getScriptedFields();
       expect(saveSpy.callCount).to.equal(1);
       expect(scriptedFields).to.have.length(oldCount + 1);
       expect(indexPattern.fields.byName[scriptedField.name].displayName).to.equal(scriptedField.name);
     });
 
     it('should remove scripted field, by name', function () {
-      var saveSpy = sinon.spy(indexPattern, 'save');
-      var scriptedFields = indexPattern.getScriptedFields();
-      var oldCount = scriptedFields.length;
-      var scriptedField = _.last(scriptedFields);
+      let saveSpy = sinon.spy(indexPattern, 'save');
+      let scriptedFields = indexPattern.getScriptedFields();
+      let oldCount = scriptedFields.length;
+      let scriptedField = _.last(scriptedFields);
 
       indexPattern.removeScriptedField(scriptedField.name);
 
@@ -230,8 +236,8 @@ describe('index pattern', function () {
     });
 
     it('should not allow duplicate names', function () {
-      var scriptedFields = indexPattern.getScriptedFields();
-      var scriptedField = _.last(scriptedFields);
+      let scriptedFields = indexPattern.getScriptedFields();
+      let scriptedField = _.last(scriptedFields);
       expect(function () {
         indexPattern.addScriptedField(scriptedField.name, '\'new script\'', 'string');
       }).to.throwError(function (e) {
@@ -242,9 +248,9 @@ describe('index pattern', function () {
 
   describe('popularizeField', function () {
     it('should increment the poplarity count by default', function () {
-      var saveSpy = sinon.stub(indexPattern, 'save');
+      let saveSpy = sinon.stub(indexPattern, 'save');
       indexPattern.fields.forEach(function (field, i) {
-        var oldCount = field.count;
+        let oldCount = field.count;
 
         indexPattern.popularizeField(field.name);
 
@@ -254,10 +260,10 @@ describe('index pattern', function () {
     });
 
     it('should increment the poplarity count', function () {
-      var saveSpy = sinon.stub(indexPattern, 'save');
+      let saveSpy = sinon.stub(indexPattern, 'save');
       indexPattern.fields.forEach(function (field, i) {
-        var oldCount = field.count;
-        var incrementAmount = 4;
+        let oldCount = field.count;
+        let incrementAmount = 4;
 
         indexPattern.popularizeField(field.name, incrementAmount);
 
@@ -268,9 +274,9 @@ describe('index pattern', function () {
 
     it('should decrement the poplarity count', function () {
       indexPattern.fields.forEach(function (field, i) {
-        var oldCount = field.count;
-        var incrementAmount = 4;
-        var decrementAmount = -2;
+        let oldCount = field.count;
+        let incrementAmount = 4;
+        let decrementAmount = -2;
 
         indexPattern.popularizeField(field.name, incrementAmount);
         indexPattern.popularizeField(field.name, decrementAmount);
@@ -281,99 +287,167 @@ describe('index pattern', function () {
 
     it('should not go below 0', function () {
       indexPattern.fields.forEach(function (field) {
-        var decrementAmount = -Number.MAX_VALUE;
+        let decrementAmount = -Number.MAX_VALUE;
         indexPattern.popularizeField(field.name, decrementAmount);
         expect(field.count).to.equal(0);
       });
     });
   });
 
-  describe('#toIndexList', function () {
+  describe('#toDetailedIndexList', function () {
+    require('testUtils/noDigestPromises').activateForSuite();
     context('when index pattern is an interval', function () {
-      var interval;
+      let interval;
       beforeEach(function () {
         interval = 'result:getInterval';
         sinon.stub(indexPattern, 'getInterval').returns(interval);
       });
 
-      it('invokes interval toIndexList with given start/stop times', function () {
-        indexPattern.toIndexList(1, 2);
-        $rootScope.$apply();
-
-        var id = indexPattern.id;
+      it('invokes interval toDetailedIndexList with given start/stop times', async function () {
+        await indexPattern.toDetailedIndexList(1, 2);
+        let id = indexPattern.id;
         expect(intervals.toIndexList.calledWith(id, interval, 1, 2)).to.be(true);
       });
-      it('is fulfilled by the result of interval toIndexList', function () {
-        var indexList;
-        indexPattern.toIndexList().then(function (val) {
-          indexList = val;
-        });
-        $rootScope.$apply();
-
-        expect(indexList[0]).to.equal('foo');
-        expect(indexList[1]).to.equal('bar');
+      it('is fulfilled by the result of interval toDetailedIndexList', async function () {
+        let indexList = await indexPattern.toDetailedIndexList();
+        expect(indexList[0].index).to.equal('foo');
+        expect(indexList[1].index).to.equal('bar');
       });
 
       context('with sort order', function () {
-        require('testUtils/noDigestPromises').activateForSuite();
-
-        context('undefined', function () {
-          it('provides the index list in tact', async function () {
-            const indexList = await indexPattern.toIndexList();
-            expect(indexList).to.eql(['foo', 'bar']);
+        it('passes the sort order to the intervals module', function () {
+          return indexPattern.toDetailedIndexList(1, 2, 'SORT_DIRECTION')
+          .then(function () {
+            expect(intervals.toIndexList.callCount).to.be(1);
+            expect(intervals.toIndexList.getCall(0).args[4]).to.be('SORT_DIRECTION');
           });
         });
+      });
+    });
 
-        context('asc', function () {
-          it('provides the index list in tact', async function () {
-            const indexList = await indexPattern.toIndexList(1, 2, 'asc');
-            expect(indexList).to.eql(['foo', 'bar']);
-          });
-        });
+    context('when index pattern is a time-base wildcard', function () {
+      beforeEach(function () {
+        sinon.stub(indexPattern, 'getInterval').returns(false);
+        sinon.stub(indexPattern, 'hasTimeField').returns(true);
+        sinon.stub(indexPattern, 'isWildcard').returns(true);
+      });
+
+      it('invokes calculateIndices with given start/stop times and sortOrder', async function () {
+        await indexPattern.toDetailedIndexList(1, 2, 'sortOrder');
+        let id = indexPattern.id;
+        let field = indexPattern.timeFieldName;
+        expect(calculateIndices.calledWith(id, field, 1, 2, 'sortOrder')).to.be(true);
+      });
+
+      it('is fulfilled by the result of calculateIndices', async function () {
+        let indexList = await indexPattern.toDetailedIndexList();
+        expect(indexList[0].index).to.equal('foo');
+        expect(indexList[1].index).to.equal('bar');
+      });
+    });
+
+    context('when index pattern is a time-base wildcard that is configured not to expand', function () {
+      beforeEach(function () {
+        sinon.stub(indexPattern, 'getInterval').returns(false);
+        sinon.stub(indexPattern, 'hasTimeField').returns(true);
+        sinon.stub(indexPattern, 'isWildcard').returns(true);
+        sinon.stub(indexPattern, 'canExpandIndices').returns(false);
+      });
+
+      it('is fulfilled by id', async function () {
+        let indexList = await indexPattern.toDetailedIndexList();
+        expect(indexList.index).to.equal(indexPattern.id);
+      });
+    });
+
+    context('when index pattern is neither an interval nor a time-based wildcard', function () {
+      beforeEach(function () {
+        sinon.stub(indexPattern, 'getInterval').returns(false);
+      });
+
+      it('is fulfilled by id', async function () {
+        let indexList = await indexPattern.toDetailedIndexList();
+        expect(indexList.index).to.equal(indexPattern.id);
+      });
+    });
+  });
 
-        context('desc', function () {
-          it('reverses the index list', async function () {
-            const indexList = await indexPattern.toIndexList(1, 2, 'desc');
-            expect(indexList).to.eql(['bar', 'foo']);
+  describe('#toIndexList', function () {
+    context('when index pattern is an interval', function () {
+      require('testUtils/noDigestPromises').activateForSuite();
+
+      let interval;
+      beforeEach(function () {
+        interval = 'result:getInterval';
+        sinon.stub(indexPattern, 'getInterval').returns(interval);
+      });
+
+      it('invokes interval toIndexList with given start/stop times', async function () {
+        await indexPattern.toIndexList(1, 2);
+        let id = indexPattern.id;
+        expect(intervals.toIndexList.calledWith(id, interval, 1, 2)).to.be(true);
+      });
+      it('is fulfilled by the result of interval toIndexList', async function () {
+        let indexList = await indexPattern.toIndexList();
+        expect(indexList[0]).to.equal('foo');
+        expect(indexList[1]).to.equal('bar');
+      });
+
+      context('with sort order', function () {
+        it('passes the sort order to the intervals module', function () {
+          return indexPattern.toIndexList(1, 2, 'SORT_DIRECTION')
+          .then(function () {
+            expect(intervals.toIndexList.callCount).to.be(1);
+            expect(intervals.toIndexList.getCall(0).args[4]).to.be('SORT_DIRECTION');
           });
         });
       });
     });
 
     context('when index pattern is a time-base wildcard', function () {
+      require('testUtils/noDigestPromises').activateForSuite();
       beforeEach(function () {
         sinon.stub(indexPattern, 'getInterval').returns(false);
         sinon.stub(indexPattern, 'hasTimeField').returns(true);
         sinon.stub(indexPattern, 'isWildcard').returns(true);
       });
 
-      it('invokes calculateIndices with given start/stop times and sortOrder', function () {
-        indexPattern.toIndexList(1, 2, 'sortOrder');
-        $rootScope.$apply();
-
-        var id = indexPattern.id;
-        var field = indexPattern.timeFieldName;
+      it('invokes calculateIndices with given start/stop times and sortOrder', async function () {
+        await indexPattern.toIndexList(1, 2, 'sortOrder');
+        let id = indexPattern.id;
+        let field = indexPattern.timeFieldName;
         expect(calculateIndices.calledWith(id, field, 1, 2, 'sortOrder')).to.be(true);
       });
-      it('is fulfilled by the result of calculateIndices', function () {
-        var indexList;
-        indexPattern.toIndexList().then(function (val) {
-          indexList = val;
-        });
-        $rootScope.$apply();
 
+      it('is fulfilled by the result of calculateIndices', async function () {
+        let indexList = await indexPattern.toIndexList();
         expect(indexList[0]).to.equal('foo');
         expect(indexList[1]).to.equal('bar');
       });
     });
 
+    context('when index pattern is a time-base wildcard that is configured not to expand', function () {
+      require('testUtils/noDigestPromises').activateForSuite();
+      beforeEach(function () {
+        sinon.stub(indexPattern, 'getInterval').returns(false);
+        sinon.stub(indexPattern, 'hasTimeField').returns(true);
+        sinon.stub(indexPattern, 'isWildcard').returns(true);
+        sinon.stub(indexPattern, 'canExpandIndices').returns(false);
+      });
+
+      it('is fulfilled by id', async function () {
+        let indexList = await indexPattern.toIndexList();
+        expect(indexList).to.equal(indexPattern.id);
+      });
+    });
+
     context('when index pattern is neither an interval nor a time-based wildcard', function () {
       beforeEach(function () {
         sinon.stub(indexPattern, 'getInterval').returns(false);
       });
 
       it('is fulfilled by id', function () {
-        var indexList;
+        let indexList;
         indexPattern.toIndexList().then(function (val) {
           indexList = val;
         });
@@ -384,6 +458,21 @@ describe('index pattern', function () {
     });
   });
 
+  describe('#canExpandIndices()', function () {
+    it('returns true if notExpandable is false', function () {
+      indexPattern.notExpandable = false;
+      expect(indexPattern.canExpandIndices()).to.be(true);
+    });
+    it('returns true if notExpandable is not defined', function () {
+      delete indexPattern.notExpandable;
+      expect(indexPattern.canExpandIndices()).to.be(true);
+    });
+    it('returns false if notExpandable is true', function () {
+      indexPattern.notExpandable = true;
+      expect(indexPattern.canExpandIndices()).to.be(false);
+    });
+  });
+
   describe('#hasTimeField()', function () {
     beforeEach(function () {
       // for the sake of these tests, it doesn't much matter what type of field
diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js
index 190fdcca49dc6..4f2c4c65904a4 100644
--- a/src/ui/public/index_patterns/__tests__/_map_field.js
+++ b/src/ui/public/index_patterns/__tests__/_map_field.js
@@ -1,10 +1,10 @@
 describe('field mapping normalizer (mapField)', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var fn;
-  var fields;
+  let fn;
+  let fields;
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector, config) {
     config.set('metaFields', ['_id', '_timestamp']);
@@ -17,31 +17,31 @@ describe('field mapping normalizer (mapField)', function () {
   });
 
   it('should return a modified copy of the object, not modify the original', function () {
-    var pristine = _.cloneDeep(fields['foo.bar']);
-    var mapped = fn(fields['foo.bar'], 'foo.bar');
+    let pristine = _.cloneDeep(fields['foo.bar']);
+    let mapped = fn(fields['foo.bar'], 'foo.bar');
 
     expect(fields['foo.bar']).to.not.eql(mapped);
     expect(fields['foo.bar']).to.eql(pristine);
   });
 
   it('should not consider _id indexed unless it is', function () {
-    var mapped = fn(fields._id, '_id');
+    let mapped = fn(fields._id, '_id');
     expect(mapped.indexed).to.be(false);
 
-    var mapping = _.cloneDeep(fields._id);
+    let mapping = _.cloneDeep(fields._id);
     mapping.mapping._id.index = 'not_analyzed';
-    var mapped2 = fn(mapping, '_id');
+    let mapped2 = fn(mapping, '_id');
     expect(mapped2.indexed).to.be(true);
   });
 
   it('should always consider _timestamp to be an indexed date', function () {
-    var mapped = fn(fields._timestamp, '_timestamp');
+    let mapped = fn(fields._timestamp, '_timestamp');
     expect(mapped.indexed).to.be(true);
     expect(mapped.type).to.be('date');
   });
 
   it('should treat falsy and no as false for index', function () {
-    var mapped = fn(fields.index_no_field, 'index_no_field');
+    let mapped = fn(fields.index_no_field, 'index_no_field');
     expect(mapped.indexed).to.be(false);
 
     fields.index_no_field.index = false;
@@ -50,7 +50,7 @@ describe('field mapping normalizer (mapField)', function () {
   });
 
   it('should treat other values for index as true', function () {
-    var mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
+    let mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
     expect(mapped.indexed).to.be(true);
   });
 
diff --git a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
index 7450de671725d..4f67defbb5f1c 100644
--- a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
+++ b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
@@ -1,7 +1,7 @@
 describe('Index pattern to wildcard', function () {
 
-  var fn = require('ui/index_patterns/_pattern_to_wildcard')();
-  var expect = require('expect.js');
+  let fn = require('ui/index_patterns/_pattern_to_wildcard')();
+  let expect = require('expect.js');
 
 
   it('should be a function', function () {
diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js
index d5c44ec2d00cb..286e5fc022618 100644
--- a/src/ui/public/index_patterns/__tests__/calculate_indices.js
+++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js
@@ -1,5 +1,6 @@
 describe('ui/index_patterns/_calculate_indices', () => {
   const _ = require('lodash');
+  const pluck = require('lodash').pluck;
   const sinon = require('auto-release-sinon');
   const expect = require('expect.js');
   const ngMock = require('ngMock');
@@ -40,7 +41,7 @@ describe('ui/index_patterns/_calculate_indices', () => {
 
   function run({ start = undefined, stop = undefined } = {}) {
     calculateIndices('wat-*-no', '@something', start, stop).then(value => {
-      indices = value;
+      indices = pluck(value, 'index');
     });
     $rootScope.$apply();
     config = _.first(es.fieldStats.lastCall.args);
@@ -130,29 +131,45 @@ describe('ui/index_patterns/_calculate_indices', () => {
         };
 
         return calculateIndices('*', 'time', null, null).then(function (resp) {
-          expect(resp).to.eql(['c', 'a', 'b']);
+          expect(pluck(resp, 'index')).to.eql(['c', 'a', 'b']);
         });
       });
     });
 
-    context('when sorting desc', function () {
-      it('returns the indices in max_value order', function () {
+    context('when sorting asc', function () {
+      it('resolves to an array of objects, each with index, start, and end properties', function () {
         response = {
           indices: {
-            c: { fields: { time: { max_value: 10 } } },
-            a: { fields: { time: { max_value: 15 } } },
-            b: { fields: { time: { max_value: 1 } } },
+            c: { fields: { time: { max_value: 10, min_value: 9 } } },
+            a: { fields: { time: { max_value: 15, min_value: 5 } } },
+            b: { fields: { time: { max_value: 1, min_value: 0 } } },
           }
         };
 
-        return calculateIndices('*', 'time', null, null, 'desc').then(function (resp) {
-          expect(resp).to.eql(['a', 'c', 'b']);
+        return calculateIndices('*', 'time', null, null, 'asc').then(function (resp) {
+          expect(resp).to.eql([
+            {
+              index: 'b',
+              min: 0,
+              max: 1
+            },
+            {
+              index: 'a',
+              min: 5,
+              max: 15
+            },
+            {
+              index: 'c',
+              min: 9,
+              max: 10
+            }
+          ]);
         });
       });
     });
 
-    context('when sorting asc', function () {
-      it('returns the indices in min_value order', function () {
+    context('when sorting desc', function () {
+      it('resolves to an array of objects, each with index, min, and max properties', function () {
         response = {
           indices: {
             c: { fields: { time: { max_value: 10, min_value: 9 } } },
@@ -161,8 +178,24 @@ describe('ui/index_patterns/_calculate_indices', () => {
           }
         };
 
-        return calculateIndices('*', 'time', null, null, 'asc').then(function (resp) {
-          expect(resp).to.eql(['b', 'a', 'c']);
+        return calculateIndices('*', 'time', null, null, 'desc').then(function (resp) {
+          expect(resp).to.eql([
+            {
+              index: 'a',
+              max: 15,
+              min: 5
+            },
+            {
+              index: 'c',
+              max: 10,
+              min: 9
+            },
+            {
+              index: 'b',
+              max: 1,
+              min: 0
+            },
+          ]);
         });
       });
     });
diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js
index d6ff0d80eba1c..0bd445ec21176 100644
--- a/src/ui/public/index_patterns/__tests__/flatten_hit.js
+++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js
@@ -1,18 +1,18 @@
 
 describe('IndexPattern#flattenHit()', function () {
 
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var flattenHit;
-  var config;
-  var hit;
-  var flat;
+  let flattenHit;
+  let config;
+  let hit;
+  let flat;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
-    var indexPattern = {
+    let indexPattern = {
       fields: {
         byName: {
           'message': { type: 'string' },
diff --git a/src/ui/public/index_patterns/__tests__/index_patterns.js b/src/ui/public/index_patterns/__tests__/index_patterns.js
new file mode 100644
index 0000000000000..bdbf5d391bdc8
--- /dev/null
+++ b/src/ui/public/index_patterns/__tests__/index_patterns.js
@@ -0,0 +1,33 @@
+import ngMock from 'ngMock';
+import expect from 'expect.js';
+import sinon from 'auto-release-sinon';
+
+describe('IndexPatterns service', function () {
+  let indexPatterns;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    const IndexPattern = Private(require('../_index_pattern'));
+    indexPatterns = Private(require('../index_patterns'));
+
+    // prevent IndexPattern initialization from doing anything
+    Private.stub(
+      require('../_index_pattern'),
+      function (...args) {
+        const indexPattern = new IndexPattern(...args);
+        sinon.stub(indexPattern, 'init', function () {
+          return new Promise();
+        });
+        return indexPattern;
+      }
+    );
+  }));
+
+  it('does not cache gets without an id', function () {
+    expect(indexPatterns.get()).to.not.be(indexPatterns.get());
+  });
+
+  it('does cache gets for the same id', function () {
+    expect(indexPatterns.get(1)).to.be(indexPatterns.get(1));
+  });
+});
diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js
index 58fb51a6eb7ce..899552aef3850 100644
--- a/src/ui/public/index_patterns/__tests__/intervals.js
+++ b/src/ui/public/index_patterns/__tests__/intervals.js
@@ -1,67 +1,168 @@
+let pluck = require('lodash').pluck;
+let moment = require('moment');
 
-var moment = require('moment');
 describe('Index Patterns', function () {
   describe('interval.toIndexList()', function () {
-    var expect = require('expect.js');
-    var ngMock = require('ngMock');
+    let expect = require('expect.js');
+    let ngMock = require('ngMock');
 
-    var intervals;
+    let intervals;
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       intervals = Private(require('ui/index_patterns/_intervals'));
     }));
 
     it('should return correct indices for hourly [logstash-]YYYY.MM.DD.HH', function () {
-      var start = moment.utc('2014-01-01T07:00:00Z');
-      var end = moment.utc('2014-01-01T08:30:00Z');
-      var interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
-      var list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
-      expect(list).to.contain('logstash-2014.01.01.07');
-      expect(list).to.contain('logstash-2014.01.01.08');
+      let start = moment.utc('2014-01-01T07:00:00Z');
+      let end = moment.utc('2014-01-01T08:30:00Z');
+      let interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
+      let list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
+      expect(list).to.eql([
+        {
+          index: 'logstash-2014.01.01.07',
+          min: moment.utc('2014-01-01T07:00:00').valueOf(),
+          max: moment.utc('2014-01-01T07:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.01.01.08',
+          min: moment.utc('2014-01-01T08:00:00').valueOf(),
+          max: moment.utc('2014-01-01T08:59:59.999').valueOf(),
+        }
+      ]);
     });
 
     it('should return correct indices for daily [logstash-]YYYY.MM.DD', function () {
-      var start = moment(1418244231248);
-      var end = moment(1418849261281);
-      var interval = { name: 'days', startOf: 'day', display: 'Daily' };
-      var list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
-      expect(list).to.contain('logstash-2014.12.10');
-      expect(list).to.contain('logstash-2014.12.11');
-      expect(list).to.contain('logstash-2014.12.12');
-      expect(list).to.contain('logstash-2014.12.13');
-      expect(list).to.contain('logstash-2014.12.14');
-      expect(list).to.contain('logstash-2014.12.15');
-      expect(list).to.contain('logstash-2014.12.16');
-      expect(list).to.contain('logstash-2014.12.17');
-    });
-
-    it('should return correct indices for weekly [logstash-]GGGG.WW', function () {
-      var start = moment.utc(1418244231248);
-      var end = moment.utc(1418849261281);
-      var interval = { name: 'weeks', startOf: 'isoWeek', display: 'Weekly' };
-      var list = intervals.toIndexList('[logstash-]GGGG.WW', interval, start, end);
-      expect(list).to.contain('logstash-2014.50');
-      expect(list).to.contain('logstash-2014.51');
+      let start = moment(1418244231248);
+      let end = moment(1418849261281);
+      let interval = { name: 'days', startOf: 'day', display: 'Daily' };
+      let list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
+      expect(list).to.eql([
+        {
+          index: 'logstash-2014.12.10',
+          min: moment.utc('2014-12-10T00:00:00').valueOf(),
+          max: moment.utc('2014-12-10T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.11',
+          min: moment.utc('2014-12-11T00:00:00').valueOf(),
+          max: moment.utc('2014-12-11T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.12',
+          min: moment.utc('2014-12-12T00:00:00').valueOf(),
+          max: moment.utc('2014-12-12T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.13',
+          min: moment.utc('2014-12-13T00:00:00').valueOf(),
+          max: moment.utc('2014-12-13T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.14',
+          min: moment.utc('2014-12-14T00:00:00').valueOf(),
+          max: moment.utc('2014-12-14T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.15',
+          min: moment.utc('2014-12-15T00:00:00').valueOf(),
+          max: moment.utc('2014-12-15T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.16',
+          min: moment.utc('2014-12-16T00:00:00').valueOf(),
+          max: moment.utc('2014-12-16T23:59:59.999').valueOf(),
+        },
+        {
+          index: 'logstash-2014.12.17',
+          min: moment.utc('2014-12-17T00:00:00').valueOf(),
+          max: moment.utc('2014-12-17T23:59:59.999').valueOf(),
+        },
+      ]);
     });
 
     it('should return correct indices for monthly [logstash-]YYYY.MM', function () {
-      var start = moment.utc('2014-12-01');
-      var end = moment.utc('2015-02-01');
-      var interval = { name: 'months', startOf: 'month', display: 'Monthly' };
-      var list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
-      expect(list).to.contain('logstash-2014.12');
-      expect(list).to.contain('logstash-2015.01');
-      expect(list).to.contain('logstash-2015.02');
+      let start = moment.utc('2014-12-01');
+      let end = moment.utc('2015-02-01');
+      let interval = { name: 'months', startOf: 'month', display: 'Monthly' };
+      let list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
+      expect(list).to.eql([
+        {
+          index: 'logstash-2014.12',
+          min: moment.utc(0).year(2014).month(11).valueOf(),
+          max: moment.utc(0).year(2015).month(0).subtract(1, 'ms').valueOf(),
+        },
+        {
+          index: 'logstash-2015.01',
+          min: moment.utc(0).year(2015).month(0).valueOf(),
+          max: moment.utc(0).year(2015).month(1).subtract(1, 'ms').valueOf(),
+        },
+        {
+          index: 'logstash-2015.02',
+          min: moment.utc(0).year(2015).month(1).valueOf(),
+          max: moment.utc(0).year(2015).month(2).subtract(1, 'ms').valueOf(),
+        },
+      ]);
     });
 
     it('should return correct indices for yearly [logstash-]YYYY', function () {
-      var start = moment.utc('2014-12-01');
-      var end = moment.utc('2015-02-01');
-      var interval = { name: 'years', startOf: 'year', display: 'Yearly' };
-      var list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
-      expect(list).to.contain('logstash-2014');
-      expect(list).to.contain('logstash-2015');
+      let start = moment.utc('2014-12-01');
+      let end = moment.utc('2015-02-01');
+      let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+      let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
+      expect(list).to.eql([
+        {
+          index: 'logstash-2014',
+          min: moment.utc(0).year(2014).valueOf(),
+          max: moment.utc(0).year(2015).subtract(1, 'ms').valueOf(),
+        },
+        {
+          index: 'logstash-2015',
+          min: moment.utc(0).year(2015).valueOf(),
+          max: moment.utc(0).year(2016).subtract(1, 'ms').valueOf(),
+        },
+      ]);
     });
 
+    context('with sortDirection=asc', function () {
+      it('returns values in ascending order', function () {
+        let start = moment.utc('2014-12-01');
+        let end = moment.utc('2015-02-01');
+        let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+        let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'asc');
+        expect(list).to.eql([
+          {
+            index: 'logstash-2014',
+            min: moment.utc(0).year(2014).valueOf(),
+            max: moment.utc(0).year(2015).subtract(1, 'ms').valueOf(),
+          },
+          {
+            index: 'logstash-2015',
+            min: moment.utc(0).year(2015).valueOf(),
+            max: moment.utc(0).year(2016).subtract(1, 'ms').valueOf(),
+          },
+        ]);
+      });
+    });
+
+    context('with sortDirection=desc', function () {
+      it('returns values in descending order', function () {
+        let start = moment.utc('2014-12-01');
+        let end = moment.utc('2015-02-01');
+        let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+        let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'desc');
+        expect(list).to.eql([
+          {
+            index: 'logstash-2015',
+            min: moment.utc(0).year(2015).valueOf(),
+            max: moment.utc(0).year(2016).subtract(1, 'ms').valueOf(),
+          },
+          {
+            index: 'logstash-2014',
+            min: moment.utc(0).year(2014).valueOf(),
+            max: moment.utc(0).year(2015).subtract(1, 'ms').valueOf(),
+          },
+        ]);
+      });
+    });
   });
 });
diff --git a/src/ui/public/index_patterns/_calculate_indices.js b/src/ui/public/index_patterns/_calculate_indices.js
index 9401e1d923ecf..07643a81b9201 100644
--- a/src/ui/public/index_patterns/_calculate_indices.js
+++ b/src/ui/public/index_patterns/_calculate_indices.js
@@ -31,8 +31,7 @@ define(function (require) {
     // given time range
     function calculateIndices(pattern, timeFieldName, start, stop, sortDirection) {
       return getFieldStats(pattern, timeFieldName, start, stop)
-      .then(resp => resp.indices)
-      .then(indices => omitIndicesWithoutTimeField(indices, timeFieldName))
+      .then(resp => omitIndicesWithoutTimeField(resp.indices, timeFieldName))
       .then(indices => sortIndexStats(indices, timeFieldName, sortDirection));
     };
 
@@ -60,19 +59,27 @@ define(function (require) {
     }
 
     function sortIndexStats(indices, timeFieldName, sortDirection) {
-      if (!sortDirection) return _.keys(indices);
+      const desc = sortDirection === 'desc';
+      const leader = desc ? 'max' : 'min';
 
-      // FIXME: Once https://github.com/elastic/elasticsearch/issues/14404 is closed
-      // this should be sorting based on the sortable value of a field.
-      const edgeKey = sortDirection === 'desc' ? 'max_value' : 'min_value';
+      let indexDetails = _(indices).map((stats, index) => {
+        const field = stats.fields[timeFieldName];
 
-      return _(indices)
-      .map((stats, index) => (
-        { index, edge: stats.fields[timeFieldName][edgeKey] }
-      ))
-      .sortByOrder(['edge'], [sortDirection])
-      .pluck('index')
-      .value();
+        // TODO: remove when we get to es 2.2, see elastic/elasticsearch#14404
+        let min = field.min_value;
+        if (typeof min === 'string') min = moment(min).valueOf();
+
+        let max = field.max_value;
+        if (typeof max === 'string') max = moment(max).valueOf();
+
+        return { index, min, max };
+      });
+
+      if (sortDirection) {
+        indexDetails = indexDetails.sortByOrder([leader], [sortDirection]);
+      }
+
+      return indexDetails.value();
     }
 
     return calculateIndices;
diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js
index 5a4e8c0020dc6..8a00745711396 100644
--- a/src/ui/public/index_patterns/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/_cast_mapping_type.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function CastMappingTypeFn() {
-    var IndexedArray = require('ui/IndexedArray');
+    let IndexedArray = require('ui/IndexedArray');
 
     castMappingType.types = new IndexedArray({
       index: ['name'],
@@ -33,7 +33,7 @@ define(function (require) {
     function castMappingType(name) {
       if (!name) return 'unknown';
 
-      var match = castMappingType.types.byName[name];
+      let match = castMappingType.types.byName[name];
       return match ? match.type : 'string';
     }
 
diff --git a/src/ui/public/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js
index 0dd55d21bbe67..1b69bb6d8f10e 100644
--- a/src/ui/public/index_patterns/_ensure_some.js
+++ b/src/ui/public/index_patterns/_ensure_some.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function EnsureSomeIndexPatternsFn(Private, Notifier, $location, kbnUrl) {
-    var errors = require('ui/errors');
-    var notify = new Notifier();
+    let errors = require('ui/errors');
+    let notify = new Notifier();
 
     return function ensureSomeIndexPatterns() {
       return function promiseHandler(patterns) {
diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
index 5352e38d89d68..e263f92012ef7 100644
--- a/src/ui/public/index_patterns/_field.js
+++ b/src/ui/public/index_patterns/_field.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
-    var notify = new Notifier({ location: 'IndexPattern Field' });
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
-    var fieldTypes = Private(require('ui/index_patterns/_field_types'));
-    var fieldFormats = Private(require('ui/registry/field_formats'));
-    var ObjDefine = require('ui/utils/ObjDefine');
+    let notify = new Notifier({ location: 'IndexPattern Field' });
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let fieldTypes = Private(require('ui/index_patterns/_field_types'));
+    let fieldFormats = Private(require('ui/registry/field_formats'));
+    let ObjDefine = require('ui/utils/ObjDefine');
 
     function Field(indexPattern, spec) {
       // unwrap old instances of Field
@@ -13,14 +13,14 @@ define(function (require) {
       // constuct this object using ObjDefine class, which
       // extends the Field.prototype but gets it's properties
       // defined using the logic below
-      var obj = new ObjDefine(spec, Field.prototype);
+      let obj = new ObjDefine(spec, Field.prototype);
 
       if (spec.name === '_source') {
         spec.type = '_source';
       }
 
       // find the type for this field, fallback to unknown type
-      var type = fieldTypes.byName[spec.type];
+      let type = fieldTypes.byName[spec.type];
       if (spec.type && !type) {
         notify.error(
           'Unknown field type "' + spec.type + '"' +
@@ -31,16 +31,16 @@ define(function (require) {
 
       if (!type) type = fieldTypes.byName.unknown;
 
-      var format = spec.format;
+      let format = spec.format;
       if (!format || !(format instanceof FieldFormat)) {
         format = indexPattern.fieldFormatMap[spec.name] || fieldFormats.getDefaultInstance(spec.type);
       }
 
-      var indexed = !!spec.indexed;
-      var scripted = !!spec.scripted;
-      var sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
-      var bucketable = indexed || scripted;
-      var filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
+      let indexed = !!spec.indexed;
+      let scripted = !!spec.scripted;
+      let sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
+      let bucketable = indexed || scripted;
+      let filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
 
       obj.fact('name');
       obj.fact('type');
diff --git a/src/ui/public/index_patterns/_field_format/FieldFormat.js b/src/ui/public/index_patterns/_field_format/FieldFormat.js
index c107e763b197c..06e53c4385019 100644
--- a/src/ui/public/index_patterns/_field_format/FieldFormat.js
+++ b/src/ui/public/index_patterns/_field_format/FieldFormat.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function FieldFormatClassProvider(config, $rootScope, Private) {
-    var _ = require('lodash');
-    var contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes'));
+    let _ = require('lodash');
+    let contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes'));
 
     function FieldFormat(params) {
-      var self = this;
+      let self = this;
 
       // give the constructor a more appropriate name
       self.type = self.constructor;
@@ -59,7 +59,7 @@ define(function (require) {
      * @return {any}
      */
     FieldFormat.prototype.param = function (name) {
-      var val = this._params[name];
+      let val = this._params[name];
       if (val || val === false || val === 0) {
         // truthy, false, or 0 are fine
         // '', NaN, null, undefined, etc are not
@@ -84,10 +84,10 @@ define(function (require) {
      * @return {object}
      */
     FieldFormat.prototype.toJSON = function () {
-      var type = this.type;
-      var defaults = this._paramDefaults;
+      let type = this.type;
+      let defaults = this._paramDefaults;
 
-      var params = _.transform(this._params, function (uniqParams, val, param) {
+      let params = _.transform(this._params, function (uniqParams, val, param) {
         if (val !== defaults[param]) {
           uniqParams[param] = val;
         }
diff --git a/src/ui/public/index_patterns/_field_format/contentTypes.js b/src/ui/public/index_patterns/_field_format/contentTypes.js
index 510f70f96ccfc..4bd4d3cd1d136 100644
--- a/src/ui/public/index_patterns/_field_format/contentTypes.js
+++ b/src/ui/public/index_patterns/_field_format/contentTypes.js
@@ -1,20 +1,20 @@
 define(function (require) {
   return function contentTypesProvider(highlightFilter) {
-    var _ = require('lodash');
-    var angular = require('angular');
+    let _ = require('lodash');
+    let angular = require('angular');
     require('ui/highlight');
 
-    var types = {
+    let types = {
       html: function (format, convert) {
         return function recurse(value, field, hit) {
           if (!value || typeof value.map !== 'function') {
             return convert.call(format, value, field, hit);
           }
 
-          var subVals = value.map(function (v) {
+          let subVals = value.map(function (v) {
             return recurse(v, field, hit);
           });
-          var useMultiLine = subVals.some(function (sub) {
+          let useMultiLine = subVals.some(function (sub) {
             return sub.indexOf('\n') > -1;
           });
 
@@ -39,7 +39,7 @@ define(function (require) {
     }
 
     function fallbackHtml(value, field, hit) {
-      var formatted = _.escape(this.convert(value, 'text'));
+      let formatted = _.escape(this.convert(value, 'text'));
 
       if (!hit || !hit.highlight || !hit.highlight[field.name]) {
         return formatted;
@@ -49,8 +49,8 @@ define(function (require) {
     }
 
     function setup(format) {
-      var src = format._convert || {};
-      var converters = format._convert = {};
+      let src = format._convert || {};
+      let converters = format._convert = {};
 
       converters.text = types.text(format, src.text || fallbackText);
       converters.html = types.html(format, src.html || fallbackHtml);
diff --git a/src/ui/public/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js
index b4fe34e0568b4..99ce7ebfbe965 100644
--- a/src/ui/public/index_patterns/_field_list.js
+++ b/src/ui/public/index_patterns/_field_list.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function FieldListProvider(Private) {
-    var Field = Private(require('ui/index_patterns/_field'));
-    var IndexedArray = require('ui/IndexedArray');
-    var _ = require('lodash');
+    let Field = Private(require('ui/index_patterns/_field'));
+    let IndexedArray = require('ui/IndexedArray');
+    let _ = require('lodash');
 
     _.class(FieldList).inherits(IndexedArray);
     function FieldList(indexPattern, specs) {
diff --git a/src/ui/public/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js
index 8d8b927a5be08..e0506c2d2792a 100644
--- a/src/ui/public/index_patterns/_field_types.js
+++ b/src/ui/public/index_patterns/_field_types.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function IndexPatternFieldTypes() {
-    var IndexedArray = require('ui/IndexedArray');
+    let IndexedArray = require('ui/IndexedArray');
 
     return new IndexedArray({
       index: ['name'],
diff --git a/src/ui/public/index_patterns/_flatten_hit.js b/src/ui/public/index_patterns/_flatten_hit.js
index 5aea6cbbfac14..9cbbaa631eb6d 100644
--- a/src/ui/public/index_patterns/_flatten_hit.js
+++ b/src/ui/public/index_patterns/_flatten_hit.js
@@ -2,18 +2,18 @@
 // returns a flattened version
 define(function (require) {
   return function FlattenHitProvider(config, $rootScope) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var metaFields = config.get('metaFields');
+    let metaFields = config.get('metaFields');
     $rootScope.$on('change:config.metaFields', function () {
       metaFields = config.get('metaFields');
     });
 
     function flattenHit(indexPattern, hit) {
-      var flat = {};
+      let flat = {};
 
       // recursively merge _source
-      var fields = indexPattern.fields.byName;
+      let fields = indexPattern.fields.byName;
       (function flatten(obj, keyPrefix) {
         keyPrefix = keyPrefix ? keyPrefix + '.' : '';
         _.forOwn(obj, function (val, key) {
@@ -21,8 +21,8 @@ define(function (require) {
 
           if (flat[key] !== void 0) return;
 
-          var hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
-          var isValue = !_.isPlainObject(val);
+          let hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
+          let isValue = !_.isPlainObject(val);
 
           if (hasValidMapping || isValue) {
             flat[key] = val;
diff --git a/src/ui/public/index_patterns/_format_hit.js b/src/ui/public/index_patterns/_format_hit.js
index 21e41c9c368e3..e753cc8cf81d0 100644
--- a/src/ui/public/index_patterns/_format_hit.js
+++ b/src/ui/public/index_patterns/_format_hit.js
@@ -1,12 +1,12 @@
 // Takes a hit, merges it with any stored/scripted fields, and with the metaFields
 // returns a formated version
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function (indexPattern, defaultFormat) {
 
     function convert(hit, val, fieldName) {
-      var field = indexPattern.fields.byName[fieldName];
+      let field = indexPattern.fields.byName[fieldName];
       if (!field) return defaultFormat.convert(val, 'html');
       return field.format.getConverterFor('html')(val, field, hit);
     }
@@ -16,12 +16,12 @@ define(function (require) {
 
       // use and update the partial cache, but don't rewrite it. _source is stored in partials
       // but not $$_formatted
-      var partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
-      var cache = hit.$$_formatted = {};
+      let partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
+      let cache = hit.$$_formatted = {};
 
       _.forOwn(indexPattern.flattenHit(hit), function (val, fieldName) {
         // sync the formatted and partial cache
-        var formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
+        let formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
         cache[fieldName] = partials[fieldName] = formatted;
       });
 
@@ -29,7 +29,7 @@ define(function (require) {
     }
 
     formatHit.formatField = function (hit, fieldName) {
-      var partials = hit.$$_partialFormatted;
+      let partials = hit.$$_partialFormatted;
       if (partials && partials[fieldName] != null) {
         return partials[fieldName];
       }
@@ -38,7 +38,7 @@ define(function (require) {
         partials = hit.$$_partialFormatted = {};
       }
 
-      var val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
+      let val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
       return partials[fieldName] = convert(hit, val, fieldName);
     };
 
diff --git a/src/ui/public/index_patterns/_get_computed_fields.js b/src/ui/public/index_patterns/_get_computed_fields.js
index 4d2019b931b89..07b312b602f48 100644
--- a/src/ui/public/index_patterns/_get_computed_fields.js
+++ b/src/ui/public/index_patterns/_get_computed_fields.js
@@ -1,11 +1,11 @@
 // Takes a hit, merges it with any stored/scripted fields, and with the metaFields
 // returns a flattened version
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function () {
-    var self = this;
-    var scriptFields = {};
-    var fielddataFields = [];
+    let self = this;
+    let scriptFields = {};
+    let fielddataFields = [];
 
     fielddataFields = _.pluck(self.fields.byType.date, 'name');
 
diff --git a/src/ui/public/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js
index 751344fba1b44..b71528b488937 100644
--- a/src/ui/public/index_patterns/_get_ids.js
+++ b/src/ui/public/index_patterns/_get_ids.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function GetIndexPatternIdsFn(es, kbnIndex) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     // many places may require the id list, so we will cache it seperately
     // didn't incorportate with the indexPattern cache to prevent id collisions.
-    var cachedPromise;
+    let cachedPromise;
 
-    var getIds = function () {
+    let getIds = function () {
       if (cachedPromise) {
         // retrun a clone of the cached response
         return cachedPromise.then(function (cachedResp) {
diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
index b7a3492c38e99..181d5c111b770 100644
--- a/src/ui/public/index_patterns/_index_pattern.js
+++ b/src/ui/public/index_patterns/_index_pattern.js
@@ -1,29 +1,31 @@
 define(function (require) {
   return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope, safeConfirm) {
-    var _ = require('lodash');
-    var errors = require('ui/errors');
-    var angular = require('angular');
+    let _ = require('lodash');
+    let errors = require('ui/errors');
+    let angular = require('angular');
 
-    var fieldformats = Private(require('ui/registry/field_formats'));
-    var getIds = Private(require('ui/index_patterns/_get_ids'));
-    var mapper = Private(require('ui/index_patterns/_mapper'));
-    var intervals = Private(require('ui/index_patterns/_intervals'));
-    var getComputedFields = require('ui/index_patterns/_get_computed_fields');
-    var DocSource = Private(require('ui/courier/data_source/doc_source'));
-    var mappingSetup = Private(require('ui/utils/mapping_setup'));
-    var FieldList = Private(require('ui/index_patterns/_field_list'));
+    let fieldformats = Private(require('ui/registry/field_formats'));
+    let getIds = Private(require('ui/index_patterns/_get_ids'));
+    let mapper = Private(require('ui/index_patterns/_mapper'));
+    let intervals = Private(require('ui/index_patterns/_intervals'));
+    let getComputedFields = require('ui/index_patterns/_get_computed_fields');
+    let DocSource = Private(require('ui/courier/data_source/doc_source'));
+    let mappingSetup = Private(require('ui/utils/mapping_setup'));
+    let FieldList = Private(require('ui/index_patterns/_field_list'));
 
-    var flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
-    var formatHit = require('ui/index_patterns/_format_hit');
-    var calculateIndices = Private(require('ui/index_patterns/_calculate_indices'));
+    let flattenHit = Private(require('ui/index_patterns/_flatten_hit'));
+    let formatHit = require('ui/index_patterns/_format_hit');
+    let calculateIndices = Private(require('ui/index_patterns/_calculate_indices'));
+    let patternCache = Private(require('ui/index_patterns/_pattern_cache'));
 
-    var type = 'index-pattern';
+    let type = 'index-pattern';
 
-    var notify = new Notifier();
+    let notify = new Notifier();
 
-    var mapping = mappingSetup.expandShorthand({
+    let mapping = mappingSetup.expandShorthand({
       title: 'string',
       timeFieldName: 'string',
+      notExpandable: 'boolean',
       intervalName: 'string',
       fields: 'json',
       fieldFormatMap: {
@@ -31,8 +33,8 @@ define(function (require) {
         _serialize: function (map) {
           if (map == null) return;
 
-          var count = 0;
-          var serialized = _.transform(map, function (flat, format, field) {
+          let count = 0;
+          let serialized = _.transform(map, function (flat, format, field) {
             if (!format) return;
             count++;
             flat[field] = format;
@@ -43,7 +45,7 @@ define(function (require) {
         _deserialize: function (map) {
           if (map == null) return {};
           return _.mapValues(angular.fromJson(map), function (mapping) {
-            var FieldFormat = fieldformats.byId[mapping.id];
+            let FieldFormat = fieldformats.byId[mapping.id];
             return FieldFormat && new FieldFormat(mapping.params);
           });
         }
@@ -51,11 +53,11 @@ define(function (require) {
     });
 
     function IndexPattern(id) {
-      var self = this;
+      let self = this;
 
       setId(id);
 
-      var docSource = new DocSource();
+      let docSource = new DocSource();
 
       self.init = function () {
         // tell the docSource where to find the doc
@@ -123,7 +125,7 @@ define(function (require) {
       self.addScriptedField = function (name, script, type, lang) {
         type = type || 'string';
 
-        var scriptFields = _.pluck(self.getScriptedFields(), 'name');
+        let scriptFields = _.pluck(self.getScriptedFields(), 'name');
 
         if (_.contains(scriptFields, name)) {
           throw new errors.DuplicateField(name);
@@ -141,7 +143,7 @@ define(function (require) {
       };
 
       self.removeScriptedField = function (name) {
-        var fieldIndex = _.findIndex(self.fields, {
+        let fieldIndex = _.findIndex(self.fields, {
           name: name,
           scripted: true
         });
@@ -154,10 +156,10 @@ define(function (require) {
       self.popularizeField = function (fieldName, unit) {
         if (unit == null) unit = 1;
 
-        var field = _.get(self, ['fields', 'byName', fieldName]);
+        let field = _.get(self, ['fields', 'byName', fieldName]);
         if (!field) return;
 
-        var count = Math.max((field.count || 0) + unit, 0);
+        let count = Math.max((field.count || 0) + unit, 0);
         if (field.count !== count) {
           field.count = count;
           self.save();
@@ -177,23 +179,39 @@ define(function (require) {
       };
 
       self.toIndexList = function (start, stop, sortDirection) {
-        return new Promise(function (resolve) {
-          var indexList;
-          var interval = self.getInterval();
-
-          if (interval) {
-            indexList = intervals.toIndexList(self.id, interval, start, stop);
-            if (sortDirection === 'desc') indexList = indexList.reverse();
-          } else if (self.isWildcard() && self.hasTimeField()) {
-            indexList = calculateIndices(self.id, self.timeFieldName, start, stop, sortDirection);
-          } else {
-            indexList = self.id;
+        return self
+        .toDetailedIndexList(start, stop, sortDirection)
+        .then(function (detailedIndices) {
+          if (!_.isArray(detailedIndices)) {
+            return detailedIndices.index;
           }
 
-          resolve(indexList);
+          return _.pluck(detailedIndices, 'index');
         });
       };
 
+      self.toDetailedIndexList = Promise.method(function (start, stop, sortDirection) {
+        let interval = self.getInterval();
+
+        if (interval) {
+          return intervals.toIndexList(self.id, interval, start, stop, sortDirection);
+        }
+
+        if (self.isWildcard() && self.hasTimeField() && self.canExpandIndices()) {
+          return calculateIndices(self.id, self.timeFieldName, start, stop, sortDirection);
+        }
+
+        return {
+          index: self.id,
+          min: -Infinity,
+          max: Infinity,
+        };
+      });
+
+      self.canExpandIndices = function () {
+        return !this.notExpandable;
+      };
+
       self.hasTimeField = function () {
         return !!(this.timeFieldName && this.fields.byName[this.timeFieldName]);
       };
@@ -203,7 +221,7 @@ define(function (require) {
       };
 
       self.prepBody = function () {
-        var body = {};
+        let body = {};
 
         // serialize json fields
         _.forOwn(mapping, function (fieldMapping, fieldName) {
@@ -227,16 +245,23 @@ define(function (require) {
       }
 
       self.create = function () {
-        var body = self.prepBody();
+        let body = self.prepBody();
         return docSource.doCreate(body)
         .then(setId)
         .catch(function (err) {
           if (_.get(err, 'origError.status') === 409) {
-            var confirmMessage = 'Are you sure you want to overwrite this?';
+            let confirmMessage = 'Are you sure you want to overwrite this?';
 
             return safeConfirm(confirmMessage).then(
               function () {
-                return docSource.doIndex(body).then(setId);
+                return Promise.try(function () {
+                  const cached = patternCache.get(self.id);
+                  if (cached) {
+                    return cached.then(pattern => pattern.destroy());
+                  }
+                })
+                .then(() => docSource.doIndex(body))
+                .then(setId);
               },
               _.constant(false) // if the user doesn't overwrite, resolve with false
             );
@@ -246,7 +271,7 @@ define(function (require) {
       };
 
       self.save = function () {
-        var body = self.prepBody();
+        let body = self.prepBody();
         return docSource.doIndex(body).then(setId);
       };
 
@@ -275,6 +300,11 @@ define(function (require) {
         return '' + self.toJSON();
       };
 
+      self.destroy = function () {
+        patternCache.clear(self.id);
+        docSource.destroy();
+      };
+
       self.metaFields = config.get('metaFields');
       self.getComputedFields = getComputedFields.bind(self);
 
diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js
index c7f24488e98d2..a89d9970bb141 100644
--- a/src/ui/public/index_patterns/_intervals.js
+++ b/src/ui/public/index_patterns/_intervals.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function IndexNameIntervalsService(timefilter) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var IndexedArray = require('ui/IndexedArray');
+    let _ = require('lodash');
+    let moment = require('moment');
+    let IndexedArray = require('ui/IndexedArray');
 
-    var intervals = new IndexedArray({
+    let intervals = new IndexedArray({
       index: ['name'],
       initialSet: [
         {
@@ -35,16 +35,16 @@ define(function (require) {
       ]
     });
 
-    intervals.toIndexList = function (format, interval, a, b) {
-      var bounds;
+    intervals.toIndexList = function (format, interval, a, b, sortDirection) {
+      let bounds;
 
       // setup the range that the list will span, return two moment objects that
       // are in proper order. a and b can be numbers to specify to go before or after now (respectively)
       // a certain number of times, based on the interval
-      var range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
-        var val = v[0];
-        var bound = v[1];
-        var extend = v[2];
+      let range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
+        let val = v[0];
+        let bound = v[1];
+        let extend = v[2];
 
         // grab a bound from the time filter
         if (val == null) {
@@ -65,15 +65,29 @@ define(function (require) {
         if (!interval) throw new Error('Interval must be one of ' + _.pluck(intervals, 'name'));
       }
 
-      var indexList = [];
-      var start = range.shift();
+      let indexList = [];
+      let start = range.shift();
       // turn stop into milliseconds to that it's not constantly converted by the while condition
-      var stop = range.shift().valueOf();
+      let stop = range.shift().valueOf();
+
+      let add = sortDirection === 'desc' ? 'unshift' : 'push';
 
       while (start <= stop) {
-        indexList.push(start.format(format));
-        start.add(1, interval.name);
+        const index = start.format(format);
+        const next = moment(start).add(1, interval.name);
+        const bound = moment(next).subtract(1, 'ms');
+
+        const min = start.valueOf();
+        const max = bound.valueOf();
+        indexList[add]({
+          index: index,
+          min: min,
+          max: max
+        });
+
+        start = next;
       }
+
       return indexList;
     };
 
diff --git a/src/ui/public/index_patterns/_local_cache.js b/src/ui/public/index_patterns/_local_cache.js
index 462e0205b1815..d38d59600d587 100644
--- a/src/ui/public/index_patterns/_local_cache.js
+++ b/src/ui/public/index_patterns/_local_cache.js
@@ -1,21 +1,21 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   return function LocalCacheFactory() {
     function LocalCache(opts) {
       opts = opts || {};
-      var _id = opts.id || function (o) { return '' + o; };
-      var _cache = {};
+      let _id = opts.id || function (o) { return '' + o; };
+      let _cache = {};
 
       this.get = function (obj) {
-        var id = _id(obj);
+        let id = _id(obj);
         return _cache[id] ? JSON.parse(_cache[id]) : null;
       };
 
       this.set = function (obj, val) {
-        var id = _id(obj);
-        var clean = !_cache.hasOwnProperty(id);
+        let id = _id(obj);
+        let clean = !_cache.hasOwnProperty(id);
         _cache[id] = angular.toJson(val);
         return clean;
       };
@@ -26,7 +26,7 @@ define(function (require) {
           return;
         }
 
-        var id = _id(obj);
+        let id = _id(obj);
         delete _cache[id];
       };
     }
diff --git a/src/ui/public/index_patterns/_map_field.js b/src/ui/public/index_patterns/_map_field.js
index 47313d57c521f..95efa8f281bbf 100644
--- a/src/ui/public/index_patterns/_map_field.js
+++ b/src/ui/public/index_patterns/_map_field.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function MapFieldFn(Private, config) {
-    var _ = require('lodash');
-    var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
+    let _ = require('lodash');
+    let castMappingType = Private(require('ui/index_patterns/_cast_mapping_type'));
 
     /**
      * Accepts a field object and its name, and tries to give it a mapping
@@ -10,14 +10,14 @@ define(function (require) {
      * @return {Object} - the resulting field after overrides and tweaking
      */
     return function mapField(field, name) {
-      var keys = Object.keys(field.mapping);
+      let keys = Object.keys(field.mapping);
       if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
 
-      var mapping = _.cloneDeep(field.mapping[keys.shift()]);
+      let mapping = _.cloneDeep(field.mapping[keys.shift()]);
       mapping.type = castMappingType(mapping.type);
 
       // Override the mapping, even if elasticsearch says otherwise
-      var mappingOverrides = {
+      let mappingOverrides = {
         _source: { type: '_source' },
         _index: { type: 'string' },
         _type: { type: 'string' },
diff --git a/src/ui/public/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js
index bb41117ca2c00..0c630404c02c6 100644
--- a/src/ui/public/index_patterns/_mapper.js
+++ b/src/ui/public/index_patterns/_mapper.js
@@ -1,22 +1,22 @@
 define(function (require) {
   return function MapperService(Private, Promise, es, config, kbnIndex) {
-    var _ = require('lodash');
-    var moment = require('moment');
+    let _ = require('lodash');
+    let moment = require('moment');
 
-    var IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices;
-    var transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields'));
-    var intervals = Private(require('ui/index_patterns/_intervals'));
-    var patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
+    let IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices;
+    let transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields'));
+    let intervals = Private(require('ui/index_patterns/_intervals'));
+    let patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
 
-    var LocalCache = Private(require('ui/index_patterns/_local_cache'));
+    let LocalCache = Private(require('ui/index_patterns/_local_cache'));
 
     function Mapper() {
 
       // Save a reference to mapper
-      var self = this;
+      let self = this;
 
       // proper-ish cache, keeps a clean copy of the object, only returns copies of it's copy
-      var fieldCache = self.cache = new LocalCache();
+      let fieldCache = self.cache = new LocalCache();
 
       /**
        * Gets an object containing all fields with their mappings
@@ -26,9 +26,9 @@ define(function (require) {
        * @async
        */
       self.getFieldsForIndexPattern = function (indexPattern, skipIndexPatternCache) {
-        var id = indexPattern.id;
+        let id = indexPattern.id;
 
-        var cache = fieldCache.get(id);
+        let cache = fieldCache.get(id);
         if (cache) return Promise.resolve(cache);
 
         if (!skipIndexPatternCache) {
@@ -46,7 +46,7 @@ define(function (require) {
           });
         }
 
-        var promise = Promise.resolve(id);
+        let promise = Promise.resolve(id);
         if (indexPattern.intervalName) {
           promise = self.getIndicesForIndexPattern(indexPattern)
           .then(function (existing) {
@@ -77,8 +77,8 @@ define(function (require) {
           index: patternToWildcard(indexPattern.id)
         })
         .then(function (resp) {
-          // var all = Object.keys(resp).sort();
-          var all = _(resp)
+          // let all = Object.keys(resp).sort();
+          let all = _(resp)
           .map(function (index, key) {
             if (index.aliases) {
               return [Object.keys(index.aliases), key];
@@ -91,8 +91,8 @@ define(function (require) {
           .uniq(true)
           .value();
 
-          var matches = all.filter(function (existingIndex) {
-            var parsed = moment(existingIndex, indexPattern.id);
+          let matches = all.filter(function (existingIndex) {
+            let parsed = moment(existingIndex, indexPattern.id);
             return existingIndex === parsed.format(indexPattern.id);
           });
 
diff --git a/src/ui/public/index_patterns/_pattern_cache.js b/src/ui/public/index_patterns/_pattern_cache.js
index 3cc57c08368e9..c83d4827487cf 100644
--- a/src/ui/public/index_patterns/_pattern_cache.js
+++ b/src/ui/public/index_patterns/_pattern_cache.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function PatternCache() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var vals = {};
+    let vals = {};
 
-    var validId = function (id) {
+    let validId = function (id) {
       return typeof id !== 'object';
     };
 
diff --git a/src/ui/public/index_patterns/_pattern_to_wildcard.js b/src/ui/public/index_patterns/_pattern_to_wildcard.js
index 092f05617d65c..5ff765b0fecfe 100644
--- a/src/ui/public/index_patterns/_pattern_to_wildcard.js
+++ b/src/ui/public/index_patterns/_pattern_to_wildcard.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function PatternToWildcardFn() {
     return function (format) {
-      var wildcard = '';
-      var inEscape = false;
-      var inPattern = false;
+      let wildcard = '';
+      let inEscape = false;
+      let inPattern = false;
 
-      for (var i = 0; i < format.length; i++) {
-        var ch = format.charAt(i);
+      for (let i = 0; i < format.length; i++) {
+        let ch = format.charAt(i);
         switch (ch) {
           case '[':
             inPattern = false;
diff --git a/src/ui/public/index_patterns/_transform_mapping_into_fields.js b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
index eb850650510f1..a372424727b0a 100644
--- a/src/ui/public/index_patterns/_transform_mapping_into_fields.js
+++ b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function transformMappingIntoFields(Private, kbnIndex, config) {
-    var _ = require('lodash');
-    var mapField = Private(require('ui/index_patterns/_map_field'));
+    let _ = require('lodash');
+    let mapField = Private(require('ui/index_patterns/_map_field'));
 
 
     /**
@@ -14,15 +14,15 @@ define(function (require) {
      *                    use-cases
      */
     return function (response) {
-      var fields = {};
+      let fields = {};
       _.each(response, function (index, indexName) {
         if (indexName === kbnIndex) return;
         _.each(index.mappings, function (mappings) {
           _.each(mappings, function (field, name) {
-            var keys = Object.keys(field.mapping);
+            let keys = Object.keys(field.mapping);
             if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
 
-            var mapping = mapField(field, name);
+            let mapping = mapField(field, name);
 
             if (fields[name]) {
               if (fields[name].type !== mapping.type) {
@@ -39,7 +39,7 @@ define(function (require) {
       config.get('metaFields').forEach(function (meta) {
         if (fields[meta]) return;
 
-        var field = { mapping: {} };
+        let field = { mapping: {} };
         field.mapping[meta] = {};
         fields[meta] = mapField(field, meta);
       });
diff --git a/src/ui/public/index_patterns/index_patterns.js b/src/ui/public/index_patterns/index_patterns.js
index 979c9f7ad2620..1b732a8a49703 100644
--- a/src/ui/public/index_patterns/index_patterns.js
+++ b/src/ui/public/index_patterns/index_patterns.js
@@ -1,21 +1,21 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana/index_patterns');
+  let module = require('ui/modules').get('kibana/index_patterns');
   require('ui/filters/short_dots');
 
-  module.service('indexPatterns', function (es, Notifier, Private, Promise, kbnIndex) {
-    var self = this;
-    var _ = require('lodash');
-    var errors = require('ui/errors');
+  function IndexPatternsProvider(es, Notifier, Private, Promise, kbnIndex) {
+    let self = this;
+    let _ = require('lodash');
+    let errors = require('ui/errors');
 
-    var IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
-    var patternCache = Private(require('ui/index_patterns/_pattern_cache'));
+    let IndexPattern = Private(require('ui/index_patterns/_index_pattern'));
+    let patternCache = Private(require('ui/index_patterns/_pattern_cache'));
 
-    var notify = new Notifier({ location: 'IndexPatterns Service'});
+    let notify = new Notifier({ location: 'IndexPatterns Service'});
 
     self.get = function (id) {
       if (!id) return self.make();
 
-      var cache = patternCache.get(id);
+      let cache = patternCache.get(id);
       return cache || patternCache.set(id, self.make(id));
     };
 
@@ -25,7 +25,8 @@ define(function (require) {
 
     self.delete = function (pattern) {
       self.getIds.clearCache();
-      patternCache.delete(pattern.id);
+      pattern.destroy();
+
       return es.delete({
         index: kbnIndex,
         type: 'index-pattern',
@@ -44,5 +45,8 @@ define(function (require) {
     self.patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard'));
     self.fieldFormats = Private(require('ui/registry/field_formats'));
     self.IndexPattern = IndexPattern;
-  });
+  }
+
+  module.service('indexPatterns', Private => Private(IndexPatternsProvider));
+  return IndexPatternsProvider;
 });
diff --git a/src/ui/public/index_patterns/routeSetup/loadDefault.js b/src/ui/public/index_patterns/routeSetup/loadDefault.js
index b1ce550ade5a9..cfc8644207f5d 100644
--- a/src/ui/public/index_patterns/routeSetup/loadDefault.js
+++ b/src/ui/public/index_patterns/routeSetup/loadDefault.js
@@ -1,6 +1,6 @@
 let _ = require('lodash');
 let { NoDefaultIndexPattern, NoDefinedIndexPatterns } = require('ui/errors');
-let Notifier = require('ui/notify/Notifier');
+let Notifier = require('ui/notify/notifier');
 let notify = new Notifier({
   location: 'Index Patterns'
 });
diff --git a/src/ui/public/jquery/__tests__/findTestSubject.js b/src/ui/public/jquery/__tests__/findTestSubject.js
index 891dbdd81a95d..048e8680138a5 100644
--- a/src/ui/public/jquery/__tests__/findTestSubject.js
+++ b/src/ui/public/jquery/__tests__/findTestSubject.js
@@ -1,5 +1,5 @@
-var $ = require('jquery');
-var expect = require('expect.js');
+let $ = require('jquery');
+let expect = require('expect.js');
 
 function $make(subject) {
   return $('<div>').attr('data-test-subj', subject);
@@ -7,42 +7,42 @@ function $make(subject) {
 
 describe('jQuery.findTestSubject', function () {
   it('finds all of the element with a subject', function () {
-    var $container = $('<div>');
-    var $match = $make('subject').appendTo($container);
-    var $noMatch = $make('notSubject').appendTo($container);
+    let $container = $('<div>');
+    let $match = $make('subject').appendTo($container);
+    let $noMatch = $make('notSubject').appendTo($container);
 
-    var $found = $container.findTestSubject('subject');
+    let $found = $container.findTestSubject('subject');
     expect($found.is($match)).to.be(true);
     expect($found.is($noMatch)).to.be(false);
   });
 
   it('finds multiple elements with a subject', function () {
-    var $container = $('<div>');
-    var $match = $make('subject').appendTo($container);
-    var $otherMatch = $make('subject').appendTo($container);
+    let $container = $('<div>');
+    let $match = $make('subject').appendTo($container);
+    let $otherMatch = $make('subject').appendTo($container);
 
-    var $found = $container.findTestSubject('subject');
+    let $found = $container.findTestSubject('subject');
     expect($found.filter($match).size()).to.be(1);
     expect($found.filter($otherMatch).size()).to.be(1);
   });
 
   it('finds all of the elements with either subject', function () {
-    var $container = $('<div>');
-    var $match1 = $make('subject').appendTo($container);
-    var $match2 = $make('alsoSubject').appendTo($container);
-    var $noMatch = $make('notSubject').appendTo($container);
+    let $container = $('<div>');
+    let $match1 = $make('subject').appendTo($container);
+    let $match2 = $make('alsoSubject').appendTo($container);
+    let $noMatch = $make('notSubject').appendTo($container);
 
-    var $found = $container.findTestSubject('subject', 'alsoSubject');
+    let $found = $container.findTestSubject('subject', 'alsoSubject');
     expect($found.filter($match1).size()).to.be(1);
     expect($found.filter($match2).size()).to.be(1);
     expect($found.filter($noMatch).size()).to.be(0);
   });
 
   it('finds all of the elements with a decendant selector', function () {
-    var $container = $('<div>');
-    var $parent = $make('foo name').appendTo($container);
-    var $bar = $make('bar othername').appendTo($parent);
-    var $baz = $make('baz third name').appendTo($parent);
+    let $container = $('<div>');
+    let $parent = $make('foo name').appendTo($container);
+    let $bar = $make('bar othername').appendTo($parent);
+    let $baz = $make('baz third name').appendTo($parent);
 
     expect($container.findTestSubject('foo bar').is($bar)).to.be(true);
     expect($container.findTestSubject('foo bar').is($baz)).to.be(false);
@@ -52,9 +52,9 @@ describe('jQuery.findTestSubject', function () {
   });
 
   it('finds elements with compound subjects', function () {
-    var $container = $('<div>');
-    var $bar = $make('button bar').appendTo($container);
-    var $baz = $make('button baz').appendTo($container);
+    let $container = $('<div>');
+    let $bar = $make('button bar').appendTo($container);
+    let $baz = $make('button baz').appendTo($container);
 
     expect($container.findTestSubject('button&bar').is($bar)).to.be(true);
     expect($container.findTestSubject('button& bar').is($bar)).to.be(true);
diff --git a/src/ui/public/jquery/findTestSubject.js b/src/ui/public/jquery/findTestSubject.js
index 6ffb01789a9ad..a3af782338a5b 100644
--- a/src/ui/public/jquery/findTestSubject.js
+++ b/src/ui/public/jquery/findTestSubject.js
@@ -1,3 +1,5 @@
+let testSubjSelector = require('@spalger/test-subj-selector');
+
 module.exports = function bindToJquery($) {
 
   /**
@@ -5,28 +7,28 @@ module.exports = function bindToJquery($) {
    *
    * ```js
    * // this
-   * var $button = $('[data-test-subj~="saveButton"]');
+   * let $button = $('[data-test-subj~="saveButton"]');
    *
    * // becomes this
-   * var $button = $.findTestSubject('saveButton');
+   * let $button = $.findTestSubject('saveButton');
    * ```
    *
    * Supports multiple subjects
    * ```js
    * // find any saveButton or cancelButton
-   * var $buttons = $.findTestSubject('saveButton', 'cancelButton');
+   * let $buttons = $.findTestSubject('saveButton', 'cancelButton');
    * ```
    *
    * Supports subject "selectors"
    * ```js
    * // find any saveButton inside a savedObjectForm
-   * var $button = $.findTestSubject('savedObjectForm saveButton');
+   * let $button = $.findTestSubject('savedObjectForm saveButton');
    * ```
    *
    * Supports selecting compound subjects
    * ```js
    * // find any smallButton that is also a saveButton inside a savedObjectForm
-   * var $input = $.findTestSubject('savedObjectForm smallButton&saveButton');
+   * let $input = $.findTestSubject('savedObjectForm smallButton&saveButton');
    * ```
    *
    * @return {jQueryCollection}
@@ -41,28 +43,12 @@ module.exports = function bindToJquery($) {
    */
   $.fn.findTestSubject = findTestSubject;
 
-  function findTestSubject(/* ...subjectSelectors */) {
-    var subjectSelectors = [].slice.apply(arguments);
-    var $els = $();
-    var $context = this;
-
-    subjectSelectors.forEach(function (subjectSelector) {
-      var cssSelectors = [];
-      var terms = subjectSelector
-        .replace(/\s*&\s*/g, '&') // remove all whitespace around joins
-        .split(/\s+/);
-
-      function termToCssSelector(term) {
-        return term ? '[data-test-subj~="' + term + '"]' : '';
-      }
-
-      while (terms.length) {
-        var term = terms.shift();
-        // split each term by joins/& and map to css selectors
-        cssSelectors.push(term.split('&').map(termToCssSelector).join(''));
-      }
+  function findTestSubject(...subjectSelectors) {
+    let $els = $();
+    let $context = this;
 
-      $els = $els.add($context.find(cssSelectors.join(' ')));
+    subjectSelectors.forEach(function (selector) {
+      $els = $els.add($context.find(testSubjSelector(selector)));
     });
 
     return $els;
diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js
index 56fe2205bdb7c..5dfa598acabee 100644
--- a/src/ui/public/listen/__tests__/listen.js
+++ b/src/ui/public/listen/__tests__/listen.js
@@ -1,11 +1,11 @@
 
 describe('listen component', function () {
-  var sinon = require('auto-release-sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let sinon = require('auto-release-sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var $rootScope;
-  var Events;
+  let $rootScope;
+  let Events;
 
   require('ui/listen');
 
@@ -21,8 +21,8 @@ describe('listen component', function () {
   });
 
   it('binds to an event emitter', function () {
-    var emitter = new Events();
-    var $scope = $rootScope.$new();
+    let emitter = new Events();
+    let $scope = $rootScope.$new();
 
     function handler() {}
     $scope.$listen(emitter, 'hello', handler);
@@ -32,8 +32,8 @@ describe('listen component', function () {
   });
 
   it('binds to $scope, waiting for the destroy event', function () {
-    var emitter = new Events();
-    var $scope = $rootScope.$new();
+    let emitter = new Events();
+    let $scope = $rootScope.$new();
 
     sinon.stub($scope, '$on');
     sinon.stub($rootScope, '$on');
@@ -44,14 +44,14 @@ describe('listen component', function () {
     expect($rootScope.$on).to.have.property('callCount', 0);
     expect($scope.$on).to.have.property('callCount', 1);
 
-    var call = $scope.$on.firstCall;
+    let call = $scope.$on.firstCall;
     expect(call.args[0]).to.be('$destroy');
     expect(call.args[1]).to.be.a('function');
   });
 
   it('unbinds the event handler when $destroy is triggered', function () {
-    var emitter = new Events();
-    var $scope = $rootScope.$new();
+    let emitter = new Events();
+    let $scope = $rootScope.$new();
 
     sinon.stub($scope, '$on');
     sinon.stub(emitter, 'off');
@@ -61,7 +61,7 @@ describe('listen component', function () {
     $scope.$listen(emitter, 'hello', handler);
 
     // get the unbinder that was registered to $scope
-    var unbinder = $scope.$on.firstCall.args[1];
+    let unbinder = $scope.$on.firstCall.args[1];
 
     // call the unbinder
     expect(emitter.off).to.have.property('callCount', 0);
@@ -69,7 +69,7 @@ describe('listen component', function () {
     expect(emitter.off).to.have.property('callCount', 1);
 
     // check that the off args were as expected
-    var call = emitter.off.firstCall;
+    let call = emitter.off.firstCall;
     expect(call.args[0]).to.be('hello');
     expect(call.args[1]).to.be(handler);
   });
diff --git a/src/ui/public/listen/listen.js b/src/ui/public/listen/listen.js
index 3ed67ccf84f66..10df0943b07ec 100644
--- a/src/ui/public/listen/listen.js
+++ b/src/ui/public/listen/listen.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules').get('kibana')
   .run(function ($rootScope) {
diff --git a/src/ui/public/modules.js b/src/ui/public/modules.js
index 286b6cd6a20a3..939cddc4843d5 100644
--- a/src/ui/public/modules.js
+++ b/src/ui/public/modules.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var angular = require('angular');
-  var existingModules = {};
-  var _ = require('lodash');
-  var links = [];
+  const angular = require('angular');
+  const existingModules = {};
+  const _ = require('lodash');
+  const links = [];
 
   function link(module) {
     // as modules are defined they will be set as requirements for this app
@@ -13,7 +13,7 @@ define(function (require) {
   }
 
   function get(moduleName, requires) {
-    var module = existingModules[moduleName];
+    let module = existingModules[moduleName];
 
     if (module === void 0) {
       // create the module
@@ -36,13 +36,13 @@ define(function (require) {
   }
 
   function close(moduleName) {
-    var module = existingModules[moduleName];
+    const module = existingModules[moduleName];
 
     // already closed
     if (!module) return;
 
     // if the module is currently linked, unlink it
-    var i = links.indexOf(module);
+    const i = links.indexOf(module);
     if (i > -1) links.splice(i, 1);
 
     // remove from linked modules list of required modules
diff --git a/src/ui/public/navbar/__tests__/navbar.js b/src/ui/public/navbar/__tests__/navbar.js
new file mode 100644
index 0000000000000..9f8c3e9910b60
--- /dev/null
+++ b/src/ui/public/navbar/__tests__/navbar.js
@@ -0,0 +1,140 @@
+const ngMock = require('ngMock');
+const sinon = require('sinon');
+const expect = require('expect.js');
+const angular = require('angular');
+const _ = require('lodash');
+
+require('ui/navbar');
+const navbarExtensionsRegistry = require('ui/registry/navbar_extensions');
+const Registry = require('ui/registry/_registry');
+
+const defaultMarkup = `
+  <navbar name="testing">
+    <div class="button-group" role="toolbar">
+      <button>
+        <i aria-hidden="true" class="fa fa-file-new-o"></i>
+      </button>
+      <button>
+        <i aria-hidden="true" class="fa fa-save"></i>
+      </button>
+      <button>
+        <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+      </button>
+    </div>
+  </navbar>`;
+
+
+describe('navbar directive', function () {
+  let $rootScope;
+  let $compile;
+  let stubRegistry;
+
+  beforeEach(function () {
+    ngMock.module('kibana', function (PrivateProvider) {
+      stubRegistry = new Registry({
+        index: ['name'],
+        group: ['appName'],
+        order: ['order']
+      });
+
+      PrivateProvider.swap(navbarExtensionsRegistry, stubRegistry);
+    });
+
+    ngMock.module('kibana/navbar');
+
+    // Create the scope
+    ngMock.inject(function ($injector) {
+      $rootScope = $injector.get('$rootScope');
+      $compile = $injector.get('$compile');
+    });
+  });
+
+  function init(markup = defaultMarkup) {
+    // Give us a scope
+    const $el = angular.element(markup);
+    $compile($el)($rootScope);
+    $el.scope().$digest();
+    return $el;
+  }
+
+  describe('incorrect use', function () {
+    it('should throw if missing a name property', function () {
+      const markup = `<navbar><div class="button-group" role="toolbar"></div></navbar>`;
+      expect(() => init(markup)).to.throwException(/requires a name attribute/);
+    });
+
+    it('should throw if missing a button group', function () {
+      const markup = `<navbar name="testing"></navbar>`;
+      expect(() => init(markup)).to.throwException(/must have exactly 1 button group/);
+    });
+
+    it('should throw if multiple button groups', function () {
+      const markup = `  <navbar name="testing">
+          <div class="button-group" role="toolbar">
+            <button>
+              <i aria-hidden="true" class="fa fa-file-new-o"></i>
+            </button>
+            <button>
+              <i aria-hidden="true" class="fa fa-save"></i>
+            </button>
+          </div>
+          <div class="button-group" role="toolbar">
+            <button>
+              <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+            </button>
+          </div>
+        </navbar>`;
+      expect(() => init(markup)).to.throwException(/must have exactly 1 button group/);
+    });
+
+    it('should throw if button group not direct child', function () {
+      const markup = `<navbar><div><div class="button-group" role="toolbar"></div></div></navbar>`;
+      expect(() => init(markup)).to.throwException(/must have exactly 1 button group/);
+    });
+  });
+
+  describe('injecting extensions', function () {
+    function registerExtension(def = {}) {
+      stubRegistry.register(function () {
+        return _.defaults(def, {
+          name: 'exampleButton',
+          appName: 'testing',
+          order: 0,
+          template: `
+            <button class="test-button">
+              <i aria-hidden="true" class="fa fa-rocket"></i>
+            </button>`
+        });
+      });
+    }
+
+    it('should use the default markup', function () {
+      var $el = init();
+      expect($el.find('.button-group button').length).to.equal(3);
+    });
+
+    it('should append to end then order == 0', function () {
+      registerExtension({ order: 0 });
+      var $el = init();
+
+      expect($el.find('.button-group button').length).to.equal(4);
+      expect($el.find('.button-group button').last().hasClass('test-button')).to.be.ok();
+    });
+
+    it('should append to end then order > 0', function () {
+      registerExtension({ order: 1 });
+      var $el = init();
+
+      expect($el.find('.button-group button').length).to.equal(4);
+      expect($el.find('.button-group button').last().hasClass('test-button')).to.be.ok();
+    });
+
+    it('should append to end then order < 0', function () {
+      registerExtension({ order: -1 });
+      var $el = init();
+
+      expect($el.find('.button-group button').length).to.equal(4);
+      expect($el.find('.button-group button').first().hasClass('test-button')).to.be.ok();
+    });
+  });
+});
diff --git a/src/ui/public/navbar/navbar.js b/src/ui/public/navbar/navbar.js
new file mode 100644
index 0000000000000..2e49a760708be
--- /dev/null
+++ b/src/ui/public/navbar/navbar.js
@@ -0,0 +1,56 @@
+const _ = require('lodash');
+const $ = require('jquery');
+const navbar = require('ui/modules').get('kibana/navbar');
+
+require('ui/render_directive');
+
+navbar.directive('navbar', function (Private, $compile) {
+  const navbarExtensions = Private(require('ui/registry/navbar_extensions'));
+  const getExtensions = _.memoize(function (name) {
+    if (!name) throw new Error('navbar directive requires a name attribute');
+    return _.sortBy(navbarExtensions.byAppName[name], 'order');
+  });
+
+  return {
+    restrict: 'E',
+    template: function ($el, $attrs) {
+      const $buttonGroup = $el.children('.button-group');
+      if ($buttonGroup.length !== 1) throw new Error('navbar must have exactly 1 button group');
+
+      const extensions = getExtensions($attrs.name);
+      const buttons = $buttonGroup.children().detach().toArray();
+      const controls = [
+        ...buttons.map(function (button) {
+          return {
+            order: 0,
+            $el: $(button),
+          };
+        }),
+        ...extensions.map(function (extension, i) {
+          return {
+            order: extension.order,
+            index: i,
+            extension: extension,
+          };
+        }),
+      ];
+
+      _.sortBy(controls, 'order').forEach(function (control) {
+        if (control.$el) {
+          return $buttonGroup.append(control.$el);
+        }
+
+        const { extension, index } = control;
+        const $ext = $(`<render-directive definition="navbar.extensions[${index}]"></render-directive>`);
+        $ext.html(extension.template);
+        $buttonGroup.append($ext);
+      });
+
+      return $el.html();
+    },
+    controllerAs: 'navbar',
+    controller: function ($attrs) {
+      this.extensions = getExtensions($attrs.name);
+    }
+  };
+});
diff --git a/src/ui/public/notify/__tests__/lib/_format_es_msg.js b/src/ui/public/notify/__tests__/lib/_format_es_msg.js
index 6a2668332692d..5a91514b4ba1e 100644
--- a/src/ui/public/notify/__tests__/lib/_format_es_msg.js
+++ b/src/ui/public/notify/__tests__/lib/_format_es_msg.js
@@ -1,25 +1,25 @@
 describe('formatESMsg', function () {
-  var formatESMsg = require('ui/notify/lib/_format_es_msg');
-  var expect = require('expect.js');
+  let formatESMsg = require('ui/notify/lib/_format_es_msg');
+  let expect = require('expect.js');
 
   it('should return undefined if passed a basic error', function () {
-    var err = new Error('This is a normal error');
+    let err = new Error('This is a normal error');
 
-    var actual = formatESMsg(err);
+    let actual = formatESMsg(err);
 
     expect(actual).to.be(undefined);
   });
 
   it('should return undefined if passed a string', function () {
-    var err = 'This is a error string';
+    let err = 'This is a error string';
 
-    var actual = formatESMsg(err);
+    let actual = formatESMsg(err);
 
     expect(actual).to.be(undefined);
   });
 
   it('should return the root_cause if passed an extended elasticsearch', function () {
-    var err = new Error('This is an elasticsearch error');
+    let err = new Error('This is an elasticsearch error');
     err.resp = {
       error : {
         root_cause : [
@@ -30,13 +30,13 @@ describe('formatESMsg', function () {
       }
     };
 
-    var actual = formatESMsg(err);
+    let actual = formatESMsg(err);
 
     expect(actual).to.equal('I am the detailed message');
   });
 
   it('should combine the reason messages if more than one is returned.', function () {
-    var err = new Error('This is an elasticsearch error');
+    let err = new Error('This is an elasticsearch error');
     err.resp = {
       error : {
         root_cause : [
@@ -50,7 +50,7 @@ describe('formatESMsg', function () {
       }
     };
 
-    var actual = formatESMsg(err);
+    let actual = formatESMsg(err);
 
     expect(actual).to.equal('I am the detailed message 1\nI am the detailed message 2');
   });
diff --git a/src/ui/public/notify/__tests__/lib/_format_msg.js b/src/ui/public/notify/__tests__/lib/_format_msg.js
index 52d9546216db2..1bb74d353631e 100644
--- a/src/ui/public/notify/__tests__/lib/_format_msg.js
+++ b/src/ui/public/notify/__tests__/lib/_format_msg.js
@@ -1,28 +1,44 @@
 describe('formatMsg', function () {
-  var formatMsg = require('ui/notify/lib/_format_msg');
-  var expect = require('expect.js');
+  let formatMsg = require('ui/notify/lib/_format_msg');
+  let expect = require('expect.js');
 
   it('should prepend the second argument to result', function () {
-    var actual = formatMsg('error message', 'unit_test');
+    let actual = formatMsg('error message', 'unit_test');
 
     expect(actual).to.equal('unit_test: error message');
   });
 
   it('should handle a simple string', function () {
-    var actual = formatMsg('error message');
+    let actual = formatMsg('error message');
 
     expect(actual).to.equal('error message');
   });
 
   it('should handle a simple Error object', function () {
-    var err = new Error('error message');
-    var actual = formatMsg(err);
+    let err = new Error('error message');
+    let actual = formatMsg(err);
 
     expect(actual).to.equal('error message');
   });
 
+  it('should handle a simple Angular $http error object', function () {
+    let err = {
+      data: {
+        statusCode: 403,
+        error: 'Forbidden',
+        message: '[security_exception] action [indices:data/read/mget] is unauthorized for user [user]'
+      },
+      status: 403,
+      config: {},
+      statusText: 'Forbidden'
+    };
+    let actual = formatMsg(err);
+
+    expect(actual).to.equal('Error 403 Forbidden: [security_exception] action [indices:data/read/mget] is unauthorized for user [user]');
+  });
+
   it('should handle an extended elasticsearch error', function () {
-    var err = {
+    let err = {
       resp : {
         error : {
           root_cause : [
@@ -34,7 +50,7 @@ describe('formatMsg', function () {
       }
     };
 
-    var actual = formatMsg(err);
+    let actual = formatMsg(err);
 
     expect(actual).to.equal('I am the detailed message');
   });
diff --git a/src/ui/public/notify/__tests__/Notifier.js b/src/ui/public/notify/__tests__/notifier.js
similarity index 81%
rename from src/ui/public/notify/__tests__/Notifier.js
rename to src/ui/public/notify/__tests__/notifier.js
index 3ded8ae762d05..1d0e5290c9120 100644
--- a/src/ui/public/notify/__tests__/Notifier.js
+++ b/src/ui/public/notify/__tests__/notifier.js
@@ -1,14 +1,14 @@
 describe('Notifier', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var Notifier = require('ui/notify/Notifier');
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let Notifier = require('ui/notify/notifier');
 
-  var message = 'Oh, the humanity!';
-  var notifier;
-  var params;
-  var version = window.__KBN__.version;
-  var buildNum = window.__KBN__.buildNum;
+  let message = 'Oh, the humanity!';
+  let notifier;
+  let params;
+  let version = window.__KBN__.version;
+  let buildNum = window.__KBN__.buildNum;
 
   beforeEach(ngMock.module('kibana'));
 
@@ -43,17 +43,17 @@ describe('Notifier', function () {
       expect(notify('error').title).to.equal('Error');
     });
 
-    it('sets lifetime to Infinity', function () {
-      expect(notify('error').lifetime).to.equal(Infinity);
+    it('sets lifetime to 5 minutes', function () {
+      expect(notify('error').lifetime).to.equal(300000);
     });
 
     it('allows reporting', function () {
-      var includesReport = _.includes(notify('error').actions, 'report');
+      let includesReport = _.includes(notify('error').actions, 'report');
       expect(includesReport).to.true;
     });
 
     it('allows accepting', function () {
-      var includesAccept = _.includes(notify('error').actions, 'accept');
+      let includesAccept = _.includes(notify('error').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -86,12 +86,12 @@ describe('Notifier', function () {
     });
 
     it('does not allow reporting', function () {
-      var includesReport = _.includes(notify('warning').actions, 'report');
+      let includesReport = _.includes(notify('warning').actions, 'report');
       expect(includesReport).to.false;
     });
 
     it('allows accepting', function () {
-      var includesAccept = _.includes(notify('warning').actions, 'accept');
+      let includesAccept = _.includes(notify('warning').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -124,12 +124,12 @@ describe('Notifier', function () {
     });
 
     it('does not allow reporting', function () {
-      var includesReport = _.includes(notify('info').actions, 'report');
+      let includesReport = _.includes(notify('info').actions, 'report');
       expect(includesReport).to.false;
     });
 
     it('allows accepting', function () {
-      var includesAccept = _.includes(notify('info').actions, 'accept');
+      let includesAccept = _.includes(notify('info').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -150,13 +150,13 @@ describe('Notifier', function () {
   function testVersionInfo(fnName) {
     context('when version is configured', function () {
       it('adds version to notification', function () {
-        var notification = notify(fnName);
+        let notification = notify(fnName);
         expect(notification.info.version).to.equal(version);
       });
     });
     context('when build number is configured', function () {
       it('adds buildNum to notification', function () {
-        var notification = notify(fnName);
+        let notification = notify(fnName);
         expect(notification.info.buildNum).to.equal(buildNum);
       });
     });
diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js
index 62681163211e7..a3bbf88d77472 100644
--- a/src/ui/public/notify/directives.js
+++ b/src/ui/public/notify/directives.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var notify = require('ui/modules').get('kibana/notify');
-  var _ = require('lodash');
+  let notify = require('ui/modules').get('kibana/notify');
+  let _ = require('lodash');
 
   notify.directive('kbnNotifications', function () {
     return {
diff --git a/src/ui/public/notify/errors.js b/src/ui/public/notify/errors.js
index f5d9ded164fca..44fe93a22ea19 100644
--- a/src/ui/public/notify/errors.js
+++ b/src/ui/public/notify/errors.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var errors = {};
-  var _ = require('lodash');
+  let errors = {};
+  let _ = require('lodash');
 
-  var canStack = (function () {
-    var err = new Error();
+  let canStack = (function () {
+    let err = new Error();
     return !!err.stack;
   }());
 
diff --git a/src/ui/public/notify/lib/_format_es_msg.js b/src/ui/public/notify/lib/_format_es_msg.js
index a389a27852521..b5e4eea6d118e 100644
--- a/src/ui/public/notify/lib/_format_es_msg.js
+++ b/src/ui/public/notify/lib/_format_es_msg.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * Utilize the extended error information returned from elasticsearch
@@ -7,12 +7,12 @@ define(function (require) {
    * @returns {string}
    */
   return function formatESMsg(err) {
-    var rootCause = _.get(err, 'resp.error.root_cause');
+    let rootCause = _.get(err, 'resp.error.root_cause');
     if (!rootCause) {
       return; //undefined
     }
 
-    var result = _.pluck(rootCause, 'reason').join('\n');
+    let result = _.pluck(rootCause, 'reason').join('\n');
     return result;
   };
 });
diff --git a/src/ui/public/notify/lib/_format_msg.js b/src/ui/public/notify/lib/_format_msg.js
index 87f75e7e37c03..f4ec291c9384e 100644
--- a/src/ui/public/notify/lib/_format_msg.js
+++ b/src/ui/public/notify/lib/_format_msg.js
@@ -1,5 +1,7 @@
 define(function (require) {
-  var formatESMsg = require('ui/notify/lib/_format_es_msg');
+  let _ = require('lodash');
+  let has = _.has;
+  let formatESMsg = require('ui/notify/lib/_format_es_msg');
 
   /**
    * Formats the error message from an error object, extended elasticsearch
@@ -8,22 +10,34 @@ define(function (require) {
    * @param  {String} from - Prefix for message indicating source (optional)
    * @returns {string}
    */
-  return function formatMsg(err, from) {
-    var rtn = '';
+  function formatMsg(err, from) {
+    let rtn = '';
     if (from) {
       rtn += from + ': ';
     }
 
-    var esMsg = formatESMsg(err);
+    let esMsg = formatESMsg(err);
 
     if (typeof err === 'string') {
       rtn += err;
     } else if (esMsg) {
       rtn += esMsg;
     } else if (err instanceof Error) {
-      rtn += err.message;
+      rtn += formatMsg.describeError(err);
+    } else if (has(err, 'status') && has(err, 'data')) {
+      // is an Angular $http "error object"
+      rtn += 'Error ' + err.status + ' ' + err.statusText + ': ' + err.data.message;
     }
 
     return rtn;
   };
+
+  formatMsg.describeError = function (err) {
+    if (!err) return undefined;
+    if (err.body && err.body.message) return err.body.message;
+    if (err.message) return err.message;
+    return '' + err;
+  };
+
+  return formatMsg;
 });
diff --git a/src/ui/public/notify/Notifier.js b/src/ui/public/notify/notifier.js
similarity index 85%
rename from src/ui/public/notify/Notifier.js
rename to src/ui/public/notify/notifier.js
index 66203e35f5c2f..091a2e0f4b0a6 100644
--- a/src/ui/public/notify/Notifier.js
+++ b/src/ui/public/notify/notifier.js
@@ -1,27 +1,27 @@
 
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
+  let _ = require('lodash');
+  let $ = require('jquery');
 
-  var metadata = require('ui/metadata');
-  var formatMsg = require('ui/notify/lib/_format_msg');
+  let metadata = require('ui/metadata');
+  let formatMsg = require('ui/notify/lib/_format_msg');
 
-  var notifs = [];
-  var setTO = setTimeout;
-  var clearTO = clearTimeout;
-  var version = metadata.version;
-  var buildNum = metadata.buildNum;
-  var consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
+  let notifs = [];
+  let setTO = setTimeout;
+  let clearTO = clearTimeout;
+  let version = metadata.version;
+  let buildNum = metadata.buildNum;
+  let consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
 
-  var fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html');
+  let fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html');
 
-  var log = _.bindKey(console, 'log');
+  let log = _.bindKey(console, 'log');
 
   // used to identify the first call to fatal, set to false there
-  var firstFatal = true;
+  let firstFatal = true;
 
-  var fatalToastTemplate = (function lazyTemplate(tmpl) {
-    var compiled;
+  let fatalToastTemplate = (function lazyTemplate(tmpl) {
+    let compiled;
     return function (vars) {
       return (compiled || (compiled = _.template(tmpl)))(vars);
     };
@@ -37,7 +37,7 @@ define(function (require) {
   function closeNotif(cb, key) {
     return function () {
       // this === notif
-      var i = notifs.indexOf(this);
+      let i = notifs.indexOf(this);
       if (i !== -1) notifs.splice(i, 1);
       if (this.timerId) this.timerId = clearTO(this.timerId);
       if (typeof cb === 'function') cb(key);
@@ -63,7 +63,7 @@ define(function (require) {
 
     notif.count = (notif.count || 0) + 1;
 
-    var dup = _.find(notifs, function (item) {
+    let dup = _.find(notifs, function (item) {
       return item.content === notif.content && item.lifetime === notif.lifetime;
     });
 
@@ -79,7 +79,7 @@ define(function (require) {
   }
 
   function formatInfo() {
-    var info = [];
+    let info = [];
 
     if (!_.isUndefined(version)) {
       info.push(`Version: ${version}`);
@@ -104,7 +104,7 @@ define(function (require) {
    * Functionality to check that
    */
   function Notifier(opts) {
-    var self = this;
+    let self = this;
     opts = opts || {};
 
     // label type thing to say where notifications came from
@@ -153,7 +153,7 @@ define(function (require) {
    * @return {function} - the wrapped function
    */
   Notifier.prototype.timed = function (name, fn) {
-    var self = this;
+    let self = this;
 
     if (typeof name === 'function') {
       fn = name;
@@ -161,8 +161,8 @@ define(function (require) {
     }
 
     return function WrappedNotifierFunction() {
-      var cntx = this;
-      var args = arguments;
+      let cntx = this;
+      let args = arguments;
 
       return self.event(name, function () {
         return fn.apply(cntx, args);
@@ -198,13 +198,13 @@ define(function (require) {
       });
     }
 
-    var html = fatalToastTemplate({
+    let html = fatalToastTemplate({
       info: formatInfo(),
       msg: formatMsg(err, this.from),
       stack: formatStack(err)
     });
 
-    var $container = $('#fatal-splash-screen');
+    let $container = $('#fatal-splash-screen');
 
     if (!$container.size()) {
       $(document.body)
@@ -229,7 +229,7 @@ define(function (require) {
       content: formatMsg(err, this.from),
       icon: 'warning',
       title: 'Error',
-      lifetime: Infinity,
+      lifetime: 300000,
       actions: ['report', 'accept'],
       stack: formatStack(err)
     }, cb);
@@ -267,11 +267,13 @@ define(function (require) {
     }, cb);
   };
 
+  Notifier.prototype.describeError = formatMsg.describeError;
+
   if (log === _.noop) {
     Notifier.prototype.log = _.noop;
   } else {
     Notifier.prototype.log = function () {
-      var args = [].slice.apply(arguments);
+      let args = [].slice.apply(arguments);
       if (this.from) args.unshift(this.from + ':');
       log.apply(null, args);
     };
@@ -280,15 +282,15 @@ define(function (require) {
   // general functionality used by .event() and .lifecycle()
   function createGroupLogger(type, opts) {
     // Track the groups managed by this logger
-    var groups = window[type + 'Groups'] = {};
+    let groups = window[type + 'Groups'] = {};
 
     return function logger(name, success) {
-      var status; // status of the timer
-      var exec; // function to execute and wrap
-      var ret; // return value
+      let status; // status of the timer
+      let exec; // function to execute and wrap
+      let ret; // return value
 
-      var complete = function (val) { logger(name, true); return val; };
-      var failure = function (err) { logger(name, false); throw err; };
+      let complete = function (val) { logger(name, true); return val; };
+      let failure = function (err) { logger(name, false); throw err; };
 
       if (typeof success === 'function' || success === void 0) {
         // start
@@ -304,7 +306,7 @@ define(function (require) {
       }
       else {
         groups[name] = now() - (groups[name] || 0);
-        var time = ' in ' + groups[name].toFixed(2) + 'ms';
+        let time = ' in ' + groups[name].toFixed(2) + 'ms';
 
         // end
         if (success) {
diff --git a/src/ui/public/notify/notify.js b/src/ui/public/notify/notify.js
index 9a371eed3fdc5..3121a07a32860 100644
--- a/src/ui/public/notify/notify.js
+++ b/src/ui/public/notify/notify.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var modules = require('ui/modules');
-  var module = modules.get('kibana/notify');
-  var errors = require('ui/notify/errors');
-  var Notifier = require('ui/notify/Notifier');
-  var rootNotifier = new Notifier();
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let modules = require('ui/modules');
+  let module = modules.get('kibana/notify');
+  let errors = require('ui/notify/errors');
+  let Notifier = require('ui/notify/notifier');
+  let rootNotifier = new Notifier();
 
   require('ui/notify/directives');
 
diff --git a/src/ui/public/number_list/number_list.js b/src/ui/public/number_list/number_list.js
index 0b6e1b97053c9..cf65bf8cb2909 100644
--- a/src/ui/public/number_list/number_list.js
+++ b/src/ui/public/number_list/number_list.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var parseRange = require('ui/utils/range');
+  let _ = require('lodash');
+  let parseRange = require('ui/utils/range');
 
   require('ui/number_list/number_list_input');
   require('ui/modules')
@@ -12,7 +12,7 @@ define(function (require) {
       controllerAs: 'numberListCntr',
       require: 'ngModel',
       controller: function ($scope, $attrs, $parse) {
-        var self = this;
+        let self = this;
 
         // Called from the pre-link function once we have the controllers
         self.init = function (modelCntr) {
@@ -24,7 +24,7 @@ define(function (require) {
 
           self.getUnitName = _.partial($parse($attrs.unit), $scope);
 
-          var defaultRange = self.range = parseRange('[0,Infinity)');
+          let defaultRange = self.range = parseRange('[0,Infinity)');
 
           $scope.$watch(function () {
             return $attrs.range;
@@ -47,7 +47,7 @@ define(function (require) {
            * @return {undefined}
            */
           self.remove = function (index) {
-            var list = self.getList();
+            let list = self.getList();
             if (!list) return;
 
             list.splice(index, 1);
@@ -58,7 +58,7 @@ define(function (require) {
            * @return {undefined}
            */
           self.add = function () {
-            var list = self.getList();
+            let list = self.getList();
             if (!list) return;
 
             list.push(_.last(list) + 1);
diff --git a/src/ui/public/number_list/number_list_input.js b/src/ui/public/number_list/number_list_input.js
index 9c3aa1936d59a..37265d840b988 100644
--- a/src/ui/public/number_list/number_list_input.js
+++ b/src/ui/public/number_list/number_list_input.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var keyMap = require('ui/utils/key_map');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let keyMap = require('ui/utils/key_map');
 
-  var INVALID = {}; // invalid flag
-  var FLOATABLE = /^[\d\.e\-\+]+$/i;
+  let INVALID = {}; // invalid flag
+  let FLOATABLE = /^[\d\.e\-\+]+$/i;
 
-  var VALIDATION_ERROR = 'numberListRangeAndOrder';
-  var DIRECTIVE_ATTR = 'kbn-number-list-input';
+  let VALIDATION_ERROR = 'numberListRangeAndOrder';
+  let DIRECTIVE_ATTR = 'kbn-number-list-input';
 
   require('ui/modules')
   .get('kibana')
@@ -16,13 +16,13 @@ define(function (require) {
       restrict: 'A',
       require: ['ngModel', '^kbnNumberList'],
       link: function ($scope, $el, attrs, controllers) {
-        var ngModelCntr = controllers[0];
-        var numberListCntr = controllers[1];
+        let ngModelCntr = controllers[0];
+        let numberListCntr = controllers[1];
 
-        var $setModel = $parse(attrs.ngModel).assign;
-        var $repeater = $el.closest('[ng-repeat]');
+        let $setModel = $parse(attrs.ngModel).assign;
+        let $repeater = $el.closest('[ng-repeat]');
 
-        var handlers = {
+        let handlers = {
           up: change(add, 1),
           'shift-up': change(addTenth, 1),
 
@@ -54,14 +54,14 @@ define(function (require) {
 
         function go(dir) {
           return function () {
-            var $to = $get(dir);
+            let $to = $get(dir);
             if ($to.size()) $to.focus();
             else return false;
           };
         }
 
         function idKey(event) {
-          var id = [];
+          let id = [];
           if (event.ctrlKey) id.push('ctrl');
           if (event.shiftKey) id.push('shift');
           if (event.metaKey) id.push('meta');
@@ -75,8 +75,8 @@ define(function (require) {
         }
 
         function addTenth(n, val, str) {
-          var int = Math.floor(val);
-          var dec = parseInt(str.split('.')[1] || 0, 10);
+          let int = Math.floor(val);
+          let dec = parseInt(str.split('.')[1] || 0, 10);
           dec = dec + parseInt(n, 10);
 
           if (dec < 0 || dec > 9) {
@@ -93,11 +93,11 @@ define(function (require) {
 
         function change(using, mod) {
           return function () {
-            var str = String(ngModelCntr.$viewValue);
-            var val = parse(str);
+            let str = String(ngModelCntr.$viewValue);
+            let val = parse(str);
             if (val === INVALID) return;
 
-            var next = using(mod, val, str);
+            let next = using(mod, val, str);
             if (next === INVALID) return;
 
             $el.val(next);
@@ -106,7 +106,7 @@ define(function (require) {
         }
 
         function onKeydown(event) {
-          var handler = handlers[idKey(event)];
+          let handler = handlers[idKey(event)];
           if (!handler) return;
 
           if (handler(event) !== false) {
@@ -122,7 +122,7 @@ define(function (require) {
         });
 
         function parse(viewValue) {
-          var num = viewValue;
+          let num = viewValue;
 
           if (typeof num !== 'number' || isNaN(num)) {
             // parse non-numbers
@@ -133,13 +133,13 @@ define(function (require) {
             if (isNaN(num)) return INVALID;
           }
 
-          var range = numberListCntr.range;
+          let range = numberListCntr.range;
           if (!range.within(num)) return INVALID;
 
           if ($scope.$index > 0) {
-            var i = $scope.$index - 1;
-            var list = numberListCntr.getList();
-            var prev = list[i];
+            let i = $scope.$index - 1;
+            let list = numberListCntr.getList();
+            let prev = list[i];
             if (num <= prev) return INVALID;
           }
 
@@ -155,14 +155,14 @@ define(function (require) {
             }
           }
         ], function () {
-          var valid = parse(ngModelCntr.$viewValue) !== INVALID;
+          let valid = parse(ngModelCntr.$viewValue) !== INVALID;
           ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
         });
 
         function validate(then) {
           return function (input) {
-            var value = parse(input);
-            var valid = value !== INVALID;
+            let value = parse(input);
+            let valid = value !== INVALID;
             value = valid ? value : input;
             ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
             then && then(input, value);
diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js
index 0a798c511952d..a89ab8ad283ef 100644
--- a/src/ui/public/paginated_table/__tests__/index.js
+++ b/src/ui/public/paginated_table/__tests__/index.js
@@ -1,23 +1,23 @@
 
 require('ui/paginated_table');
-var _ = require('lodash');
-var $ = require('jquery');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('paginated table', function () {
-  var $el;
-  var $rootScope;
-  var $compile;
-  var $scope;
-  var $elScope;
-  var $orderBy;
-  var defaultPerPage = 10;
-
-  var makeData = function (colCount, rowCount) {
-    var columns = [];
-    var rows = [];
+  let $el;
+  let $rootScope;
+  let $compile;
+  let $scope;
+  let $elScope;
+  let $orderBy;
+  let defaultPerPage = 10;
+
+  let makeData = function (colCount, rowCount) {
+    let columns = [];
+    let rows = [];
 
     if (_.isNumber(colCount)) {
       _.times(colCount, function (i) {
@@ -29,7 +29,7 @@ describe('paginated table', function () {
 
     if (_.isNumber(rowCount)) {
       _.times(rowCount, function (col) {
-        var rowItems = [];
+        let rowItems = [];
 
         _.times(columns.length, function (row) {
           rowItems.push('item' + col + row);
@@ -47,7 +47,7 @@ describe('paginated table', function () {
     };
   };
 
-  var renderTable = function (cols, rows, perPage) {
+  let renderTable = function (cols, rows, perPage) {
     $scope.cols = cols || [];
     $scope.rows = rows || [];
     $scope.perPage = perPage || defaultPerPage;
@@ -67,23 +67,23 @@ describe('paginated table', function () {
 
   describe('rendering', function () {
     it('should not display without rows', function () {
-      var cols = [{
+      let cols = [{
         title: 'test1'
       }];
-      var rows = [];
+      let rows = [];
 
       renderTable(cols, rows);
       expect($el.children().size()).to.be(0);
     });
 
     it('should render columns and rows', function () {
-      var data = makeData(2, 2);
-      var cols = data.columns;
-      var rows = data.rows;
+      let data = makeData(2, 2);
+      let cols = data.columns;
+      let rows = data.rows;
 
       renderTable(cols, rows);
       expect($el.children().size()).to.be(1);
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       // should pad rows
       expect(tableRows.size()).to.be(defaultPerPage);
       // should contain the row data
@@ -95,13 +95,13 @@ describe('paginated table', function () {
 
     it('should paginate rows', function () {
       // note: paginate truncates pages, so don't make too many
-      var rowCount = _.random(16, 24);
-      var perPageCount = _.random(5, 8);
-      var data = makeData(3, rowCount);
-      var pageCount = Math.ceil(rowCount / perPageCount);
+      let rowCount = _.random(16, 24);
+      let perPageCount = _.random(5, 8);
+      let data = makeData(3, rowCount);
+      let pageCount = Math.ceil(rowCount / perPageCount);
 
       renderTable(data.columns, data.rows, perPageCount);
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.size()).to.be(perPageCount);
       // add 2 for the first and last page links
       expect($el.find('paginate-controls a').size()).to.be(pageCount + 2);
@@ -109,9 +109,9 @@ describe('paginated table', function () {
   });
 
   describe('sorting', function () {
-    var data;
-    var lastRowIndex;
-    var paginatedTable;
+    let data;
+    let lastRowIndex;
+    let paginatedTable;
 
     beforeEach(function () {
       data = makeData(3, [
@@ -131,7 +131,7 @@ describe('paginated table', function () {
     // });
 
     it('should not sort by default', function () {
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be(data.rows[lastRowIndex][0]);
     });
@@ -141,7 +141,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(999);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
@@ -154,7 +154,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
@@ -165,7 +165,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('zzzz');
     });
@@ -176,7 +176,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('zzzz');
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
     });
@@ -188,7 +188,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
     });
@@ -202,7 +202,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(lastRowIndex).find('td').eq(1).text()).to.be('zzzz');
     });
@@ -210,17 +210,17 @@ describe('paginated table', function () {
   });
 
   describe('sorting duplicate columns', function () {
-    var data;
-    var paginatedTable;
-    var colText = 'test row';
+    let data;
+    let paginatedTable;
+    let colText = 'test row';
 
     beforeEach(function () {
-      var cols = [
+      let cols = [
         { title: colText },
         { title: colText },
         { title: colText }
       ];
-      var rows = [
+      let rows = [
         ['bbbb', 'aaaa', 'zzzz'],
         ['cccc', 'cccc', 'aaaa'],
         ['zzzz', 'bbbb', 'bbbb'],
@@ -233,7 +233,7 @@ describe('paginated table', function () {
     });
 
     it('should have duplicate column titles', function () {
-      var columns = $el.find('thead th span');
+      let columns = $el.find('thead th span');
       columns.each(function () {
         expect($(this).text()).to.be(colText);
       });
@@ -244,7 +244,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(2);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
@@ -258,7 +258,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(2);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
@@ -281,7 +281,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1);
       $scope.$digest();
 
-      var sorters = $el.find('thead th i');
+      let sorters = $el.find('thead th i');
       expect(sorters.eq(0).hasClass('fa-sort')).to.be(true);
       expect(sorters.eq(1).hasClass('fa-sort')).to.be(false);
       expect(sorters.eq(2).hasClass('fa-sort')).to.be(true);
@@ -290,9 +290,9 @@ describe('paginated table', function () {
   });
 
   describe('custom sorting', function () {
-    var data;
-    var paginatedTable;
-    var sortHandler;
+    let data;
+    let paginatedTable;
+    let sortHandler;
 
     beforeEach(function () {
       sortHandler = sinon.spy();
@@ -311,7 +311,7 @@ describe('paginated table', function () {
 
     // TODO: This is failing randomly
     it('should allow custom sorting handler', function () {
-      var columnIndex = 1;
+      let columnIndex = 1;
       paginatedTable.sortColumn(columnIndex);
       $scope.$digest();
       expect(sortHandler.callCount).to.be(1);
@@ -320,9 +320,9 @@ describe('paginated table', function () {
   });
 
   describe('object rows', function () {
-    var cols;
-    var rows;
-    var paginatedTable;
+    let cols;
+    let rows;
+    let paginatedTable;
 
     beforeEach(function () {
       cols = [{
@@ -341,7 +341,7 @@ describe('paginated table', function () {
     });
 
     it('should append object markup', function () {
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('h1').size()).to.be(0);
       expect(tableRows.eq(1).find('h1').size()).to.be(1);
       expect(tableRows.eq(2).find('h1').size()).to.be(0);
@@ -350,7 +350,7 @@ describe('paginated table', function () {
     it('should sort using object value', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
-      var tableRows = $el.find('tbody tr');
+      let tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('h1').size()).to.be(0);
       expect(tableRows.eq(1).find('h1').size()).to.be(0);
       // html row should be the last row
diff --git a/src/ui/public/paginated_table/paginated_table.js b/src/ui/public/paginated_table/paginated_table.js
index e90c958db2e8e..8845f7260242b 100644
--- a/src/ui/public/paginated_table/paginated_table.js
+++ b/src/ui/public/paginated_table/paginated_table.js
@@ -2,8 +2,8 @@ define(function (require) {
   require('ui/modules')
   .get('kibana')
   .directive('paginatedTable', function ($filter) {
-    var _ = require('lodash');
-    var orderBy = $filter('orderBy');
+    let _ = require('lodash');
+    let orderBy = $filter('orderBy');
 
     return {
       restrict: 'E',
@@ -18,24 +18,24 @@ define(function (require) {
       },
       controllerAs: 'paginatedTable',
       controller: function ($scope) {
-        var self = this;
+        let self = this;
         self.sort = {
           columnIndex: null,
           direction: null
         };
 
         self.sortColumn = function (colIndex) {
-          var col = $scope.columns[colIndex];
+          let col = $scope.columns[colIndex];
 
           if (!col) return;
           if (col.sortable === false) return;
 
-          var sortDirection;
+          let sortDirection;
 
           if (self.sort.columnIndex !== colIndex) {
             sortDirection = 'asc';
           } else {
-            var directions = {
+            let directions = {
               null: 'asc',
               'asc': 'desc',
               'desc': null
@@ -55,7 +55,7 @@ define(function (require) {
           } else {
             // use generic sort handler
             self.sort.getter = function (row) {
-              var value = row[index];
+              let value = row[index];
               if (value && value.value != null) return value.value;
               return value;
             };
@@ -73,7 +73,7 @@ define(function (require) {
             return;
           }
 
-          var sort = self.sort;
+          let sort = self.sort;
           if (sort.direction == null) {
             $scope.sortedRows = $scope.rows.slice(0);
           } else {
diff --git a/src/ui/public/parse_query/lib/from_user.js b/src/ui/public/parse_query/lib/from_user.js
index 0eb2e32d93efd..6792494ab4e27 100644
--- a/src/ui/public/parse_query/lib/from_user.js
+++ b/src/ui/public/parse_query/lib/from_user.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function GetQueryFromUser(es, Private) {
-    var decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
+    let decorateQuery = Private(require('ui/courier/data_source/_decorate_query'));
 
     /**
      * Take text from the user and make it into a query object
@@ -13,7 +13,7 @@ define(function (require) {
         return decorateQuery({query_string: {query: text}});
       }
 
-      var matchAll = getQueryStringQuery('*');
+      let matchAll = getQueryStringQuery('*');
 
       // If we get an empty object, treat it as a *
       if (_.isObject(text)) {
diff --git a/src/ui/public/parse_query/lib/to_user.js b/src/ui/public/parse_query/lib/to_user.js
index 736718a5d0d01..9eef6e8a4b8bc 100644
--- a/src/ui/public/parse_query/lib/to_user.js
+++ b/src/ui/public/parse_query/lib/to_user.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   /**
    * Take text from the model and present it to the user as a string
diff --git a/src/ui/public/parse_query/parse_query.js b/src/ui/public/parse_query/parse_query.js
index b14384e507ff1..a17dfd772c17c 100644
--- a/src/ui/public/parse_query/parse_query.js
+++ b/src/ui/public/parse_query/parse_query.js
@@ -2,8 +2,8 @@ define(function (require) {
   require('ui/modules')
     .get('kibana')
     .directive('parseQuery', function (Private) {
-      var fromUser = Private(require('ui/parse_query/lib/from_user'));
-      var toUser = require('ui/parse_query/lib/to_user');
+      let fromUser = Private(require('ui/parse_query/lib/from_user'));
+      let toUser = require('ui/parse_query/lib/to_user');
 
       return {
         restrict: 'A',
@@ -12,7 +12,7 @@ define(function (require) {
           'ngModel': '='
         },
         link: function ($scope, elem, attr, ngModel) {
-          var init = function () {
+          let init = function () {
             $scope.ngModel = fromUser($scope.ngModel);
           };
 
diff --git a/src/ui/public/partials/paginate_controls.html b/src/ui/public/partials/paginate_controls.html
index 6f03f0f7f394e..42984e118d58f 100644
--- a/src/ui/public/partials/paginate_controls.html
+++ b/src/ui/public/partials/paginate_controls.html
@@ -1,6 +1,9 @@
 <div class="pagination-other-pages">
   <ul class="pagination-other-pages-list pagination-sm" ng-if="page.count > 1">
-    <li ng-hide="page.first">
+    <li ng-style="{'visibility':'hidden'}" ng-if="page.first">
+      <a ng-click="paginate.goToPage(page.prev)">«</a>
+    </li>
+    <li ng-style="{'visibility':'visible'}" ng-if="!page.first">
       <a ng-click="paginate.goToPage(page.prev)">«</a>
     </li>
 
@@ -18,7 +21,10 @@
       <a ng-click="paginate.goToPage(page.count)">...{{page.count}}</a>
     </li>
 
-    <li ng-hide="page.last">
+    <li ng-style="{'visibility':'hidden'}" ng-if="page.last">
+      <a ng-click="paginate.goToPage(page.next)">»</a>
+    </li>
+    <li ng-style="{'visibility':'visible'}" ng-if="!page.last">
       <a ng-click="paginate.goToPage(page.next)">»</a>
     </li>
   </ul>
diff --git a/src/ui/public/partials/saved_object_finder.html b/src/ui/public/partials/saved_object_finder.html
index 7432e71d8a543..35c68c424c03d 100644
--- a/src/ui/public/partials/saved_object_finder.html
+++ b/src/ui/public/partials/saved_object_finder.html
@@ -11,12 +11,13 @@
       ng-keydown="finder.filterKeyDown($event)"
       class="form-control"
       name="filter"
-      type="text" />
+      type="text"
+      autocomplete="off" />
 
     <span class="finder-hit-count"><strong>{{finder.hitCount}}</strong> {{finder.hitCountNoun()}}</span>
   </div>
 </form>
-<paginate list="finder.hits" per-page="5">
+<paginate list="finder.hits" per-page="{{perPage}}">
   <ul
     class="list-group list-group-menu"
     ng-class="{'select-mode': finder.selector.enabled}">
@@ -43,4 +44,4 @@
       <p ng-bind="'No matching ' + finder.properties.nouns + ' found.'"></p>
     </li>
   </ul>
-</paginate>
\ No newline at end of file
+</paginate>
diff --git a/src/ui/public/persisted_log/__tests__/persisted_log.js b/src/ui/public/persisted_log/__tests__/persisted_log.js
index 726d20e2652ae..d62cbfbbf5435 100644
--- a/src/ui/public/persisted_log/__tests__/persisted_log.js
+++ b/src/ui/public/persisted_log/__tests__/persisted_log.js
@@ -1,15 +1,15 @@
 
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var storage;
-var config;
-var PersistedLog;
+let storage;
+let config;
+let PersistedLog;
 
-var historyName = 'testHistory';
-var historyLimit = 10;
-var payload = [
+let historyName = 'testHistory';
+let historyLimit = 10;
+let payload = [
   { first: 'clark', last: 'kent' },
   { first: 'peter', last: 'parker' },
   { first: 'bruce', last: 'wayne' }
@@ -41,7 +41,7 @@ describe('PersistedLog', function () {
 
   describe('expected API', function () {
     it('has expected methods', function () {
-      var log = new PersistedLog(historyName);
+      let log = new PersistedLog(historyName);
 
       expect(log.add).to.be.a('function');
       expect(log.get).to.be.a('function');
@@ -50,17 +50,17 @@ describe('PersistedLog', function () {
 
   describe('internal functionality', function () {
     it('reads from storage', function () {
-      var log = new PersistedLog(historyName);
+      let log = new PersistedLog(historyName);
 
       expect(storage.get.calledOnce).to.be(true);
       expect(storage.get.calledWith(historyName)).to.be(true);
     });
 
     it('writes to storage', function () {
-      var log = new PersistedLog(historyName);
-      var newItem = { first: 'diana', last: 'prince' };
+      let log = new PersistedLog(historyName);
+      let newItem = { first: 'diana', last: 'prince' };
 
-      var data = log.add(newItem);
+      let data = log.add(newItem);
 
       expect(storage.set.calledOnce).to.be(true);
       expect(data).to.eql([newItem]);
@@ -70,19 +70,19 @@ describe('PersistedLog', function () {
   describe('persisting data', function () {
     it('fetches records from storage', function () {
       storage.get.returns(payload);
-      var log = new PersistedLog(historyName);
+      let log = new PersistedLog(historyName);
 
-      var items = log.get();
+      let items = log.get();
       expect(items.length).to.equal(3);
       expect(items).to.eql(payload);
     });
 
     it('prepends new records', function () {
       storage.get.returns(payload.slice(0));
-      var log = new PersistedLog(historyName);
-      var newItem = { first: 'selina', last: 'kyle' };
+      let log = new PersistedLog(historyName);
+      let newItem = { first: 'selina', last: 'kyle' };
 
-      var items = log.add(newItem);
+      let items = log.add(newItem);
       expect(items.length).to.equal(payload.length + 1);
       expect(items[0]).to.eql(newItem);
     });
@@ -90,26 +90,26 @@ describe('PersistedLog', function () {
 
   describe('stack options', function () {
     it('should observe the maxLength option', function () {
-      var bulkData = [];
+      let bulkData = [];
 
-      for (var i = 0; i < historyLimit; i++) {
+      for (let i = 0; i < historyLimit; i++) {
         bulkData.push(['record ' + i]);
       }
       storage.get.returns(bulkData);
 
-      var log = new PersistedLog(historyName, { maxLength: historyLimit });
+      let log = new PersistedLog(historyName, { maxLength: historyLimit });
       log.add(['new array 1']);
-      var items = log.add(['new array 2']);
+      let items = log.add(['new array 2']);
 
       expect(items.length).to.equal(historyLimit);
     });
 
     it('should observe the filterDuplicates option', function () {
       storage.get.returns(payload.slice(0));
-      var log = new PersistedLog(historyName, { filterDuplicates: true });
-      var newItem = payload[1];
+      let log = new PersistedLog(historyName, { filterDuplicates: true });
+      let newItem = payload[1];
 
-      var items = log.add(newItem);
+      let items = log.add(newItem);
       expect(items.length).to.equal(payload.length);
     });
 
diff --git a/src/ui/public/persisted_log/persisted_log.js b/src/ui/public/persisted_log/persisted_log.js
index dfcb3c793c4a7..e3b4fff263a02 100644
--- a/src/ui/public/persisted_log/persisted_log.js
+++ b/src/ui/public/persisted_log/persisted_log.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var modules = require('ui/modules');
-  var _ = require('lodash');
+  let modules = require('ui/modules');
+  let _ = require('lodash');
 
   modules.get('kibana/persisted_log')
   .factory('PersistedLog', function ($window, localStorage) {
diff --git a/src/ui/public/persisted_state/__tests__/persisted_state.js b/src/ui/public/persisted_state/__tests__/persisted_state.js
index c62bedba492e4..a03761bb21507 100644
--- a/src/ui/public/persisted_state/__tests__/persisted_state.js
+++ b/src/ui/public/persisted_state/__tests__/persisted_state.js
@@ -1,12 +1,12 @@
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
-var noDigestPromises = require('testUtils/noDigestPromises');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
-var errors = require('ui/errors');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
+let noDigestPromises = require('testUtils/noDigestPromises');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
+let errors = require('ui/errors');
 
-var PersistedState;
-var Events;
+let PersistedState;
+let Events;
 
 describe('Persisted State', function () {
   noDigestPromises.activateForSuite();
@@ -21,7 +21,7 @@ describe('Persisted State', function () {
   });
 
   describe('state creation', function () {
-    var persistedState;
+    let persistedState;
 
     it('should create an empty state instance', function () {
       persistedState = new PersistedState();
@@ -34,7 +34,7 @@ describe('Persisted State', function () {
     });
 
     it('should create a state instance with data', function () {
-      var val = { red: 'blue' };
+      let val = { red: 'blue' };
       persistedState = new PersistedState(val);
 
       expect(persistedState.get()).to.eql(val);
@@ -43,7 +43,7 @@ describe('Persisted State', function () {
     });
 
     it('should create a copy of the state passed in', function () {
-      var val = { red: 'blue' };
+      let val = { red: 'blue' };
       persistedState = new PersistedState(val);
 
       expect(persistedState.get()).to.eql(val);
@@ -51,10 +51,10 @@ describe('Persisted State', function () {
     });
 
     it('should not throw if creating valid child object', function () {
-      var run = function () {
-        var val = { red: 'blue' };
-        var path = ['test.path'];
-        var parent = new PersistedState();
+      let run = function () {
+        let val = { red: 'blue' };
+        let path = ['test.path'];
+        let parent = new PersistedState();
         new PersistedState(val, path, parent);
       };
 
@@ -62,8 +62,8 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given an invalid value', function () {
-      var run = function () {
-        var val = 'bananas';
+      let run = function () {
+        let val = 'bananas';
         new PersistedState(val);
       };
 
@@ -73,10 +73,10 @@ describe('Persisted State', function () {
     });
 
     it('should not throw if given primitive to child', function () {
-      var run = function () {
-        var val = 'bananas';
-        var path = ['test.path'];
-        var parent = new PersistedState();
+      let run = function () {
+        let val = 'bananas';
+        let path = ['test.path'];
+        let parent = new PersistedState();
         new PersistedState(val, path, parent);
       };
 
@@ -84,10 +84,10 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given an invalid parent object', function () {
-      var run = function () {
-        var val = { red: 'blue' };
-        var path = ['test.path'];
-        var parent = {};
+      let run = function () {
+        let val = { red: 'blue' };
+        let path = ['test.path'];
+        let parent = {};
         new PersistedState(val, path, parent);
       };
 
@@ -97,10 +97,10 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given a parent without a path', function () {
-      var run = function () {
-        var val = { red: 'blue' };
-        var path;
-        var parent = new PersistedState();
+      let run = function () {
+        let val = { red: 'blue' };
+        let path;
+        let parent = new PersistedState();
 
         new PersistedState(val, path, parent);
       };
@@ -112,11 +112,11 @@ describe('Persisted State', function () {
   });
 
   describe('child state creation', function () {
-    var childState;
+    let childState;
 
     it('should not append the child state to the parent, without parent value', function () {
-      var childIndex = 'i can haz child';
-      var persistedState = new PersistedState();
+      let childIndex = 'i can haz child';
+      let persistedState = new PersistedState();
       childState = persistedState.createChild(childIndex);
 
       // parent state should not contain the child state
@@ -125,9 +125,9 @@ describe('Persisted State', function () {
     });
 
     it('should not append the child state to the parent, with parent value', function () {
-      var childIndex = 'i can haz child';
-      var persistedStateValue = { original: true };
-      var persistedState = new PersistedState(persistedStateValue);
+      let childIndex = 'i can haz child';
+      let persistedStateValue = { original: true };
+      let persistedState = new PersistedState(persistedStateValue);
       childState = persistedState.createChild(childIndex);
 
       // child state should be empty, we didn't give it any default data
@@ -139,14 +139,14 @@ describe('Persisted State', function () {
     });
 
     it('should append the child state to the parent, with parent and child values', function () {
-      var childIndex = 'i can haz child';
-      var childStateValue = { tacos: 'yes please' };
-      var persistedStateValue = { original: true };
-      var persistedState = new PersistedState(persistedStateValue);
+      let childIndex = 'i can haz child';
+      let childStateValue = { tacos: 'yes please' };
+      let persistedStateValue = { original: true };
+      let persistedState = new PersistedState(persistedStateValue);
       childState = persistedState.createChild(childIndex, childStateValue);
 
       // parent state should contain the child and its original state value
-      var parentState = persistedState.get();
+      let parentState = persistedState.get();
       expect(parentState).to.have.property('original', true);
       expect(parentState).to.have.property(childIndex);
       expect(parentState[childIndex]).to.eql(childStateValue);
@@ -155,15 +155,15 @@ describe('Persisted State', function () {
 
   describe('deep child state creation', function () {
     it('should delegate get/set calls to parent state', function () {
-      var children = [{
+      let children = [{
         path: 'first*child',
         value: { first: true, second: false }
       }, {
         path: 'second child',
         value: { first: false, second: true }
       }];
-      var persistedStateValue = { original: true };
-      var persistedState = new PersistedState(persistedStateValue);
+      let persistedStateValue = { original: true };
+      let persistedState = new PersistedState(persistedStateValue);
 
       // first child is a child of the parent persistedState
       children[0].instance = persistedState.createChild(children[0].path, children[0].value);
@@ -174,7 +174,7 @@ describe('Persisted State', function () {
       expect(children[1].instance.get()).to.eql(children[1].value);
 
       // parent should contain original props and first child path, but not the second child path
-      var parentState = persistedState.get();
+      let parentState = persistedState.get();
       _.keys(persistedStateValue).forEach(function (key) {
         expect(parentState).to.have.property(key);
       });
@@ -182,28 +182,28 @@ describe('Persisted State', function () {
       expect(parentState).to.not.have.property(children[1].path);
 
       // second child path should be inside the first child
-      var firstChildState = children[0].instance.get();
+      let firstChildState = children[0].instance.get();
       expect(firstChildState).to.have.property(children[1].path);
       expect(firstChildState[children[1].path]).to.eql(children[1].value);
 
       // check that the second child is still accessible from the parent instance
-      var firstChild = persistedState.get(children[0].path);
+      let firstChild = persistedState.get(children[0].path);
       expect(firstChild).to.have.property(children[1].path);
     });
   });
 
   describe('child state removal', function () {
     it('should clear path from parent state', function () {
-      var persistedState = new PersistedState();
-      var childState = persistedState.createChild('child', { userId: 1234 });
+      let persistedState = new PersistedState();
+      let childState = persistedState.createChild('child', { userId: 1234 });
       expect(persistedState.get()).to.eql({ child: { userId: 1234 }});
       persistedState.removeChild('child');
       expect(persistedState.get()).to.eql({});
     });
 
     it('should reset original parent value at path', function () {
-      var persistedState = new PersistedState({ user: 1234 });
-      var childState = persistedState.createChild('user', { id: 5678 });
+      let persistedState = new PersistedState({ user: 1234 });
+      let childState = persistedState.createChild('user', { id: 5678 });
       expect(persistedState.get()).to.eql({ user: { id: 5678 }});
 
       persistedState.removeChild('user');
@@ -211,8 +211,8 @@ describe('Persisted State', function () {
     });
 
     it('should clear changedState', function () {
-      var persistedState = new PersistedState({ user: 1234 });
-      var childState = persistedState.createChild('user');
+      let persistedState = new PersistedState({ user: 1234 });
+      let childState = persistedState.createChild('user');
       childState.set('name', 'user name');
       expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' }});
 
@@ -223,16 +223,16 @@ describe('Persisted State', function () {
 
   describe('deep child state removal', function () {
     it('should clear path from parent state', function () {
-      var persistedState = new PersistedState();
-      var childState = persistedState.createChild('child.state', { userId: 1234 });
+      let persistedState = new PersistedState();
+      let childState = persistedState.createChild('child.state', { userId: 1234 });
       expect(persistedState.get()).to.eql({ child: { state: { userId: 1234 }}});
       persistedState.removeChild('child.state');
       expect(persistedState.get()).to.eql({});
     });
 
     it('should reset original parent value at path', function () {
-      var persistedState = new PersistedState({ user: { id: 1234 }});
-      var childState = persistedState.createChild('user.id', 5678);
+      let persistedState = new PersistedState({ user: { id: 1234 }});
+      let childState = persistedState.createChild('user.id', 5678);
       expect(persistedState.get()).to.eql({ user: { id: 5678 }});
 
       persistedState.removeChild('user.id');
@@ -240,8 +240,8 @@ describe('Persisted State', function () {
     });
 
     it('should reset original parent other values at path', function () {
-      var persistedState = new PersistedState({ user: { name: 'user' }});
-      var childState = persistedState.createChild('user.id', 5678);
+      let persistedState = new PersistedState({ user: { name: 'user' }});
+      let childState = persistedState.createChild('user.id', 5678);
       expect(persistedState.get()).to.eql({ user: { name: 'user', id: 5678 }});
 
       persistedState.removeChild('user.id');
@@ -249,8 +249,8 @@ describe('Persisted State', function () {
     });
 
     it('should clear the changed state', function () {
-      var persistedState = new PersistedState({ user: { id: 1234 }});
-      var childState = persistedState.createChild('user.name');
+      let persistedState = new PersistedState({ user: { id: 1234 }});
+      let childState = persistedState.createChild('user.name');
       childState.set('user name');
       expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' }});
 
@@ -262,8 +262,8 @@ describe('Persisted State', function () {
 
   describe('child state conditions', function () {
     it('should be merged with the parent state', function () {
-      var parent = new PersistedState({ name: 'test' });
-      var child = parent.createChild('child', 'value');
+      let parent = new PersistedState({ name: 'test' });
+      let child = parent.createChild('child', 'value');
       expect(parent.get()).to.eql({
         name: 'test',
         child: 'value'
@@ -283,8 +283,8 @@ describe('Persisted State', function () {
     });
 
     it('should give child state precedence', function () {
-      var parent = new PersistedState({ user: { id: 1234, name: 'test' }});
-      var child = parent.createChild('user', { name: 'child test' });
+      let parent = new PersistedState({ user: { id: 1234, name: 'test' }});
+      let child = parent.createChild('user', { name: 'child test' });
       expect(parent.get()).to.eql({
         user: {
           id: 1234,
@@ -297,8 +297,8 @@ describe('Persisted State', function () {
     });
 
     it('should be cleaned up with removeChild', function () {
-      var parent = new PersistedState({ name: 'test' });
-      var child = parent.createChild('child', 'value');
+      let parent = new PersistedState({ name: 'test' });
+      let child = parent.createChild('child', 'value');
       expect(parent.get()).to.eql({
         name: 'test',
         child: 'value'
@@ -313,16 +313,16 @@ describe('Persisted State', function () {
 
   describe('colliding child paths and parent state values', function () {
     it('should not change the child path value by default', function () {
-      var childIndex = 'childTest';
-      var persistedStateValue = {};
+      let childIndex = 'childTest';
+      let persistedStateValue = {};
       persistedStateValue[childIndex] = { overlapping_index: true };
 
-      var persistedState = new PersistedState(persistedStateValue);
-      var state = persistedState.get();
+      let persistedState = new PersistedState(persistedStateValue);
+      let state = persistedState.get();
       expect(state).to.have.property(childIndex);
       expect(state[childIndex]).to.eql(persistedStateValue[childIndex]);
 
-      var childState = persistedState.createChild(childIndex);
+      let childState = persistedState.createChild(childIndex);
       expect(childState.get()).to.eql(persistedStateValue[childIndex]);
 
       // make sure the parent state is still the same
@@ -332,21 +332,21 @@ describe('Persisted State', function () {
     });
 
     it('should merge default child state', function () {
-      var childIndex = 'childTest';
-      var childStateValue = { child_index: false };
-      var persistedStateValue = {};
+      let childIndex = 'childTest';
+      let childStateValue = { child_index: false };
+      let persistedStateValue = {};
       persistedStateValue[childIndex] = { parent_index: true };
 
-      var persistedState = new PersistedState(persistedStateValue);
-      var state = persistedState.get();
+      let persistedState = new PersistedState(persistedStateValue);
+      let state = persistedState.get();
       expect(state).to.have.property(childIndex);
       expect(state[childIndex]).to.eql(persistedStateValue[childIndex]);
 
       // pass in child state value
-      var childState = persistedState.createChild(childIndex, childStateValue);
+      let childState = persistedState.createChild(childIndex, childStateValue);
 
       // parent's default state is merged with child state
-      var compare = _.merge({}, childStateValue, persistedStateValue[childIndex]);
+      let compare = _.merge({}, childStateValue, persistedStateValue[childIndex]);
       expect(childState.get()).to.eql(compare);
       state = persistedState.get();
       expect(state).to.have.property(childIndex);
@@ -356,11 +356,11 @@ describe('Persisted State', function () {
 
   describe('mutation', function () {
     it('should not mutate the internal object', function () {
-      var persistedStateValue = { hello: 'world' };
-      var insertedObj = { farewell: 'cruel world' };
-      var persistedState = new PersistedState(persistedStateValue);
+      let persistedStateValue = { hello: 'world' };
+      let insertedObj = { farewell: 'cruel world' };
+      let persistedState = new PersistedState(persistedStateValue);
 
-      var obj = persistedState.get();
+      let obj = persistedState.get();
       _.assign(obj, insertedObj);
 
       expect(obj).to.have.property('farewell');
@@ -369,7 +369,7 @@ describe('Persisted State', function () {
   });
 
   describe('JSON importing and exporting', function () {
-    var persistedStateValue;
+    let persistedStateValue;
 
     beforeEach(function () {
       persistedStateValue = { one: 1, two: 2, 'meaning of life': 42 };
@@ -377,38 +377,38 @@ describe('Persisted State', function () {
 
     describe('exporting state to JSON', function () {
       it('should return the full JSON representation', function () {
-        var persistedState = new PersistedState(persistedStateValue);
+        let persistedState = new PersistedState(persistedStateValue);
 
-        var json = persistedState.toJSON();
+        let json = persistedState.toJSON();
         expect(json).to.eql(persistedStateValue);
       });
 
       it('should return the JSON representation of the child state', function () {
-        var persistedState = new PersistedState(persistedStateValue);
-        var childState = persistedState.createChild('awesome', { pants: false });
+        let persistedState = new PersistedState(persistedStateValue);
+        let childState = persistedState.createChild('awesome', { pants: false });
 
         expect(childState.toJSON()).to.eql({ pants: false });
         // verify JSON output of the parent state
-        var parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
+        let parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
         expect(persistedState.toJSON()).to.eql(parentCompare);
       });
 
       it('should export stringified version of state', function () {
-        var persistedState = new PersistedState(persistedStateValue);
-        var childState = persistedState.createChild('awesome', { pants: false });
+        let persistedState = new PersistedState(persistedStateValue);
+        let childState = persistedState.createChild('awesome', { pants: false });
 
-        var data = childState.toString();
+        let data = childState.toString();
         expect(JSON.parse(data)).to.eql({ pants: false });
         // verify JSON output of the parent state
-        var parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
+        let parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
         expect(JSON.parse(persistedState.toString())).to.eql(parentCompare);
       });
     });
 
     describe('importing state from JSON string (hydration)', function () {
       it('should set the state from JSON string input', function () {
-        var stateJSON = JSON.stringify(persistedStateValue);
-        var persistedState = new PersistedState();
+        let stateJSON = JSON.stringify(persistedStateValue);
+        let persistedState = new PersistedState();
         expect(persistedState.get()).to.eql({});
 
         persistedState.fromString(stateJSON);
@@ -419,7 +419,7 @@ describe('Persisted State', function () {
 
   describe('get state', function () {
     it('should perform deep gets with various formats', function () {
-      var obj = {
+      let obj = {
         red: {
           green: {
             blue: 'yellow'
@@ -430,7 +430,7 @@ describe('Persisted State', function () {
           violet: ''
         }
       };
-      var persistedState = new PersistedState(obj);
+      let persistedState = new PersistedState(obj);
       expect(persistedState.get()).to.eql(obj);
 
       expect(persistedState.get('red')).to.eql({ green: { blue: 'yellow' } });
@@ -449,7 +449,7 @@ describe('Persisted State', function () {
     });
 
     it('should perform deep gets with arrays', function () {
-      var persistedState = new PersistedState({ hello: { nouns: ['world', 'humans', 'everyone'] } });
+      let persistedState = new PersistedState({ hello: { nouns: ['world', 'humans', 'everyone'] } });
 
       expect(persistedState.get()).to.eql({ hello: { nouns: ['world', 'humans', 'everyone'] } });
       expect(persistedState.get('hello')).to.eql({ nouns: ['world', 'humans', 'everyone'] });
@@ -457,9 +457,9 @@ describe('Persisted State', function () {
     });
 
     it('should pass defaults to parent delegation', function () {
-      var persistedState = new PersistedState({ parent: true });
-      var childState = persistedState.createChild('child', { account: { name: 'first child' }});
-      var defaultValue = 'i have no data';
+      let persistedState = new PersistedState({ parent: true });
+      let childState = persistedState.createChild('child', { account: { name: 'first child' }});
+      let defaultValue = 'i have no data';
 
       expect(childState.get('account.name', defaultValue)).to.eql('first child');
       expect(childState.get('account.age', defaultValue)).to.eql(defaultValue);
@@ -469,32 +469,32 @@ describe('Persisted State', function () {
   describe('set state', function () {
     describe('path format support', function () {
       it('should create deep objects from dot notation', function () {
-        var persistedState = new PersistedState();
+        let persistedState = new PersistedState();
         persistedState.set('one.two.three', 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects from array notation', function () {
-        var persistedState = new PersistedState();
+        let persistedState = new PersistedState();
         persistedState.set('one[two][three]', 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects from arrays', function () {
-        var persistedState = new PersistedState();
+        let persistedState = new PersistedState();
         persistedState.set(['one', 'two', 'three'], 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects with an existing path', function () {
-        var persistedState = new PersistedState({}, 'deep.path');
+        let persistedState = new PersistedState({}, 'deep.path');
         persistedState.set('green[red].blue', 4);
         expect(persistedState.get()).to.eql({ green: { red: { blue: 4 } }});
       });
     });
 
     describe('simple replace operations', function () {
-      var persistedState;
+      let persistedState;
 
       it('should replace value with string', function () {
         persistedState = new PersistedState({ hello: 'world' });
@@ -530,7 +530,7 @@ describe('Persisted State', function () {
     });
 
     describe('deep replace operations', function () {
-      var persistedState;
+      let persistedState;
 
       it('should append to the object', function () {
         persistedState = new PersistedState({ hello: { message: 'world' } });
@@ -553,19 +553,19 @@ describe('Persisted State', function () {
 
   describe('internal state tracking', function () {
     it('should be an empty object', function () {
-      var persistedState = new PersistedState();
+      let persistedState = new PersistedState();
       expect(persistedState._defaultState).to.eql({});
     });
 
     it('should store the default state value', function () {
-      var val = { one: 1, two: 2 };
-      var persistedState = new PersistedState(val);
+      let val = { one: 1, two: 2 };
+      let persistedState = new PersistedState(val);
       expect(persistedState._defaultState).to.eql(val);
     });
 
     it('should keep track of changes', function () {
-      var val = { one: 1, two: 2 };
-      var persistedState = new PersistedState(val);
+      let val = { one: 1, two: 2 };
+      let persistedState = new PersistedState(val);
 
       persistedState.set('two', 22);
       expect(persistedState._defaultState).to.eql(val);
@@ -574,17 +574,17 @@ describe('Persisted State', function () {
   });
 
   describe('events', function () {
-    var persistedState;
-    var emitter;
+    let persistedState;
+    let emitter;
 
-    var getByType = function (type, spy) {
+    let getByType = function (type, spy) {
       spy = spy || emitter;
       return spy.getCalls().filter(function (call) {
         return call.args[0] === type;
       });
     };
 
-    var watchEmitter = function (state) {
+    let watchEmitter = function (state) {
       return sinon.spy(state, 'emit');
     };
 
@@ -665,7 +665,7 @@ describe('Persisted State', function () {
     });
 
     it('should emit on parent and child instances', function (done) {
-      var child = persistedState.createChild('checker');
+      let child = persistedState.createChild('checker');
       expect(getByType('change')).to.have.length(0);
 
       // parent and child should emit, set up listener to test
diff --git a/src/ui/public/persisted_state/persisted_state.js b/src/ui/public/persisted_state/persisted_state.js
index cf4f2bbda9360..9bf400c21c000 100644
--- a/src/ui/public/persisted_state/persisted_state.js
+++ b/src/ui/public/persisted_state/persisted_state.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
-  var toPath = require('lodash/internal/toPath');
-  var errors = require('ui/errors');
+  let _ = require('lodash');
+  let toPath = require('lodash/internal/toPath');
+  let errors = require('ui/errors');
 
   return function (Private) {
-    var Events = Private(require('ui/events'));
-    var SimpleEmitter = require('ui/utils/SimpleEmitter');
+    let Events = Private(require('ui/events'));
+    let SimpleEmitter = require('ui/utils/SimpleEmitter');
 
     function validateParent(parent, path) {
       if (path.length <= 0) {
@@ -17,7 +17,7 @@ define(function (require) {
     }
 
     function validateValue(value) {
-      var msg = 'State value must be a plain object';
+      let msg = 'State value must be a plain object';
       if (!value) return;
       if (!_.isPlainObject(value)) throw new errors.PersistedStateError(msg);
     }
@@ -73,21 +73,21 @@ define(function (require) {
     };
 
     PersistedState.prototype.set = function (key, value) {
-      var params = prepSetParams(key, value, this._path);
-      var val = this._set(params.key, params.value);
+      let params = prepSetParams(key, value, this._path);
+      let val = this._set(params.key, params.value);
       this.emit('set');
       return val;
     };
 
     PersistedState.prototype.setSilent = function (key, value) {
-      var params = prepSetParams(key, value, this._path);
+      let params = prepSetParams(key, value, this._path);
       return this._set(params.key, params.value, true);
     };
 
     PersistedState.prototype.reset = function (path) {
-      var keyPath = this._getIndex(path);
-      var origValue = _.get(this._defaultState, keyPath);
-      var currentValue = _.get(this._mergedState, keyPath);
+      let keyPath = this._getIndex(path);
+      let origValue = _.get(this._defaultState, keyPath);
+      let currentValue = _.get(this._mergedState, keyPath);
 
       if (_.isUndefined(origValue)) {
         this._cleanPath(path, this._mergedState);
@@ -108,7 +108,7 @@ define(function (require) {
     };
 
     PersistedState.prototype.removeChild = function (path) {
-      var origValue = _.get(this._defaultState, this._getIndex(path));
+      let origValue = _.get(this._defaultState, this._getIndex(path));
 
       if (_.isUndefined(origValue)) {
         this.reset(path);
@@ -139,19 +139,19 @@ define(function (require) {
     };
 
     PersistedState.prototype._getPartialIndex = function (key) {
-      var keyPath = this._getIndex(key);
+      let keyPath = this._getIndex(key);
       return keyPath.slice(this._path.length);
     };
 
     PersistedState.prototype._cleanPath = function (path, stateTree) {
-      var partialPath = this._getPartialIndex(path);
-      var remove = true;
+      let partialPath = this._getPartialIndex(path);
+      let remove = true;
 
       // recursively delete value tree, when no other keys exist
       while (partialPath.length > 0) {
-        var lastKey = partialPath.splice(partialPath.length - 1, 1)[0];
-        var statePath = this._path.concat(partialPath);
-        var stateVal = statePath.length > 0 ? _.get(stateTree, statePath) : stateTree;
+        let lastKey = partialPath.splice(partialPath.length - 1, 1)[0];
+        let statePath = this._path.concat(partialPath);
+        let stateVal = statePath.length > 0 ? _.get(stateTree, statePath) : stateTree;
 
         // if stateVal isn't an object, do nothing
         if (!_.isPlainObject(stateVal)) return;
@@ -162,13 +162,13 @@ define(function (require) {
     };
 
     PersistedState.prototype._getDefault = function () {
-      var def = (this._hasPath()) ? undefined : {};
+      let def = (this._hasPath()) ? undefined : {};
       return (this._parent ? this.get() : def);
     };
 
     PersistedState.prototype._setPath = function (path) {
-      var isString = _.isString(path);
-      var isArray = _.isArray(path);
+      let isString = _.isString(path);
+      let isArray = _.isArray(path);
 
       if (!isString && !isArray) return [];
       return (isString) ? [this._getIndex(path)] : path;
@@ -196,11 +196,11 @@ define(function (require) {
     };
 
     PersistedState.prototype._set = function (key, value, silent, initialChildState) {
-      var self = this;
-      var stateChanged = false;
-      var initialState = !this._initialized;
-      var keyPath = this._getIndex(key);
-      var hasKeyPath = keyPath.length > 0;
+      let self = this;
+      let stateChanged = false;
+      let initialState = !this._initialized;
+      let keyPath = this._getIndex(key);
+      let hasKeyPath = keyPath.length > 0;
 
       // if this is the initial state value, save value as the default
       if (initialState) {
@@ -226,7 +226,7 @@ define(function (require) {
           }
         } else {
           // check for changes at path, emit an event when different
-          var curVal = hasKeyPath ? this.get(keyPath) : this._mergedState;
+          let curVal = hasKeyPath ? this.get(keyPath) : this._mergedState;
           stateChanged = !_.isEqual(curVal, value);
 
           if (!initialChildState) {
@@ -243,11 +243,11 @@ define(function (require) {
       }
 
       // update the merged state value
-      var targetObj = this._mergedState || _.cloneDeep(this._defaultState);
-      var sourceObj = _.merge({}, this._defaultChildState, this._changedState);
+      let targetObj = this._mergedState || _.cloneDeep(this._defaultState);
+      let sourceObj = _.merge({}, this._defaultChildState, this._changedState);
 
       // handler arguments are (targetValue, sourceValue, key, target, source)
-      var mergeMethod = function (targetValue, sourceValue, mergeKey) {
+      let mergeMethod = function (targetValue, sourceValue, mergeKey) {
         // if not initial state, skip default merge method (ie. return value, see note below)
         if (!initialState && !initialChildState && _.isEqual(keyPath, self._getIndex(mergeKey))) {
           // use the sourceValue or fall back to targetValue
diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js
index c797d70654f04..f467d512a3c3e 100644
--- a/src/ui/public/private/__tests__/private.js
+++ b/src/ui/public/private/__tests__/private.js
@@ -1,9 +1,9 @@
 
 describe('Private module loader', function () {
 
-  var Private;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let Private;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -11,12 +11,12 @@ describe('Private module loader', function () {
   }));
 
   it('accepts a provider that will be called to init a module', function () {
-    var football = {};
+    let football = {};
     function Provider() {
       return football;
     }
 
-    var instance = Private(Provider);
+    let instance = Private(Provider);
     expect(instance).to.be(football);
   });
 
@@ -25,25 +25,25 @@ describe('Private module loader', function () {
       return Private;
     }
 
-    var instance = Private(Provider);
+    let instance = Private(Provider);
     expect(instance).to.be(Private);
   });
 
   it('detects circular dependencies', function () {
     expect(function () {
       function Provider1() {
-        var p3 = Private(Provider3);
+        let p3 = Private(Provider3);
       }
 
       function Provider2() {
-        var p3 = Private(Provider3);
+        let p3 = Private(Provider3);
       }
 
       function Provider3() {
-        var p1 = Private(Provider3);
+        let p1 = Private(Provider3);
       }
 
-      var p1 = Private(Provider1);
+      let p1 = Private(Provider1);
     }).to.throwException(/circular/i);
   });
 
@@ -57,24 +57,24 @@ describe('Private module loader', function () {
 
   describe('#stub', function () {
     it('accepts a replacement instance for a Provider', function () {
-      var replaced = {};
-      var replacement = {};
+      let replaced = {};
+      let replacement = {};
 
       function Provider() {
         return replaced;
       }
 
-      var instance = Private(Provider);
+      let instance = Private(Provider);
       expect(instance).to.be(replaced);
 
       Private.stub(Provider, replacement);
 
-      var instance2 = Private(Provider);
+      let instance2 = Private(Provider);
       expect(instance2).to.be(replacement);
 
       Private.stub(Provider, replaced);
 
-      var instance3 = Private(Provider);
+      let instance3 = Private(Provider);
       expect(instance3).to.be(replaced);
     });
   });
@@ -89,18 +89,18 @@ describe('Private module loader', function () {
         return {};
       }
 
-      var instance1 = Private(Provider1);
+      let instance1 = Private(Provider1);
       expect(instance1).to.be.an('object');
 
       Private.swap(Provider1, Provider2);
 
-      var instance2 = Private(Provider1);
+      let instance2 = Private(Provider1);
       expect(instance2).to.be.an('object');
       expect(instance2).to.not.be(instance1);
 
       Private.swap(Provider1, Provider1);
 
-      var instance3 = Private(Provider1);
+      let instance3 = Private(Provider1);
       expect(instance3).to.be(instance1);
     });
   });
diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js
index 767e30d5bc3f3..0eebd7d2443c7 100644
--- a/src/ui/public/private/private.js
+++ b/src/ui/public/private/private.js
@@ -22,10 +22,10 @@ define(function (require) {
    * ```js
    * define(function (require) {
    *   return function ServerHealthProvider(Private, Promise) {
-   *     var ping = Private(require('ui/ping'));
+   *     let ping = Private(require('ui/ping'));
    *     return {
    *       check: Promise.method(function () {
-   *         var attempts = 0;
+   *         let attempts = 0;
    *         return (function attempt() {
    *           attempts += 1;
    *           return ping.ping()
@@ -86,8 +86,8 @@ define(function (require) {
    */
 
 
-  var _ = require('lodash');
-  var nextId = _.partial(_.uniqueId, 'privateProvider#');
+  let _ = require('lodash');
+  let nextId = _.partial(_.uniqueId, 'privateProvider#');
 
   function name(fn) {
     return fn.name || fn.toString().split('\n').shift();
@@ -95,11 +95,11 @@ define(function (require) {
 
   require('ui/modules').get('kibana')
   .provider('Private', function () {
-    var provider = this;
+    let provider = this;
 
     // one cache/swaps per Provider
-    var cache = {};
-    var swaps = {};
+    let cache = {};
+    let swaps = {};
 
     // return the uniq id for this function
     function identify(fn) {
@@ -117,15 +117,15 @@ define(function (require) {
     };
 
     provider.swap = function (fn, prov) {
-      var id = identify(fn);
+      let id = identify(fn);
       swaps[id] = prov;
     };
 
     provider.$get = ['$injector', function PrivateFactory($injector) {
 
       // prevent circular deps by tracking where we came from
-      var privPath = [];
-      var pathToString = function () {
+      let privPath = [];
+      let pathToString = function () {
         return privPath.map(name).join(' -> ');
       };
 
@@ -140,8 +140,8 @@ define(function (require) {
 
         privPath.push(prov);
 
-        var context = {};
-        var instance = $injector.invoke(prov, context, locals);
+        let context = {};
+        let instance = $injector.invoke(prov, context, locals);
         if (!_.isObject(instance)) instance = context;
 
         privPath.pop();
@@ -152,7 +152,7 @@ define(function (require) {
       function get(id, prov, $delegateProv, $delegateId) {
         if (cache[id]) return cache[id];
 
-        var instance;
+        let instance;
 
         if ($delegateId != null && $delegateProv != null) {
           instance = instantiate(prov, {
@@ -167,9 +167,9 @@ define(function (require) {
 
       // main api, get the appropriate instance for a provider
       function Private(prov) {
-        var id = identify(prov);
-        var $delegateId;
-        var $delegateProv;
+        let id = identify(prov);
+        let $delegateId;
+        let $delegateProv;
 
         if (swaps[id]) {
           $delegateId = id;
diff --git a/src/ui/public/promises/promises.js b/src/ui/public/promises/promises.js
index 8189f7445945e..1f1651b913081 100644
--- a/src/ui/public/promises/promises.js
+++ b/src/ui/public/promises/promises.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   // Provides a tiny subset of the excelent API from
   // bluebird, reimplemented using the $q service
@@ -9,7 +9,7 @@ define(function (require) {
     function Promise(fn) {
       if (typeof this === 'undefined') throw new Error('Promise constructor must be called with "new"');
 
-      var defer = $q.defer();
+      let defer = $q.defer();
       try {
         fn(defer.resolve, defer.reject);
       } catch (e) {
@@ -20,12 +20,12 @@ define(function (require) {
 
     Promise.all = Promise.props = $q.all;
     Promise.resolve = function (val) {
-      var defer = $q.defer();
+      let defer = $q.defer();
       defer.resolve(val);
       return defer.promise;
     };
     Promise.reject = function (reason) {
-      var defer = $q.defer();
+      let defer = $q.defer();
       defer.reject(reason);
       return defer.promise;
     };
@@ -36,7 +36,7 @@ define(function (require) {
     };
     Promise.method = function (fn) {
       return function () {
-        var args = Array.prototype.slice.call(arguments);
+        let args = Array.prototype.slice.call(arguments);
         return Promise.try(fn, args, this);
       };
     };
@@ -64,17 +64,17 @@ define(function (require) {
       return obj && typeof obj.then === 'function';
     };
     Promise.halt = _.once(function () {
-      var promise = new Promise();
+      let promise = new Promise();
       promise.then = _.constant(promise);
       promise.catch = _.constant(promise);
       return promise;
     });
     Promise.try = function (fn, args, ctx) {
       if (typeof fn !== 'function') {
-        return Promise.reject('fn must be a function');
+        return Promise.reject(new TypeError('fn must be a function'));
       }
 
-      var value;
+      let value;
 
       if (_.isArray(args)) {
         try { value = fn.apply(ctx, args); }
@@ -155,7 +155,7 @@ define(function (require) {
      * @return {Promise}
      */
     function PromiseEmitter(fn, handler) {
-      var prom = new Promise(fn);
+      let prom = new Promise(fn);
 
       if (!handler) return prom;
 
diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
index da013d6132b9e..d2381b707f6f6 100644
--- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
+++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
@@ -1,24 +1,24 @@
 describe('Reflow watcher', function () {
   require('angular');
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var sinon = require('auto-release-sinon');
-  var ngMock = require('ngMock');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let sinon = require('auto-release-sinon');
+  let ngMock = require('ngMock');
 
-  var $body = $(document.body);
-  var $window = $(window);
-  var expectStubbedEventAndEl = function (stub, event, $el) {
+  let $body = $(document.body);
+  let $window = $(window);
+  let expectStubbedEventAndEl = function (stub, event, $el) {
     expect(stub.getCalls().some(function (call) {
-      var events = call.args[0].split(' ');
+      let events = call.args[0].split(' ');
       return _.contains(events, event) && $el.is(call.thisValue);
     })).to.be(true);
   };
 
-  var EventEmitter;
-  var reflowWatcher;
-  var $rootScope;
-  var $onStub;
+  let EventEmitter;
+  let reflowWatcher;
+  let $rootScope;
+  let $onStub;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
@@ -49,7 +49,7 @@ describe('Reflow watcher', function () {
   });
 
   describe('un-listens in #destroy()', function () {
-    var $offStub;
+    let $offStub;
 
     beforeEach(function () {
       $offStub = sinon.stub($.fn, 'off');
@@ -67,7 +67,7 @@ describe('Reflow watcher', function () {
   });
 
   it('triggers the "reflow" event within a new angular tick', function () {
-    var stub = sinon.stub();
+    let stub = sinon.stub();
     reflowWatcher.on('reflow', stub);
     reflowWatcher.trigger();
 
diff --git a/src/ui/public/reflow_watcher/reflow_watcher.js b/src/ui/public/reflow_watcher/reflow_watcher.js
index d6aad9a2649cb..c4128f3d0db59 100644
--- a/src/ui/public/reflow_watcher/reflow_watcher.js
+++ b/src/ui/public/reflow_watcher/reflow_watcher.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function ReflowWatcherService(Private, $rootScope, $http) {
-    var angular = require('angular');
-    var $ = require('jquery');
-    var _ = require('lodash');
+    let angular = require('angular');
+    let $ = require('jquery');
+    let _ = require('lodash');
 
-    var EventEmitter = Private(require('ui/events'));
-    var $body = $(document.body);
-    var $window = $(window);
+    let EventEmitter = Private(require('ui/events'));
+    let $body = $(document.body);
+    let $window = $(window);
 
-    var MOUSE_EVENTS = 'mouseup';
-    var WINDOW_EVENTS = 'resize';
+    let MOUSE_EVENTS = 'mouseup';
+    let WINDOW_EVENTS = 'resize';
 
     _.class(ReflowWatcher).inherits(EventEmitter);
     /**
diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js
index c33369195ff59..0a749c43c0660 100644
--- a/src/ui/public/registry/__tests__/index.js
+++ b/src/ui/public/registry/__tests__/index.js
@@ -1,11 +1,11 @@
 describe('Registry', function () {
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-  var registry = require('ui/registry/_registry');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var Private;
-  var IndexedArray;
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+  let registry = require('ui/registry/_registry');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let Private;
+  let IndexedArray;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -13,14 +13,14 @@ describe('Registry', function () {
   }));
 
   it('is technically a function', function () {
-    var reg = registry();
+    let reg = registry();
     expect(reg).to.be.a('function');
   });
 
   describe('#register', function () {
     it('accepts a Private module', function () {
-      var reg = registry();
-      var mod = function SomePrivateModule() {};
+      let reg = registry();
+      let mod = function SomePrivateModule() {};
 
       reg.register(mod);
       // modules are not exposed, so this is the most that we can test
@@ -29,13 +29,13 @@ describe('Registry', function () {
 
   describe('as a module', function () {
     it('exposes the list of registered modules', function () {
-      var reg = registry();
-      var mod = function SomePrivateModule(Private) {
+      let reg = registry();
+      let mod = function SomePrivateModule(Private) {
         this.PrivateModuleLoader = Private;
       };
 
       reg.register(mod);
-      var modules = Private(reg);
+      let modules = Private(reg);
       expect(modules).to.have.length(1);
       expect(modules[0]).to.have.property('PrivateModuleLoader', Private);
     });
@@ -43,16 +43,16 @@ describe('Registry', function () {
 
   describe('spec', function () {
     it('executes with the module list as "this", and can override it', function () {
-      var i = 0;
-      var self;
+      let i = 0;
+      let self;
 
-      var reg = registry({
+      let reg = registry({
         constructor: function () {
           return { mods: (self = this) };
         }
       });
 
-      var modules = Private(reg);
+      let modules = Private(reg);
       expect(modules).to.be.an('object');
       expect(modules).to.have.property('mods', self);
     });
@@ -60,7 +60,7 @@ describe('Registry', function () {
 
   describe('spec.name', function () {
     it('sets the displayName of the registry and the name param on the final instance', function () {
-      var reg = registry({
+      let reg = registry({
         name: 'visTypes'
       });
 
@@ -71,28 +71,28 @@ describe('Registry', function () {
 
   describe('spec.constructor', function () {
     it('executes before the modules are returned', function () {
-      var i = 0;
-      var reg = registry({
+      let i = 0;
+      let reg = registry({
         constructor: function () {
           i = i + 1;
         }
       });
 
-      var modules = Private(reg);
+      let modules = Private(reg);
       expect(i).to.be(1);
     });
 
     it('executes with the module list as "this", and can override it', function () {
-      var i = 0;
-      var self;
+      let i = 0;
+      let self;
 
-      var reg = registry({
+      let reg = registry({
         constructor: function () {
           return { mods: (self = this) };
         }
       });
 
-      var modules = Private(reg);
+      let modules = Private(reg);
       expect(modules).to.be.an('object');
       expect(modules).to.have.property('mods', self);
     });
@@ -100,13 +100,13 @@ describe('Registry', function () {
 
   describe('spec[any]', function () {
     it('mixes the extra properties into the module list', function () {
-      var reg = registry({
+      let reg = registry({
         someMethod: function () {
           return this;
         }
       });
 
-      var modules = Private(reg);
+      let modules = Private(reg);
       expect(modules).to.have.property('someMethod');
       expect(modules.someMethod()).to.be(modules);
     });
diff --git a/src/ui/public/registry/_registry.js b/src/ui/public/registry/_registry.js
index 4530e93249afe..a3ff35905c93f 100644
--- a/src/ui/public/registry/_registry.js
+++ b/src/ui/public/registry/_registry.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var IndexedArray = require('ui/IndexedArray');
-  var notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
+  let _ = require('lodash');
+  let IndexedArray = require('ui/IndexedArray');
+  let notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
 
   /**
    * Create a registry, which is just a Private module provider.
@@ -16,7 +16,7 @@ define(function (require) {
    *
    * + register a module
    * ```js
-   * var registry = require('ui/registry/vis_types');
+   * let registry = require('ui/registry/vis_types');
    * registry.add(function InjectablePrivateModule($http, Promise) {
    *   ...
    * })
@@ -24,7 +24,7 @@ define(function (require) {
    *
    * + get all registered modules
    * ```js
-   * var visTypes = Private(require('ui/registry/vis_types'));
+   * let visTypes = Private(require('ui/registry/vis_types'));
    * ```
    *
    *
@@ -49,10 +49,10 @@ define(function (require) {
   return function createRegistry(spec) {
     spec = spec || {};
 
-    var constructor = _.has(spec, 'constructor') && spec.constructor;
-    var iaOpts = _.defaults(_.pick(spec, IndexedArray.OPT_NAMES), { index: ['name'] });
-    var props = _.omit(spec, notPropsOptNames);
-    var providers = [];
+    let constructor = _.has(spec, 'constructor') && spec.constructor;
+    let iaOpts = _.defaults(_.pick(spec, IndexedArray.OPT_NAMES), { index: ['name'] });
+    let props = _.omit(spec, notPropsOptNames);
+    let providers = [];
 
     /**
      * This is the Private module that will be instanciated by
@@ -62,10 +62,10 @@ define(function (require) {
      *                          that were registered, the registry spec
      *                          defines how things will be indexed.
      */
-    var registry = function (Private, $injector) {
+    let registry = function (Private, $injector) {
       // index all of the modules
       iaOpts.initialSet = providers.map(Private);
-      var modules = new IndexedArray(iaOpts);
+      let modules = new IndexedArray(iaOpts);
 
       // mixin other props
       _.assign(modules, props);
diff --git a/src/ui/public/registry/chrome_nav_controls.js b/src/ui/public/registry/chrome_nav_controls.js
new file mode 100644
index 0000000000000..77093938ac804
--- /dev/null
+++ b/src/ui/public/registry/chrome_nav_controls.js
@@ -0,0 +1,6 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'chromeNavControls',
+    order: ['order']
+  });
+});
diff --git a/src/ui/public/registry/field_formats.js b/src/ui/public/registry/field_formats.js
index 3de51d4924d20..8d37db7d99254 100644
--- a/src/ui/public/registry/field_formats.js
+++ b/src/ui/public/registry/field_formats.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return require('ui/registry/_registry')({
     name: 'fieldFormats',
@@ -7,8 +7,8 @@ define(function (require) {
     group: ['fieldType'],
 
     constructor: function (config, $rootScope) {
-      var self = this;
-      var defaultMap;
+      let self = this;
+      let defaultMap;
 
       function init() {
         parseDefaultTypeMap();
@@ -56,7 +56,7 @@ define(function (require) {
        * @return {FieldFormat}
        */
       self.getInstance = _.memoize(function (formatId) {
-        var FieldFormat = self.byId[formatId];
+        let FieldFormat = self.byId[formatId];
         return new FieldFormat();
       });
 
@@ -67,8 +67,8 @@ define(function (require) {
        * @return {FieldFormat}
        */
       self.getDefaultInstance = _.memoize(function (fieldType) {
-        var conf = self.getDefaultConfig(fieldType);
-        var FieldFormat = self.byId[conf.id];
+        let conf = self.getDefaultConfig(fieldType);
+        let FieldFormat = self.byId[conf.id];
         return new FieldFormat(conf.params);
       });
 
diff --git a/src/ui/public/registry/navbar_extensions.js b/src/ui/public/registry/navbar_extensions.js
new file mode 100644
index 0000000000000..085f85771faa4
--- /dev/null
+++ b/src/ui/public/registry/navbar_extensions.js
@@ -0,0 +1,8 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'navbarExtensions',
+    index: ['name'],
+    group: ['appName'],
+    order: ['order']
+  });
+});
diff --git a/src/ui/public/registry/settings_sections.js b/src/ui/public/registry/settings_sections.js
new file mode 100644
index 0000000000000..b00f1363eb053
--- /dev/null
+++ b/src/ui/public/registry/settings_sections.js
@@ -0,0 +1,6 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'settingsSections',
+    order: ['order']
+  });
+});
diff --git a/src/ui/public/render_directive/__tests__/render_directive.js b/src/ui/public/render_directive/__tests__/render_directive.js
new file mode 100644
index 0000000000000..1168bed286a4f
--- /dev/null
+++ b/src/ui/public/render_directive/__tests__/render_directive.js
@@ -0,0 +1,65 @@
+const angular = require('angular');
+const sinon = require('sinon');
+const expect = require('expect.js');
+const ngMock = require('ngMock');
+
+require('ui/render_directive');
+
+let $parentScope;
+let $elem;
+let $directiveScope;
+
+function init(markup = '', definition = {}) {
+  ngMock.module('kibana/render_directive');
+
+  // Create the scope
+  ngMock.inject(function ($rootScope, $compile) {
+    $parentScope = $rootScope;
+
+    // create the markup
+    $elem = angular.element('<render-directive>');
+    $elem.html(markup);
+    if (definition !== null) {
+      $parentScope.definition = definition;
+      $elem.attr('definition', 'definition');
+    }
+
+    // compile the directive
+    $compile($elem)($parentScope);
+    $parentScope.$apply();
+
+    $directiveScope = $elem.isolateScope();
+  });
+}
+
+describe('render_directive', function () {
+  describe('directive requirements', function () {
+    it('should throw if not given a definition', function () {
+      expect(() => init('', null)).to.throwException(/must have a definition/);
+    });
+  });
+
+  describe('rendering with definition', function () {
+    it('should call link method', function () {
+      const markup = '<p>hello world</p>';
+      const definition = {
+        link: sinon.stub(),
+      };
+
+      init(markup, definition);
+
+      sinon.assert.callCount(definition.link, 1);
+    });
+
+    it('should call controller method', function () {
+      const markup = '<p>hello world</p>';
+      const definition = {
+        controller: sinon.stub(),
+      };
+
+      init(markup, definition);
+
+      sinon.assert.callCount(definition.controller, 1);
+    });
+  });
+});
diff --git a/src/ui/public/render_directive/render_directive.js b/src/ui/public/render_directive/render_directive.js
new file mode 100644
index 0000000000000..21ee171e90e05
--- /dev/null
+++ b/src/ui/public/render_directive/render_directive.js
@@ -0,0 +1,30 @@
+const _ = require('lodash');
+const $ = require('jquery');
+const module = require('ui/modules').get('kibana/render_directive');
+
+module.directive('renderDirective', function () {
+  return {
+    restrict: 'E',
+    scope: {
+      'definition': '='
+    },
+    template: function ($el, $attrs) {
+      return $el.html();
+    },
+    controller: function ($scope, $element, $attrs, $transclude) {
+      if (!$scope.definition) throw new Error('render-directive must have a definition attribute');
+
+      const { controller, controllerAs } = $scope.definition;
+      if (controller) {
+        if (controllerAs) $scope[controllerAs] = this;
+        $scope.$eval(controller, { $scope, $element, $attrs, $transclude });
+      }
+    },
+    link: function ($scope, $el, $attrs) {
+      const { link } = $scope.definition;
+      if (link) {
+        link($scope, $el, $attrs);
+      }
+    }
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/routes/RouteManager.js b/src/ui/public/routes/RouteManager.js
index f6a77d8631a51..24425c933db0d 100644
--- a/src/ui/public/routes/RouteManager.js
+++ b/src/ui/public/routes/RouteManager.js
@@ -1,19 +1,19 @@
-var _ = require('lodash');
+let _ = require('lodash');
 
-var wrapRouteWithPrep = require('./wrapRouteWithPrep');
-var RouteSetupManager = require('./RouteSetupManager');
+let wrapRouteWithPrep = require('./wrapRouteWithPrep');
+let RouteSetupManager = require('./RouteSetupManager');
 
 function RouteManager() {
-  var self = this;
-  var setup = new RouteSetupManager();
-  var when = [];
-  var defaults = [];
-  var otherwise;
+  let self = this;
+  let setup = new RouteSetupManager();
+  let when = [];
+  let defaults = [];
+  let otherwise;
 
   self.config = function ($routeProvider) {
     when.forEach(function (args) {
-      var path = args[0];
-      var route = args[1] || {};
+      let path = args[0];
+      let route = args[1] || {};
 
       // merge in any defaults
       defaults.forEach(function (args) {
diff --git a/src/ui/public/routes/RouteSetupManager.js b/src/ui/public/routes/RouteSetupManager.js
index a2fd67b6e40df..1fb7b5399c565 100644
--- a/src/ui/public/routes/RouteSetupManager.js
+++ b/src/ui/public/routes/RouteSetupManager.js
@@ -66,7 +66,7 @@ module.exports = class RouteSetupManager {
     )
     .then(() => {
       // wait for the queue to fill up, then do all the work
-      var defer = Promise.defer();
+      let defer = Promise.defer();
       userWork.resolveWhenFull(defer);
 
       return defer.promise.then(() => Promise.all(userWork.doWork()));
diff --git a/src/ui/public/routes/WorkQueue.js b/src/ui/public/routes/WorkQueue.js
index 79536fbd23218..73e41b94df394 100644
--- a/src/ui/public/routes/WorkQueue.js
+++ b/src/ui/public/routes/WorkQueue.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   function WorkQueue() {
-    var q = this;
+    let q = this;
 
-    var work = [];
-    var fullDefers = [];
+    let work = [];
+    let fullDefers = [];
 
     q.limit = 0;
     Object.defineProperty(q, 'length', {
@@ -14,13 +14,13 @@ define(function (require) {
       }
     });
 
-    var resolve = function (defers) {
+    let resolve = function (defers) {
       return defers.splice(0).map(function (defer) {
         return defer.resolve();
       });
     };
 
-    var checkIfFull = function () {
+    let checkIfFull = function () {
       if (work.length >= q.limit && fullDefers.length) {
         resolve(fullDefers);
       }
@@ -32,7 +32,7 @@ define(function (require) {
     };
 
     q.doWork = function () {
-      var resps = resolve(work);
+      let resps = resolve(work);
       checkIfFull();
       return resps;
     };
diff --git a/src/ui/public/routes/__tests__/_RouteManager.js b/src/ui/public/routes/__tests__/_RouteManager.js
index ce5a7e9864a3e..060674d5a1e82 100644
--- a/src/ui/public/routes/__tests__/_RouteManager.js
+++ b/src/ui/public/routes/__tests__/_RouteManager.js
@@ -1,17 +1,17 @@
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var sinon = require('auto-release-sinon');
-var RouteManager = require('ui/routes/RouteManager');
-var expect = require('expect.js');
-
-var routes; // will contain an new instance of RouteManager for each test
-var chainableMethods = [
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let RouteManager = require('ui/routes/RouteManager');
+let expect = require('expect.js');
+
+let routes; // will contain an new instance of RouteManager for each test
+let chainableMethods = [
   { name: 'when', args: ['', {}] },
   { name: 'otherwise', args: [{}] },
   { name: 'defaults', args: [/regexp/, {}] }
 ];
 
-var $rp;
+let $rp;
 describe('routes/RouteManager', function () {
   beforeEach(ngMock.module('kibana', function ($routeProvider) {
     $rp = $routeProvider;
@@ -31,7 +31,7 @@ describe('routes/RouteManager', function () {
 
   describe('#otherwise', function () {
     it('should forward the last otherwise route', function () {
-      var otherRoute = {};
+      let otherRoute = {};
       routes.otherwise({});
       routes.otherwise(otherRoute);
 
@@ -68,7 +68,7 @@ describe('routes/RouteManager', function () {
 
   describe('#config', function () {
     it('should add defined routes to the global $routeProvider service in order', function () {
-      var args = [
+      let args = [
         ['/one', {}],
         ['/two', {}]
       ];
@@ -81,8 +81,8 @@ describe('routes/RouteManager', function () {
 
       expect($rp.when.callCount).to.be(args.length);
       _.times(args.length, function (i) {
-        var call = $rp.when.getCall(i);
-        var a = args.shift();
+        let call = $rp.when.getCall(i);
+        let a = args.shift();
 
         expect(call.args[0]).to.be(a[0]);
         expect(call.args[1]).to.be(a[1]);
diff --git a/src/ui/public/routes/__tests__/_WorkQueue.js b/src/ui/public/routes/__tests__/_WorkQueue.js
index 526df2161b402..2d5c115ab5ec2 100644
--- a/src/ui/public/routes/__tests__/_WorkQueue.js
+++ b/src/ui/public/routes/__tests__/_WorkQueue.js
@@ -1,13 +1,13 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var WorkQueue = require('ui/routes/WorkQueue');
-var sinon = require('auto-release-sinon');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let WorkQueue = require('ui/routes/WorkQueue');
+let sinon = require('auto-release-sinon');
 require('ui/promises');
 
 describe('work queue', function () {
-  var queue;
-  var Promise;
+  let queue;
+  let Promise;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_Promise_) {
@@ -25,10 +25,10 @@ describe('work queue', function () {
 
   describe('#resolveWhenFull', function () {
     it('resolves requests waiting for the queue to fill when appropriate', function () {
-      var size = _.random(5, 50);
+      let size = _.random(5, 50);
       queue.limit = size;
 
-      var whenFull = Promise.defer();
+      let whenFull = Promise.defer();
       sinon.stub(whenFull, 'resolve');
       queue.resolveWhenFull(whenFull);
 
@@ -53,11 +53,11 @@ describe('work queue', function () {
    *                         can manipulate the filled queue
    */
   function fillWithStubs(then) {
-    var size = _.random(5, 50);
-    var stub = sinon.stub();
+    let size = _.random(5, 50);
+    let stub = sinon.stub();
 
     _.times(size, function () {
-      var d = Promise.defer();
+      let d = Promise.defer();
       // overwrite the defer methods with the stub
       d.resolve = stub;
       d.reject = stub;
diff --git a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
index d37cf57c10dfa..76d545ba0400c 100644
--- a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
+++ b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
@@ -1,15 +1,15 @@
-var RouteManager = require('ui/routes/RouteManager');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let RouteManager = require('ui/routes/RouteManager');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var wrapRouteWithPrep = require('ui/routes/wrapRouteWithPrep');
-var Promise = require('bluebird');
-var _ = require('lodash');
-var stub = require('auto-release-sinon').stub;
+let wrapRouteWithPrep = require('ui/routes/wrapRouteWithPrep');
+let Promise = require('bluebird');
+let _ = require('lodash');
+let stub = require('auto-release-sinon').stub;
 
 require('ui/private');
 
-var routes;
+let routes;
 
 describe('wrapRouteWithPrep fn', function () {
   require('testUtils/noDigestPromises').activateForSuite();
@@ -18,20 +18,20 @@ describe('wrapRouteWithPrep fn', function () {
     routes = new RouteManager();
   });
 
-  var SchedulingTest = function (opts) {
+  let SchedulingTest = function (opts) {
     opts = opts || {};
 
-    var delaySetup = opts.delayUserWork ? 0 : 50;
-    var delayUserWork = opts.delayUserWork ? 50 : 0;
+    let delaySetup = opts.delayUserWork ? 0 : 50;
+    let delayUserWork = opts.delayUserWork ? 50 : 0;
 
     return function () {
       ngMock.module('kibana', 'kibana/notify');
-      var setupComplete = false;
-      var userWorkComplete = false;
-      var route;
-      var Private;
-      var Promise;
-      var $injector;
+      let setupComplete = false;
+      let userWorkComplete = false;
+      let route;
+      let Private;
+      let Promise;
+      let $injector;
 
       ngMock.inject(function ($rootScope, _Private_, _Promise_, _$injector_) {
         Private = _Private_;
diff --git a/src/ui/public/routes/routes.js b/src/ui/public/routes/routes.js
index faa10c794686a..58b26aa14be26 100644
--- a/src/ui/public/routes/routes.js
+++ b/src/ui/public/routes/routes.js
@@ -1,8 +1,12 @@
-var RouteManager = require('./RouteManager');
-var defaultRouteManager = new RouteManager();
+let RouteManager = require('./RouteManager');
+let defaultRouteManager = new RouteManager();
 
-require('ui/modules')
-.get('kibana', ['ngRoute'])
-.config(defaultRouteManager.config);
-
-module.exports = defaultRouteManager;
+module.exports = {
+  ...defaultRouteManager,
+  enable() {
+    require('angular-route/angular-route');
+    require('ui/modules')
+    .get('kibana', ['ngRoute'])
+    .config(defaultRouteManager.config);
+  }
+};
diff --git a/src/ui/public/routes/wrapRouteWithPrep.js b/src/ui/public/routes/wrapRouteWithPrep.js
index e92b50018e872..3c266d1c44c2e 100644
--- a/src/ui/public/routes/wrapRouteWithPrep.js
+++ b/src/ui/public/routes/wrapRouteWithPrep.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var angular = require('angular');
-  var _ = require('lodash');
+  let angular = require('angular');
+  let _ = require('lodash');
 
-  var WorkQueue = require('ui/routes/WorkQueue');
-  var errors = require('ui/errors');
+  let WorkQueue = require('ui/routes/WorkQueue');
+  let errors = require('ui/errors');
 
   function wrapRouteWithPrep(route, setup) {
     if (!route.resolve && route.redirectTo) return;
 
-    var userWork = new WorkQueue();
+    let userWork = new WorkQueue();
     // the point at which we will consider the queue "full"
     userWork.limit = _.keys(route.resolve).length;
 
-    var resolve = {
+    let resolve = {
       __prep__: function ($injector) {
         return $injector.invoke(setup.doWork, setup, { userWork });
       }
@@ -22,7 +22,7 @@ define(function (require) {
     // prep is complete
     _.forOwn(route.resolve || {}, function (expr, name) {
       resolve[name] = function ($injector, Promise) {
-        var defer = Promise.defer();
+        let defer = Promise.defer();
         userWork.push(defer);
         return defer.promise.then(function () {
           return $injector[angular.isString(expr) ? 'get' : 'invoke'](expr);
diff --git a/src/ui/public/safe_confirm/__tests__/safe_confirm.js b/src/ui/public/safe_confirm/__tests__/safe_confirm.js
index 8952cec32f9b4..0c17cd413d657 100644
--- a/src/ui/public/safe_confirm/__tests__/safe_confirm.js
+++ b/src/ui/public/safe_confirm/__tests__/safe_confirm.js
@@ -1,14 +1,14 @@
 describe('ui/safe_confirm', function () {
-  var sinon = require('sinon');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let sinon = require('sinon');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var $rootScope;
-  var $window;
-  var $timeout;
-  var message;
-  var safeConfirm;
-  var promise;
+  let $rootScope;
+  let $window;
+  let $timeout;
+  let message;
+  let safeConfirm;
+  let promise;
 
   beforeEach(function () {
     ngMock.module('kibana', function ($provide) {
@@ -34,7 +34,7 @@ describe('ui/safe_confirm', function () {
       expect($window.confirm.called).to.be(false);
     });
     it('returned promise is not resolved', function () {
-      var isResolved = false;
+      let isResolved = false;
       function markAsResolved() {
         isResolved = true;
       }
@@ -54,7 +54,7 @@ describe('ui/safe_confirm', function () {
       it('promise is fulfilled with true', function () {
         $timeout.flush();
 
-        var value;
+        let value;
         promise.then(function (v) {
           value = v;
         });
@@ -69,7 +69,7 @@ describe('ui/safe_confirm', function () {
         $window.confirm.returns(false); // must be set before $timeout.flush()
         $timeout.flush();
 
-        var value;
+        let value;
         promise.then(null, function (v) {
           value = v;
         });
diff --git a/src/ui/public/share/__tests__/url_shortener.js b/src/ui/public/share/__tests__/url_shortener.js
new file mode 100644
index 0000000000000..8c7bd55ebaf63
--- /dev/null
+++ b/src/ui/public/share/__tests__/url_shortener.js
@@ -0,0 +1,124 @@
+import _ from 'lodash';
+import sinon from 'sinon';
+import expect from 'expect.js';
+import ngMock from 'ngMock';
+import chrome from 'ui/chrome';
+import LibUrlShortenerProvider from 'ui/share/lib/url_shortener';
+
+describe('Url shortener', () => {
+  let $rootScope;
+  let $location;
+  let $http;
+  let urlShortener;
+  let $httpBackend;
+  const shareId = 'id123';
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (_$rootScope_, _$location_, _$httpBackend_, Private) {
+    $location = _$location_;
+    $rootScope = _$rootScope_;
+    $httpBackend = _$httpBackend_;
+    urlShortener = Private(LibUrlShortenerProvider);
+  }));
+
+  describe('Shorten without base path', () => {
+    it('should shorten urls with a port', function (done) {
+      $httpBackend.when('POST', '/shorten').respond(function (type, route, data) {
+        expect(JSON.parse(data).url).to.be('/app/kibana#123');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl('http://localhost:5601/app/kibana#123').then(function (url) {
+        expect(url).to.be(`http://localhost:5601/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    it('should shorten urls without a port', function (done) {
+      $httpBackend.when('POST', '/shorten').respond(function (type, route, data) {
+        expect(JSON.parse(data).url).to.be('/app/kibana#123');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl('http://localhost/app/kibana#123').then(function (url) {
+        expect(url).to.be(`http://localhost/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+  });
+
+  describe('Shorten with base path', () => {
+    const basePath = '/foo';
+
+    let getBasePath;
+    beforeEach(ngMock.inject((Private) => {
+      getBasePath = sinon.stub(chrome, 'getBasePath', () => basePath);
+      urlShortener = Private(LibUrlShortenerProvider);
+    }));
+
+    it('should shorten urls with a port', (done) => {
+      $httpBackend.when('POST', `${basePath}/shorten`).respond((type, route, data) => {
+        expect(JSON.parse(data).url).to.be('/app/kibana#123');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl(`http://localhost:5601${basePath}/app/kibana#123`).then((url) => {
+        expect(url).to.be(`http://localhost:5601${basePath}/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    it('should shorten urls without a port', (done) => {
+      $httpBackend.when('POST', `${basePath}/shorten`).respond((type, route, data) => {
+        expect(JSON.parse(data).url).to.be('/app/kibana#123');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl(`http://localhost${basePath}/app/kibana#123`).then((url) => {
+        expect(url).to.be(`http://localhost${basePath}/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    it('should shorten urls with a query string', (done) => {
+      $httpBackend.when('POST', `${basePath}/shorten`).respond((type, route, data) => {
+        expect(JSON.parse(data).url).to.be('/app/kibana?foo#123');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl(`http://localhost${basePath}/app/kibana?foo#123`).then((url) => {
+        expect(url).to.be(`http://localhost${basePath}/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    it('should shorten urls without a hash', (done) => {
+      $httpBackend.when('POST', `${basePath}/shorten`).respond((type, route, data) => {
+        expect(JSON.parse(data).url).to.be('/app/kibana');
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl(`http://localhost${basePath}/app/kibana`).then((url) => {
+        expect(url).to.be(`http://localhost${basePath}/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    it('should shorten urls with a query string in the hash', (done) => {
+      const relativeUrl = "/app/kibana#/discover?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-15m,mode:quick,to:now))&_a=(columns:!(_source),index:%27logstash-*%27,interval:auto,query:(query_string:(analyze_wildcard:!t,query:%27*%27)),sort:!(%27@timestamp%27,desc))"; //eslint-disable-line max-len, quotes
+      $httpBackend.when('POST', `${basePath}/shorten`).respond((type, route, data) => {
+        expect(JSON.parse(data).url).to.be(relativeUrl);
+        return [200, shareId];
+      });
+      urlShortener.shortenUrl(`http://localhost${basePath}${relativeUrl}`).then((url) => {
+        expect(url).to.be(`http://localhost${basePath}/goto/${shareId}`);
+        done();
+      });
+      $httpBackend.flush();
+    });
+
+    afterEach(() => {
+      getBasePath.restore();
+    });
+  });
+});
diff --git a/src/ui/public/share/directives/share.js b/src/ui/public/share/directives/share.js
new file mode 100644
index 0000000000000..49ebb95afba34
--- /dev/null
+++ b/src/ui/public/share/directives/share.js
@@ -0,0 +1,16 @@
+const app = require('ui/modules').get('kibana');
+
+app.directive('share', function () {
+  return {
+    restrict: 'E',
+    scope: {
+      objectType: '@',
+      objectId: '@',
+      setAllowEmbed: '&?allowEmbed'
+    },
+    template: require('ui/share/views/share.html'),
+    controller: function ($scope) {
+      $scope.allowEmbed = $scope.setAllowEmbed ? $scope.setAllowEmbed() : true;
+    }
+  };
+});
diff --git a/src/ui/public/share/directives/share_object_url.js b/src/ui/public/share/directives/share_object_url.js
new file mode 100644
index 0000000000000..b606c251d09ac
--- /dev/null
+++ b/src/ui/public/share/directives/share_object_url.js
@@ -0,0 +1,80 @@
+const app = require('ui/modules').get('kibana');
+const Clipboard = require('clipboard');
+
+require('../styles/index.less');
+
+app.directive('shareObjectUrl', function (Private, Notifier) {
+  const urlShortener = Private(require('../lib/url_shortener'));
+
+  return {
+    restrict: 'E',
+    scope: {
+      getShareAsEmbed: '&shareAsEmbed'
+    },
+    template: require('ui/share/views/share_object_url.html'),
+    link: function ($scope, $el) {
+      const notify = new Notifier({
+        location: `Share ${$scope.$parent.objectType}`
+      });
+
+      $scope.textbox = $el.find('input.url')[0];
+      $scope.clipboardButton = $el.find('button.clipboard-button')[0];
+
+      const clipboard = new Clipboard($scope.clipboardButton, {
+        target(trigger) {
+          return $scope.textbox;
+        }
+      });
+
+      clipboard.on('success', e => {
+        notify.info('URL copied to clipboard.');
+        e.clearSelection();
+      });
+
+      clipboard.on('error', () => {
+        notify.info('URL selected. Press Ctrl+C to copy.');
+      });
+
+      $scope.$on('$destroy', () => {
+        clipboard.destroy();
+      });
+
+      $scope.clipboard = clipboard;
+    },
+    controller: function ($scope, $location) {
+      function updateUrl(url) {
+        $scope.url = url;
+
+        if ($scope.shareAsEmbed) {
+          $scope.formattedUrl = `<iframe src="${$scope.url}" height="600" width="800"></iframe>`;
+        } else {
+          $scope.formattedUrl = $scope.url;
+        }
+
+        $scope.shortGenerated = false;
+      }
+
+      $scope.shareAsEmbed = $scope.getShareAsEmbed();
+
+      $scope.generateShortUrl = function () {
+        if ($scope.shortGenerated) return;
+
+        urlShortener.shortenUrl($scope.url)
+        .then(shortUrl => {
+          updateUrl(shortUrl);
+          $scope.shortGenerated = true;
+        });
+      };
+
+      $scope.getUrl = function () {
+        let url = $location.absUrl();
+        if ($scope.shareAsEmbed) {
+          url = url.replace('?', '?embed=true&');
+        }
+        return url;
+      };
+
+      $scope.$watch('getUrl()', updateUrl);
+    }
+  };
+});
diff --git a/src/ui/public/share/index.js b/src/ui/public/share/index.js
new file mode 100644
index 0000000000000..2dec91dcc725d
--- /dev/null
+++ b/src/ui/public/share/index.js
@@ -0,0 +1,2 @@
+require('./directives/share');
+require('./directives/share_object_url');
diff --git a/src/ui/public/share/lib/url_shortener.js b/src/ui/public/share/lib/url_shortener.js
new file mode 100644
index 0000000000000..76b755771fc15
--- /dev/null
+++ b/src/ui/public/share/lib/url_shortener.js
@@ -0,0 +1,33 @@
+import chrome from 'ui/chrome';
+import url from 'url';
+
+export default function createUrlShortener(Notifier, $http, $location) {
+  const notify = new Notifier({
+    location: 'Url Shortener'
+  });
+
+  function shortenUrl(absoluteUrl) {
+    const basePath = chrome.getBasePath();
+
+    const parsedUrl = url.parse(absoluteUrl);
+    const path = parsedUrl.path.replace(basePath, '');
+    const hash = parsedUrl.hash ? parsedUrl.hash : '';
+    const relativeUrl = path + hash;
+
+    const formData = { url: relativeUrl };
+
+    return $http.post(`${basePath}/shorten`, formData).then((result) => {
+      return url.format({
+        protocol: parsedUrl.protocol,
+        host: parsedUrl.host,
+        pathname: `${basePath}/goto/${result.data}`
+      });
+    }).catch((response) => {
+      notify.error(response);
+    });
+  }
+
+  return {
+    shortenUrl
+  };
+};
diff --git a/src/ui/public/share/styles/index.less b/src/ui/public/share/styles/index.less
new file mode 100644
index 0000000000000..5acb20bb3449a
--- /dev/null
+++ b/src/ui/public/share/styles/index.less
@@ -0,0 +1,21 @@
+share-object-url {
+  .input-group {
+    display: flex;
+
+    .clipboard-button {
+       border-top-left-radius: 0;
+       border-bottom-left-radius: 0;
+    }
+
+    .shorten-button {
+       border-top-right-radius: 0;
+       border-top-left-radius: 0;
+       border-bottom-right-radius: 0;
+       border-bottom-left-radius: 0;
+    }
+
+    .form-control.url {
+      cursor: text;
+    }
+  }
+}
diff --git a/src/ui/public/share/views/share.html b/src/ui/public/share/views/share.html
new file mode 100644
index 0000000000000..5f7ffdd0a6797
--- /dev/null
+++ b/src/ui/public/share/views/share.html
@@ -0,0 +1,15 @@
+<form role="form" class="vis-share">
+  <div class="form-group" ng-if="allowEmbed">
+    <label>
+      Embed this {{objectType}}
+      <small>Add to your html source. Note all clients must still be able to access kibana</small>
+    </label>
+    <share-object-url share-as-embed="true"></share-object-url>
+  </div>
+  <div class="form-group">
+    <label>
+      Share a link
+    </label>
+    <share-object-url share-as-embed="false"></share-object-url>
+  </div>
+</form>
diff --git a/src/ui/public/share/views/share_object_url.html b/src/ui/public/share/views/share_object_url.html
new file mode 100644
index 0000000000000..6c1b1438e9e90
--- /dev/null
+++ b/src/ui/public/share/views/share_object_url.html
@@ -0,0 +1,21 @@
+<div class="input-group">
+  <input
+    ng-model="formattedUrl"
+    type="text"
+    readonly=""
+    class="form-control url">
+  </input>
+  <button
+    class="shorten-button"
+    tooltip="Generate Short URL"
+    ng-click="generateShortUrl()"
+    ng-disabled="shortGenerated">
+    <span aria-hidden="true" class="fa fa-compress"></span>
+  </button>
+  <button
+    class="clipboard-button"
+    tooltip="Copy to Clipboard"
+    ng-click="copyToClipboard()">
+    <span aria-hidden="true" class="fa fa-clipboard"></span>
+  </button>
+</div>
diff --git a/src/ui/public/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js
index 61dcf5a9ab31c..d57abbc835d15 100644
--- a/src/ui/public/state_management/__tests__/app_state.js
+++ b/src/ui/public/state_management/__tests__/app_state.js
@@ -1,11 +1,11 @@
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/state_management/app_state');
 
 describe('State Management', function () {
-  var $rootScope;
-  var AppState;
+  let $rootScope;
+  let AppState;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) {
@@ -14,7 +14,7 @@ describe('State Management', function () {
   }));
 
   describe('App State', function () {
-    var appState;
+    let appState;
 
     beforeEach(function () {
       appState = new AppState();
@@ -26,7 +26,7 @@ describe('State Management', function () {
     });
 
     it('should use passed in params', function () {
-      var params = {
+      let params = {
         test: true,
         mock: false
       };
@@ -45,8 +45,8 @@ describe('State Management', function () {
     });
 
     it('should be destroyed on $routeChangeStart', function () {
-      var destroySpy = sinon.spy(appState, 'destroy');
-      var url = '/test/path';
+      let destroySpy = sinon.spy(appState, 'destroy');
+      let url = '/test/path';
 
       $rootScope.$emit('$routeChangeStart');
 
diff --git a/src/ui/public/state_management/__tests__/global_state.js b/src/ui/public/state_management/__tests__/global_state.js
index 8e8c586456ead..3a13c9b3dec33 100644
--- a/src/ui/public/state_management/__tests__/global_state.js
+++ b/src/ui/public/state_management/__tests__/global_state.js
@@ -1,13 +1,13 @@
 
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/state_management/global_state');
 
 describe('State Management', function () {
-  var $rootScope;
-  var $location;
-  var state;
+  let $rootScope;
+  let $location;
+  let state;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$location_, globalState) {
diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js
index 4fbe7286422ff..e4b9ab4785eaa 100644
--- a/src/ui/public/state_management/__tests__/state.js
+++ b/src/ui/public/state_management/__tests__/state.js
@@ -1,15 +1,15 @@
 
-var _ = require('lodash');
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 require('ui/private');
 
 describe('State Management', function () {
-  var $rootScope;
-  var $location;
-  var State;
-  var Events;
+  let $rootScope;
+  let $location;
+  let State;
+  let Events;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$rootScope_, _$location_, Private) {
@@ -21,26 +21,26 @@ describe('State Management', function () {
 
   describe('Provider', function () {
     it('should reset the state to the defaults', function () {
-      var state = new State('_s', { message: ['test'] });
+      let state = new State('_s', { message: ['test'] });
       state.reset();
-      var search = $location.search();
+      let search = $location.search();
       expect(search).to.have.property('_s');
       expect(search._s).to.equal('(message:!(test))');
       expect(state.message).to.eql(['test']);
     });
 
     it('should apply the defaults upon initialization', function () {
-      var state = new State('_s', { message: 'test' });
+      let state = new State('_s', { message: 'test' });
       expect(state).to.have.property('message', 'test');
     });
 
     it('should inherit from Events', function () {
-      var state = new State();
+      let state = new State();
       expect(state).to.be.an(Events);
     });
 
     it('should emit an event if reset with changes', function (done) {
-      var state = new State('_s', { message: 'test' });
+      let state = new State('_s', { message: 'test' });
       state.on('reset_with_changes', function (keys) {
         expect(keys).to.eql(['message']);
         done();
@@ -52,7 +52,7 @@ describe('State Management', function () {
     });
 
     it('should not emit an event if reset without changes', function () {
-      var state = new State('_s', { message: 'test' });
+      let state = new State('_s', { message: 'test' });
       state.on('reset_with_changes', function () {
         expect().fail();
       });
@@ -65,29 +65,29 @@ describe('State Management', function () {
 
   describe('Search', function () {
     it('should save to $location.search()', function () {
-      var state = new State('_s', { test: 'foo' });
+      let state = new State('_s', { test: 'foo' });
       state.save();
-      var search = $location.search();
+      let search = $location.search();
       expect(search).to.have.property('_s');
       expect(search._s).to.equal('(test:foo)');
     });
 
     it('should emit an event if changes are saved', function (done) {
-      var state = new State();
+      let state = new State();
       state.on('save_with_changes', function (keys) {
         expect(keys).to.eql(['test']);
         done();
       });
       state.test = 'foo';
       state.save();
-      var search = $location.search();
+      let search = $location.search();
       $rootScope.$apply();
     });
   });
 
   describe('Fetch', function () {
     it('should emit an event if changes are fetched', function (done) {
-      var state = new State();
+      let state = new State();
       state.on('fetch_with_changes', function (keys) {
         expect(keys).to.eql(['foo']);
         done();
@@ -99,7 +99,7 @@ describe('State Management', function () {
     });
 
     it('should have events that attach to scope', function (done) {
-      var state = new State();
+      let state = new State();
       state.on('test', function (message) {
         expect(message).to.equal('foo');
         done();
@@ -109,7 +109,7 @@ describe('State Management', function () {
     });
 
     it('should fire listeners for #onUpdate() on #fetch()', function (done) {
-      var state = new State();
+      let state = new State();
       state.on('fetch_with_changes', function (keys) {
         expect(keys).to.eql(['foo']);
         done();
@@ -121,7 +121,7 @@ describe('State Management', function () {
     });
 
     it('should apply defaults to fetches', function () {
-      var state = new State('_s', { message: 'test' });
+      let state = new State('_s', { message: 'test' });
       $location.search({ _s: '(foo:bar)' });
       state.fetch();
       expect(state).to.have.property('foo', 'bar');
@@ -129,15 +129,15 @@ describe('State Management', function () {
     });
 
     it('should call fetch when $routeUpdate is fired on $rootScope', function () {
-      var state = new State();
-      var spy = sinon.spy(state, 'fetch');
+      let state = new State();
+      let spy = sinon.spy(state, 'fetch');
       $rootScope.$emit('$routeUpdate', 'test');
       sinon.assert.calledOnce(spy);
     });
 
     it('should clear state when missing form URL', function () {
-      var stateObj;
-      var state = new State();
+      let stateObj;
+      let state = new State();
 
       // set satte via URL
       $location.search({ _s: '(foo:(bar:baz))' });
diff --git a/src/ui/public/state_management/_state_sync.js b/src/ui/public/state_management/_state_sync.js
index 7c4925eb17cae..f23dc183d6bad 100644
--- a/src/ui/public/state_management/_state_sync.js
+++ b/src/ui/public/state_management/_state_sync.js
@@ -1,15 +1,15 @@
 define(function (require) {
 
-  var angular = require('angular');
-  var _ = require('lodash');
-  var rison = require('ui/utils/rison');
+  let angular = require('angular');
+  let _ = require('lodash');
+  let rison = require('ui/utils/rison');
 
   // invokable/private angular dep
   return function ($location) {
     // feed in some of the private state from globalState
     return function (globalState, updateListeners, app) {
-      var getAppStash = function (search) {
-        var appStash = search._a && rison.decode(search._a);
+      let getAppStash = function (search) {
+        let appStash = search._a && rison.decode(search._a);
         if (app.current) {
           // Apply the defaults to appStash
           appStash = _.defaults(appStash || {}, app.defaults);
@@ -17,20 +17,20 @@ define(function (require) {
         return appStash;
       };
 
-      var diffTrans = function (trans) {
-        var obj = trans[0];
-        var update = trans[1];
+      let diffTrans = function (trans) {
+        let obj = trans[0];
+        let update = trans[1];
 
-        var diff = {};
+        let diff = {};
 
         // the keys that are currently set on obj, excluding methods
-        var objKeys = Object.keys(obj).filter(function (key) {
+        let objKeys = Object.keys(obj).filter(function (key) {
           return typeof obj[key] !== 'function';
         });
 
         if (update) {
           // the keys obj should have after applying the update
-          var updateKeys = diff.keys = Object.keys(update).filter(function (key) {
+          let updateKeys = diff.keys = Object.keys(update).filter(function (key) {
             return typeof update[key] !== 'function';
           });
 
@@ -53,8 +53,8 @@ define(function (require) {
         return diff;
       };
 
-      var notify = function (trans, diff) {
-        var listeners = null;
+      let notify = function (trans, diff) {
+        let listeners = null;
 
         if (trans[0] === app.current) {
           listeners = app.listeners;
@@ -67,11 +67,11 @@ define(function (require) {
         });
       };
 
-      var applyDiff = function (trans, diff) {
+      let applyDiff = function (trans, diff) {
         if (!diff.all.length) return;
 
-        var obj = trans[0];
-        var update = trans[1];
+        let obj = trans[0];
+        let update = trans[1];
 
         diff.remove.forEach(function (key) {
           delete obj[key];
@@ -82,13 +82,13 @@ define(function (require) {
         });
       };
 
-      var syncTrans = function (trans, forceNotify) {
+      let syncTrans = function (trans, forceNotify) {
         // obj that will be modified by update(trans[1])
         // if it is empty, we can skip it all
-        var skipWrite = !trans[0];
+        let skipWrite = !trans[0];
         trans[0] = trans[0] || {};
 
-        var diff = diffTrans(trans);
+        let diff = diffTrans(trans);
         if (!skipWrite && (forceNotify || diff.all.length)) {
           applyDiff(trans, diff);
           notify(trans, diff);
@@ -99,17 +99,17 @@ define(function (require) {
       return {
         // sync by pushing to the url
         push: function (forceNotify) {
-          var search = $location.search();
+          let search = $location.search();
 
-          var appStash = getAppStash(search) || {};
-          var globalStash = search._g ? rison.decode(search._g) : {};
+          let appStash = getAppStash(search) || {};
+          let globalStash = search._g ? rison.decode(search._g) : {};
 
-          var res = _.mapValues({
+          let res = _.mapValues({
             app: [appStash, app.current],
             global: [globalStash, globalState]
           }, function (trans, key) {
-            var diff = syncTrans(trans, forceNotify);
-            var urlKey = '_' + key.charAt(0);
+            let diff = syncTrans(trans, forceNotify);
+            let urlKey = '_' + key.charAt(0);
             if (diff.keys.length === 0) {
               delete search[urlKey];
             } else {
@@ -123,10 +123,10 @@ define(function (require) {
         },
         // sync by pulling from the url
         pull: function (forceNotify) {
-          var search = $location.search();
+          let search = $location.search();
 
-          var appStash = getAppStash(search);
-          var globalStash = search._g && rison.decode(search._g);
+          let appStash = getAppStash(search);
+          let globalStash = search._g && rison.decode(search._g);
 
           return _.mapValues({
             app: [app.current, appStash],
diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js
index a3b3317b1c3b4..8bb6454d5d99e 100644
--- a/src/ui/public/state_management/app_state.js
+++ b/src/ui/public/state_management/app_state.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var modules = require('ui/modules');
-  var urlParam = '_a';
+  let _ = require('lodash');
+  let modules = require('ui/modules');
+  let urlParam = '_a';
 
   function AppStateProvider(Private, $rootScope, getAppState) {
-    var State = Private(require('ui/state_management/state'));
-    var PersistedState = Private(require('ui/persisted_state/persisted_state'));
-    var persistedStates;
-    var eventUnsubscribers;
+    let State = Private(require('ui/state_management/state'));
+    let PersistedState = Private(require('ui/persisted_state/persisted_state'));
+    let persistedStates;
+    let eventUnsubscribers;
 
     _.class(AppState).inherits(State);
     function AppState(defaults) {
@@ -29,31 +29,31 @@ define(function (require) {
 
     AppState.prototype.makeStateful = function (prop) {
       if (persistedStates[prop]) return persistedStates[prop];
-      var self = this;
+      let self = this;
 
       // set up the ui state
       persistedStates[prop] = new PersistedState();
 
       // update the app state when the stateful instance changes
-      var updateOnChange = function () {
-        var replaceState = false; // TODO: debouncing logic
+      let updateOnChange = function () {
+        let replaceState = false; // TODO: debouncing logic
 
         self[prop] = persistedStates[prop].getChanges();
         self.save(replaceState);
       };
-      var handlerOnChange = (method) => persistedStates[prop][method]('change', updateOnChange);
+      let handlerOnChange = (method) => persistedStates[prop][method]('change', updateOnChange);
       handlerOnChange('on');
       eventUnsubscribers.push(() => handlerOnChange('off'));
 
       // update the stateful object when the app state changes
-      var persistOnChange = function (changes) {
+      let persistOnChange = function (changes) {
         if (!changes) return;
 
         if (changes.indexOf(prop) !== -1) {
           persistedStates[prop].set(self[prop]);
         }
       };
-      var handlePersist = (method) => this[method]('fetch_with_changes', persistOnChange);
+      let handlePersist = (method) => this[method]('fetch_with_changes', persistOnChange);
       handlePersist('on');
       eventUnsubscribers.push(() => handlePersist('off'));
 
@@ -71,7 +71,7 @@ define(function (require) {
     return Private(AppStateProvider);
   })
   .service('getAppState', function ($location) {
-    var currentAppState;
+    let currentAppState;
 
     function get() {
       return currentAppState;
@@ -79,7 +79,7 @@ define(function (require) {
 
     // Checks to see if the appState might already exist, even if it hasn't been newed up
     get.previouslyStored = function () {
-      var search = $location.search();
+      let search = $location.search();
       return search[urlParam] ? true : false;
     };
 
diff --git a/src/ui/public/state_management/global_state.js b/src/ui/public/state_management/global_state.js
index 6f74135ea4e8d..469b815b28bb3 100644
--- a/src/ui/public/state_management/global_state.js
+++ b/src/ui/public/state_management/global_state.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
-  var qs = require('ui/utils/query_string');
-  var rison = require('ui/utils/rison');
+  let _ = require('lodash');
+  let angular = require('angular');
+  let qs = require('ui/utils/query_string');
+  let rison = require('ui/utils/rison');
 
-  var module = require('ui/modules').get('kibana/global_state');
+  let module = require('ui/modules').get('kibana/global_state');
 
   module.service('globalState', function (Private, $rootScope, $location) {
-    var State = Private(require('ui/state_management/state'));
+    let State = Private(require('ui/state_management/state'));
 
     _.class(GlobalState).inherits(State);
     function GlobalState(defaults) {
diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js
index 1c0c91ed003cc..373639037ab99 100644
--- a/src/ui/public/state_management/state.js
+++ b/src/ui/public/state_management/state.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var _ = require('lodash');
-  var rison = require('ui/utils/rison');
+  let _ = require('lodash');
+  let rison = require('ui/utils/rison');
 
-  var applyDiff = require('ui/utils/diff_object');
-  var qs = require('ui/utils/query_string');
+  let applyDiff = require('ui/utils/diff_object');
+  let qs = require('ui/utils/query_string');
 
   return function StateProvider(Notifier, Private, $rootScope, $location) {
-    var Events = Private(require('ui/events'));
+    let Events = Private(require('ui/events'));
 
     _.class(State).inherits(Events);
     function State(urlParam, defaults) {
       State.Super.call(this);
 
-      var self = this;
+      let self = this;
       self.setDefaults(defaults);
       self._urlParam = urlParam || '_s';
 
@@ -23,7 +23,7 @@ define(function (require) {
           self.fetch();
         }),
 
-        // begining of full route update, new app will be initialized before
+        // beginning of full route update, new app will be initialized before
         // $routeChangeSuccess or $routeChangeError
         $rootScope.$on('$routeChangeStart', function () {
           if (self._persistAcrossApps) {
@@ -39,11 +39,11 @@ define(function (require) {
     }
 
     State.prototype._readFromURL = function () {
-      var search = $location.search();
+      let search = $location.search();
       try {
         return search[this._urlParam] ? rison.decode(search[this._urlParam]) : null;
       } catch (e) {
-        var notify = new Notifier();
+        let notify = new Notifier();
         notify.error('Unable to parse URL');
         search[this._urlParam] = rison.encode(this._defaults);
         $location.search(search).replace();
@@ -56,7 +56,7 @@ define(function (require) {
      * @returns {void}
      */
     State.prototype.fetch = function () {
-      var stash = this._readFromURL();
+      let stash = this._readFromURL();
 
       // nothing to read from the url? save if ordered to persist
       if (stash === null) {
@@ -69,7 +69,7 @@ define(function (require) {
 
       _.defaults(stash, this._defaults);
       // apply diff to state from stash, will change state in place via side effect
-      var diffResults = applyDiff(this, stash);
+      let diffResults = applyDiff(this, stash);
 
       if (diffResults.keys.length) {
         this.emit('fetch_with_changes', diffResults.keys);
@@ -81,8 +81,8 @@ define(function (require) {
      * @returns {void}
      */
     State.prototype.save = function (replace) {
-      var stash = this._readFromURL();
-      var state = this.toObject();
+      let stash = this._readFromURL();
+      let state = this.toObject();
       replace = replace || false;
 
       if (!stash) {
@@ -92,14 +92,14 @@ define(function (require) {
 
       _.defaults(state, this._defaults);
       // apply diff to state from stash, will change state in place via side effect
-      var diffResults = applyDiff(stash, state);
+      let diffResults = applyDiff(stash, state);
 
       if (diffResults.keys.length) {
         this.emit('save_with_changes', diffResults.keys);
       }
 
       // persist the state in the URL
-      var search = $location.search();
+      let search = $location.search();
       search[this._urlParam] = this.toRISON();
       if (replace) {
         $location.search(search).replace();
@@ -124,7 +124,7 @@ define(function (require) {
     State.prototype.reset = function () {
       // apply diff to _attributes from defaults, this is side effecting so
       // it will change the state in place.
-      var diffResults = applyDiff(this, this._defaults);
+      let diffResults = applyDiff(this, this._defaults);
       if (diffResults.keys.length) {
         this.emit('reset_with_changes', diffResults.keys);
       }
@@ -136,8 +136,8 @@ define(function (require) {
      * @returns {void}
      */
     State.prototype.destroy = function () {
-      this.off(); // removes all listners
-      this._cleanUpListeners(); // Removes the $routeUpdate listner
+      this.off(); // removes all listeners
+      this._cleanUpListeners(); // Removes the $routeUpdate listener
     };
 
     State.prototype.setDefaults = function (defaults) {
diff --git a/src/ui/public/storage/__tests__/storage.js b/src/ui/public/storage/__tests__/storage.js
index c6b99c6324f14..ff27a41ee38d6 100644
--- a/src/ui/public/storage/__tests__/storage.js
+++ b/src/ui/public/storage/__tests__/storage.js
@@ -1,10 +1,10 @@
-var sinon = require('sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var storage;
-var $window;
-var payload = { first: 'john', last: 'smith' };
+let storage;
+let $window;
+let payload = { first: 'john', last: 'smith' };
 
 require('ui/storage');
 
@@ -69,21 +69,21 @@ describe('StorageService', function () {
 
   describe('json data', function () {
     it('should parse JSON when reading from the store', function () {
-      var getItem = $window.localStorage.getItem;
+      let getItem = $window.localStorage.getItem;
       getItem.returns(JSON.stringify(payload));
 
-      var data = storage.get('name');
+      let data = storage.get('name');
       expect(data).to.eql(payload);
     });
 
     it('should write JSON string to the store', function () {
-      var setItem = $window.localStorage.setItem;
-      var key = 'name';
-      var value = payload;
+      let setItem = $window.localStorage.setItem;
+      let key = 'name';
+      let value = payload;
 
       storage.set(key, value);
 
-      var call = setItem.getCall(0);
+      let call = setItem.getCall(0);
       expect(call.args[0]).to.equal(key);
       expect(call.args[1]).to.equal(JSON.stringify(value));
     });
@@ -91,15 +91,15 @@ describe('StorageService', function () {
 
   describe('expected responses', function () {
     it('should return null when not exists', function () {
-      var data = storage.get('notexists');
+      let data = storage.get('notexists');
       expect(data).to.equal(null);
     });
 
     it('should return null when invalid JSON', function () {
-      var getItem = $window.localStorage.getItem;
+      let getItem = $window.localStorage.getItem;
       getItem.returns('not: json');
 
-      var data = storage.get('name');
+      let data = storage.get('name');
       expect(data).to.equal(null);
     });
   });
diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js
index 7207c66ea182a..cd7684afed9f8 100644
--- a/src/ui/public/storage/storage.js
+++ b/src/ui/public/storage/storage.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var modules = require('ui/modules');
-  var angular = require('angular');
+  let modules = require('ui/modules');
+  let angular = require('angular');
 
   function Storage(store) {
-    var self = this;
+    let self = this;
     self.store = store;
 
     self.get = function (key) {
@@ -31,7 +31,7 @@ define(function (require) {
     };
   }
 
-  var createService = function (type) {
+  let createService = function (type) {
     return function ($window) {
       return new Storage($window[type]);
     };
diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js
index b8093ab75a3c6..89cf548410062 100644
--- a/src/ui/public/stringify/__tests__/_color.js
+++ b/src/ui/public/stringify/__tests__/_color.js
@@ -1,8 +1,8 @@
 describe('Color Format', function () {
-  var fieldFormats;
-  var ColorFormat;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let fieldFormats;
+  let ColorFormat;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -12,7 +12,7 @@ describe('Color Format', function () {
   }));
 
   it('should add colors if the value is in range', function () {
-    var colorer = new ColorFormat({
+    let colorer = new ColorFormat({
       colors: [{
         range: '100:150',
         text: 'blue',
@@ -26,7 +26,7 @@ describe('Color Format', function () {
   });
 
   it('should not convert invalid ranges', function () {
-    var colorer = new ColorFormat({
+    let colorer = new ColorFormat({
       colors: [{
         range: '100150',
         text: 'blue',
diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js
index f2be1b24308d8..e6acc4eb3fd4f 100644
--- a/src/ui/public/stringify/__tests__/_conformance.js
+++ b/src/ui/public/stringify/__tests__/_conformance.js
@@ -1,12 +1,12 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
-var fieldFormats;
-var FieldFormat;
-var config;
+let fieldFormats;
+let FieldFormat;
+let config;
 
-var formatIds = [
+let formatIds = [
   'bytes',
   'date',
   'ip',
@@ -15,7 +15,8 @@ var formatIds = [
   'color',
   'string',
   'url',
-  '_source'
+  '_source',
+  'truncate'
 ];
 
 module.exports = describe('conformance', function () {
@@ -27,8 +28,8 @@ module.exports = describe('conformance', function () {
   }));
 
   formatIds.forEach(function (id) {
-    var instance;
-    var Type;
+    let instance;
+    let Type;
 
     beforeEach(function () {
       Type = fieldFormats.getType(id);
@@ -69,7 +70,7 @@ module.exports = describe('conformance', function () {
     basicPatternTests('number', require('numeral'))();
 
     it('tries to parse strings', function () {
-      var number = new (fieldFormats.getType('number'))({ pattern: '0.0b' });
+      let number = new (fieldFormats.getType('number'))({ pattern: '0.0b' });
       expect(number.convert(123.456)).to.be('123.5B');
       expect(number.convert('123.456')).to.be('123.5B');
     });
@@ -77,11 +78,11 @@ module.exports = describe('conformance', function () {
   });
 
   function basicPatternTests(id, lib) {
-    var confKey = id === 'date' ? 'dateFormat' : 'format:' + id + ':defaultPattern';
+    let confKey = id === 'date' ? 'dateFormat' : 'format:' + id + ':defaultPattern';
 
     return function () {
       it('converts using the format:' + id + ':defaultPattern config', function () {
-        var inst = fieldFormats.getInstance(id);
+        let inst = fieldFormats.getInstance(id);
         [
           '0b',
           '0 b',
@@ -89,22 +90,22 @@ module.exports = describe('conformance', function () {
           '0.[000]b',
           '0.[0]b'
         ].forEach(function (pattern) {
-          var num = _.random(-10000, 10000, true);
+          let num = _.random(-10000, 10000, true);
           config.set(confKey, pattern);
           expect(inst.convert(num)).to.be(lib(num).format(pattern));
         });
       });
 
       it('uses the pattern param if available', function () {
-        var num = _.random(-10000, 10000, true);
-        var defFormat = '0b';
-        var customFormat = '0.00000%';
+        let num = _.random(-10000, 10000, true);
+        let defFormat = '0b';
+        let customFormat = '0.00000%';
 
         config.set(confKey, defFormat);
-        var defInst = fieldFormats.getInstance(id);
+        let defInst = fieldFormats.getInstance(id);
 
-        var Type = fieldFormats.getType(id);
-        var customInst = new Type({ pattern: customFormat });
+        let Type = fieldFormats.getType(id);
+        let customInst = new Type({ pattern: customFormat });
 
         expect(defInst.convert(num)).to.not.be(customInst.convert(num));
         expect(defInst.convert(num)).to.be(lib(num).format(defFormat));
diff --git a/src/ui/public/stringify/__tests__/_date.js b/src/ui/public/stringify/__tests__/_date.js
index 40f3380df52da..7c2bedd2f5083 100644
--- a/src/ui/public/stringify/__tests__/_date.js
+++ b/src/ui/public/stringify/__tests__/_date.js
@@ -1,12 +1,12 @@
 describe('Date Format', function () {
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
-  var moment = require('moment-timezone');
-  var fieldFormats;
-  var settings;
-  var convert;
-  var $scope;
-  var off;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+  let moment = require('moment-timezone');
+  let fieldFormats;
+  let settings;
+  let convert;
+  let $scope;
+  let off;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, config, $rootScope) {
@@ -14,8 +14,8 @@ describe('Date Format', function () {
     settings = config;
 
     fieldFormats = Private(require('ui/registry/field_formats'));
-    var DateFormat = fieldFormats.getType('date');
-    var date = new DateFormat();
+    let DateFormat = fieldFormats.getType('date');
+    let date = new DateFormat();
 
     convert = date.convert.bind(date);
   }));
@@ -29,17 +29,17 @@ describe('Date Format', function () {
     function setDefaultTimezone() {
       moment.tz.setDefault(settings.get('dateFormat:tz'));
     }
-    var time = 1445027693942;
+    let time = 1445027693942;
 
     off = $scope.$on('change:config.dateFormat:tz', setDefaultTimezone);
 
     settings.set('dateFormat:tz', 'America/Chicago');
     $scope.$digest();
-    var chicagoTime = convert(time);
+    let chicagoTime = convert(time);
 
     settings.set('dateFormat:tz', 'America/Phoenix');
     $scope.$digest();
-    var phoenixTime = convert(time);
+    let phoenixTime = convert(time);
 
     expect(chicagoTime).not.to.equal(phoenixTime);
     off();
diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js
index b8964bca664ff..208816c08ce3d 100644
--- a/src/ui/public/stringify/__tests__/_ip.js
+++ b/src/ui/public/stringify/__tests__/_ip.js
@@ -1,16 +1,21 @@
 describe('IP Address Format', function () {
-  var fieldFormats;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
+  let ip;
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    fieldFormats = Private(require('ui/registry/field_formats'));
+    const fieldFormats = Private(require('ui/registry/field_formats'));
+    ip = fieldFormats.getInstance('ip');
   }));
 
   it('convers a value from a decimal to a string', function () {
-    var ip = fieldFormats.getInstance('ip');
     expect(ip.convert(1186489492)).to.be('70.184.100.148');
   });
 
+  it('converts null and undefined to -',  function () {
+    expect(ip.convert(null)).to.be('-');
+    expect(ip.convert(undefined)).to.be('-');
+  });
+
 });
diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js
index 41c989258487a..44cbddd885c2a 100644
--- a/src/ui/public/stringify/__tests__/_source.js
+++ b/src/ui/public/stringify/__tests__/_source.js
@@ -1,10 +1,10 @@
 describe('_source formatting', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var fieldFormats;
+  let fieldFormats;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -12,10 +12,10 @@ describe('_source formatting', function () {
   }));
 
   describe('Source format', function () {
-    var indexPattern;
-    var hits;
-    var format;
-    var convertHtml;
+    let indexPattern;
+    let hits;
+    let format;
+    let convertHtml;
 
     beforeEach(ngMock.inject(function (Private) {
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
@@ -25,8 +25,8 @@ describe('_source formatting', function () {
     }));
 
     it('uses the _source, field, and hit to create a <dl>', function () {
-      var hit = _.first(hits);
-      var $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
+      let hit = _.first(hits);
+      let $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
       expect($dl.is('dl')).to.be.ok();
       expect($dl.find('dt')).to.have.length(_.keys(indexPattern.flattenHit(hit)).length);
     });
diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js
index c2a7a2276b6d7..dbbaf0d86ac0f 100644
--- a/src/ui/public/stringify/__tests__/_string.js
+++ b/src/ui/public/stringify/__tests__/_string.js
@@ -1,7 +1,7 @@
 describe('String Format', function () {
-  var fieldFormats;
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let fieldFormats;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -9,8 +9,8 @@ describe('String Format', function () {
   }));
 
   it('decode a base64 string', function () {
-    var StringFormat = fieldFormats.getType('string');
-    var string = new StringFormat({
+    let StringFormat = fieldFormats.getType('string');
+    let string = new StringFormat({
       transform: 'base64'
     });
     expect(string.convert('Zm9vYmFy')).to.be('foobar');
diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js
new file mode 100644
index 0000000000000..3612413e8eb82
--- /dev/null
+++ b/src/ui/public/stringify/__tests__/_truncate.js
@@ -0,0 +1,38 @@
+describe('String Truncate Format', function () {
+  let fieldFormats;
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    fieldFormats = Private(require('ui/registry/field_formats'));
+  }));
+
+  it('truncate large string', function () {
+    let Truncate = fieldFormats.getType('truncate');
+    let truncate = new Truncate({fieldLength: 4});
+
+    expect(truncate.convert('This is some text')).to.be('This...');
+  });
+
+  it('does not truncate large string when field length is not a string', function () {
+    let Truncate = fieldFormats.getType('truncate');
+    let truncate = new Truncate({fieldLength: 'not number'});
+
+    expect(truncate.convert('This is some text')).to.be('This is some text');
+  });
+
+  it('does not truncate large string when field length is null', function () {
+    let Truncate = fieldFormats.getType('truncate');
+    let truncate = new Truncate({fieldLength: null});
+
+    expect(truncate.convert('This is some text')).to.be('This is some text');
+  });
+
+  it('does not truncate large string when field length larger than the text', function () {
+    let Truncate = fieldFormats.getType('truncate');
+    let truncate = new Truncate({fieldLength: 100000});
+
+    expect(truncate.convert('This is some text')).to.be('This is some text');
+  });
+});
diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js
index f9b0943f6b45d..472e87da2f865 100644
--- a/src/ui/public/stringify/__tests__/_url.js
+++ b/src/ui/public/stringify/__tests__/_url.js
@@ -1,9 +1,9 @@
 describe('Url Format', function () {
-  var $ = require('jquery');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let $ = require('jquery');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var fieldFormats;
+  let fieldFormats;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -11,16 +11,16 @@ describe('Url Format', function () {
   }));
 
   describe('Url Format', function () {
-    var Url;
+    let Url;
 
     beforeEach(function () {
       Url = fieldFormats.getType('url');
     });
 
     it('ouputs a simple <a> tab by default', function () {
-      var url = new Url();
+      let url = new Url();
 
-      var $a = $(url.convert('http://elastic.co', 'html'));
+      let $a = $(url.convert('http://elastic.co', 'html'));
       expect($a.is('a')).to.be(true);
       expect($a.size()).to.be(1);
       expect($a.attr('href')).to.be('http://elastic.co');
@@ -29,17 +29,17 @@ describe('Url Format', function () {
     });
 
     it('outputs an <image> if type === "img"', function () {
-      var url = new Url({ type: 'img' });
+      let url = new Url({ type: 'img' });
 
-      var $img = $(url.convert('http://elastic.co', 'html'));
+      let $img = $(url.convert('http://elastic.co', 'html'));
       expect($img.is('img')).to.be(true);
       expect($img.attr('src')).to.be('http://elastic.co');
     });
 
     describe('url template', function () {
       it('accepts a template', function () {
-        var url = new Url({ urlTemplate: 'url: {{ value }}' });
-        var $a = $(url.convert('url', 'html'));
+        let url = new Url({ urlTemplate: 'url: {{ value }}' });
+        let $a = $(url.convert('url', 'html'));
         expect($a.is('a')).to.be(true);
         expect($a.size()).to.be(1);
         expect($a.attr('href')).to.be('url: url');
@@ -48,15 +48,15 @@ describe('Url Format', function () {
       });
 
       it('only outputs the url if the contentType === "text"', function () {
-        var url = new Url();
+        let url = new Url();
         expect(url.convert('url', 'text')).to.be('url');
       });
     });
 
     describe('label template', function () {
       it('accepts a template', function () {
-        var url = new Url({ labelTemplate: 'extension: {{ value }}' });
-        var $a = $(url.convert('php', 'html'));
+        let url = new Url({ labelTemplate: 'extension: {{ value }}' });
+        let $a = $(url.convert('php', 'html'));
         expect($a.is('a')).to.be(true);
         expect($a.size()).to.be(1);
         expect($a.attr('href')).to.be('php');
@@ -64,19 +64,19 @@ describe('Url Format', function () {
       });
 
       it('uses the label template for text formating', function () {
-        var url = new Url({ labelTemplate: 'external {{value }}'});
+        let url = new Url({ labelTemplate: 'external {{value }}'});
         expect(url.convert('url', 'text')).to.be('external url');
       });
 
       it('can use the raw value', function () {
-        var url = new Url({
+        let url = new Url({
           labelTemplate: 'external {{value}}'
         });
         expect(url.convert('url?', 'text')).to.be('external url?');
       });
 
       it('can use the url', function () {
-        var url = new Url({
+        let url = new Url({
           urlTemplate: 'http://google.com/{{value}}',
           labelTemplate: 'external {{url}}'
         });
@@ -86,19 +86,19 @@ describe('Url Format', function () {
 
     describe('templating', function () {
       it('ignores unknown variables', function () {
-        var url = new Url({ urlTemplate: '{{ not really a var }}' });
+        let url = new Url({ urlTemplate: '{{ not really a var }}' });
         expect(url.convert('url', 'text')).to.be('');
       });
 
       it('does not allow executing code in variable expressions', function () {
         window.SHOULD_NOT_BE_TRUE = false;
-        var url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
+        let url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
         expect(url.convert('url', 'text')).to.be('');
       });
 
       describe('', function () {
         it('does not get values from the prototype chain', function () {
-          var url = new Url({ urlTemplate: '{{ toString }}' });
+          let url = new Url({ urlTemplate: '{{ toString }}' });
           expect(url.convert('url', 'text')).to.be('');
         });
       });
diff --git a/src/ui/public/stringify/__tests__/index.js b/src/ui/public/stringify/__tests__/index.js
index 5d848800765fc..a7d021f87a6b5 100644
--- a/src/ui/public/stringify/__tests__/index.js
+++ b/src/ui/public/stringify/__tests__/index.js
@@ -6,4 +6,5 @@ describe('Stringify Component', function () {
   require('./_url');
   require('./_color');
   require('./_date');
+  require('./_truncate');
 });
diff --git a/src/ui/public/stringify/editors/truncate.html b/src/ui/public/stringify/editors/truncate.html
new file mode 100644
index 0000000000000..25f093bc14f82
--- /dev/null
+++ b/src/ui/public/stringify/editors/truncate.html
@@ -0,0 +1,6 @@
+<div class="form-group">
+  <label>Field Length</label>
+  <input ng-model="editor.formatParams.fieldLength" class="form-control">
+</div>
+
+<field-format-editor-samples inputs="editor.field.format.type.sampleInput"></field-format-editor-samples>
diff --git a/src/ui/public/stringify/icons/index.js b/src/ui/public/stringify/icons/index.js
new file mode 100644
index 0000000000000..139018f01dd0c
--- /dev/null
+++ b/src/ui/public/stringify/icons/index.js
@@ -0,0 +1,7 @@
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/go.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/stop.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/de.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/ne.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/us.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/ni.png');
+require('!!file?name=[path][name].[ext]!ui/stringify/icons/cv.png');
diff --git a/src/ui/public/stringify/register.js b/src/ui/public/stringify/register.js
index 242b5052b16be..1004a0c61ab63 100644
--- a/src/ui/public/stringify/register.js
+++ b/src/ui/public/stringify/register.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var fieldFormats = require('ui/registry/field_formats');
+  let fieldFormats = require('ui/registry/field_formats');
   fieldFormats.register(require('ui/stringify/types/Url'));
   fieldFormats.register(require('ui/stringify/types/Bytes'));
   fieldFormats.register(require('ui/stringify/types/Date'));
@@ -9,4 +9,5 @@ define(function (require) {
   fieldFormats.register(require('ui/stringify/types/String'));
   fieldFormats.register(require('ui/stringify/types/Source'));
   fieldFormats.register(require('ui/stringify/types/Color'));
+  fieldFormats.register(require('ui/stringify/types/truncate'));
 });
diff --git a/src/ui/public/stringify/samples/large.html b/src/ui/public/stringify/samples/large.html
new file mode 100644
index 0000000000000..37e1e1ab56550
--- /dev/null
+++ b/src/ui/public/stringify/samples/large.html
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris vitae sem consequat, sollicitudin enim a, feugiat mi. Curabitur congue laoreet elit, eu dictum nisi commodo ut. Nullam congue sem a blandit commodo. Suspendisse eleifend sodales leo ac hendrerit. Nam fringilla tempor fermentum. Ut tristique pharetra sapien sit amet pharetra. Ut turpis massa, viverra id erat quis, fringilla vehicula risus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus tincidunt gravida gravida. Praesent et ligula viverra, semper lacus in, tristique elit. Cras ac eleifend diam. Nulla facilisi. Morbi id sagittis magna. Sed fringilla, magna in suscipit aliquet.
\ No newline at end of file
diff --git a/src/ui/public/stringify/types/Bytes.js b/src/ui/public/stringify/types/Bytes.js
index a164545ab08bb..74fa3585891ce 100644
--- a/src/ui/public/stringify/types/Bytes.js
+++ b/src/ui/public/stringify/types/Bytes.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function BytesFormatProvider(Private) {
-    var Numeral = Private(require('ui/stringify/types/_Numeral'));
+    let Numeral = Private(require('ui/stringify/types/_Numeral'));
     return Numeral.factory({
       id: 'bytes',
       title: 'Bytes',
diff --git a/src/ui/public/stringify/types/Date.js b/src/ui/public/stringify/types/Date.js
index bdd3ee463fc06..ce7fc3e28ae1e 100644
--- a/src/ui/public/stringify/types/Date.js
+++ b/src/ui/public/stringify/types/Date.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function DateTimeFormatProvider(Private) {
-    var _ = require('lodash');
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
-    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
-    var moment = require('moment');
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
+    let moment = require('moment');
 
     require('ui/field_format_editor/pattern/pattern');
 
@@ -25,7 +25,7 @@ define(function (require) {
       template: require('ui/stringify/editors/date.html'),
       controllerAs: 'cntrl',
       controller: function ($interval, $scope) {
-        var self = this;
+        let self = this;
         self.sampleInputs = [
           Date.now(),
           +moment().startOf('year'),
@@ -41,11 +41,11 @@ define(function (require) {
     DateTime.prototype._convert = function (val) {
       // don't give away our ref to converter so
       // we can hot-swap when config changes
-      var pattern = this.param('pattern');
-      var timezone = this.param('timezone');
+      let pattern = this.param('pattern');
+      let timezone = this.param('timezone');
 
-      var timezoneChanged = this._timeZone !== timezone;
-      var datePatternChanged = this._memoizedPattern !== pattern;
+      let timezoneChanged = this._timeZone !== timezone;
+      let datePatternChanged = this._memoizedPattern !== pattern;
       if (timezoneChanged || datePatternChanged) {
         this._timeZone = timezone;
         this._memoizedPattern = pattern;
diff --git a/src/ui/public/stringify/types/Ip.js b/src/ui/public/stringify/types/Ip.js
index 29dbc6333afa0..ca5e860f38f2f 100644
--- a/src/ui/public/stringify/types/Ip.js
+++ b/src/ui/public/stringify/types/Ip.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function IpFormatProvider(Private) {
-    var _ = require('lodash');
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
 
     _.class(Ip).inherits(FieldFormat);
     function Ip(params) {
@@ -13,6 +13,7 @@ define(function (require) {
     Ip.fieldType = 'ip';
 
     Ip.prototype._convert = function (val) {
+      if (val === undefined || val === null) return '-';
       if (!isFinite(val)) return val;
 
       // shazzam!
diff --git a/src/ui/public/stringify/types/Number.js b/src/ui/public/stringify/types/Number.js
index 84bb74d236234..66cec585b254d 100644
--- a/src/ui/public/stringify/types/Number.js
+++ b/src/ui/public/stringify/types/Number.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function NumberFormatProvider(Private) {
-    var Numeral = Private(require('ui/stringify/types/_Numeral'));
+    let Numeral = Private(require('ui/stringify/types/_Numeral'));
     return Numeral.factory({
       id: 'number',
       title: 'Number',
diff --git a/src/ui/public/stringify/types/Percent.js b/src/ui/public/stringify/types/Percent.js
index 093899fba6c77..689098b6478b5 100644
--- a/src/ui/public/stringify/types/Percent.js
+++ b/src/ui/public/stringify/types/Percent.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function NumberFormatProvider(Private) {
-    var _ = require('lodash');
-    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
-    var Numeral = Private(require('ui/stringify/types/_Numeral'));
+    let _ = require('lodash');
+    let BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
+    let Numeral = Private(require('ui/stringify/types/_Numeral'));
 
     return Numeral.factory({
       id: 'percent',
diff --git a/src/ui/public/stringify/types/Source.js b/src/ui/public/stringify/types/Source.js
index 20d778ec350fa..6a9cbd1951c16 100644
--- a/src/ui/public/stringify/types/Source.js
+++ b/src/ui/public/stringify/types/Source.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function _SourceProvider(Private, shortDotsFilter) {
-    var _ = require('lodash');
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
-    var noWhiteSpace = require('ui/utils/no_white_space');
-    var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
-    var angular = require('angular');
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let noWhiteSpace = require('ui/utils/no_white_space');
+    let template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
+    let angular = require('angular');
 
     _.class(Source).inherits(FieldFormat);
     function Source(params) {
@@ -20,15 +20,15 @@ define(function (require) {
       html: function sourceToHtml(source, field, hit) {
         if (!field) return this.getConverter('text')(source, field, hit);
 
-        var highlights = (hit && hit.highlight) || {};
-        var formatted = field.indexPattern.formatHit(hit);
-        var highlightPairs = [];
-        var sourcePairs = [];
+        let highlights = (hit && hit.highlight) || {};
+        let formatted = field.indexPattern.formatHit(hit);
+        let highlightPairs = [];
+        let sourcePairs = [];
 
         _.keys(formatted).forEach(function (key) {
-          var pairs = highlights[key] ? highlightPairs : sourcePairs;
-          var field = shortDotsFilter(key);
-          var val = formatted[key];
+          let pairs = highlights[key] ? highlightPairs : sourcePairs;
+          let field = shortDotsFilter(key);
+          let val = formatted[key];
           pairs.push([field, val]);
         }, []);
 
diff --git a/src/ui/public/stringify/types/String.js b/src/ui/public/stringify/types/String.js
index 1d587474046f0..291be2ba21ae0 100644
--- a/src/ui/public/stringify/types/String.js
+++ b/src/ui/public/stringify/types/String.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function _StringProvider(Private) {
-    var _ = require('lodash');
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
 
     require('ui/field_format_editor/samples/samples');
 
diff --git a/src/ui/public/stringify/types/Url.js b/src/ui/public/stringify/types/Url.js
index 0a235f6c09e94..9cb718808cb58 100644
--- a/src/ui/public/stringify/types/Url.js
+++ b/src/ui/public/stringify/types/Url.js
@@ -1,9 +1,11 @@
 define(function (require) {
   return function UrlFormatProvider(Private, highlightFilter) {
-    var _ = require('lodash');
+    let _ = require('lodash');
+
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
 
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
     require('ui/field_format_editor/pattern/pattern');
+    require('ui/stringify/icons');
 
     _.class(Url).inherits(FieldFormat);
     function Url(params) {
@@ -28,7 +30,7 @@ define(function (require) {
       template: require('ui/stringify/editors/url.html'),
       controllerAs: 'url',
       controller: function ($scope) {
-        var iconPattern = 'ui/stringify/icons/{{value}}.png';
+        let iconPattern = '/bundles/src/ui/public/stringify/icons/{{value}}.png';
 
         this.samples = {
           a: [ 'john', '/some/pathname/asset.png', 1234 ],
@@ -36,7 +38,7 @@ define(function (require) {
         };
 
         $scope.$watch('editor.formatParams.type', function (type, prev) {
-          var params = $scope.editor.formatParams;
+          let params = $scope.editor.formatParams;
           if (type === 'img' && type !== prev && !params.urlTemplate) {
             params.urlTemplate = iconPattern;
           }
@@ -57,7 +59,7 @@ define(function (require) {
     ];
 
     Url.prototype._formatUrl = function (value) {
-      var template = this.param('urlTemplate');
+      let template = this.param('urlTemplate');
       if (!template) return value;
 
       return this._compileTemplate(template)({
@@ -67,7 +69,7 @@ define(function (require) {
     };
 
     Url.prototype._formatLabel = function (value, url) {
-      var template = this.param('labelTemplate');
+      let template = this.param('labelTemplate');
       if (url == null) url = this._formatUrl(value);
       if (!template) return url;
 
@@ -83,8 +85,8 @@ define(function (require) {
       },
 
       html: function (rawValue, field, hit) {
-        var url = _.escape(this._formatUrl(rawValue));
-        var label = _.escape(this._formatLabel(rawValue, url));
+        let url = _.escape(this._formatUrl(rawValue));
+        let label = _.escape(this._formatLabel(rawValue, url));
 
         switch (this.param('type')) {
           case 'img':
@@ -100,19 +102,19 @@ define(function (require) {
     };
 
     Url.prototype._compileTemplate = function (template) {
-      var parts = template.split(Url.templateMatchRE).map(function (part, i) {
+      let parts = template.split(Url.templateMatchRE).map(function (part, i) {
         // trim all the odd bits, the variable names
         return (i % 2) ? part.trim() : part;
       });
 
       return function (locals) {
         // replace all the odd bits with their local var
-        var output = '';
-        var i = -1;
+        let output = '';
+        let i = -1;
         while (++i < parts.length) {
           if (i % 2) {
             if (locals.hasOwnProperty(parts[i])) {
-              var local = locals[parts[i]];
+              let local = locals[parts[i]];
               output += local == null ? '' : local;
             }
           } else {
diff --git a/src/ui/public/stringify/types/_Numeral.js b/src/ui/public/stringify/types/_Numeral.js
index 6c55a4616c5c3..ec99a625151c8 100644
--- a/src/ui/public/stringify/types/_Numeral.js
+++ b/src/ui/public/stringify/types/_Numeral.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function AbstractNumeralFormatProvider(Private) {
-    var _ = require('lodash');
-    var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
-    var BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
-    var numeral = require('numeral')();
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let BoundToConfigObj = Private(require('ui/bound_to_config_obj'));
+    let numeral = require('numeral')();
     require('ui/field_format_editor/numeral/numeral');
 
     _.class(Numeral).inherits(FieldFormat);
diff --git a/src/ui/public/stringify/types/truncate.js b/src/ui/public/stringify/types/truncate.js
new file mode 100644
index 0000000000000..8252cc708ddda
--- /dev/null
+++ b/src/ui/public/stringify/types/truncate.js
@@ -0,0 +1,35 @@
+define(function (require) {
+  return function TruncateFormatProvider(Private) {
+    let _ = require('lodash');
+    let FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat'));
+    let omission = '...';
+
+    _.class(Truncate).inherits(FieldFormat);
+
+    function Truncate(params) {
+      Truncate.Super.call(this, params);
+    }
+
+    Truncate.id = 'truncate';
+    Truncate.title = 'Truncated String';
+    Truncate.fieldType = ['string'];
+
+    Truncate.prototype._convert = function (val) {
+      let length = this.param('fieldLength');
+      if (length > 0) {
+        return _.trunc(val, {
+          'length': length + omission.length,
+          'omission': omission
+        });
+      }
+
+      return val;
+    };
+
+    Truncate.editor = require('ui/stringify/editors/truncate.html');
+
+    Truncate.sampleInput = [ require('ui/stringify/samples/large.html') ];
+
+    return Truncate;
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/styleCompile/__tests__/styleCompile.js b/src/ui/public/styleCompile/__tests__/styleCompile.js
index 0b51ff35c9d67..e7e77420949c9 100644
--- a/src/ui/public/styleCompile/__tests__/styleCompile.js
+++ b/src/ui/public/styleCompile/__tests__/styleCompile.js
@@ -1,10 +1,10 @@
 describe('styleCompile directive', function () {
-  var $ = require('jquery');
-  var expect = require('expect.js');
-  var ngMock = require('ngMock');
+  let $ = require('jquery');
+  let expect = require('expect.js');
+  let ngMock = require('ngMock');
 
-  var config;
-  var $rootScope;
+  let config;
+  let $rootScope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -13,7 +13,7 @@ describe('styleCompile directive', function () {
   }));
 
   it('exports a few config values as css', function () {
-    var $style = $('#style-compile');
+    let $style = $('#style-compile');
 
     config.set('truncate:maxHeight', 0);
     $rootScope.$apply();
diff --git a/src/ui/public/styleCompile/styleCompile.js b/src/ui/public/styleCompile/styleCompile.js
index f318ec8e4b7c8..9050b674b51e3 100644
--- a/src/ui/public/styleCompile/styleCompile.js
+++ b/src/ui/public/styleCompile/styleCompile.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var $style = $('<style>').appendTo('head').attr('id', 'style-compile');
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let $style = $('<style>').appendTo('head').attr('id', 'style-compile');
 
   require('ui/config');
 
   require('ui/modules')
   .get('kibana')
   .run(function ($rootScope, $compile, config) {
-    var truncateGradientHeight = 15;
-    var template = _.template(require('./styleCompile.css.tmpl'));
-    var locals = {};
+    let truncateGradientHeight = 15;
+    let template = _.template(require('./styleCompile.css.tmpl'));
+    let locals = {};
 
     // watch the value of the truncate:maxHeight config param
     $rootScope.$watch(function () {
diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
index 016c09af33c35..6dcb58bf4b151 100644
--- a/src/ui/public/styles/base.less
+++ b/src/ui/public/styles/base.less
@@ -457,3 +457,14 @@ fieldset {
     overflow-y: hidden;
   }
 }
+
+.list-group {
+  .list-group-item {
+    &.active,
+    &.active:hover,
+    &.active:focus {
+      background-color: @list-group-menu-item-active-bg;
+      cursor: default;
+    }
+  }
+}
diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less
index 4c12933cb62dc..de3269d7a8922 100644
--- a/src/ui/public/styles/dark-theme.less
+++ b/src/ui/public/styles/dark-theme.less
@@ -313,14 +313,51 @@
 
 // /src/ui/public/vislib/styles/_legend.less
   .legend-col-wrapper {
+
+    .legend-toggle {
+      &:hover {
+        color: @sidebar-hover-color;
+        background-color: @sidebar-hover-bg;
+      }
+
+      background-color: @sidebar-bg;
+    }
+
     .legend-ul {
-      li.color {
-        color: @legend-item-color;
+      border-left-color: @sidebar-bg;
+      color: @legend-item-color;
+    }
+
+  }
+
+  .legend-value {
+     &-title {
+      padding: 3px;
+
+      &:hover {
+        background-color: @sidebar-hover-bg;
+      }
+    }
+
+    &-full {
+      background-color: @sidebar-hover-bg;
+    }
+
+    &-details {
+      border-bottom: 1px solid @sidebar-bg;
+
+      .filter-button {
+        background-color: @sidebar-bg;
+
+        &:hover {
+          background-color: @sidebar-hover-bg;
+        }
       }
     }
   }
 
 
+
 // /src/ui/public/vislib/styles/_layout.less
   .y-axis-title text, .x-axis-title text {
     fill: @vis-axis-title-color;
@@ -535,5 +572,5 @@
       }
     }
   }
-
 }
+
diff --git a/src/ui/public/styles/dark-variables.less b/src/ui/public/styles/dark-variables.less
index d6762142eb07e..063d44e59f1e3 100644
--- a/src/ui/public/styles/dark-variables.less
+++ b/src/ui/public/styles/dark-variables.less
@@ -150,3 +150,8 @@
 @navbar-default-border:                       darken(@navbar-default-bg, 10%);
 
 @spinner-bg:                                  @white;
+
+@sidebar-bg:                                  @btn-default-bg;
+@sidebar-hover-bg:                            darken(@btn-default-bg, 5%);
+@sidebar-hover-color:                         @text-color;
+
diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
index 7ebe03f6b59e0..aed197898242b 100644
--- a/src/ui/public/styles/variables/bootstrap-mods.less
+++ b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -104,6 +104,8 @@
 
 //** Default background color used for all tables.
 @table-bg:                  transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:                       #f9f9f9;
 //** Background color used for `.table-hover`.
 @table-bg-hover:            @gray-lighter;
 @table-bg-active:           @table-bg-hover;
@@ -155,6 +157,8 @@
 //** Small `.form-control` border radius
 @input-border-radius-small:      @border-radius-small;
 
+//** Placeholder text color
+@input-color-placeholder:               #acb6c0;
 
 //** Default `.form-control` height
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
@@ -197,6 +201,9 @@
 //** Dropdown menu `border-color` **for IE8**.
 @dropdown-fallback-border:      @gray13;
 
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:                   #e5e5e5;
+
 //** Dropdown link text color.
 @dropdown-link-color:           @gray-dark;
 //** Hover color for dropdown links.
@@ -333,6 +340,7 @@
 @navbar-arrow-size:                7px;
 
 // Default theme
+@navbar-default-bg:                     #656A76;
 @navbar-default-color:                  @white;
 @navbar-default-border:                 darken(@navbar-default-bg, 10%);
 @navbar-default-link-color:             @gray-lighter;
@@ -356,6 +364,7 @@
 
 // Inverted navbar
 // Reset inverted navbar basics
+@navbar-inverse-link-active-bg:         #41454c;
 @navbar-inverse-color:                  @white;
 @navbar-inverse-bg:                     @gray-darker;
 @navbar-inverse-border:                 darken(@navbar-inverse-bg, 10%);
@@ -549,6 +558,8 @@
 @modal-backdrop-opacity:                .5;
 //** Modal footer border color
 @modal-footer-border-color:             @modal-header-border-color;
+//** Modal header border color
+@modal-header-border-color:             #e5e5e5;
 
 //** Padding applied to the modal body
 @modal-inner-padding:         20px;
@@ -635,6 +646,9 @@
 //** Background color of disabled list items
 @list-group-disabled-bg:                @gray-lighter;
 //** Text color for content within disabled list items
+//** Background color of single list items on hover
+@list-group-hover-bg:                   #f5f5f5;
+
 @list-group-disabled-text-color:        @list-group-disabled-color;
 @list-group-link-color:                 @gray5;
 @list-group-link-hover-color:           @list-group-link-color;
@@ -665,10 +679,12 @@
 @panel-danger-text:                     @state-danger-text;
 @panel-danger-border:                   @state-danger-border;
 @panel-danger-heading-bg:               @state-danger-bg;
-@panel-body-padding:          15px;
-@panel-heading-padding:       10px 15px;
-@panel-footer-padding:        @panel-heading-padding;
-@panel-border-radius:         @border-radius-base;
+@panel-body-padding:                    15px;
+@panel-heading-padding:                 10px 15px;
+@panel-footer-padding:                  @panel-heading-padding;
+@panel-border-radius:                   @border-radius-base;
+@panel-footer-bg:                       #f5f5f5;
+@panel-default-heading-bg:              #f5f5f5;
 
 
 //== Thumbnails
@@ -748,21 +764,23 @@
 //
 //##
 
-@close-color:                 @black;
-@close-font-weight:           bold;
-@close-text-shadow:           none;
+@close-color:                           @black;
+@close-font-weight:                     bold;
+@close-text-shadow:                     none;
 
 
 //== Code
 //
 //##
 
+@code-color:                            #c7254e;
+@code-bg:                               #f9f2f4;
 @kbd-color:                             @white;
 @kbd-bg:                                @gray3;
 @pre-bg:                                @gray-lighter;
 @pre-color:                             @gray-dark;
 @pre-border-color:                      @gray12;
-@pre-scrollable-max-height:   340px;
+@pre-scrollable-max-height:             340px;
 
 
 //== Type
diff --git a/src/ui/public/styles/variables/colors.less b/src/ui/public/styles/variables/colors.less
index 609ee38e7f2f8..7e9f97dc75173 100644
--- a/src/ui/public/styles/variables/colors.less
+++ b/src/ui/public/styles/variables/colors.less
@@ -26,45 +26,11 @@
 @gray-light:                            #b4bcc2;
 @gray-lighter:                          #ecf0f1;
 
+@esGreen:                               #94C63D;
+@esGreen2:                              darken(@esGreen, 25%);
+
 @brand-primary:                         @gray4;
 @brand-success:                         #31C471;
 @brand-info:                            #1F6B7A;
 @brand-warning:                         #F39C12;
 @brand-danger:                          #E74C3C;
-
-//== Tables
-//** Background color used for `.table-striped`.
-@table-bg-accent:                       #f9f9f9;
-
-//== Forms
-//** Placeholder text color
-@input-color-placeholder:               #acb6c0;
-
-//== Dropdowns
-//** Divider color for between dropdown items.
-@dropdown-divider-bg:                   #e5e5e5;
-
-
-//== Navbar
-// Default theme
-@navbar-default-bg:                     #656A76;
-// Inverted navbar links
-@navbar-inverse-link-active-bg:         #41454c;
-
-
-//== Modals
-//** Modal header border color
-@modal-header-border-color:             #e5e5e5;
-
-//== List group
-//** Background color of single list items on hover
-@list-group-hover-bg:                   #f5f5f5;
-
-
-//== Panels
-@panel-footer-bg:                       #f5f5f5;
-@panel-default-heading-bg:              #f5f5f5;
-
-//== Code
-@code-color:                            #c7254e;
-@code-bg:                               #f9f2f4;
diff --git a/src/ui/public/template_vis_type/TemplateRenderbot.js b/src/ui/public/template_vis_type/TemplateRenderbot.js
index 104036a37d696..bbc04bc05a7ba 100644
--- a/src/ui/public/template_vis_type/TemplateRenderbot.js
+++ b/src/ui/public/template_vis_type/TemplateRenderbot.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function TemplateRenderbotFactory(Private, $compile, $rootScope) {
-    var _ = require('lodash');
-    var Renderbot = Private(require('ui/Vis/Renderbot'));
+    let _ = require('lodash');
+    let Renderbot = Private(require('ui/Vis/Renderbot'));
 
     _.class(TemplateRenderbot).inherits(Renderbot);
-    function TemplateRenderbot(vis, $el) {
-      TemplateRenderbot.Super.call(this, vis, $el);
+    function TemplateRenderbot(vis, $el, uiState) {
+      TemplateRenderbot.Super.call(this, vis, $el, uiState);
 
       this.$scope = $rootScope.$new();
       this.$scope.vis = vis;
diff --git a/src/ui/public/template_vis_type/TemplateVisType.js b/src/ui/public/template_vis_type/TemplateVisType.js
index d4419d2eba969..2d482c16e1359 100644
--- a/src/ui/public/template_vis_type/TemplateVisType.js
+++ b/src/ui/public/template_vis_type/TemplateVisType.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function TemplateVisTypeFactory(Private) {
-    var _ = require('lodash');
-    var VisType = Private(require('ui/Vis/VisType'));
-    var TemplateRenderbot = Private(require('ui/template_vis_type/TemplateRenderbot'));
+    let _ = require('lodash');
+    let VisType = Private(require('ui/Vis/VisType'));
+    let TemplateRenderbot = Private(require('ui/template_vis_type/TemplateRenderbot'));
 
     _.class(TemplateVisType).inherits(VisType);
     function TemplateVisType(opts) {
@@ -14,8 +14,8 @@ define(function (require) {
       }
     }
 
-    TemplateVisType.prototype.createRenderbot = function (vis, $el) {
-      return new TemplateRenderbot(vis, $el);
+    TemplateVisType.prototype.createRenderbot = function (vis, $el, uiState) {
+      return new TemplateRenderbot(vis, $el, uiState);
     };
 
     return TemplateVisType;
diff --git a/src/ui/public/testHarness/testHarness.js b/src/ui/public/testHarness/testHarness.js
index de49194825b19..dbbd77b153cec 100644
--- a/src/ui/public/testHarness/testHarness.js
+++ b/src/ui/public/testHarness/testHarness.js
@@ -1,15 +1,15 @@
 /* global mocha */
 
 // chrome expects to be loaded first, let it get its way
-var chrome = require('ui/chrome');
+let chrome = require('ui/chrome');
 
-var Nonsense = require('Nonsense');
-var sinon = require('sinon');
-var $ = require('jquery');
-var _ = require('lodash');
-var parse = require('url').parse;
+let Nonsense = require('Nonsense');
+let sinon = require('sinon');
+let $ = require('jquery');
+let _ = require('lodash');
+let parse = require('url').parse;
 
-var StackTraceMapper = require('ui/StackTraceMapper');
+let StackTraceMapper = require('ui/StackTraceMapper');
 
 /*** the vislib tests have certain style requirements, so lets make sure they are met ***/
 $('body').attr('id', 'test-harness-body'); // so we can make high priority selectors
@@ -17,8 +17,8 @@ require('./testHarness.less');
 
 
 /*** Setup seeded random ***/
-var seedInput = parse(window.location.href, true).query.seed;
-var seed = _.add(seedInput, 0) || Date.now();
+let seedInput = parse(window.location.href, true).query.seed;
+let seed = _.add(seedInput, 0) || Date.now();
 Math.random = _.bindKey(new Nonsense(seed), 'frac');
 Math.random.nonsense = new Nonsense(seed);
 console.log('Random-ness seed: ' + seed);
@@ -37,8 +37,8 @@ before(function () {
   // before the tests start, load the sourcemap and hook into error generation for the mocha reporter
   this.timeout(30000);
 
-  var mapper;
-  var Runner = window.Mocha.Runner;
+  let mapper;
+  let Runner = window.Mocha.Runner;
 
   Runner.prototype.emit = _.wrap(Runner.prototype.emit, function (emit, event, test, err) {
     if (err && mapper) err = mapper.mapError(err);
diff --git a/src/ui/public/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js
index a511540a743da..1aa7391077b5d 100644
--- a/src/ui/public/time_buckets/calc_auto_interval.js
+++ b/src/ui/public/time_buckets/calc_auto_interval.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function DateIntervalRoundingRulesProvider() {
-    var moment = require('moment');
+    let moment = require('moment');
     // these are the rounding rules used by roundInterval()
-    var d = require('moment').duration;
+    let d = require('moment').duration;
 
-    var roundingRules = [
+    let roundingRules = [
       [ d(500, 'ms'), d(100, 'ms') ],
       [ d(5, 'second'), d(1, 'second') ],
       [ d(7.5, 'second'), d(5, 'second') ],
@@ -23,16 +23,16 @@ define(function (require) {
       [ Infinity, d(1, 'year') ]
     ];
 
-    var revRoundingRules = roundingRules.slice(0).reverse();
+    let revRoundingRules = roundingRules.slice(0).reverse();
 
     function find(rules, check, last) {
       function pick(buckets, duration) {
-        var target = duration / buckets;
-        var lastResp;
+        let target = duration / buckets;
+        let lastResp;
 
-        for (var i = 0; i < rules.length; i++) {
-          var rule = rules[i];
-          var resp = check(rule[0], rule[1], target);
+        for (let i = 0; i < rules.length; i++) {
+          let rule = rules[i];
+          let resp = check(rule[0], rule[1], target);
 
           if (resp == null) {
             if (!last) continue;
@@ -45,12 +45,12 @@ define(function (require) {
         }
 
         // fallback to just a number of milliseconds, ensure ms is >= 1
-        var ms = Math.max(Math.floor(target), 1);
+        let ms = Math.max(Math.floor(target), 1);
         return moment.duration(ms, 'ms');
       }
 
       return function (buckets, duration) {
-        var interval = pick(buckets, duration);
+        let interval = pick(buckets, duration);
         if (interval) return moment.duration(interval._data);
       };
     }
diff --git a/src/ui/public/time_buckets/calc_es_interval.js b/src/ui/public/time_buckets/calc_es_interval.js
index 5f19f05d4da5b..8db9c4cd8fb5e 100644
--- a/src/ui/public/time_buckets/calc_es_interval.js
+++ b/src/ui/public/time_buckets/calc_es_interval.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function () {
-    var moment = require('moment');
-    var dateMath = require('ui/utils/dateMath');
+    let moment = require('moment');
+    let dateMath = require('ui/utils/dateMath');
 
-    var unitsDesc = dateMath.unitsDesc;
-    var largeMax = unitsDesc.indexOf('M');
+    let unitsDesc = dateMath.unitsDesc;
+    let largeMax = unitsDesc.indexOf('M');
 
     /**
      * Convert a moment.duration into an es
@@ -15,9 +15,9 @@ define(function (require) {
      * @return {object}
      */
     function esDuration(duration) {
-      for (var i = 0; i < unitsDesc.length; i++) {
-        var unit = unitsDesc[i];
-        var val = duration.as(unit);
+      for (let i = 0; i < unitsDesc.length; i++) {
+        let unit = unitsDesc[i];
+        let val = duration.as(unit);
         // find a unit that rounds neatly
         if (val >= 1 && Math.floor(val) === val) {
 
@@ -36,7 +36,7 @@ define(function (require) {
         }
       }
 
-      var ms = duration.as('ms');
+      let ms = duration.as('ms');
       return {
         value: ms,
         unit: 'ms',
diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js
index 1d2449d84a910..50c6e1480eee6 100644
--- a/src/ui/public/time_buckets/time_buckets.js
+++ b/src/ui/public/time_buckets/time_buckets.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function IntervalHelperProvider(Private, timefilter, config) {
-    var _ = require('lodash');
-    var moment = require('moment');
+    let _ = require('lodash');
+    let moment = require('moment');
 
-    var dateMath = require('ui/utils/dateMath');
-    var parseInterval = require('ui/utils/parse_interval');
-    var calcAuto = Private(require('ui/time_buckets/calc_auto_interval'));
-    var calcEsInterval = Private(require('ui/time_buckets/calc_es_interval'));
-    var tzOffset = moment().format('Z');
+    let dateMath = require('ui/utils/dateMath');
+    let parseInterval = require('ui/utils/parse_interval');
+    let calcAuto = Private(require('ui/time_buckets/calc_auto_interval'));
+    let calcEsInterval = Private(require('ui/time_buckets/calc_es_interval'));
+    let tzOffset = moment().format('Z');
 
     function isValidMoment(m) {
       return m && ('isValid' in m) && m.isValid();
@@ -42,7 +42,7 @@ define(function (require) {
     TimeBuckets.prototype.setBounds = function (input) {
       if (!input) return this.clearBounds();
 
-      var bounds;
+      let bounds;
       if (_.isPlainObject(input)) {
         // accept the response from timefilter.getActiveBounds()
         bounds = [input.min, input.max];
@@ -50,11 +50,11 @@ define(function (require) {
         bounds = _.isArray(input) ? input : [];
       }
 
-      var moments = _(bounds)
+      let moments = _(bounds)
       .map(_.ary(moment, 1))
       .sortBy(Number);
 
-      var valid = moments.size() === 2 && moments.every(isValidMoment);
+      let valid = moments.size() === 2 && moments.every(isValidMoment);
       if (!valid) {
         this.clearBounds();
         throw new Error('invalid bounds set: ' + input);
@@ -88,9 +88,9 @@ define(function (require) {
     /**
      * Return the current bounds, if we have any.
      *
-     * THIS DOES NOT CLONE THE BOUNDS, so editting them
+     * THIS DOES NOT CLONE THE BOUNDS, so editing them
      * may have unexpected side-effects. Always
-     * call bounds.min.clone() before editting
+     * call bounds.min.clone() before editing
      *
      * @return {object|undefined} - If bounds are not defined, this
      *                      returns undefined, else it returns the bounds
@@ -132,7 +132,7 @@ define(function (require) {
      * @param {object|string|moment.duration} input - see desc
      */
     TimeBuckets.prototype.setInterval = function (input) {
-      var interval = input;
+      let interval = input;
 
       // selection object -> val
       if (_.isObject(input)) {
@@ -196,13 +196,13 @@ define(function (require) {
      * @return {[type]} [description]
      */
     TimeBuckets.prototype.getInterval = function () {
-      var self = this;
-      var duration = self.getDuration();
+      let self = this;
+      let duration = self.getDuration();
       return decorateInterval(maybeScaleInterval(readInterval()));
 
       // either pull the interval from state or calculate the auto-interval
       function readInterval() {
-        var interval = self._i;
+        let interval = self._i;
         if (moment.isDuration(interval)) return interval;
         return calcAuto.near(config.get('histogram:barTarget'), duration);
       }
@@ -211,9 +211,9 @@ define(function (require) {
       function maybeScaleInterval(interval) {
         if (!self.hasBounds()) return interval;
 
-        var maxLength = config.get('histogram:maxBars');
-        var approxLen = duration / interval;
-        var scaled;
+        let maxLength = config.get('histogram:maxBars');
+        let approxLen = duration / interval;
+        let scaled;
 
         if (approxLen > maxLength) {
           scaled = calcAuto.lessThan(maxLength, duration);
@@ -233,13 +233,13 @@ define(function (require) {
 
       // append some TimeBuckets specific props to the interval
       function decorateInterval(interval) {
-        var esInterval = calcEsInterval(interval);
+        let esInterval = calcEsInterval(interval);
         interval.esValue = esInterval.value;
         interval.esUnit = esInterval.unit;
         interval.expression = esInterval.expression;
         interval.overflow = duration > interval ? moment.duration(interval - duration) : false;
 
-        var prettyUnits = moment.normalizeUnits(esInterval.unit);
+        let prettyUnits = moment.normalizeUnits(esInterval.unit);
         if (esInterval.value === 1) {
           interval.description = prettyUnits;
         } else {
@@ -262,11 +262,11 @@ define(function (require) {
      * @return {string}
      */
     TimeBuckets.prototype.getScaledDateFormat = function () {
-      var interval = this.getInterval();
-      var rules = config.get('dateFormat:scaled');
+      let interval = this.getInterval();
+      let rules = config.get('dateFormat:scaled');
 
-      for (var i = rules.length - 1; i >= 0; i--) {
-        var rule = rules[i];
+      for (let i = rules.length - 1; i >= 0; i--) {
+        let rule = rules[i];
         if (!rule[0] || interval >= moment.duration(rule[0])) {
           return rule[1];
         }
@@ -277,23 +277,23 @@ define(function (require) {
 
 
     TimeBuckets.__cached__ = function (self) {
-      var cache = {};
-      var sameMoment = same(moment.isMoment);
-      var sameDuration = same(moment.isDuration);
+      let cache = {};
+      let sameMoment = same(moment.isMoment);
+      let sameDuration = same(moment.isDuration);
 
-      var desc = {
+      let desc = {
         __cached__: {
           value: self
         },
       };
 
-      var breakers = {
+      let breakers = {
         setBounds: 'bounds',
         clearBounds: 'bounds',
         setInterval: 'interval'
       };
 
-      var resources = {
+      let resources = {
         bounds: {
           setup: function () {
             return [self._lb, self._ub];
@@ -325,16 +325,16 @@ define(function (require) {
       }
 
       function cacheBreaker(prop) {
-        var resource = resources[breakers[prop]];
-        var setup = resource.setup;
-        var changes = resource.changes;
-        var deps = resource.deps;
-        var fn = self[prop];
+        let resource = resources[breakers[prop]];
+        let setup = resource.setup;
+        let changes = resource.changes;
+        let deps = resource.deps;
+        let fn = self[prop];
 
         return {
           value: function cacheBreaker(input) {
-            var prev = setup.call(self);
-            var ret = fn.apply(self, arguments);
+            let prev = setup.call(self);
+            let ret = fn.apply(self, arguments);
 
             if (changes.call(self, prev)) {
               cache = {};
diff --git a/src/ui/public/timefilter/__tests__/diff_interval.js b/src/ui/public/timefilter/__tests__/diff_interval.js
index 19bfad1bde475..9aeff5890ba09 100644
--- a/src/ui/public/timefilter/__tests__/diff_interval.js
+++ b/src/ui/public/timefilter/__tests__/diff_interval.js
@@ -1,14 +1,14 @@
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Timefilter service', function () {
   describe('Refresh interval diff watcher', function () {
 
-    var fn;
-    var update;
-    var fetch;
-    var timefilter;
+    let fn;
+    let update;
+    let fetch;
+    let timefilter;
 
     beforeEach(ngMock.module('kibana'));
 
diff --git a/src/ui/public/timefilter/__tests__/diff_time.js b/src/ui/public/timefilter/__tests__/diff_time.js
index 6c2e1ad35b455..b4ffce4ddd365 100644
--- a/src/ui/public/timefilter/__tests__/diff_time.js
+++ b/src/ui/public/timefilter/__tests__/diff_time.js
@@ -1,13 +1,13 @@
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Timefilter service', function () {
   describe('time diff watcher', function () {
-    var fn;
-    var update;
-    var fetch;
-    var timefilter;
+    let fn;
+    let update;
+    let fetch;
+    let timefilter;
 
     beforeEach(ngMock.module('kibana'));
 
diff --git a/src/ui/public/timefilter/__tests__/index.js b/src/ui/public/timefilter/__tests__/index.js
index e0a348b4475eb..0582f9daa016f 100644
--- a/src/ui/public/timefilter/__tests__/index.js
+++ b/src/ui/public/timefilter/__tests__/index.js
@@ -1,4 +1,4 @@
-var modules = require('ui/modules');
+let modules = require('ui/modules');
 
 modules.get('kibana').config(function ($provide) {
   $provide.decorator('timefilter', function ($delegate) {
diff --git a/src/ui/public/timefilter/lib/diff_interval.js b/src/ui/public/timefilter/lib/diff_interval.js
index f345066d7a4a3..e52157fcb776f 100644
--- a/src/ui/public/timefilter/lib/diff_interval.js
+++ b/src/ui/public/timefilter/lib/diff_interval.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function diffTimeProvider(Private) {
-    var diff = Private(require('ui/utils/diff_time_picker_vals'));
+    let diff = Private(require('ui/utils/diff_time_picker_vals'));
 
     return function (self) {
-      var oldRefreshInterval = _.clone(self.refreshInterval);
+      let oldRefreshInterval = _.clone(self.refreshInterval);
 
       return function () {
         if (diff(self.refreshInterval, oldRefreshInterval)) {
diff --git a/src/ui/public/timefilter/lib/diff_time.js b/src/ui/public/timefilter/lib/diff_time.js
index 4dd2cbb2d211e..97c208a7e06d0 100644
--- a/src/ui/public/timefilter/lib/diff_time.js
+++ b/src/ui/public/timefilter/lib/diff_time.js
@@ -1,10 +1,10 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function diffTimeProvider(Private) {
-    var diff = Private(require('ui/utils/diff_time_picker_vals'));
+    let diff = Private(require('ui/utils/diff_time_picker_vals'));
 
     return function (self) {
-      var oldTime = _.clone(self.time);
+      let oldTime = _.clone(self.time);
       return function () {
         if (diff(self.time, oldTime)) {
           self.emit('update');
diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
index cc81cf813daca..795660dadcc69 100644
--- a/src/ui/public/timefilter/timefilter.js
+++ b/src/ui/public/timefilter/timefilter.js
@@ -8,17 +8,17 @@ define(function (require) {
   .get('kibana')
   .service('timefilter', function (Private, globalState, $rootScope, config) {
 
-    var _ = require('lodash');
-    var angular = require('angular');
-    var moment = require('moment');
-    var dateMath = require('ui/utils/dateMath');
-    var Events = Private(require('ui/events'));
-    var diff = Private(require('ui/utils/diff_time_picker_vals'));
+    let _ = require('lodash');
+    let angular = require('angular');
+    let moment = require('moment');
+    let dateMath = require('ui/utils/dateMath');
+    let Events = Private(require('ui/events'));
+    let diff = Private(require('ui/utils/diff_time_picker_vals'));
 
     require('ui/state_management/global_state');
 
     function convertISO8601(stringTime) {
-      var obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
+      let obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
       return obj.isValid() ? obj : stringTime;
     }
 
@@ -26,9 +26,9 @@ define(function (require) {
     function Timefilter() {
       Timefilter.Super.call(this);
 
-      var self = this;
-      var diffTime = Private(require('ui/timefilter/lib/diff_time'))(self);
-      var diffInterval = Private(require('ui/timefilter/lib/diff_interval'))(self);
+      let self = this;
+      let diffTime = Private(require('ui/timefilter/lib/diff_time'))(self);
+      let diffInterval = Private(require('ui/timefilter/lib/diff_interval'))(self);
 
       self.enabled = false;
 
@@ -38,8 +38,8 @@ define(function (require) {
       });
 
       self.consumeDefaults = _.once(function () {
-        var timeDefaults = config.get('timepicker:timeDefaults');
-        var refreshIntervalDefaults = config.get('timepicker:refreshIntervalDefaults');
+        let timeDefaults = config.get('timepicker:timeDefaults');
+        let refreshIntervalDefaults = config.get('timepicker:refreshIntervalDefaults');
 
         // These can be date math strings or moments.
         self.time = _.defaults(globalState.time || {}, timeDefaults);
@@ -47,8 +47,8 @@ define(function (require) {
 
         globalState.on('fetch_with_changes', function () {
           // clone and default to {} in one
-          var newTime = _.defaults({}, globalState.time, timeDefaults);
-          var newRefreshInterval = _.defaults({}, globalState.refreshInterval, refreshIntervalDefaults);
+          let newTime = _.defaults({}, globalState.time, timeDefaults);
+          let newRefreshInterval = _.defaults({}, globalState.refreshInterval, refreshIntervalDefaults);
 
           if (newTime) {
             if (newTime.to) newTime.to = convertISO8601(newTime.to);
@@ -77,11 +77,11 @@ define(function (require) {
     }
 
     Timefilter.prototype.get = function (indexPattern) {
-      var filter;
-      var timefield = indexPattern.timeFieldName && _.find(indexPattern.fields, {name: indexPattern.timeFieldName});
+      let filter;
+      let timefield = indexPattern.timeFieldName && _.find(indexPattern.fields, {name: indexPattern.timeFieldName});
 
       if (timefield) {
-        var bounds = this.getBounds();
+        let bounds = this.getBounds();
         filter = {range : {}};
         filter.range[timefield.name] = {
           gte: bounds.min.valueOf(),
diff --git a/src/ui/public/timepicker/quick_ranges.js b/src/ui/public/timepicker/quick_ranges.js
index d9c57ebeb5fb6..c8ae493ef906a 100644
--- a/src/ui/public/timepicker/quick_ranges.js
+++ b/src/ui/public/timepicker/quick_ranges.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.constant('quickRanges', [
     { from: 'now/d',    to: 'now/d',    display: 'Today',                 section: 0 },
diff --git a/src/ui/public/timepicker/refresh_intervals.js b/src/ui/public/timepicker/refresh_intervals.js
index baf4ec0d4fbd6..5f951e7ab27b2 100644
--- a/src/ui/public/timepicker/refresh_intervals.js
+++ b/src/ui/public/timepicker/refresh_intervals.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.constant('refreshIntervals', [
     { value : 0, display: 'Off', section: 0},
diff --git a/src/ui/public/timepicker/time_units.js b/src/ui/public/timepicker/time_units.js
index c1de68e5d2d73..9e1cac99924b0 100644
--- a/src/ui/public/timepicker/time_units.js
+++ b/src/ui/public/timepicker/time_units.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var module = require('ui/modules').get('kibana');
+  let module = require('ui/modules').get('kibana');
 
   module.constant('timeUnits', {
     s: 'second',
diff --git a/src/ui/public/timepicker/timepicker.js b/src/ui/public/timepicker/timepicker.js
index 15a5ebe6b03db..611ef2dfc2b25 100644
--- a/src/ui/public/timepicker/timepicker.js
+++ b/src/ui/public/timepicker/timepicker.js
@@ -1,15 +1,16 @@
 define(function (require) {
-  var html = require('ui/timepicker/timepicker.html');
-  var module = require('ui/modules').get('ui/timepicker');
-  var _ = require('lodash');
-  var dateMath = require('ui/utils/dateMath');
-  var moment = require('moment');
+  let html = require('ui/timepicker/timepicker.html');
+  let module = require('ui/modules').get('ui/timepicker');
+  let _ = require('lodash');
+  let dateMath = require('ui/utils/dateMath');
+  let moment = require('moment');
 
   require('ui/directives/input_datetime');
   require('ui/directives/inequality');
   require('ui/timepicker/quick_ranges');
   require('ui/timepicker/refresh_intervals');
   require('ui/timepicker/time_units');
+  require('ui/timepicker/toggle');
 
   module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshIntervals) {
     return {
@@ -23,7 +24,7 @@ define(function (require) {
       },
       template: html,
       controller: function ($scope) {
-        var init = function () {
+        let init = function () {
           $scope.setMode($scope.mode);
         };
 
@@ -73,8 +74,8 @@ define(function (require) {
             case 'quick':
               break;
             case 'relative':
-              var fromParts = $scope.from.toString().split('-');
-              var relativeParts = [];
+              let fromParts = $scope.from.toString().split('-');
+              let relativeParts = [];
 
               // Try to parse the relative time, if we can't use moment duration to guestimate
               if ($scope.to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
@@ -84,11 +85,11 @@ define(function (require) {
                 $scope.relative.count = parseInt(relativeParts[1], 10);
                 $scope.relative.unit = relativeParts[2];
               } else {
-                var duration = moment.duration(moment().diff(dateMath.parse($scope.from)));
-                var units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
+                let duration = moment.duration(moment().diff(dateMath.parse($scope.from)));
+                let units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
                 if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
-                for (var i = 0; i < units.length; i++) {
-                  var as = duration.as(units[i]);
+                for (let i = 0; i < units.length; i++) {
+                  let as = duration.as(units[i]);
                   if (as > 1) {
                     $scope.relative.count = Math.round(as);
                     $scope.relative.unit = units[i];
@@ -120,7 +121,7 @@ define(function (require) {
         };
 
         $scope.formatRelative = function () {
-          var parsed = dateMath.parse(getRelativeString());
+          let parsed = dateMath.parse(getRelativeString());
           $scope.relative.preview =  parsed ? parsed.format($scope.format) : undefined;
           return parsed;
         };
diff --git a/src/ui/public/timepicker/toggle.html b/src/ui/public/timepicker/toggle.html
new file mode 100644
index 0000000000000..6c4b59b6f6ece
--- /dev/null
+++ b/src/ui/public/timepicker/toggle.html
@@ -0,0 +1,33 @@
+<ul ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
+  <li>
+    <a
+      ng-click="toggleRefresh()"
+      ng-show="timefilter.refreshInterval.value > 0">
+
+      <i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
+    </a>
+  </li>
+
+  <li
+    ng-class="{active: pickerTemplate.is('interval') }"
+    ng-show="timefilter.refreshInterval.value > 0 || !!pickerTemplate.current"
+    class="to-body">
+
+    <a ng-click="pickerTemplate.toggle('interval')" class="navbar-timepicker-auto-refresh-desc">
+      <span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
+      <span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
+    </a>
+
+  </li>
+
+  <li class="to-body" ng-class="{active: pickerTemplate.is('filter')}">
+    <a
+      ng-click="pickerTemplate.toggle('filter')"
+      aria-haspopup="true"
+      aria-expanded="false"
+      class="navbar-timepicker-time-desc">
+      <i aria-hidden="true" class="fa fa-clock-o"></i>
+      <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
+    </a>
+  </li>
+</ul>
diff --git a/src/ui/public/timepicker/toggle.js b/src/ui/public/timepicker/toggle.js
new file mode 100644
index 0000000000000..2b9bf03fdc6be
--- /dev/null
+++ b/src/ui/public/timepicker/toggle.js
@@ -0,0 +1,16 @@
+import UiModules from 'ui/modules';
+import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
+
+import toggleHtml from './toggle.html';
+
+// TODO: the chrome-context directive is currently responsible for several variables
+// on scope used by this template. We need to get rid of that directive and move that
+// logic here
+
+chromeNavControlsRegistry.register(function () {
+  return {
+    name: 'timepicker toggle',
+    order: 100,
+    template: toggleHtml
+  };
+});
diff --git a/src/ui/public/tooltip/tooltip.js b/src/ui/public/tooltip/tooltip.js
index 058239f396fec..9ac91a5c361e1 100644
--- a/src/ui/public/tooltip/tooltip.js
+++ b/src/ui/public/tooltip/tooltip.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var html = require('ui/tooltip/tooltip.html');
+  let html = require('ui/tooltip/tooltip.html');
 
   require('ui-bootstrap')
   .config(function ($tooltipProvider) {
diff --git a/src/ui/public/typeahead/_input.js b/src/ui/public/typeahead/_input.js
index 809893c6481a2..004676b215dc4 100644
--- a/src/ui/public/typeahead/_input.js
+++ b/src/ui/public/typeahead/_input.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var typeahead = require('ui/modules').get('kibana/typeahead');
+  let _ = require('lodash');
+  let typeahead = require('ui/modules').get('kibana/typeahead');
 
   require('ui/notify/directives');
 
@@ -11,8 +11,8 @@ define(function (require) {
       require: ['^ngModel', '^kbnTypeahead'],
 
       link: function ($scope, $el, $attr, deps) {
-        var model = deps[0];
-        var typeaheadCtrl = deps[1];
+        let model = deps[0];
+        let typeaheadCtrl = deps[1];
 
         typeaheadCtrl.setInputModel(model);
 
diff --git a/src/ui/public/typeahead/_items.js b/src/ui/public/typeahead/_items.js
index 1445fe344fdd0..be7ea1960be78 100644
--- a/src/ui/public/typeahead/_items.js
+++ b/src/ui/public/typeahead/_items.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var typeahead = require('ui/modules').get('kibana/typeahead');
-  var listTemplate = require('ui/typeahead/partials/typeahead-items.html');
+  let _ = require('lodash');
+  let typeahead = require('ui/modules').get('kibana/typeahead');
+  let listTemplate = require('ui/typeahead/partials/typeahead-items.html');
 
   require('ui/notify/directives');
 
diff --git a/src/ui/public/typeahead/typeahead.js b/src/ui/public/typeahead/typeahead.js
index 48c65279ab8ec..4a7eca749f228 100644
--- a/src/ui/public/typeahead/typeahead.js
+++ b/src/ui/public/typeahead/typeahead.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var _ = require('lodash');
-  var typeahead = require('ui/modules').get('kibana/typeahead');
+  let _ = require('lodash');
+  let typeahead = require('ui/modules').get('kibana/typeahead');
 
   require('ui/typeahead/typeahead.less');
   require('ui/typeahead/_input');
   require('ui/typeahead/_items');
 
   typeahead.directive('kbnTypeahead', function () {
-    var keyMap = {
+    let keyMap = {
       ESC: 27,
       UP: 38,
       DOWN: 40,
@@ -23,7 +23,7 @@ define(function (require) {
       controllerAs: 'typeahead',
 
       controller: function ($scope, $element, $timeout, PersistedLog, config) {
-        var self = this;
+        let self = this;
         self.form = $element.closest('form');
         self.query = '';
         self.hidden = true;
@@ -76,7 +76,7 @@ define(function (require) {
         };
 
         self.activateNext = function () {
-          var index = self.getActiveIndex();
+          let index = self.getActiveIndex();
           if (index == null) {
             index = 0;
           } else if (index < $scope.filteredItems.length - 1) {
@@ -87,7 +87,7 @@ define(function (require) {
         };
 
         self.activatePrev = function () {
-          var index = self.getActiveIndex();
+          let index = self.getActiveIndex();
 
           if (index > 0 && index != null) {
             --index;
@@ -138,7 +138,7 @@ define(function (require) {
         };
 
         self.keypressHandler = function (ev) {
-          var keyCode = ev.which || ev.keyCode;
+          let keyCode = ev.which || ev.keyCode;
 
           if (self.focused) {
             self.hidden = false;
@@ -194,11 +194,11 @@ define(function (require) {
           }
 
           // update the filteredItems using the query
-          var beginningMatches = $scope.items.filter(function (item) {
+          let beginningMatches = $scope.items.filter(function (item) {
             return item.indexOf(query) === 0;
           });
 
-          var otherMatches = $scope.items.filter(function (item) {
+          let otherMatches = $scope.items.filter(function (item) {
             return item.indexOf(query) > 0;
           });
 
diff --git a/src/ui/public/url/__tests__/url.js b/src/ui/public/url/__tests__/url.js
index 321bb94718401..bac0d05773764 100644
--- a/src/ui/public/url/__tests__/url.js
+++ b/src/ui/public/url/__tests__/url.js
@@ -1,18 +1,18 @@
 
-var sinon = require('auto-release-sinon');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var faker = require('faker');
-var _ = require('lodash');
-var MockState = require('fixtures/mock_state');
+let sinon = require('auto-release-sinon');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let faker = require('faker');
+let _ = require('lodash');
+let MockState = require('fixtures/mock_state');
 
 // global vars, injected and mocked in init()
-var kbnUrl;
-var $route;
-var $location;
-var $rootScope;
-var globalStateMock;
-var appState;
+let kbnUrl;
+let $route;
+let $location;
+let $rootScope;
+let globalStateMock;
+let appState;
 
 require('ui/url');
 
@@ -81,7 +81,7 @@ describe('kbnUrl', function () {
         }
       };
 
-      var unbind = sinon.stub();
+      let unbind = sinon.stub();
       sinon.stub($rootScope, '$on').returns(unbind);
       $route.reload = sinon.stub();
 
@@ -89,7 +89,7 @@ describe('kbnUrl', function () {
       kbnUrl.change('/url');
       expect($rootScope.$on.callCount).to.be(1);
 
-      var handler = $rootScope.$on.firstCall.args[1];
+      let handler = $rootScope.$on.firstCall.args[1];
       handler();
       expect(unbind.callCount).to.be(1);
       expect($route.reload.callCount).to.be(1);
@@ -151,9 +151,9 @@ describe('kbnUrl', function () {
     });
 
     it('should uri encode replaced params', function () {
-      var url = '/some/path/';
-      var params = { replace: faker.Lorem.words(3).join(' ') };
-      var check = encodeURIComponent(params.replace);
+      let url = '/some/path/';
+      let params = { replace: faker.Lorem.words(3).join(' ') };
+      let check = encodeURIComponent(params.replace);
       sinon.stub($location, 'url');
 
       kbnUrl.change(url + '{{replace}}', params);
@@ -163,22 +163,22 @@ describe('kbnUrl', function () {
 
     it('should parse angular expression in substitutions and uri encode the results', function () {
       // build url by piecing together these parts
-      var urlParts = ['/', '/', '?', '&', '#'];
+      let urlParts = ['/', '/', '?', '&', '#'];
       // make sure it can parse templates with weird spacing
-      var wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
+      let wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
       // make sure filters are evaluated via angular expressions
-      var objIndex = 4; // used to case one replace as an object
-      var filters = ['', 'uppercase', '', 'uppercase', 'rison'];
+      let objIndex = 4; // used to case one replace as an object
+      let filters = ['', 'uppercase', '', 'uppercase', 'rison'];
 
       // the words (template keys) used must all be unique
-      var words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
+      let words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
         if (filters[i].length) {
           return word + '|' + filters[i];
         }
         return word;
       });
 
-      var replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
+      let replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
         // make selected replacement into an object
         if (i === objIndex) {
           return { replace: word };
@@ -188,19 +188,19 @@ describe('kbnUrl', function () {
       });
 
       // build the url and test url
-      var url = '';
-      var testUrl = '';
+      let url = '';
+      let testUrl = '';
       urlParts.forEach(function (part, i) {
         url += part + wrappers[i][0] + words[i] + wrappers[i][1];
-        var locals = {};
+        let locals = {};
         locals[words[i].split('|')[0]] = replacements[i];
         testUrl += part + encodeURIComponent($rootScope.$eval(words[i], locals));
       });
 
       // create the locals replacement object
-      var params = {};
+      let params = {};
       replacements.forEach(function (replacement, i) {
-        var word = words[i].split('|')[0];
+        let word = words[i].split('|')[0];
         params[word] = replacement;
       });
 
@@ -213,7 +213,7 @@ describe('kbnUrl', function () {
     });
 
     it('should handle dot notation', function () {
-      var url = '/some/thing/{{that.is.substituted}}';
+      let url = '/some/thing/{{that.is.substituted}}';
 
       kbnUrl.change(url, {
         that: {
@@ -227,8 +227,8 @@ describe('kbnUrl', function () {
     });
 
     it('should throw when params are missing', function () {
-      var url = '/{{replace_me}}';
-      var params = {};
+      let url = '/{{replace_me}}';
+      let params = {};
 
       try {
         kbnUrl.change(url, params);
@@ -240,8 +240,8 @@ describe('kbnUrl', function () {
     });
 
     it('should throw when filtered params are missing', function () {
-      var url = '/{{replace_me|number}}';
-      var params = {};
+      let url = '/{{replace_me|number}}';
+      let params = {};
 
       try {
         kbnUrl.change(url, params);
@@ -253,10 +253,10 @@ describe('kbnUrl', function () {
     });
 
     it('should change the entire url', function () {
-      var path = '/test/path';
-      var search = {search: 'test'};
-      var hash = 'hash';
-      var newPath = '/new/location';
+      let path = '/test/path';
+      let search = {search: 'test'};
+      let hash = 'hash';
+      let newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -276,10 +276,10 @@ describe('kbnUrl', function () {
 
   describe('changePath', function () {
     it('should change just the path', function () {
-      var path = '/test/path';
-      var search = {search: 'test'};
-      var hash = 'hash';
-      var newPath = '/new/location';
+      let path = '/test/path';
+      let search = {search: 'test'};
+      let hash = 'hash';
+      let newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -299,10 +299,10 @@ describe('kbnUrl', function () {
 
   describe('redirect', function () {
     it('should change the entire url', function () {
-      var path = '/test/path';
-      var search = {search: 'test'};
-      var hash = 'hash';
-      var newPath = '/new/location';
+      let path = '/test/path';
+      let search = {search: 'test'};
+      let hash = 'hash';
+      let newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -340,10 +340,10 @@ describe('kbnUrl', function () {
 
   describe('redirectPath', function () {
     it('should only change the path', function () {
-      var path = '/test/path';
-      var search = {search: 'test'};
-      var hash = 'hash';
-      var newPath = '/new/location';
+      let path = '/test/path';
+      let search = {search: 'test'};
+      let hash = 'hash';
+      let newPath = '/new/location';
 
       $location
         .path(path)
@@ -374,8 +374,8 @@ describe('kbnUrl', function () {
   });
 
   describe('_shouldAutoReload', function () {
-    var next;
-    var prev;
+    let next;
+    let prev;
 
     beforeEach(function () {
       $route.current = {
diff --git a/src/ui/public/url/url.js b/src/ui/public/url/url.js
index 85d903717a626..bff12c1758f65 100644
--- a/src/ui/public/url/url.js
+++ b/src/ui/public/url/url.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/filters/uriescape');
   require('ui/filters/rison');
@@ -8,7 +8,7 @@ define(function (require) {
   .service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });
 
   function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
-    var self = this;
+    let self = this;
 
     /**
      * Navigate to a url
@@ -70,10 +70,10 @@ define(function (require) {
 
       return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
         // remove filters
-        var key = expr.split('|')[0].trim();
+        let key = expr.split('|')[0].trim();
 
         // verify that the expression can be evaluated
-        var p = $parse(key)(paramObj);
+        let p = $parse(key)(paramObj);
 
         // if evaluation can't be made, throw
         if (_.isUndefined(p)) {
@@ -109,7 +109,7 @@ define(function (require) {
      * @return {string} - the computed url
      */
     self.getRouteUrl = function (obj, route) {
-      var template = obj && obj.routes && obj.routes[route];
+      let template = obj && obj.routes && obj.routes[route];
       if (template) return self.eval(template, obj);
     };
 
@@ -140,10 +140,10 @@ define(function (require) {
     /////
     // private api
     /////
-    var reloading;
+    let reloading;
 
     self._changeLocation = function (type, url, paramObj, replace) {
-      var prev = {
+      let prev = {
         path: $location.path(),
         search: $location.search()
       };
@@ -152,13 +152,13 @@ define(function (require) {
       $location[type](url);
       if (replace) $location.replace();
 
-      var next = {
+      let next = {
         path: $location.path(),
         search: $location.search()
       };
 
       if (self._shouldAutoReload(next, prev)) {
-        var appState = getAppState();
+        let appState = getAppState();
         if (appState) appState.destroy();
 
         reloading = $rootScope.$on('$locationChangeSuccess', function () {
@@ -174,13 +174,13 @@ define(function (require) {
     self._shouldAutoReload = function (next, prev) {
       if (reloading) return false;
 
-      var route = $route.current && $route.current.$$route;
+      let route = $route.current && $route.current.$$route;
       if (!route) return false;
 
       if (next.path !== prev.path) return false;
 
-      var reloadOnSearch = route.reloadOnSearch;
-      var searchSame = _.isEqual(next.search, prev.search);
+      let reloadOnSearch = route.reloadOnSearch;
+      let searchSame = _.isEqual(next.search, prev.search);
 
       return (reloadOnSearch && searchSame) || !reloadOnSearch;
     };
diff --git a/src/ui/public/utils/BaseObject.js b/src/ui/public/utils/BaseObject.js
index dcecdb16b1e3c..2dc9727363ff5 100644
--- a/src/ui/public/utils/BaseObject.js
+++ b/src/ui/public/utils/BaseObject.js
@@ -1,7 +1,7 @@
 define(function (require) {
-  var _ = require('lodash');
-  var rison = require('ui/utils/rison');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let rison = require('ui/utils/rison');
+  let angular = require('angular');
 
   function BaseObject(attributes) {
     // Set the attributes or default to an empty object
diff --git a/src/ui/public/utils/CidrMask.js b/src/ui/public/utils/CidrMask.js
index 2ca30f3fb9091..be51f4c70f842 100644
--- a/src/ui/public/utils/CidrMask.js
+++ b/src/ui/public/utils/CidrMask.js
@@ -1,13 +1,13 @@
 define(function (require) {
-  var Ipv4Address = require('ui/utils/Ipv4Address');
-  var NUM_BITS = 32;
+  let Ipv4Address = require('ui/utils/Ipv4Address');
+  let NUM_BITS = 32;
 
   function throwError(mask) {
     throw Error('Invalid CIDR mask: ' + mask);
   }
 
   function CidrMask(mask) {
-    var splits = mask.split('\/');
+    let splits = mask.split('\/');
     if (splits.length !== 2) throwError(mask);
     this.initialAddress = new Ipv4Address(splits[0]);
     this.prefixLength = Number(splits[1]);
@@ -15,9 +15,9 @@ define(function (require) {
   }
 
   CidrMask.prototype.getRange = function () {
-    var variableBits = NUM_BITS - this.prefixLength;
-    var fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
-    var numAddresses = Math.pow(2, variableBits);
+    let variableBits = NUM_BITS - this.prefixLength;
+    let fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
+    let numAddresses = Math.pow(2, variableBits);
     return {
       from: new Ipv4Address(fromAddress).toString(),
       to: new Ipv4Address(fromAddress + numAddresses - 1).toString()
diff --git a/src/ui/public/utils/Ipv4Address.js b/src/ui/public/utils/Ipv4Address.js
index d0c8fd3f5f29d..d8c396d02ab6b 100644
--- a/src/ui/public/utils/Ipv4Address.js
+++ b/src/ui/public/utils/Ipv4Address.js
@@ -1,6 +1,6 @@
 define(function () {
-  var NUM_BYTES = 4;
-  var BYTE_SIZE = 256;
+  let NUM_BYTES = 4;
+  let BYTE_SIZE = 256;
 
   function throwError(ipAddress) {
     throw Error('Invalid IPv4 address: ' + ipAddress);
@@ -19,11 +19,11 @@ define(function () {
     if (typeof ipAddress === 'string') {
       this.value = 0;
 
-      var bytes = ipAddress.split('.');
+      let bytes = ipAddress.split('.');
       if (bytes.length !== NUM_BYTES) throwError(ipAddress);
 
-      for (var i = 0; i < bytes.length; i++) {
-        var byte = Number(bytes[i]);
+      for (let i = 0; i < bytes.length; i++) {
+        let byte = Number(bytes[i]);
         if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress);
         this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte;
       }
@@ -33,9 +33,9 @@ define(function () {
   }
 
   Ipv4Address.prototype.toString = function () {
-    var value = this.value;
-    var bytes = [];
-    for (var i = 0; i < NUM_BYTES; i++) {
+    let value = this.value;
+    let bytes = [];
+    for (let i = 0; i < NUM_BYTES; i++) {
       bytes.unshift(value % 256);
       value = Math.floor(value / 256);
     }
diff --git a/src/ui/public/utils/ObjDefine.js b/src/ui/public/utils/ObjDefine.js
index ef5bb4737beb1..c13010ee62cdc 100644
--- a/src/ui/public/utils/ObjDefine.js
+++ b/src/ui/public/utils/ObjDefine.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   function ObjDefine(defaults, prototype) {
     this.obj; // created by this.create()
@@ -10,7 +10,7 @@ define(function (require) {
   }
 
   ObjDefine.REDEFINE_SUPPORTED = (function () {
-    var a = Object.create(Object.prototype, {
+    let a = Object.create(Object.prototype, {
       prop: {
         configurable: true,
         value: 1
@@ -67,7 +67,7 @@ define(function (require) {
    * @return {object} - created object
    */
   ObjDefine.prototype.create = function () {
-    var self = this;
+    let self = this;
     self.obj = Object.create(this.prototype, self.descs);
 
     if (!ObjDefine.REDEFINE_SUPPORTED && !self.prototype.toJSON) {
@@ -77,7 +77,7 @@ define(function (require) {
       // due to https://github.com/ariya/phantomjs/issues/11856
       self.obj.toJSON = function () {
         return _.transform(self.obj, function (json, val, key) {
-          var desc = self.descs[key];
+          let desc = self.descs[key];
           if (desc && desc.enumerable && val == null) return;
           json[key] = val;
         }, {});
@@ -98,8 +98,8 @@ define(function (require) {
   };
 
   ObjDefine.prototype._describe = function (name, val, exported, changeable) {
-    var self = this;
-    var exists = val != null;
+    let self = this;
+    let exists = val != null;
 
     if (exported && ObjDefine.REDEFINE_SUPPORTED) {
       return {
diff --git a/src/ui/public/utils/SimpleEmitter.js b/src/ui/public/utils/SimpleEmitter.js
index a82ce604ea9cd..d3001ecb4a9fe 100644
--- a/src/ui/public/utils/SimpleEmitter.js
+++ b/src/ui/public/utils/SimpleEmitter.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var BaseObject = require('ui/utils/BaseObject');
+  let _ = require('lodash');
+  let BaseObject = require('ui/utils/BaseObject');
 
   /**
    * Simple event emitter class used in the vislib. Calls
@@ -21,7 +21,7 @@ define(function (require) {
    * @return {SimpleEmitter} - this, for chaining
    */
   SimpleEmitter.prototype.on = function (name, handler) {
-    var handlers = this._listeners[name];
+    let handlers = this._listeners[name];
     if (!handlers) handlers = this._listeners[name] = [];
 
     handlers.push(handler);
@@ -69,8 +69,8 @@ define(function (require) {
    */
   SimpleEmitter.prototype.emit = _.restParam(function (name, args) {
     if (!this._listeners[name]) return this;
-    var listeners = this.listeners(name);
-    var i = -1;
+    let listeners = this.listeners(name);
+    let i = -1;
 
     while (++i < listeners.length) {
       listeners[i].apply(this, args);
diff --git a/src/ui/public/utils/__tests__/Ipv4Address.js b/src/ui/public/utils/__tests__/Ipv4Address.js
index 80d93abebbb2c..40a5831c4c2b7 100644
--- a/src/ui/public/utils/__tests__/Ipv4Address.js
+++ b/src/ui/public/utils/__tests__/Ipv4Address.js
@@ -1,5 +1,5 @@
-var Ipv4Address = require('ui/utils/Ipv4Address');
-var expect = require('expect.js');
+let Ipv4Address = require('ui/utils/Ipv4Address');
+let expect = require('expect.js');
 
 describe('Ipv4Address', function () {
   it('should throw errors with invalid IP addresses', function () {
@@ -37,7 +37,7 @@ describe('Ipv4Address', function () {
   });
 
   it('should correctly calculate the decimal representation of an IP address', function () {
-    var ipAddress = new Ipv4Address('0.0.0.0');
+    let ipAddress = new Ipv4Address('0.0.0.0');
     expect(ipAddress.valueOf()).to.be(0);
 
     ipAddress = new Ipv4Address('0.0.0.1');
@@ -48,7 +48,7 @@ describe('Ipv4Address', function () {
   });
 
   it('toString()', function () {
-    var ipAddress = new Ipv4Address('0.000.00000.1');
+    let ipAddress = new Ipv4Address('0.000.00000.1');
     expect(ipAddress.toString()).to.be('0.0.0.1');
 
     ipAddress = new Ipv4Address('123.123.123.123');
diff --git a/src/ui/public/utils/__tests__/ObjDefine.js b/src/ui/public/utils/__tests__/ObjDefine.js
index 8b84f51cd7a35..ec4b15b1cda73 100644
--- a/src/ui/public/utils/__tests__/ObjDefine.js
+++ b/src/ui/public/utils/__tests__/ObjDefine.js
@@ -1,7 +1,7 @@
-var expect = require('expect.js');
+let expect = require('expect.js');
 
 describe('ObjDefine Utility', function () {
-  var ObjDefine = require('ui/utils/ObjDefine');
+  let ObjDefine = require('ui/utils/ObjDefine');
 
   function flatten(obj) {
     return JSON.parse(JSON.stringify(obj));
@@ -9,10 +9,10 @@ describe('ObjDefine Utility', function () {
 
   describe('#writ', function () {
     it('creates writeable properties', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.writ('name', 'foo');
 
-      var obj = def.create();
+      let obj = def.create();
       expect(obj).to.have.property('name', 'foo');
 
       obj.name = 'bar';
@@ -20,13 +20,13 @@ describe('ObjDefine Utility', function () {
     });
 
     it('exports the property to JSON', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.writ('name', 'foo');
       expect(flatten(def.create())).to.have.property('name', 'foo');
     });
 
     it('does not export property to JSON it it\'s undefined or null', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.writ('name');
       expect(flatten(def.create())).to.not.have.property('name');
 
@@ -35,10 +35,10 @@ describe('ObjDefine Utility', function () {
     });
 
     it('switched to exporting if a value is written', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.writ('name');
 
-      var obj = def.create();
+      let obj = def.create();
       expect(flatten(obj)).to.not.have.property('name');
 
       obj.name = null;
@@ -49,10 +49,10 @@ describe('ObjDefine Utility', function () {
     });
 
     it('setting a writ value to null prevents it from exporting', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.writ('name', 'foo');
 
-      var obj = def.create();
+      let obj = def.create();
       expect(flatten(obj)).to.have.property('name', 'foo');
 
       obj.name = null;
@@ -63,11 +63,11 @@ describe('ObjDefine Utility', function () {
 
   describe('#fact', function () {
     it('creates an immutable field', function () {
-      var def = new ObjDefine();
-      var val = 'foo';
-      var notval = 'bar';
+      let def = new ObjDefine();
+      let val = 'foo';
+      let notval = 'bar';
       def.fact('name', val);
-      var obj = def.create();
+      let obj = def.create();
 
 
       obj.name = notval; // UPDATE SHOULD BE IGNORED
@@ -75,7 +75,7 @@ describe('ObjDefine Utility', function () {
     });
 
     it('exports the fact to JSON', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.fact('name', 'foo');
       expect(flatten(def.create())).to.have.property('name', 'foo');
     });
@@ -83,11 +83,11 @@ describe('ObjDefine Utility', function () {
 
   describe('#comp', function () {
     it('creates an immutable field', function () {
-      var def = new ObjDefine();
-      var val = 'foo';
-      var notval = 'bar';
+      let def = new ObjDefine();
+      let val = 'foo';
+      let notval = 'bar';
       def.comp('name', val);
-      var obj = def.create();
+      let obj = def.create();
 
       expect(function () {
         'use strict'; // eslint-disable-line strict
@@ -97,7 +97,7 @@ describe('ObjDefine Utility', function () {
     });
 
     it('does not export the computed value to JSON', function () {
-      var def = new ObjDefine();
+      let def = new ObjDefine();
       def.comp('name', 'foo');
       expect(flatten(def.create())).to.not.have.property('name');
     });
@@ -108,24 +108,24 @@ describe('ObjDefine Utility', function () {
     it('creates object that inherits from the prototype', function () {
       function SomeClass() {}
 
-      var def = new ObjDefine(null, SomeClass.prototype);
-      var obj = def.create();
+      let def = new ObjDefine(null, SomeClass.prototype);
+      let obj = def.create();
 
       expect(obj).to.be.a(SomeClass);
     });
 
     it('uses the defaults for property values', function () {
-      var def = new ObjDefine({ name: 'bar' });
+      let def = new ObjDefine({ name: 'bar' });
       def.fact('name');
 
-      var obj = def.create();
+      let obj = def.create();
 
       expect(obj).to.have.property('name', 'bar');
     });
 
     it('ignores default values that are not defined propertyes', function () {
-      var def = new ObjDefine({ name: 'foo', name2: 'bar' });
-      var obj = def.create();
+      let def = new ObjDefine({ name: 'foo', name2: 'bar' });
+      let obj = def.create();
 
       expect(obj).to.not.have.property('name');
       expect(obj).to.not.have.property('name2');
diff --git a/src/ui/public/utils/__tests__/SimpleEmitter.js b/src/ui/public/utils/__tests__/SimpleEmitter.js
index 04a6380ab8e96..7e14c0c84e530 100644
--- a/src/ui/public/utils/__tests__/SimpleEmitter.js
+++ b/src/ui/public/utils/__tests__/SimpleEmitter.js
@@ -1,8 +1,8 @@
 describe('SimpleEmitter class', function () {
-  var SimpleEmitter = require('ui/utils/SimpleEmitter');
-  var expect = require('expect.js');
-  var sinon = require('auto-release-sinon');
-  var emitter;
+  let SimpleEmitter = require('ui/utils/SimpleEmitter');
+  let expect = require('expect.js');
+  let sinon = require('auto-release-sinon');
+  let emitter;
 
   beforeEach(function () {
     emitter = new SimpleEmitter();
@@ -40,7 +40,7 @@ describe('SimpleEmitter class', function () {
 
   describe('#on', function () {
     it('registers a handler', function () {
-      var handler = sinon.stub();
+      let handler = sinon.stub();
       emitter.on('a', handler);
       expect(emitter.listenerCount('a')).to.be(1);
 
@@ -56,7 +56,7 @@ describe('SimpleEmitter class', function () {
     });
 
     it('allows the same function to be registered multiple times', function () {
-      var handler = function () {};
+      let handler = function () {};
       emitter.on('a', handler);
       expect(emitter.listenerCount()).to.be(1);
       emitter.on('a', handler);
@@ -66,7 +66,7 @@ describe('SimpleEmitter class', function () {
 
   describe('#off', function () {
     it('removes a listener if it was registered', function () {
-      var handler = sinon.stub();
+      let handler = sinon.stub();
       expect(emitter.listenerCount()).to.be(0);
       emitter.on('a', handler);
       expect(emitter.listenerCount('a')).to.be(1);
@@ -93,12 +93,12 @@ describe('SimpleEmitter class', function () {
 
   describe('#emit', function () {
     it('calls the handlers in the order they were defined', function () {
-      var i = 0;
-      var incr = function () { return ++i; };
-      var one = sinon.spy(incr);
-      var two = sinon.spy(incr);
-      var three = sinon.spy(incr);
-      var four = sinon.spy(incr);
+      let i = 0;
+      let incr = function () { return ++i; };
+      let one = sinon.spy(incr);
+      let two = sinon.spy(incr);
+      let three = sinon.spy(incr);
+      let four = sinon.spy(incr);
 
       emitter
       .on('a', one)
@@ -122,11 +122,11 @@ describe('SimpleEmitter class', function () {
 
     it('always emits the handlers that were initially registered', function () {
 
-      var destructive = sinon.spy(function () {
+      let destructive = sinon.spy(function () {
         emitter.removeAllListeners();
         expect(emitter.listenerCount()).to.be(0);
       });
-      var stub = sinon.stub();
+      let stub = sinon.stub();
 
       emitter.on('run', destructive).on('run', stub).emit('run');
 
diff --git a/src/ui/public/utils/__tests__/add_word_breaks.js b/src/ui/public/utils/__tests__/add_word_breaks.js
index 798c5d6e54bde..b8e9ee82b824b 100644
--- a/src/ui/public/utils/__tests__/add_word_breaks.js
+++ b/src/ui/public/utils/__tests__/add_word_breaks.js
@@ -1,10 +1,10 @@
-var _ = require('lodash');
-var expect = require('expect.js');
-var addWordBreaks = require('ui/utils/add_word_breaks');
+let _ = require('lodash');
+let expect = require('expect.js');
+let addWordBreaks = require('ui/utils/add_word_breaks');
 
 describe('addWordBreaks', function () {
 
-  var fixtures = [
+  let fixtures = [
     ['aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaa<wbr>aaaaaaaaa'],
     ['aaaa aaaaaaaaaaaaaaa', 'aaaa aaaaaaaaaaa<wbr>aaaa'],
     ['aaaa;aaaaaaaaaaaaaaa', 'aaaa;aaaaaaaaaaa<wbr>aaaa'],
@@ -16,9 +16,9 @@ describe('addWordBreaks', function () {
   ];
 
   _.each(fixtures, function (fixture) {
-    var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    let msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
     it(msg, function () {
-      var results = addWordBreaks(fixture[0], 10);
+      let results = addWordBreaks(fixture[0], 10);
       expect(results).to.be(fixture[1]);
     });
   });
diff --git a/src/ui/public/utils/__tests__/cidr_mask.js b/src/ui/public/utils/__tests__/cidr_mask.js
index 9644a3eef9401..846a289c2eff7 100644
--- a/src/ui/public/utils/__tests__/cidr_mask.js
+++ b/src/ui/public/utils/__tests__/cidr_mask.js
@@ -1,6 +1,6 @@
 
-var CidrMask = require('ui/utils/CidrMask');
-var expect = require('expect.js');
+let CidrMask = require('ui/utils/CidrMask');
+let expect = require('expect.js');
 
 describe('CidrMask', function () {
   it('should throw errors with invalid CIDR masks', function () {
@@ -42,7 +42,7 @@ describe('CidrMask', function () {
   });
 
   it('should correctly grab IP address and prefix length', function () {
-    var mask = new CidrMask('0.0.0.0/1');
+    let mask = new CidrMask('0.0.0.0/1');
     expect(mask.initialAddress.toString()).to.be('0.0.0.0');
     expect(mask.prefixLength).to.be(1);
 
@@ -52,8 +52,8 @@ describe('CidrMask', function () {
   });
 
   it('should calculate a range of IP addresses', function () {
-    var mask = new CidrMask('0.0.0.0/1');
-    var range = mask.getRange();
+    let mask = new CidrMask('0.0.0.0/1');
+    let range = mask.getRange();
     expect(range.from.toString()).to.be('0.0.0.0');
     expect(range.to.toString()).to.be('127.255.255.255');
 
@@ -69,7 +69,7 @@ describe('CidrMask', function () {
   });
 
   it('toString()', function () {
-    var mask = new CidrMask('.../1');
+    let mask = new CidrMask('.../1');
     expect(mask.toString()).to.be('0.0.0.0/1');
 
     mask = new CidrMask('128.0.0.1/31');
diff --git a/src/ui/public/utils/__tests__/datemath.js b/src/ui/public/utils/__tests__/datemath.js
index 00a1995f43d8a..e8eab1aeff4b5 100644
--- a/src/ui/public/utils/__tests__/datemath.js
+++ b/src/ui/public/utils/__tests__/datemath.js
@@ -1,16 +1,16 @@
-var dateMath = require('ui/utils/dateMath');
-var expect = require('expect.js');
-var moment = require('moment');
-var _ = require('lodash');
-var sinon = require('auto-release-sinon');
+let dateMath = require('ui/utils/dateMath');
+let expect = require('expect.js');
+let moment = require('moment');
+let _ = require('lodash');
+let sinon = require('auto-release-sinon');
 
 describe('dateMath', function () {
   // Test each of these intervals when testing relative time
-  var spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
-  var anchor =  '2014-01-01T06:06:06.666Z';
-  var unix = moment(anchor).valueOf();
-  var format = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
-  var clock;
+  let spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
+  let anchor =  '2014-01-01T06:06:06.666Z';
+  let unix = moment(anchor).valueOf();
+  let format = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
+  let clock;
 
   describe('errors', function () {
     it('should return undefined if passed something falsy', function () {
@@ -39,10 +39,10 @@ describe('dateMath', function () {
   });
 
   describe('objects and strings', function () {
-    var mmnt;
-    var date;
-    var string;
-    var now;
+    let mmnt;
+    let date;
+    let string;
+    let now;
 
     beforeEach(function () {
       clock = sinon.useFakeTimers(unix);
@@ -70,8 +70,8 @@ describe('dateMath', function () {
   });
 
   describe('subtraction', function () {
-    var now;
-    var anchored;
+    let now;
+    let anchored;
 
     beforeEach(function () {
       clock = sinon.useFakeTimers(unix);
@@ -80,8 +80,8 @@ describe('dateMath', function () {
     });
 
     _.each(spans, function (span) {
-      var nowEx = 'now-5' + span;
-      var thenEx =  anchor + '||-5' + span;
+      let nowEx = 'now-5' + span;
+      let thenEx =  anchor + '||-5' + span;
 
       it('should return 5' + span + ' ago', function () {
         expect(dateMath.parse(nowEx).format(format)).to.eql(now.subtract(5, span).format(format));
@@ -94,8 +94,8 @@ describe('dateMath', function () {
   });
 
   describe('addition', function () {
-    var now;
-    var anchored;
+    let now;
+    let anchored;
 
     beforeEach(function () {
       clock = sinon.useFakeTimers(unix);
@@ -104,8 +104,8 @@ describe('dateMath', function () {
     });
 
     _.each(spans, function (span) {
-      var nowEx = 'now+5' + span;
-      var thenEx =  anchor + '||+5' + span;
+      let nowEx = 'now+5' + span;
+      let thenEx =  anchor + '||+5' + span;
 
       it('should return 5' + span + ' from now', function () {
         expect(dateMath.parse(nowEx).format()).to.eql(now.add(5, span).format());
@@ -119,8 +119,8 @@ describe('dateMath', function () {
   });
 
   describe('rounding', function () {
-    var now;
-    var anchored;
+    let now;
+    let anchored;
 
     beforeEach(function () {
       clock = sinon.useFakeTimers(unix);
diff --git a/src/ui/public/utils/__tests__/diff_object.js b/src/ui/public/utils/__tests__/diff_object.js
index 9260b5ad5d069..6759be17bdc9c 100644
--- a/src/ui/public/utils/__tests__/diff_object.js
+++ b/src/ui/public/utils/__tests__/diff_object.js
@@ -1,74 +1,74 @@
-var diff = require('ui/utils/diff_object');
-var expect = require('expect.js');
-var _ = require('lodash');
+let diff = require('ui/utils/diff_object');
+let expect = require('expect.js');
+let _ = require('lodash');
 
 describe('ui/utils/diff_object', function () {
 
   it('should list the removed keys', function () {
-    var target = { test: 'foo' };
-    var source = { foo: 'test' };
-    var results = diff(target, source);
+    let target = { test: 'foo' };
+    let source = { foo: 'test' };
+    let results = diff(target, source);
     expect(results).to.have.property('removed');
     expect(results.removed).to.eql(['test']);
   });
 
   it('should list the changed keys', function () {
-    var target = { foo: 'bar' };
-    var source = { foo: 'test' };
-    var results = diff(target, source);
+    let target = { foo: 'bar' };
+    let source = { foo: 'test' };
+    let results = diff(target, source);
     expect(results).to.have.property('changed');
     expect(results.changed).to.eql(['foo']);
   });
 
   it('should list the added keys', function () {
-    var target = { };
-    var source = { foo: 'test' };
-    var results = diff(target, source);
+    let target = { };
+    let source = { foo: 'test' };
+    let results = diff(target, source);
     expect(results).to.have.property('added');
     expect(results.added).to.eql(['foo']);
   });
 
   it('should list all the keys that are change or removed', function () {
-    var target = { foo: 'bar', test: 'foo' };
-    var source = { foo: 'test' };
-    var results = diff(target, source);
+    let target = { foo: 'bar', test: 'foo' };
+    let source = { foo: 'test' };
+    let results = diff(target, source);
     expect(results).to.have.property('keys');
     expect(results.keys).to.eql(['foo', 'test']);
   });
 
   it('should ignore functions', function () {
-    var target = { foo: 'bar', test: 'foo' };
-    var source = { foo: 'test', fn: _.noop };
+    let target = { foo: 'bar', test: 'foo' };
+    let source = { foo: 'test', fn: _.noop };
     diff(target, source);
     expect(target).to.not.have.property('fn');
   });
 
   it('should ignore underscores', function () {
-    var target = { foo: 'bar', test: 'foo' };
-    var source = { foo: 'test', _private: 'foo' };
+    let target = { foo: 'bar', test: 'foo' };
+    let source = { foo: 'test', _private: 'foo' };
     diff(target, source);
     expect(target).to.not.have.property('_private');
   });
 
   it('should ignore dollar signs', function () {
-    var target = { foo: 'bar', test: 'foo' };
-    var source = { foo: 'test', $private: 'foo' };
+    let target = { foo: 'bar', test: 'foo' };
+    let source = { foo: 'test', $private: 'foo' };
     diff(target, source);
     expect(target).to.not.have.property('$private');
   });
 
   it('should not list any changes for similar objects', function () {
-    var target = { foo: 'bar', test: 'foo' };
-    var source = { foo: 'bar', test: 'foo', $private: 'foo' };
-    var results = diff(target, source);
+    let target = { foo: 'bar', test: 'foo' };
+    let source = { foo: 'bar', test: 'foo', $private: 'foo' };
+    let results = diff(target, source);
     expect(results.changed).to.be.empty();
   });
 
   it('should only change keys that actually changed', function () {
-    var obj = { 'message': 'foo' };
-    var target = { obj: obj, message: 'foo' };
-    var source = { obj: _.cloneDeep(obj), message: 'test' };
-    var results = diff(target, source);
+    let obj = { 'message': 'foo' };
+    let target = { obj: obj, message: 'foo' };
+    let source = { obj: _.cloneDeep(obj), message: 'test' };
+    let results = diff(target, source);
     expect(target.obj).to.be(obj);
   });
 
diff --git a/src/ui/public/utils/__tests__/diff_time_picker_vals.js b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
index 68c474a733ef3..f5f5be669669b 100644
--- a/src/ui/public/utils/__tests__/diff_time_picker_vals.js
+++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
@@ -1,10 +1,10 @@
 
-var moment = require('moment');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let moment = require('moment');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Diff Time Picker Values', function () {
-  var diffTimePickerValues;
+  let diffTimePickerValues;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -12,13 +12,13 @@ describe('Diff Time Picker Values', function () {
   }));
 
   it('accepts two undefined values', function () {
-    var diff = diffTimePickerValues(undefined, undefined);
+    let diff = diffTimePickerValues(undefined, undefined);
     expect(diff).to.be(false);
   });
 
   describe('dateMath ranges', function () {
     it('knows a match', function () {
-      var diff = diffTimePickerValues(
+      let diff = diffTimePickerValues(
         {
           to: 'now',
           from: 'now-7d'
@@ -32,7 +32,7 @@ describe('Diff Time Picker Values', function () {
       expect(diff).to.be(false);
     });
     it('knows a difference', function () {
-      var diff = diffTimePickerValues(
+      let diff = diffTimePickerValues(
         {
           to: 'now',
           from: 'now-7d'
@@ -49,7 +49,7 @@ describe('Diff Time Picker Values', function () {
 
   describe('a dateMath range, and a moment range', function () {
     it('is always different', function () {
-      var diff = diffTimePickerValues(
+      let diff = diffTimePickerValues(
         {
           to: moment(),
           from: moment()
@@ -66,10 +66,10 @@ describe('Diff Time Picker Values', function () {
 
   describe('moment ranges', function () {
     it('uses the time value of moments for comparison', function () {
-      var to = moment();
-      var from = moment().add(1, 'day');
+      let to = moment();
+      let from = moment().add(1, 'day');
 
-      var diff = diffTimePickerValues(
+      let diff = diffTimePickerValues(
         {
           to: to.clone(),
           from: from.clone()
@@ -84,11 +84,11 @@ describe('Diff Time Picker Values', function () {
     });
 
     it('fails if any to or from is different', function () {
-      var to = moment();
-      var from = moment().add(1, 'day');
-      var from2 = moment().add(2, 'day');
+      let to = moment();
+      let from = moment().add(1, 'day');
+      let from2 = moment().add(2, 'day');
 
-      var diff = diffTimePickerValues(
+      let diff = diffTimePickerValues(
         {
           to: to.clone(),
           from: from.clone()
@@ -104,7 +104,7 @@ describe('Diff Time Picker Values', function () {
   });
 
   it('does not fall apart with unusual values', function () {
-    var diff = diffTimePickerValues({}, {});
+    let diff = diffTimePickerValues({}, {});
     expect(diff).to.be(false);
   });
 });
diff --git a/src/ui/public/utils/__tests__/mapping_setup.js b/src/ui/public/utils/__tests__/mapping_setup.js
new file mode 100644
index 0000000000000..3cf7fd5d25a1c
--- /dev/null
+++ b/src/ui/public/utils/__tests__/mapping_setup.js
@@ -0,0 +1,41 @@
+const _ = require('lodash');
+const ngMock = require('ngMock');
+const expect = require('expect.js');
+
+let mappingSetup;
+
+describe('ui/utils/mapping_setup', function () {
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    mappingSetup = Private(require('ui/utils/mapping_setup'));
+  }));
+
+  describe('#expandShorthand()', function () {
+    it('allows shortcuts for field types by just setting the value to the type name', function () {
+      const mapping = mappingSetup.expandShorthand({ foo: 'boolean' });
+      expect(mapping.foo.type).to.be('boolean');
+    });
+
+    it('can set type as an option', function () {
+      const mapping = mappingSetup.expandShorthand({ foo: {type: 'integer'} });
+      expect(mapping.foo.type).to.be('integer');
+    });
+
+    context('when type is json', function () {
+      it('returned object is type string', function () {
+        const mapping = mappingSetup.expandShorthand({ foo: 'json' });
+        expect(mapping.foo.type).to.be('string');
+      });
+
+      it('returned object has _serialize function', function () {
+        const mapping = mappingSetup.expandShorthand({ foo: 'json' });
+        expect(_.isFunction(mapping.foo._serialize)).to.be(true);
+      });
+
+      it('returned object has _deserialize function', function () {
+        const mapping = mappingSetup.expandShorthand({ foo: 'json' });
+        expect(_.isFunction(mapping.foo._serialize)).to.be(true);
+      });
+    });
+  });
+});
diff --git a/src/ui/public/utils/__tests__/ordinal_suffix.js b/src/ui/public/utils/__tests__/ordinal_suffix.js
index 1c63aa0aa8372..0ad67e726b79e 100644
--- a/src/ui/public/utils/__tests__/ordinal_suffix.js
+++ b/src/ui/public/utils/__tests__/ordinal_suffix.js
@@ -1,9 +1,9 @@
-var _ = require('lodash');
-var addOrdinalSuffix = require('ui/utils/ordinal_suffix');
-var expect = require('expect.js');
+let _ = require('lodash');
+let addOrdinalSuffix = require('ui/utils/ordinal_suffix');
+let expect = require('expect.js');
 
 describe('ordinal suffix util', function () {
-  var checks = {
+  let checks = {
     1: 'st',
     2: 'nd',
     3: 'rd',
@@ -37,8 +37,8 @@ describe('ordinal suffix util', function () {
   };
 
   _.forOwn(checks, function (expected, num) {
-    var int = parseInt(num, 10);
-    var float = int + Math.random();
+    let int = parseInt(num, 10);
+    let float = int + Math.random();
 
     it('knowns ' + int, function () {
       expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
diff --git a/src/ui/public/utils/__tests__/parse_interval.js b/src/ui/public/utils/__tests__/parse_interval.js
index 79ca8137d8be7..04b00404d2f97 100644
--- a/src/ui/public/utils/__tests__/parse_interval.js
+++ b/src/ui/public/utils/__tests__/parse_interval.js
@@ -1,9 +1,9 @@
-var parseInterval = require('ui/utils/parse_interval');
-var expect = require('expect.js');
+let parseInterval = require('ui/utils/parse_interval');
+let expect = require('expect.js');
 
 describe('parseInterval', function () {
   it('should correctly parse an interval containing unit and value', function () {
-    var duration = parseInterval('1d');
+    let duration = parseInterval('1d');
     expect(duration.as('d')).to.be(1);
 
     duration = parseInterval('2y');
@@ -26,7 +26,7 @@ describe('parseInterval', function () {
   });
 
   it('should correctly parse fractional intervals containing unit and value', function () {
-    var duration = parseInterval('1.5w');
+    let duration = parseInterval('1.5w');
     expect(duration.as('w')).to.be(1.5);
 
     duration = parseInterval('2.35y');
@@ -34,7 +34,7 @@ describe('parseInterval', function () {
   });
 
   it('should correctly bubble up intervals which are less than 1', function () {
-    var duration = parseInterval('0.5y');
+    let duration = parseInterval('0.5y');
     expect(duration.as('d')).to.be(183);
 
     duration = parseInterval('0.5d');
@@ -42,7 +42,7 @@ describe('parseInterval', function () {
   });
 
   it('should correctly parse a unit in an interval only', function () {
-    var duration = parseInterval('d');
+    let duration = parseInterval('d');
     expect(duration.as('d')).to.be(1);
 
     duration = parseInterval('m');
@@ -56,7 +56,7 @@ describe('parseInterval', function () {
   });
 
   it('should return null for an invalid interval', function () {
-    var duration = parseInterval('');
+    let duration = parseInterval('');
     expect(duration).to.not.be.ok();
 
     duration = parseInterval(null);
diff --git a/src/ui/public/utils/__tests__/range.js b/src/ui/public/utils/__tests__/range.js
index 9cd2a1a0715c6..d004ae6b5fd45 100644
--- a/src/ui/public/utils/__tests__/range.js
+++ b/src/ui/public/utils/__tests__/range.js
@@ -1,7 +1,7 @@
 describe('Range parsing utility', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
-  var parse = require('ui/utils/range');
+  let _ = require('lodash');
+  let expect = require('expect.js');
+  let parse = require('ui/utils/range');
 
   it('throws an error for inputs that are not formatted properly', function () {
     expect(function () {
@@ -25,7 +25,7 @@ describe('Range parsing utility', function () {
     }).to.throwException(TypeError);
   });
 
-  var tests = {
+  let tests = {
     '[ 0 , 100 ]': {
       props: {
         min: 0,
@@ -92,7 +92,7 @@ describe('Range parsing utility', function () {
   _.forOwn(tests, function (spec, str) {
 
     describe(str, function () {
-      var range = parse(str);
+      let range = parse(str);
 
       it('creation', function () {
         expect(range).to.eql(spec.props);
diff --git a/src/ui/public/utils/__tests__/scanner.js b/src/ui/public/utils/__tests__/scanner.js
new file mode 100644
index 0000000000000..68ea8ce660402
--- /dev/null
+++ b/src/ui/public/utils/__tests__/scanner.js
@@ -0,0 +1,86 @@
+let Scanner = require('ui/utils/scanner');
+let expect = require('expect.js');
+let elasticsearch = require('elasticsearch-browser');
+let sinon = require('sinon');
+
+let es = new elasticsearch.Client({
+  host: 'http://localhost:9210',
+});
+
+
+describe('Scanner', function () {
+  describe('initialization', function () {
+    it('should throw errors if missing arguments on initialization', function () {
+      expect(() => new Scanner()).to.throwError();
+      expect(() => new Scanner(es)).to.throwError();
+      expect(() => new Scanner(es, {
+        index: 'foo',
+        type: 'bar'
+      })).not.to.throwError();
+    });
+  });
+
+  describe('scan', function () {
+    let search;
+    let scroll;
+    let scanner;
+    let mockSearch = {'_scroll_id':'abc','took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':[]}}; // eslint-disable-line max-len
+    let mockScroll = {'took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':['one', 'two']}}; // eslint-disable-line max-len
+
+    beforeEach(function () {
+      scanner = new Scanner(es, {
+        index: 'foo',
+        type: 'bar'
+      });
+      search = sinon.stub(scanner.client, 'search', (req, cb) => cb(null, mockSearch));
+      scroll = sinon.stub(scanner.client, 'scroll', (req, cb) => cb(null, mockScroll));
+    });
+
+    it('should search and then scroll for results', function () {
+      return scanner.scanAndMap('')
+      .then(function (error, response) {
+        expect(search.called).to.be(true);
+        expect(scroll.called).to.be(true);
+      });
+    });
+
+    it('should map results if a function is provided', function () {
+      return scanner.scanAndMap(null, null, function (hit) {
+        return hit.toUpperCase();
+      })
+      .then(function (response) {
+        expect(response.hits[0]).to.be('ONE');
+        expect(response.hits[1]).to.be('TWO');
+      });
+    });
+
+    it('should only return the requested number of documents', function () {
+      return scanner.scanAndMap(null, {docCount: 1}, function (hit) {
+        return hit.toUpperCase();
+      })
+      .then(function (response) {
+        expect(response.hits[0]).to.be('ONE');
+        expect(response.hits[1]).to.be(undefined);
+      });
+    });
+
+    it('should scroll across multiple pages', function () {
+      scroll.restore();
+      let oneResult = {'took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':['one']}}; // eslint-disable-line max-len
+      scroll = sinon.stub(scanner.client, 'scroll', (req, cb) => cb(null, oneResult));
+      return scanner.scanAndMap(null, {pageSize: 1})
+      .then(function (response) {
+        expect(scroll.calledTwice);
+        expect(response.hits.length).to.be(2);
+        expect(scroll.getCall(1).args[0].scrollId).to.be('abc');
+        expect(scroll.getCall(0).args[0].scrollId).to.be('abc');
+      });
+    });
+
+    afterEach(function () {
+      search.restore();
+      scroll.restore();
+    });
+  });
+
+});
diff --git a/src/ui/public/utils/__tests__/sequencer.js b/src/ui/public/utils/__tests__/sequencer.js
index 3225673e05f21..551e3a27f503f 100644
--- a/src/ui/public/utils/__tests__/sequencer.js
+++ b/src/ui/public/utils/__tests__/sequencer.js
@@ -1,9 +1,9 @@
 describe('sequencer util', function () {
-  var _ = require('lodash');
-  var sequencer = require('ui/utils/sequencer');
-  var expect = require('expect.js');
+  let _ = require('lodash');
+  let sequencer = require('ui/utils/sequencer');
+  let expect = require('expect.js');
 
-  var opts = [
+  let opts = [
     { min: 500, max: 7500, length: 1500 },
     { min: 50, max: 500, length: 1000 },
     { min: 5, max: 50, length: 100 }
diff --git a/src/ui/public/utils/__tests__/slugify_id.js b/src/ui/public/utils/__tests__/slugify_id.js
index 85d880f441edd..9f2945cf8824c 100644
--- a/src/ui/public/utils/__tests__/slugify_id.js
+++ b/src/ui/public/utils/__tests__/slugify_id.js
@@ -1,10 +1,10 @@
-var _ = require('lodash');
-var slugifyId = require('ui/utils/slugify_id');
-var expect = require('expect.js');
+let _ = require('lodash');
+let slugifyId = require('ui/utils/slugify_id');
+let expect = require('expect.js');
 
 describe('slugifyId()', function () {
 
-  var fixtures = [
+  let fixtures = [
     ['test/test', 'test-slash-test'],
     ['test?test', 'test-questionmark-test'],
     ['test=test', 'test-equal-test'],
@@ -24,9 +24,9 @@ describe('slugifyId()', function () {
   ];
 
   _.each(fixtures, function (fixture) {
-    var msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    let msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
     it(msg, function () {
-      var results = slugifyId(fixture[0]);
+      let results = slugifyId(fixture[0]);
       expect(results).to.be(fixture[1]);
     });
   });
diff --git a/src/ui/public/utils/__tests__/versionmath.js b/src/ui/public/utils/__tests__/versionmath.js
deleted file mode 100644
index 5fe3323770721..0000000000000
--- a/src/ui/public/utils/__tests__/versionmath.js
+++ /dev/null
@@ -1,128 +0,0 @@
-var _ = require('lodash');
-var versionmath = require('ui/utils/versionmath');
-var expect = require('expect.js');
-var versions = [
-  '1.1.12',
-  '1.1.12',
-  '1.1.12',
-  '1.1.12',
-  '0.90.0',
-  '0.90.1',
-  '1.0.0',
-  '1.0',
-  '1.2.3',
-  '2.0.0',
-  '2.0.1',
-  '2.3.1'
-];
-
-describe('version math (0.90.0 - 2.3.1)', function () {
-  var methods = 'max,min,eq,is,lt,lte,gt,gte'.split(',');
-  describe('methods', function () {
-    it('should have ' + methods.join(', ') + ' methods', function () {
-      _.each(methods, function (method) {
-        expect(versionmath[method]).to.be.a(Function);
-      });
-    });
-  });
-
-  describe('min & max', function () {
-    it('has a max of 2.3.1', function () {
-      expect(versionmath.max(versions)).to.be('2.3.1');
-    });
-
-    it('has a min of 0.90.0', function () {
-      expect(versionmath.min(versions)).to.be('0.90.0');
-    });
-  });
-
-  describe('eq / lowest version', function () {
-    it('should be true for  0.90.0', function () {
-      expect(versionmath.eq('0.90.0', versions)).to.be(true);
-    });
-
-    it('should be false for 1.0', function () {
-      expect(versionmath.eq('1.0', versions)).to.be(false);
-    });
-  });
-
-  describe('gt / lowest version', function () {
-    it('is > 0.20.3', function () {
-      expect(versionmath.gt('0.20.3', versions)).to.be(true);
-    });
-
-    it('is not > 0.90.0', function () {
-      expect(versionmath.gt('0.90.0', versions)).to.be(false);
-    });
-
-    it('is not > 1.0.0', function () {
-      expect(versionmath.gt('1.0.0', versions)).to.be(false);
-    });
-  });
-
-  describe('gte / lowest version', function () {
-    it('is >= 0.20.3', function () {
-      expect(versionmath.gte('0.20.3', versions)).to.be(true);
-    });
-
-    it('is >= 0.90.0', function () {
-      expect(versionmath.gte('0.90.0', versions)).to.be(true);
-    });
-
-    it('is not >= 1.0.0', function () {
-      expect(versionmath.gte('1.0.0', versions)).to.be(false);
-    });
-  });
-
-  describe('lt / highest version', function () {
-    it('is not < 0.20.3', function () {
-      expect(versionmath.lt('0.20.3', versions)).to.be(false);
-    });
-
-    it('is not < 2.3.1', function () {
-      expect(versionmath.lt('2.3.1', versions)).to.be(false);
-    });
-
-    it('is < 2.5', function () {
-      expect(versionmath.lt('2.5', versions)).to.be(true);
-    });
-  });
-
-  describe('lte / highest version', function () {
-    it('is not =< 0.20.3', function () {
-      expect(versionmath.lte('0.20.3', versions)).to.be(false);
-    });
-
-    it('is =< 2.3.1', function () {
-      expect(versionmath.lte('2.3.1', versions)).to.be(true);
-    });
-
-    it('is =< 2.5', function () {
-      expect(versionmath.lte('2.5', versions)).to.be(true);
-    });
-  });
-
-  describe('is', function () {
-    it('exactly, <, <=, >, >=', function () {
-      expect(versionmath.is('0.90.0', versions)).to.be(true);
-      expect(versionmath.is('0.20.0', versions)).to.be(false);
-
-      expect(versionmath.is('>0.20.0', versions)).to.be(true);
-      expect(versionmath.is('>0.90.0', versions)).to.be(false);
-      expect(versionmath.is('>0.90.1', versions)).to.be(false);
-
-      expect(versionmath.is('>=0.20.0', versions)).to.be(true);
-      expect(versionmath.is('>=0.90.0', versions)).to.be(true);
-      expect(versionmath.is('>=0.90.1', versions)).to.be(false);
-
-      expect(versionmath.is('<2.5', versions)).to.be(true);
-      expect(versionmath.is('<2.3.1', versions)).to.be(false);
-      expect(versionmath.is('<0.90.1', versions)).to.be(false);
-
-      expect(versionmath.is('<=2.5', versions)).to.be(true);
-      expect(versionmath.is('<=2.3.1', versions)).to.be(true);
-      expect(versionmath.is('<=0.90.1', versions)).to.be(false);
-    });
-  });
-
-});
diff --git a/src/ui/public/utils/add_word_breaks.js b/src/ui/public/utils/add_word_breaks.js
index 99c35649eedd2..6f2454e93ebe4 100644
--- a/src/ui/public/utils/add_word_breaks.js
+++ b/src/ui/public/utils/add_word_breaks.js
@@ -1,13 +1,13 @@
 define(function () {
   return function addWordBreaks(text, minLineLength) {
     text = text || '';
-    var lineSize = 0;
-    var newText = '';
-    var inHtmlTag = false;
-    var inHtmlChar = false;
+    let lineSize = 0;
+    let newText = '';
+    let inHtmlTag = false;
+    let inHtmlChar = false;
 
-    for (var i = 0, len = text.length; i < len; i++) {
-      var chr = text.charAt(i);
+    for (let i = 0, len = text.length; i < len; i++) {
+      let chr = text.charAt(i);
       newText += chr;
 
       switch (chr) {
diff --git a/src/ui/public/utils/brush_event.js b/src/ui/public/utils/brush_event.js
index 7ddad4ca1cfb6..83bf127df93a1 100644
--- a/src/ui/public/utils/brush_event.js
+++ b/src/ui/public/utils/brush_event.js
@@ -1,9 +1,9 @@
 define(function (require) {
-  var moment = require('moment');
+  let moment = require('moment');
   return function brushEventProvider(timefilter) {
     return function (event) {
-      var from = moment(event.range[0]);
-      var to = moment(event.range[1]);
+      let from = moment(event.range[0]);
+      let to = moment(event.range[1]);
 
       if (to - from === 0) return;
 
diff --git a/src/ui/public/utils/dateMath.js b/src/ui/public/utils/dateMath.js
index 5c1ea32b893de..46de0fd4a8ed6 100644
--- a/src/ui/public/utils/dateMath.js
+++ b/src/ui/public/utils/dateMath.js
@@ -1,12 +1,12 @@
 define(function (require) {
-  var _ = require('lodash');
-  var moment = require('moment');
+  let _ = require('lodash');
+  let moment = require('moment');
 
-  var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
-  var unitsAsc = _.sortBy(units, function (unit) {
+  let units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
+  let unitsAsc = _.sortBy(units, function (unit) {
     return moment.duration(1, unit).valueOf();
   });
-  var unitsDesc = unitsAsc.reverse();
+  let unitsDesc = unitsAsc.reverse();
 
   /* This is a simplified version of elasticsearch's date parser */
   function parse(text, roundUp) {
@@ -14,10 +14,10 @@ define(function (require) {
     if (moment.isMoment(text)) return text;
     if (_.isDate(text)) return moment(text);
 
-    var time;
-    var mathString = '';
-    var index;
-    var parseString;
+    let time;
+    let mathString = '';
+    let index;
+    let parseString;
 
     if (text.substring(0, 3) === 'now') {
       time = moment();
@@ -43,15 +43,15 @@ define(function (require) {
   }
 
   function parseDateMath(mathString, time, roundUp) {
-    var dateTime = time;
-    var i = 0;
-    var len = mathString.length;
+    let dateTime = time;
+    let i = 0;
+    let len = mathString.length;
 
     while (i < len) {
-      var c = mathString.charAt(i++);
-      var type;
-      var num;
-      var unit;
+      let c = mathString.charAt(i++);
+      let type;
+      let num;
+      let unit;
 
       if (c === '/') {
         type = 0;
@@ -68,7 +68,7 @@ define(function (require) {
       } else if (mathString.length === 2) {
         num = mathString.charAt(i);
       } else {
-        var numFrom = i;
+        let numFrom = i;
         while (!isNaN(mathString.charAt(i))) {
           i++;
           if (i > 10) return undefined;
diff --git a/src/ui/public/utils/date_range.js b/src/ui/public/utils/date_range.js
index 285e9693ce5d5..78c213693de79 100644
--- a/src/ui/public/utils/date_range.js
+++ b/src/ui/public/utils/date_range.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var moment = require('moment');
+  let moment = require('moment');
 
   return {
     toString: function (range, format) {
@@ -12,7 +12,7 @@ define(function (require) {
       }
     },
     parse: function (rangeString, format) {
-      var chunks = rangeString.split(' to ');
+      let chunks = rangeString.split(' to ');
       if (chunks.length === 2) return {from: moment(chunks[0], format), to: moment(chunks[1], format)};
 
       chunks = rangeString.split('Before ');
diff --git a/src/ui/public/utils/decode_geo_hash.js b/src/ui/public/utils/decode_geo_hash.js
index 87b061eb16839..48881569089bf 100644
--- a/src/ui/public/utils/decode_geo_hash.js
+++ b/src/ui/public/utils/decode_geo_hash.js
@@ -17,22 +17,22 @@ define(function (require) {
    * @return {Object} interval
    */
   function decodeGeoHash(geohash) {
-    var BITS = [16, 8, 4, 2, 1];
-    var BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
-    var is_even = 1;
-    var lat = [];
-    var lon = [];
+    let BITS = [16, 8, 4, 2, 1];
+    let BASE32 = '0123456789bcdefghjkmnpqrstuvwxyz';
+    let is_even = 1;
+    let lat = [];
+    let lon = [];
     lat[0] = -90.0;
     lat[1] = 90.0;
     lon[0] = -180.0;
     lon[1] = 180.0;
-    var lat_err = 90.0;
-    var lon_err = 180.0;
-    for (var i = 0; i < geohash.length; i++) {
-      var c = geohash[i];
-      var cd = BASE32.indexOf(c);
-      for (var j = 0; j < 5; j++) {
-        var mask = BITS[j];
+    let lat_err = 90.0;
+    let lon_err = 180.0;
+    for (let i = 0; i < geohash.length; i++) {
+      let c = geohash[i];
+      let cd = BASE32.indexOf(c);
+      for (let j = 0; j < 5; j++) {
+        let mask = BITS[j];
         if (is_even) {
           lon_err /= 2;
           refine_interval(lon, cd, mask);
diff --git a/src/ui/public/utils/diff_object.js b/src/ui/public/utils/diff_object.js
index 9f2859d1ae03c..890baa5ee848e 100644
--- a/src/ui/public/utils/diff_object.js
+++ b/src/ui/public/utils/diff_object.js
@@ -1,17 +1,17 @@
 define(function (require) {
-  var _ = require('lodash');
-  var angular = require('angular');
+  let _ = require('lodash');
+  let angular = require('angular');
 
   return function (target, source) {
 
-    var diff = {};
+    let diff = {};
 
     /**
      * Filter the private vars
      * @param {string} key The keys
      * @returns {boolean}
      */
-    var filterPrivateAndMethods = function (obj) {
+    let filterPrivateAndMethods = function (obj) {
       return function (key) {
         if (_.isFunction(obj[key])) return false;
         if (key.charAt(0) === '$') return false;
@@ -19,8 +19,8 @@ define(function (require) {
       };
     };
 
-    var targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
-    var sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
+    let targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
+    let sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
 
     // Find the keys to be removed
     diff.removed = _.difference(targetKeys, sourceKeys);
diff --git a/src/ui/public/utils/diff_time_picker_vals.js b/src/ui/public/utils/diff_time_picker_vals.js
index f56d842e33c2d..87fcd4a178f92 100644
--- a/src/ui/public/utils/diff_time_picker_vals.js
+++ b/src/ui/public/utils/diff_time_picker_vals.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function DiffTimePickerValuesFn() {
-    var _ = require('lodash');
-    var angular = require('angular');
+    let _ = require('lodash');
+    let angular = require('angular');
 
-    var valueOf = function (o) {
+    let valueOf = function (o) {
       if (o) return o.valueOf();
     };
 
diff --git a/src/ui/public/utils/esBool.js b/src/ui/public/utils/esBool.js
index a3a9fa9206f89..a580ffac72188 100644
--- a/src/ui/public/utils/esBool.js
+++ b/src/ui/public/utils/esBool.js
@@ -1,5 +1,5 @@
 define(function () {
-  var map = {
+  let map = {
     'false': false,
     'off': false,
     'no': false,
@@ -11,7 +11,7 @@ define(function () {
   };
 
   return function (str) {
-    var bool = map[String(str)];
+    let bool = map[String(str)];
 
     if (typeof bool !== 'boolean') {
       throw new TypeError('"' + str + '" does not map to an esBool');
diff --git a/src/ui/public/utils/find_by_param.js b/src/ui/public/utils/find_by_param.js
new file mode 100644
index 0000000000000..0564871bdbfc7
--- /dev/null
+++ b/src/ui/public/utils/find_by_param.js
@@ -0,0 +1,13 @@
+define(function (require) {
+  let _ = require('lodash');
+  // given an object or array of objects, return the value of the passed param
+  // if the param is missing, return undefined
+  return function findByParam(values, param) {
+    if (_.isArray(values)) { // point series chart
+      let index = _.findIndex(values, param);
+      if (index === -1) return;
+      return values[index][param];
+    }
+    return values[param]; // pie chart
+  };
+});
\ No newline at end of file
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_move.js b/src/ui/public/utils/lodash-mixins/__tests__/_move.js
index 4d89a7f29cec2..3c341d5465aa2 100644
--- a/src/ui/public/utils/lodash-mixins/__tests__/_move.js
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_move.js
@@ -1,9 +1,9 @@
 describe('_.move', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
+  const _ = require('lodash');
+  const expect = require('expect.js');
 
   it('accepts previous from->to syntax', function () {
-    var list = [
+    const list = [
       1,
       1,
       1,
@@ -27,7 +27,7 @@ describe('_.move', function () {
   });
 
   it('moves an object up based on a function callback', function () {
-    var list = [
+    const list = [
       1,
       1,
       1,
@@ -55,7 +55,7 @@ describe('_.move', function () {
   });
 
   it('moves an object down based on a function callback', function () {
-    var list = [
+    const list = [
       1,
       1,
       1,
@@ -83,7 +83,7 @@ describe('_.move', function () {
   });
 
   it('moves an object up based on a where callback', function () {
-    var list = [
+    const list = [
       { v: 1 },
       { v: 1 },
       { v: 1 },
@@ -110,7 +110,7 @@ describe('_.move', function () {
 
 
   it('moves an object up based on a where callback', function () {
-    var list = [
+    const list = [
       { v: 1 },
       { v: 1 },
       { v: 1 },
@@ -136,7 +136,7 @@ describe('_.move', function () {
   });
 
   it('moves an object down based on a pluck callback', function () {
-    var list = [
+    const list = [
       { id: 0, normal: true },
       { id: 1, normal: true },
       { id: 2, normal: true },
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js b/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js
index 3832d77f230ec..673df45d07a1b 100644
--- a/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_organize_by.js
@@ -1,9 +1,9 @@
 describe('_.organize', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
+  const _ = require('lodash');
+  const expect = require('expect.js');
 
   it('it works', function () {
-    var col = [
+    const col = [
       {
         name: 'one',
         roles: ['user', 'admin', 'owner']
@@ -22,7 +22,7 @@ describe('_.organize', function () {
       }
     ];
 
-    var resp = _.organizeBy(col, 'roles');
+    const resp = _.organizeBy(col, 'roles');
     expect(resp).to.have.property('user');
     expect(resp.user).to.have.length(4);
 
@@ -34,15 +34,15 @@ describe('_.organize', function () {
   });
 
   it('behaves just like groupBy in normal scenarios', function () {
-    var col = [
+    const col = [
       { name: 'one' },
       { name: 'two' },
       { name: 'three' },
       { name: 'four' }
     ];
 
-    var orgs = _.organizeBy(col, 'name');
-    var groups = _.groupBy(col, 'name');
+    const orgs = _.organizeBy(col, 'name');
+    const groups = _.groupBy(col, 'name');
     expect(orgs).to.eql(groups);
   });
 });
diff --git a/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js b/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js
index 25925947a1062..27a8011c82e89 100644
--- a/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js
+++ b/src/ui/public/utils/lodash-mixins/__tests__/_push_all.js
@@ -1,12 +1,12 @@
 describe('_.pushAll', function () {
-  var _ = require('lodash');
-  var expect = require('expect.js');
+  const _ = require('lodash');
+  const expect = require('expect.js');
 
   it('pushes an entire array into another', function () {
-    var a = [1, 2, 3, 4];
-    var b = [5, 6, 7, 8];
+    const a = [1, 2, 3, 4];
+    const b = [5, 6, 7, 8];
 
-    var output = _.pushAll(b, a);
+    const output = _.pushAll(b, a);
     expect(output).to.be(a);
     expect(a).to.eql([1, 2, 3, 4, 5, 6, 7, 8]);
     expect(b).to.eql([5, 6, 7, 8]);
diff --git a/src/ui/public/utils/lodash-mixins/collection.js b/src/ui/public/utils/lodash-mixins/collection.js
index 5d86ec3be57b2..d5abf4cc98f9a 100644
--- a/src/ui/public/utils/lodash-mixins/collection.js
+++ b/src/ui/public/utils/lodash-mixins/collection.js
@@ -16,7 +16,7 @@ define(function (require) {
        * @return {array} - the objs argument
        */
       move: function (objs, obj, below, qualifier) {
-        var origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
+        const origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
         if (origI === -1) return objs;
 
         if (_.isNumber(below)) {
@@ -28,11 +28,11 @@ define(function (require) {
         below = !!below;
         qualifier = _.callback(qualifier);
 
-        var above = !below;
-        var finder = below ? _.findIndex : _.findLastIndex;
+        const above = !below;
+        const finder = below ? _.findIndex : _.findLastIndex;
 
         // find the index of the next/previous obj that meets the qualifications
-        var targetI = finder(objs, function (otherAgg, otherI) {
+        const targetI = finder(objs, function (otherAgg, otherI) {
           if (below && otherI <= origI) return;
           if (above && otherI >= origI) return;
           return !!qualifier(otherAgg, otherI);
@@ -59,8 +59,8 @@ define(function (require) {
        * @return {object}
        */
       organizeBy: function (collection, callback) {
-        var buckets = {};
-        var prop = typeof callback === 'function' ? false : callback;
+        const buckets = {};
+        const prop = typeof callback === 'function' ? false : callback;
 
         function add(key, obj) {
           if (!buckets[key]) buckets[key] = [];
@@ -68,14 +68,14 @@ define(function (require) {
         }
 
         _.each(collection, function (obj) {
-          var keys = prop === false ? callback(obj) : obj[prop];
+          const keys = prop === false ? callback(obj) : obj[prop];
 
           if (!_.isArray(keys)) {
             add(keys, obj);
             return;
           }
 
-          var length = keys.length;
+          let length = keys.length;
           while (length-- > 0) {
             add(keys[length], obj);
           }
@@ -109,14 +109,14 @@ define(function (require) {
        * @return {Array} dest
        */
       pushAll: function (source, dest) {
-        var start = dest.length;
-        var adding = source.length;
+        const start = dest.length;
+        const adding = source.length;
 
         // allocate - http://goo.gl/e2i0S0
         dest.length = start + adding;
 
         // fill sparse positions
-        var i = -1;
+        let i = -1;
         while (++i < adding) dest[start + i] = source[i];
 
         return dest;
diff --git a/src/ui/public/utils/lodash-mixins/function.js b/src/ui/public/utils/lodash-mixins/function.js
index 37342ffc99949..072d4cd13096e 100644
--- a/src/ui/public/utils/lodash-mixins/function.js
+++ b/src/ui/public/utils/lodash-mixins/function.js
@@ -14,11 +14,11 @@ define(function (require) {
        * @return {Function} - the wrapper method
        */
       onceWithCb: function (fn) {
-        var callbacks = [];
+        const callbacks = [];
 
         // on initial flush, call the init function, but ensure
         // that it only happens once
-        var flush = _.once(function (cntx, args) {
+        let flush = _.once(function (cntx, args) {
           args.push(function finishedOnce() {
             // override flush to simply schedule an asynchronous clear
             flush = function () {
@@ -34,8 +34,8 @@ define(function (require) {
         });
 
         return function runOnceWithCb() {
-          var args = [].slice.call(arguments, 0);
-          var cb = args[args.length - 1];
+          let args = [].slice.call(arguments, 0);
+          const cb = args[args.length - 1];
 
           if (typeof cb === 'function') {
             callbacks.push(cb);
diff --git a/src/ui/public/utils/lodash-mixins/object.js b/src/ui/public/utils/lodash-mixins/object.js
index c2677f360e628..901189c12897a 100644
--- a/src/ui/public/utils/lodash-mixins/object.js
+++ b/src/ui/public/utils/lodash-mixins/object.js
@@ -19,8 +19,8 @@ define(function (require) {
        * @return {object}
        */
       flattenWith: function (dot, nestedObj, flattenArrays) {
-        var stack = []; // track key stack
-        var flatObj = {};
+        const stack = []; // track key stack
+        const flatObj = {};
 
         (function flattenObj(obj) {
           _.keys(obj).forEach(function (key) {
diff --git a/src/ui/public/utils/lodash-mixins/oop.js b/src/ui/public/utils/lodash-mixins/oop.js
index b3dfa48e4dca0..a7d4a54e975a7 100644
--- a/src/ui/public/utils/lodash-mixins/oop.js
+++ b/src/ui/public/utils/lodash-mixins/oop.js
@@ -12,10 +12,10 @@ define(function (require) {
       };
     }
 
-    var props = {
+    const props = {
       inherits: describeConst(function (SuperClass) {
 
-        var prototype = Object.create(SuperClass.prototype, {
+        const prototype = Object.create(SuperClass.prototype, {
           constructor: describeConst(this),
           superConstructor: describeConst(SuperClass)
         });
diff --git a/src/ui/public/utils/lodash-mixins/string.js b/src/ui/public/utils/lodash-mixins/string.js
index 68a21c41ac860..8673b39f7bb56 100644
--- a/src/ui/public/utils/lodash-mixins/string.js
+++ b/src/ui/public/utils/lodash-mixins/string.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function (_) {
 
-    var DOT_PREFIX_RE = /(.).+?\./g;
+    const DOT_PREFIX_RE = /(.).+?\./g;
 
     _.mixin({
 
@@ -40,10 +40,10 @@ define(function (require) {
       commaSeperatedList: function (input) {
         if (_.isArray(input)) return input;
 
-        var source = String(input || '').split(',');
-        var list = [];
+        const source = String(input || '').split(',');
+        const list = [];
         while (source.length) {
-          var item = source.shift().trim();
+          const item = source.shift().trim();
           if (item) list.push(item);
         }
 
diff --git a/src/ui/public/utils/mapping_setup.js b/src/ui/public/utils/mapping_setup.js
index d54b6feded7d8..8715b75fd5d48 100644
--- a/src/ui/public/utils/mapping_setup.js
+++ b/src/ui/public/utils/mapping_setup.js
@@ -1,10 +1,10 @@
 define(function () {
   return function MappingSetupService(kbnIndex, es) {
-    var angular = require('angular');
-    var _ = require('lodash');
-    var mappingSetup = this;
+    let angular = require('angular');
+    let _ = require('lodash');
+    let mappingSetup = this;
 
-    var json = {
+    let json = {
       _serialize: function (val) {
         if (val != null) return angular.toJson(val);
       },
@@ -16,14 +16,14 @@ define(function () {
     /**
      * Use to create the mappings, but that should only happen one at a time
      */
-    var activeTypeCreations = {};
+    let activeTypeCreations = {};
 
     /**
      * Get the list of type's mapped in elasticsearch
      * @return {[type]} [description]
      */
-    var getKnownKibanaTypes = _.once(function () {
-      var indexName = kbnIndex;
+    let getKnownKibanaTypes = _.once(function () {
+      let indexName = kbnIndex;
       return es.indices.getFieldMapping({
         // only concerned with types in this kibana index
         index: indexName,
@@ -70,13 +70,13 @@ define(function () {
         });
       }
 
-      var prom = getKnownKibanaTypes()
+      let prom = getKnownKibanaTypes()
       .then(function (knownTypes) {
         // if the type is in the knownTypes array already
         if (~knownTypes.indexOf(type)) return false;
 
         // we need to create the mapping
-        var body = {};
+        let body = {};
         body[type] = {
           properties: mapping
         };
diff --git a/src/ui/public/utils/no_white_space.js b/src/ui/public/utils/no_white_space.js
index 2118f400ae553..988e923f3d93f 100644
--- a/src/ui/public/utils/no_white_space.js
+++ b/src/ui/public/utils/no_white_space.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var TAGS_WITH_WS = />\s+</g;
+  let TAGS_WITH_WS = />\s+</g;
 
   /**
    * Remove all of the whitespace between html tags
diff --git a/src/ui/public/utils/ordinal_suffix.js b/src/ui/public/utils/ordinal_suffix.js
index f3b4061c1fe30..dd6e747fedd31 100644
--- a/src/ui/public/utils/ordinal_suffix.js
+++ b/src/ui/public/utils/ordinal_suffix.js
@@ -1,17 +1,17 @@
 define(function (require) {
   // adopted from http://stackoverflow.com/questions/3109978/php-display-number-with-ordinal-suffix
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function addOrdinalSuffix(num) {
     return num + '' + suffix(num);
   };
 
   function suffix(num) {
-    var int = Math.floor(parseFloat(num));
+    let int = Math.floor(parseFloat(num));
 
-    var hunth = int % 100;
+    let hunth = int % 100;
     if (hunth >= 11 && hunth <= 13) return 'th';
 
-    var tenth = int % 10;
+    let tenth = int % 10;
     if (tenth === 1) return 'st';
     if (tenth === 2) return 'nd';
     if (tenth === 3) return 'rd';
diff --git a/src/ui/public/utils/parse_interval.js b/src/ui/public/utils/parse_interval.js
index 551fba8e24c7c..4ee1317e0b069 100644
--- a/src/ui/public/utils/parse_interval.js
+++ b/src/ui/public/utils/parse_interval.js
@@ -1,21 +1,21 @@
 define(function (require) {
-  var _ = require('lodash');
-  var moment = require('moment');
-  var dateMath = require('ui/utils/dateMath');
+  let _ = require('lodash');
+  let moment = require('moment');
+  let dateMath = require('ui/utils/dateMath');
 
   // Assume interval is in the form (value)(unit), such as "1h"
-  var INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
+  let INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
 
   return function parseInterval(interval) {
-    var matches = String(interval).trim().match(INTERVAL_STRING_RE);
+    let matches = String(interval).trim().match(INTERVAL_STRING_RE);
 
     if (!matches) return null;
 
     try {
-      var value = parseFloat(matches[1]) || 1;
-      var unit = matches[2];
+      let value = parseFloat(matches[1]) || 1;
+      let unit = matches[2];
 
-      var duration = moment.duration(value, unit);
+      let duration = moment.duration(value, unit);
 
       // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
       // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
@@ -24,7 +24,7 @@ define(function (require) {
       // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
       // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
       // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
-      var selectedUnit = _.find(dateMath.units, function (unit) {
+      let selectedUnit = _.find(dateMath.units, function (unit) {
         return Math.abs(duration.as(unit)) >= 1;
       });
 
diff --git a/src/ui/public/utils/query_string.js b/src/ui/public/utils/query_string.js
index 02274179e4ca9..eb7929af6ea3f 100644
--- a/src/ui/public/utils/query_string.js
+++ b/src/ui/public/utils/query_string.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var qs = {};
+  let qs = {};
 
   /*****
   /*** orignally copied from angular, modified our purposes
@@ -38,16 +38,16 @@ define(function (require) {
    * @returns {Object.<string,boolean|Array>}
    */
   qs.decode = function (keyValue) {
-    var obj = {};
-    var keyValueParts;
-    var key;
+    let obj = {};
+    let keyValueParts;
+    let key;
 
     (keyValue || '').split('&').forEach(function (keyValue) {
       if (keyValue) {
         keyValueParts = keyValue.split('=');
         key = tryDecodeURIComponent(keyValueParts[0]);
         if (key !== void 0) {
-          var val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true;
+          let val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true;
           if (!obj[key]) {
             obj[key] = val;
           } else if (Array.isArray(obj[key])) {
@@ -67,10 +67,10 @@ define(function (require) {
    * @return {String}
    */
   qs.encode = function (obj) {
-    var parts = [];
-    var keys = Object.keys(obj).sort();
+    let parts = [];
+    let keys = Object.keys(obj).sort();
     keys.forEach(function (key) {
-      var value = obj[key];
+      let value = obj[key];
       if (Array.isArray(value)) {
         value.forEach(function (arrayValue) {
           parts.push(qs.param(key, arrayValue));
@@ -93,8 +93,8 @@ define(function (require) {
    *                    the same if the url does not have a query string
    */
   qs.findInUrl = function (url) {
-    var qsStart = url.indexOf('?');
-    var hashStart = url.lastIndexOf('#');
+    let qsStart = url.indexOf('?');
+    let hashStart = url.lastIndexOf('#');
 
     if (hashStart === -1) {
       // out of bounds
@@ -112,8 +112,8 @@ define(function (require) {
   };
 
   qs.replaceParamInUrl = function (url, param, newVal) {
-    var loc = qs.findInUrl(url);
-    var parsed = qs.decode(url.substring(loc.start + 1, loc.end));
+    let loc = qs.findInUrl(url);
+    let parsed = qs.decode(url.substring(loc.start + 1, loc.end));
 
     if (newVal != null) {
       parsed[param] = newVal;
@@ -121,7 +121,7 @@ define(function (require) {
       delete parsed[param];
     }
 
-    var chars = url.split('');
+    let chars = url.split('');
     chars.splice(loc.start, loc.end - loc.start, '?' + qs.encode(parsed));
     return chars.join('');
   };
diff --git a/src/ui/public/utils/range.js b/src/ui/public/utils/range.js
index 9a2f2dcba21d2..15a977ff517ca 100644
--- a/src/ui/public/utils/range.js
+++ b/src/ui/public/utils/range.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * Regexp portion that matches our number
@@ -14,7 +14,7 @@ define(function (require) {
    *
    * @type {String}
    */
-  var _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))';
+  let _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))';
 
   /**
    * Regexp for the interval notation
@@ -26,11 +26,11 @@ define(function (require) {
    *
    * @type {RegExp}
    */
-  var RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$');
+  let RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$');
 
   function parse(input) {
 
-    var match = String(input).match(RANGE_RE);
+    let match = String(input).match(RANGE_RE);
     if (!match) {
       throw new TypeError('expected input to be in interval notation eg. (100, 200]');
     }
@@ -44,7 +44,7 @@ define(function (require) {
   }
 
   function Range(/* minIncl, min, max, maxIncl */) {
-    var args = _.toArray(arguments);
+    let args = _.toArray(arguments);
     if (args[1] > args[2]) args.reverse();
 
     this.minInclusive = args[0];
diff --git a/src/ui/public/utils/rison.js b/src/ui/public/utils/rison.js
index 2dd955105f59d..c4932355e62fe 100644
--- a/src/ui/public/utils/rison.js
+++ b/src/ui/public/utils/rison.js
@@ -361,7 +361,7 @@ define(function () {
 
   rison.parser.parse_array = function (parser) {
       var ar = [];
-      var c;
+      let c;
       while ((c = parser.next()) != ')') {
           if (!c) return parser.error("unmatched '!('");
           if (ar.length) {
@@ -400,7 +400,7 @@ define(function () {
       },
       '(': function () {
           var o = {};
-          var c;
+          let c;
           var count = 0;
           while ((c = this.next()) != ')') {
               if (count) {
@@ -425,7 +425,7 @@ define(function () {
           var i = this.index;
           var start = i;
           var segments = [];
-          var c;
+          let c;
           while ((c = s.charAt(i++)) != "'") {
               //if (i == s.length) return this.error('unmatched "\'"');
               if (!c) return this.error('unmatched "\'"');
diff --git a/src/ui/public/utils/scanner.js b/src/ui/public/utils/scanner.js
new file mode 100644
index 0000000000000..e6e59bdce159d
--- /dev/null
+++ b/src/ui/public/utils/scanner.js
@@ -0,0 +1,72 @@
+const _ = require('lodash');
+
+let Scanner = function (client, {index, type} = {}) {
+  if (!index) throw new Error('Expected index');
+  if (!type) throw new Error('Expected type');
+  if (!client) throw new Error('Expected client');
+
+  this.client = client;
+  this.index = index;
+  this.type = type;
+};
+
+Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
+  let scrollId;
+  let body;
+  let allResults = {
+    hits: [],
+    total: 0
+  };
+  const opts = _.defaults(options || {}, {
+    pageSize: 100,
+    docCount: 1000
+  });
+
+  if (searchString) {
+    body = {
+      query: {
+        simple_query_string: {
+          query: searchString + '*',
+          fields: ['title^3', 'description'],
+          default_operator: 'AND'
+        }
+      }
+    };
+  } else {
+    body = { query: {match_all: {}}};
+  }
+
+  return new Promise((resolve, reject) => {
+    const getMoreUntilDone = (error, response) => {
+      const scanAllResults = opts.docCount === Infinity;
+      allResults.total = scanAllResults ? response.hits.total : Math.min(response.hits.total, opts.docCount);
+      scrollId = response._scroll_id || scrollId;
+
+      let hits = response.hits.hits
+      .slice(0, allResults.total - allResults.hits.length);
+      if (mapFn) hits = hits.map(mapFn);
+
+      allResults.hits =  allResults.hits.concat(hits);
+
+      const collectedAllResults = allResults.total === allResults.hits.length;
+      if (collectedAllResults) {
+        resolve(allResults);
+      } else {
+        this.client.scroll({
+          scrollId
+        }, getMoreUntilDone);
+      }
+    };
+
+    this.client.search({
+      index: this.index,
+      type: this.type,
+      size: opts.pageSize,
+      body,
+      searchType: 'scan',
+      scroll: '1m'
+    }, getMoreUntilDone);
+  });
+};
+
+export default Scanner;
diff --git a/src/ui/public/utils/sequencer.js b/src/ui/public/utils/sequencer.js
index bfd863b2e239e..cdabe878ef3ac 100644
--- a/src/ui/public/utils/sequencer.js
+++ b/src/ui/public/utils/sequencer.js
@@ -1,19 +1,19 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   function create(min, max, length, mod) {
-    var seq = new Array(length);
+    let seq = new Array(length);
 
-    var valueDist = max - min;
+    let valueDist = max - min;
 
     // range of values that the mod creates
-    var modRange = [mod(0, length), mod(length - 1, length)];
+    let modRange = [mod(0, length), mod(length - 1, length)];
 
     // distance between
-    var modRangeDist = modRange[1] - modRange[0];
+    let modRangeDist = modRange[1] - modRange[0];
 
     _.times(length, function (i) {
-      var modIPercent = (mod(i, length) - modRange[0]) / modRangeDist;
+      let modIPercent = (mod(i, length) - modRange[0]) / modRangeDist;
 
       // percent applied to distance and added to min to
       // produce value
@@ -81,8 +81,8 @@ define(function (require) {
       // adapted from output of http://www.timotheegroleau.com/Flash/experiments/easing_function_generator.htm
       // generates numbers from 0 to 100
 
-      var ts = (i /= length) * i;
-      var tc = ts * i;
+      let ts = (i /= length) * i;
+      let tc = ts * i;
       return 100 * (
         0.5 * tc * ts +
         -3 * ts * ts +
diff --git a/src/ui/public/utils/slugify_id.js b/src/ui/public/utils/slugify_id.js
index 7dc20065691f6..d0206ccc24388 100644
--- a/src/ui/public/utils/slugify_id.js
+++ b/src/ui/public/utils/slugify_id.js
@@ -1,16 +1,16 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
   return function (id) {
     if (id == null) return;
 
-    var trans = {
+    let trans = {
       '/' : '-slash-',
       '\\?' : '-questionmark-',
       '\\&' : '-ampersand-',
       '=' : '-equal-'
     };
     _.each(trans, function (val, key) {
-      var regex = new RegExp(key, 'g');
+      let regex = new RegExp(key, 'g');
       id = id.replace(regex, val);
     });
     id = id.replace(/[\s]+/g, '-');
diff --git a/src/ui/public/utils/supports.js b/src/ui/public/utils/supports.js
index 1c9cd1a9ee099..8e33af752fc27 100644
--- a/src/ui/public/utils/supports.js
+++ b/src/ui/public/utils/supports.js
@@ -1,19 +1,19 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   /**
    * just a place to put feature detection checks
    */
   return {
     cssFilters: (function () {
-      var e = document.createElement('img');
-      var rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
-      var test = 'grayscale(1)';
+      let e = document.createElement('img');
+      let rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
+      let test = 'grayscale(1)';
       rules.forEach(function (rule) { e.style[rule] = test; });
 
       document.body.appendChild(e);
-      var styles = window.getComputedStyle(e);
-      var can = _(styles).pick(rules).includes(test);
+      let styles = window.getComputedStyle(e);
+      let can = _(styles).pick(rules).includes(test);
       document.body.removeChild(e);
 
       return can;
diff --git a/src/ui/public/utils/versionmath.js b/src/ui/public/utils/versionmath.js
deleted file mode 100644
index cd2e47600fc87..0000000000000
--- a/src/ui/public/utils/versionmath.js
+++ /dev/null
@@ -1,139 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-
-  function VersionMathException(message) {
-    this.message = message;
-    this.name = 'VersionMathException';
-  }
-
-  // Get the max version in this cluster
-  function max(versions) {
-    return sortVersions(versions).pop();
-  }
-
-  // Return the lowest version in the cluster
-  function min(versions) {
-    return sortVersions(versions).shift();
-  }
-
-  // Sort versions from lowest to highest
-  function sortVersions(versions) {
-    if (!_.isArray(versions)) versions = [versions];
-
-    return _.uniq(versions).sort(function (a, b) {
-      return compare(a, b) ? -1 : 1;
-    });
-  }
-
-  /*
-    Takes a version string with one of the following optional comparison prefixes: >,>=,<.<=
-    and evaluates if the cluster meets the requirement. If the prefix is omitted exact match
-    is assumed
-  */
-  function is(equation, versions) {
-    var _versions = sortVersions(versions);
-    var _v = equation;
-    var _cf;
-
-    if (_v.charAt(0) === '>') {
-      _cf = _v.charAt(1) === '=' ? gte(_v.slice(2), _versions) : gt(_v.slice(1), _versions);
-    } else if (_v.charAt(0) === '<') {
-      _cf = _v.charAt(1) === '=' ? lte(_v.slice(2), _versions) : lt(_v.slice(1), _versions);
-    } else {
-      _cf = eq(_v, _versions);
-    }
-
-    return _cf;
-  }
-
-  // check if lowest version in cluster = `version`
-  function eq(version, versions) {
-    var _versions = sortVersions(versions);
-    return version === min(_versions) ? true : false;
-  }
-
-  // version > lowest version in cluster?
-  function gt(version, versions) {
-    var _versions = sortVersions(versions);
-    return version === min(_versions) ? false : gte(version, _versions);
-  }
-
-  // version < highest version in cluster?
-  function lt(version, versions) {
-    var _versions = sortVersions(versions);
-    return version === max(_versions) ? false : lte(version, _versions);
-  }
-
-  // Check if the lowest version in the cluster is >= to `version`
-  function gte(version, versions) {
-    var _versions = sortVersions(versions);
-    return compare(version, min(_versions));
-  }
-
-  // Check if the highest version in the cluster is <= to `version`
-  function lte(version, versions) {
-    var _versions = sortVersions(versions);
-    return compare(max(_versions), version);
-  }
-
-  // Determine if a specific version meets the minimum requirement
-  function compare(required, installed) {
-    if (_.isUndefined(installed)) {
-      return;
-    }
-
-    if (!required || !installed) {
-      return undefined;
-    }
-
-    var a = installed.split('.');
-    var b = required.split('.');
-    var i;
-
-    // leave suffixes as is ("RC1 or -SNAPSHOT")
-    for (i = 0; i < Math.min(a.length, 3); ++i) {
-      a[i] = Number(a[i]);
-    }
-    for (i = 0; i < Math.min(b.length, 3); ++i) {
-      b[i] = Number(b[i]);
-    }
-    if (a.length === 2) {
-      a[2] = 0;
-    }
-
-    if (a[0] > b[0]) { return true; }
-    if (a[0] < b[0]) { return false; }
-
-    if (a[1] > b[1]) { return true; }
-    if (a[1] < b[1]) { return false; }
-
-    if (a[2] > b[2]) { return true; }
-    if (a[2] < b[2]) { return false; }
-
-    if (a.length > 3) {
-      // rc/beta suffix
-      if (b.length <= 3) {
-        return false;
-      } // no suffix on b -> a<b
-      return a[3] >= b[3];
-    }
-    if (b.length > 3) {
-      // b has a suffix but a not -> a>b
-      return true;
-    }
-
-    return true;
-  }
-
-
-  return {
-    min: min,
-    max: max,
-    is: is,
-    eq: eq,
-    gt: gt,
-    gte: gte,
-    lt: lt,
-    lte: lte
-  };
-});
diff --git a/src/ui/public/validateDateInterval.js b/src/ui/public/validateDateInterval.js
index 2adf577c288e4..9a7eec48ef896 100644
--- a/src/ui/public/validateDateInterval.js
+++ b/src/ui/public/validateDateInterval.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var parseInterval = require('ui/utils/parse_interval');
+  const parseInterval = require('ui/utils/parse_interval');
 
   require('ui/modules')
   .get('kibana')
diff --git a/src/ui/public/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js
index 8e5c56d90a1ee..37859656f3920 100644
--- a/src/ui/public/vislib/__tests__/components/color.js
+++ b/src/ui/public/vislib/__tests__/components/color.js
@@ -1,27 +1,27 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 const _ = require('lodash');
 const d3 = require('d3');
 
 describe('Vislib Color Module Test Suite', function () {
-  var seedColors;
-  var mappedColors;
+  let seedColors;
+  let mappedColors;
   let config;
 
   describe('Color (main)', function () {
     let previousConfig;
-    var getColors;
-    var arr = ['good', 'better', 'best', 'never', 'let', 'it', 'rest'];
-    var arrayOfNumbers = [1, 2, 3, 4, 5];
-    var arrayOfUndefinedValues = [undefined, undefined, undefined];
-    var arrayOfObjects = [{}, {}, {}];
-    var arrayOfBooleans = [true, false, true];
-    var arrayOfNullValues = [null, null, null];
-    var emptyObject = {};
-    var nullValue = null;
-    var notAValue;
-    var color;
+    let getColors;
+    let arr = ['good', 'better', 'best', 'never', 'let', 'it', 'rest'];
+    let arrayOfNumbers = [1, 2, 3, 4, 5];
+    let arrayOfUndefinedValues = [undefined, undefined, undefined];
+    let arrayOfObjects = [{}, {}, {}];
+    let arrayOfBooleans = [true, false, true];
+    let arrayOfNullValues = [null, null, null];
+    let emptyObject = {};
+    let nullValue = null;
+    let notAValue;
+    let color;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject((Private, config) => {
@@ -30,7 +30,7 @@ describe('Vislib Color Module Test Suite', function () {
       seedColors = Private(require('ui/vislib/components/color/seed_colors'));
       getColors = Private(require('ui/vislib/components/color/color'));
       mappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
-      color = getColors(arr);
+      color = getColors(arr, {});
     }));
 
     afterEach(ngMock.inject((config) => {
@@ -110,6 +110,11 @@ describe('Vislib Color Module Test Suite', function () {
     it('should return the value from the mapped colors', function () {
       expect(color(arr[1])).to.be(mappedColors.get(arr[1]));
     });
+
+    it('should return the value from the specified color mapping overrides', function () {
+      const colorFn = getColors(arr, {good: 'red'});
+      expect(colorFn('good')).to.be('red');
+    });
   });
 
   describe('Seed Colors', function () {
@@ -125,6 +130,7 @@ describe('Vislib Color Module Test Suite', function () {
     beforeEach(ngMock.inject((Private, config) => {
       previousConfig = config.get('visualization:colorMapping');
       mappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
+      seedColors = Private(require('ui/vislib/components/color/seed_colors'));
       mappedColors.mapping = {};
     }));
 
@@ -178,20 +184,72 @@ describe('Vislib Color Module Test Suite', function () {
       expect(mappedColors.get(arr[0])).to.not.be(seedColors[0]);
       expect(mappedColors.get('bar')).to.be(seedColors[0]);
     }));
+
+    it('should have a flush method that moves the current map to the old map', function () {
+      const arr = [1, 2, 3, 4, 5];
+      mappedColors.mapKeys(arr);
+      expect(_.keys(mappedColors.mapping).length).to.be(5);
+      expect(_.keys(mappedColors.oldMap).length).to.be(0);
+
+      mappedColors.flush();
+
+      expect(_.keys(mappedColors.oldMap).length).to.be(5);
+      expect(_.keys(mappedColors.mapping).length).to.be(0);
+
+      mappedColors.flush();
+
+      expect(_.keys(mappedColors.oldMap).length).to.be(0);
+      expect(_.keys(mappedColors.mapping).length).to.be(0);
+    });
+
+    it('should use colors in the oldMap if they are available', function () {
+      const arr = [1, 2, 3, 4, 5];
+      mappedColors.mapKeys(arr);
+      expect(_.keys(mappedColors.mapping).length).to.be(5);
+      expect(_.keys(mappedColors.oldMap).length).to.be(0);
+
+      mappedColors.flush();
+
+      mappedColors.mapKeys([3, 4, 5]);
+      expect(_.keys(mappedColors.oldMap).length).to.be(5);
+      expect(_.keys(mappedColors.mapping).length).to.be(3);
+
+      expect(mappedColors.mapping[1]).to.be(undefined);
+      expect(mappedColors.mapping[2]).to.be(undefined);
+      expect(mappedColors.mapping[3]).to.equal(mappedColors.oldMap[3]);
+      expect(mappedColors.mapping[4]).to.equal(mappedColors.oldMap[4]);
+      expect(mappedColors.mapping[5]).to.equal(mappedColors.oldMap[5]);
+    });
+
+    it('should have a purge method that clears both maps', function () {
+      const arr = [1, 2, 3, 4, 5];
+      mappedColors.mapKeys(arr);
+      mappedColors.flush();
+      mappedColors.mapKeys(arr);
+
+      expect(_.keys(mappedColors.mapping).length).to.be(5);
+      expect(_.keys(mappedColors.oldMap).length).to.be(5);
+
+      mappedColors.purge();
+
+      expect(_.keys(mappedColors.mapping).length).to.be(0);
+      expect(_.keys(mappedColors.oldMap).length).to.be(0);
+
+    });
   });
 
   describe('Color Palette', function () {
-    var num1 = 45;
-    var num2 = 72;
-    var num3 = 90;
-    var string = 'Welcome';
-    var bool = true;
-    var nullValue = null;
-    var emptyArr = [];
-    var emptyObject = {};
-    var notAValue;
-    var createColorPalette;
-    var colorPalette;
+    let num1 = 45;
+    let num2 = 72;
+    let num3 = 90;
+    let string = 'Welcome';
+    let bool = true;
+    let nullValue = null;
+    let emptyArr = [];
+    let emptyObject = {};
+    let notAValue;
+    let createColorPalette;
+    let colorPalette;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/__tests__/components/labels.js b/src/ui/public/vislib/__tests__/components/labels.js
index 0882b20eb985c..3c3cef42ab9e1 100644
--- a/src/ui/public/vislib/__tests__/components/labels.js
+++ b/src/ui/public/vislib/__tests__/components/labels.js
@@ -1,17 +1,17 @@
-var angular = require('angular');
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-
-var getLabels;
-var seriesLabels;
-var rowsLabels;
-var seriesArr;
-var rowsArr;
-var uniqLabels;
-var error;
-
-var seriesData = {
+let angular = require('angular');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+
+let getLabels;
+let seriesLabels;
+let rowsLabels;
+let seriesArr;
+let rowsArr;
+let uniqLabels;
+let error;
+
+let seriesData = {
   'label': '',
   'series': [
     {
@@ -21,7 +21,7 @@ var seriesData = {
   ]
 };
 
-var rowsData = {
+let rowsData = {
   'rows': [
     {
       'label': 'a',
@@ -62,7 +62,7 @@ var rowsData = {
   ]
 };
 
-var columnsData = {
+let columnsData = {
   'columns': [
     {
       'label': 'a',
@@ -148,27 +148,27 @@ describe('Vislib Labels Module Test Suite', function () {
   });
 
   describe('Data array', function () {
-    var childrenObject = {
+    let childrenObject = {
       children: []
     };
-    var seriesObject = {
+    let seriesObject = {
       series: []
     };
-    var rowsObject = {
+    let rowsObject = {
       rows: []
     };
-    var columnsObject = {
+    let columnsObject = {
       columns: []
     };
-    var string = 'string';
-    var number = 23;
-    var boolean = false;
-    var emptyArray = [];
-    var nullValue = null;
-    var notAValue;
-    var dataArray;
-    var testSeries;
-    var testRows;
+    let string = 'string';
+    let number = 23;
+    let boolean = false;
+    let emptyArray = [];
+    let nullValue = null;
+    let notAValue;
+    let dataArray;
+    let testSeries;
+    let testRows;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -262,8 +262,8 @@ describe('Vislib Labels Module Test Suite', function () {
   });
 
   describe('Unique labels', function () {
-    var uniqLabels;
-    var arrObj = [
+    let uniqLabels;
+    let arrObj = [
       {'label': 'a'},
       {'label': 'b'},
       {'label': 'b'},
@@ -272,15 +272,15 @@ describe('Vislib Labels Module Test Suite', function () {
       {'label': 'd'},
       {'label': 'f'}
     ];
-    var string = 'string';
-    var number = 24;
-    var boolean = false;
-    var nullValue = null;
-    var emptyObject = {};
-    var emptyArray = [];
-    var notAValue;
-    var uniq;
-    var testArr;
+    let string = 'string';
+    let number = 24;
+    let boolean = false;
+    let nullValue = null;
+    let emptyObject = {};
+    let emptyArray = [];
+    let notAValue;
+    let uniq;
+    let testArr;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -336,24 +336,24 @@ describe('Vislib Labels Module Test Suite', function () {
   });
 
   describe('Get series', function () {
-    var string = 'string';
-    var number = 24;
-    var boolean = false;
-    var nullValue = null;
-    var rowsObject = {
+    let string = 'string';
+    let number = 24;
+    let boolean = false;
+    let nullValue = null;
+    let rowsObject = {
       rows: []
     };
-    var columnsObject = {
+    let columnsObject = {
       columns: []
     };
-    var emptyObject = {};
-    var emptyArray = [];
-    var notAValue;
-    var getSeries;
-    var columnsLabels;
-    var rowsLabels;
-    var columnsArr;
-    var rowsArr;
+    let emptyObject = {};
+    let emptyArray = [];
+    let notAValue;
+    let getSeries;
+    let columnsLabels;
+    let rowsLabels;
+    let columnsArr;
+    let rowsArr;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js
index 5da63afb33a0a..ee8645f4d664b 100644
--- a/src/ui/public/vislib/__tests__/components/zero_injection.js
+++ b/src/ui/public/vislib/__tests__/components/zero_injection.js
@@ -1,11 +1,11 @@
 
-var angular = require('angular');
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let angular = require('angular');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Vislib Zero Injection Module Test Suite', function () {
-  var dateHistogramRows = {
+  let dateHistogramRows = {
     'rows': [
       {
         'label': 'Top 5 @tags: success',
@@ -155,7 +155,7 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     ]
   };
 
-  var seriesData = {
+  let seriesData = {
     series: [
       {
         label: '200',
@@ -170,7 +170,7 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     ]
   };
 
-  var multiSeriesData = {
+  let multiSeriesData = {
     series: [
       {
         label: '200',
@@ -199,7 +199,7 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     ]
   };
 
-  var multiSeriesNumberedData = {
+  let multiSeriesNumberedData = {
     series: [
       {
         label: '200',
@@ -228,31 +228,31 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     ]
   };
 
-  var childrenObject = {
+  let childrenObject = {
     children: []
   };
-  var seriesObject = {
+  let seriesObject = {
     series: []
   };
-  var rowsObject = {
+  let rowsObject = {
     rows: []
   };
-  var columnsObject = {
+  let columnsObject = {
     columns: []
   };
-  var emptyObject = {};
-  var str = 'string';
-  var number = 24;
-  var boolean = false;
-  var nullValue = null;
-  var emptyArray = [];
-  var notAValue;
+  let emptyObject = {};
+  let str = 'string';
+  let number = 24;
+  let boolean = false;
+  let nullValue = null;
+  let emptyArray = [];
+  let notAValue;
 
   describe('Zero Injection (main)', function () {
-    var injectZeros;
-    var sample1;
-    var sample2;
-    var sample3;
+    let injectZeros;
+    let sample1;
+    let sample2;
+    let sample3;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -356,9 +356,9 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Order X Values', function () {
-    var orderXValues;
-    var results;
-    var numberedResults;
+    let orderXValues;
+    let results;
+    let numberedResults;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -416,8 +416,8 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Unique Keys', function () {
-    var uniqueKeys;
-    var results;
+    let uniqueKeys;
+    let results;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -465,8 +465,8 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Flatten Data', function () {
-    var flattenData;
-    var results;
+    let flattenData;
+    let results;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -490,11 +490,11 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Zero Filled Array', function () {
-    var createZeroArray;
-    var arr1 = [1, 2, 3, 4, 5];
-    var arr2 = ['1', '2', '3', '4', '5'];
-    var results1;
-    var results2;
+    let createZeroArray;
+    let arr1 = [1, 2, 3, 4, 5];
+    let arr2 = ['1', '2', '3', '4', '5'];
+    let results1;
+    let results2;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -571,12 +571,12 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Zero Filled Data Array', function () {
-    var zeroFillArray;
-    var xValueArr = [1, 2, 3, 4, 5];
-    var createZeroArray;
-    var arr1;
-    var arr2 = [ {x: 3, y: 834} ];
-    var results;
+    let zeroFillArray;
+    let xValueArr = [1, 2, 3, 4, 5];
+    let createZeroArray;
+    let arr1;
+    let arr2 = [ {x: 3, y: 834} ];
+    let results;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -637,8 +637,8 @@ describe('Vislib Zero Injection Module Test Suite', function () {
   });
 
   describe('Injected Zero values return in the correct order', function () {
-    var injectZeros;
-    var results;
+    let injectZeros;
+    let results;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
@@ -653,7 +653,7 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     });
 
     it('should return ordered x values', function () {
-      var values = results.rows[0].series[0].values;
+      let values = results.rows[0].series[0].values;
       expect(values[0].x).to.be.lessThan(values[1].x);
       expect(values[1].x).to.be.lessThan(values[2].x);
       expect(values[2].x).to.be.lessThan(values[3].x);
diff --git a/src/ui/public/vislib/__tests__/index.js b/src/ui/public/vislib/__tests__/index.js
index 9ebf1f24a6f1a..fc3d02ed5aec5 100644
--- a/src/ui/public/vislib/__tests__/index.js
+++ b/src/ui/public/vislib/__tests__/index.js
@@ -1,14 +1,14 @@
 
-var _ = require('lodash');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var d3 = require('d3');
+let _ = require('lodash');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let d3 = require('d3');
 require('ui/vislib/styles/main.less');
 
-var angular = require('angular');
+let angular = require('angular');
 
 describe('Vislib Index Test Suite', function () {
-  var vislib;
+  let vislib;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js
index 19c58829f3cc9..b42019dbeb9c0 100644
--- a/src/ui/public/vislib/__tests__/lib/axis_title.js
+++ b/src/ui/public/vislib/__tests__/lib/axis_title.js
@@ -1,19 +1,20 @@
-var d3 = require('d3');
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib AxisTitle Class Test Suite', function () {
-  var AxisTitle;
-  var Data;
-  var axisTitle;
-  var el;
-  var dataObj;
-  var xTitle;
-  var yTitle;
-  var data = {
+  let AxisTitle;
+  let Data;
+  let PersistedState;
+  let axisTitle;
+  let el;
+  let dataObj;
+  let xTitle;
+  let yTitle;
+  let data = {
     hits: 621,
     label: '',
     ordered: {
@@ -76,6 +77,7 @@ describe('Vislib AxisTitle Class Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     AxisTitle = Private(require('ui/vislib/lib/axis_title'));
     Data = Private(require('ui/vislib/lib/data'));
+    PersistedState = Private(require('ui/persisted_state/persisted_state'));
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper');
@@ -91,7 +93,7 @@ describe('Vislib AxisTitle Class Test Suite', function () {
       .style('width', '20px');
 
 
-    dataObj = new Data(data, {});
+    dataObj = new Data(data, {}, new PersistedState());
     xTitle = dataObj.get('xAxisLabel');
     yTitle = dataObj.get('yAxisLabel');
     axisTitle = new AxisTitle($('.vis-wrapper')[0], xTitle, yTitle);
diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js
index cb5a347829b13..f87a0495db6c3 100644
--- a/src/ui/public/vislib/__tests__/lib/chart_title.js
+++ b/src/ui/public/vislib/__tests__/lib/chart_title.js
@@ -1,17 +1,18 @@
-var d3 = require('d3');
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib ChartTitle Class Test Suite', function () {
-  var ChartTitle;
-  var Data;
-  var chartTitle;
-  var el;
-  var dataObj;
-  var data = {
+  let ChartTitle;
+  let Data;
+  let persistedState;
+  let chartTitle;
+  let el;
+  let dataObj;
+  let data = {
     hits: 621,
     label: '',
     ordered: {
@@ -74,6 +75,7 @@ describe('Vislib ChartTitle Class Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     ChartTitle = Private(require('ui/vislib/lib/chart_title'));
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper')
@@ -83,7 +85,7 @@ describe('Vislib ChartTitle Class Test Suite', function () {
       .attr('class', 'chart-title')
       .style('height', '20px');
 
-    dataObj = new Data(data, {});
+    dataObj = new Data(data, {}, persistedState);
     chartTitle = new ChartTitle($('.vis-wrapper')[0], 'rows');
   }));
 
diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js
index 035cb36634fd7..3f39ddb2f6261 100644
--- a/src/ui/public/vislib/__tests__/lib/data.js
+++ b/src/ui/public/vislib/__tests__/lib/data.js
@@ -1,13 +1,13 @@
-var angular = require('angular');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let angular = require('angular');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
-var dataSeries = require('fixtures/vislib/mock_data/date_histogram/_series');
-var dataSeriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
-var dataStacked = require('fixtures/vislib/mock_data/stacked/_stacked');
+let dataSeries = require('fixtures/vislib/mock_data/date_histogram/_series');
+let dataSeriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+let dataStacked = require('fixtures/vislib/mock_data/stacked/_stacked');
 
-var seriesData = {
+let seriesData = {
   'label': '',
   'series': [
     {
@@ -17,7 +17,7 @@ var seriesData = {
   ]
 };
 
-var rowsData = {
+let rowsData = {
   'rows': [
     {
       'label': 'a',
@@ -58,7 +58,7 @@ var rowsData = {
   ]
 };
 
-var colsData = {
+let colsData = {
   'columns': [
     {
       'label': 'a',
@@ -100,11 +100,13 @@ var colsData = {
 };
 
 describe('Vislib Data Class Test Suite', function () {
-  var Data;
+  let Data;
+  let persistedState;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
   }));
 
   describe('Data Class (main)', function () {
@@ -113,12 +115,12 @@ describe('Vislib Data Class Test Suite', function () {
     });
 
     it('should return an object', function () {
-      var rowIn = new Data(rowsData, {});
+      let rowIn = new Data(rowsData, {}, persistedState);
       expect(_.isObject(rowIn)).to.be(true);
     });
 
     it('should update label in series data', function () {
-      var seriesDataWithoutLabelInSeries = {
+      let seriesDataWithoutLabelInSeries = {
         'label': '',
         'series': [
           {
@@ -128,12 +130,12 @@ describe('Vislib Data Class Test Suite', function () {
         ],
         'yAxisLabel': 'customLabel'
       };
-      var modifiedData = new Data(seriesDataWithoutLabelInSeries, {});
+      let modifiedData = new Data(seriesDataWithoutLabelInSeries, {}, persistedState);
       expect(modifiedData.data.series[0].label).to.be('customLabel');
     });
 
     it('should update label in row data', function () {
-      var seriesDataWithoutLabelInRow = {
+      let seriesDataWithoutLabelInRow = {
         'rows': [
           {
             'label': '',
@@ -158,13 +160,13 @@ describe('Vislib Data Class Test Suite', function () {
         ],
       };
 
-      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      let modifiedData = new Data(seriesDataWithoutLabelInRow, {}, persistedState);
       expect(modifiedData.data.rows[0].series[0].label).to.be('customLabel');
       expect(modifiedData.data.rows[1].series[0].label).to.be('customLabel');
     });
 
     it('should update label in column data', function () {
-      var seriesDataWithoutLabelInRow = {
+      let seriesDataWithoutLabelInRow = {
         'columns': [
           {
             'label': '',
@@ -190,7 +192,7 @@ describe('Vislib Data Class Test Suite', function () {
         'yAxisLabel': 'customLabel'
       };
 
-      var modifiedData = new Data(seriesDataWithoutLabelInRow, {});
+      let modifiedData = new Data(seriesDataWithoutLabelInRow, {}, persistedState);
       expect(modifiedData.data.columns[0].series[0].label).to.be('customLabel');
       expect(modifiedData.data.columns[1].series[0].label).to.be('customLabel');
     });
@@ -198,8 +200,8 @@ describe('Vislib Data Class Test Suite', function () {
 
 
   describe('_removeZeroSlices', function () {
-    var data;
-    var pieData = {
+    let data;
+    let pieData = {
       slices: {
         children: [
           {size: 30},
@@ -210,27 +212,27 @@ describe('Vislib Data Class Test Suite', function () {
     };
 
     beforeEach(function () {
-      data = new Data(pieData, {});
+      data = new Data(pieData, {}, persistedState);
     });
 
     it('should remove zero values', function () {
-      var slices = data._removeZeroSlices(data.data.slices);
+      let slices = data._removeZeroSlices(data.data.slices);
       expect(slices.children.length).to.be(2);
     });
   });
 
   describe('Data.flatten', function () {
-    var serIn;
-    var rowIn;
-    var colIn;
-    var serOut;
-    var rowOut;
-    var colOut;
+    let serIn;
+    let rowIn;
+    let colIn;
+    let serOut;
+    let rowOut;
+    let colOut;
 
     beforeEach(function () {
-      serIn = new Data(seriesData, {});
-      rowIn = new Data(rowsData, {});
-      colIn = new Data(colsData, {});
+      serIn = new Data(seriesData, {}, persistedState);
+      rowIn = new Data(rowsData, {}, persistedState);
+      colIn = new Data(colsData, {}, persistedState);
       serOut = serIn.flatten();
       rowOut = rowIn.flatten();
       colOut = colIn.flatten();
@@ -246,8 +248,8 @@ describe('Vislib Data Class Test Suite', function () {
 
     function testLength(inputData) {
       return function () {
-        var data = new Data(inputData, {});
-        var len = _.reduce(data.chartData(), function (sum, chart) {
+        let data = new Data(inputData, {}, persistedState);
+        let len = _.reduce(data.chartData(), function (sum, chart) {
           return sum + chart.series.reduce(function (sum, series) {
             return sum + series.values.length;
           }, 0);
@@ -259,17 +261,17 @@ describe('Vislib Data Class Test Suite', function () {
   });
 
   describe('getYMin method', function () {
-    var visData;
-    var visDataNeg;
-    var visDataStacked;
-    var minValue = 4;
-    var minValueNeg = -41;
-    var minValueStacked = 15;
+    let visData;
+    let visDataNeg;
+    let visDataStacked;
+    let minValue = 4;
+    let minValueNeg = -41;
+    let minValueStacked = 15;
 
     beforeEach(function () {
-      visData = new Data(dataSeries, {});
-      visDataNeg = new Data(dataSeriesNeg, {});
-      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+      visData = new Data(dataSeries, {}, persistedState);
+      visDataNeg = new Data(dataSeriesNeg, {}, persistedState);
+      visDataStacked = new Data(dataStacked, { type: 'histogram' }, persistedState);
     });
 
     // The first value in the time series is less than the min date in the
@@ -282,31 +284,31 @@ describe('Vislib Data Class Test Suite', function () {
     });
 
     it('should have a minimum date value that is greater than the max value within the date range', function () {
-      var series = _.pluck(visData.chartData(), 'series');
-      var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
+      let series = _.pluck(visData.chartData(), 'series');
+      let stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
       expect(_.min(series.values, function (d) { return d.x; })).to.be.greaterThan(minValue);
       expect(_.min(stackedSeries.values, function (d) { return d.x; })).to.be.greaterThan(minValueStacked);
     });
 
     it('allows passing a value getter for manipulating the values considered', function () {
-      var realMin = visData.getYMin();
-      var multiplier = 13.2;
+      let realMin = visData.getYMin();
+      let multiplier = 13.2;
       expect(visData.getYMin(function (d) { return d.y * multiplier; })).to.be(realMin * multiplier);
     });
   });
 
   describe('getYMax method', function () {
-    var visData;
-    var visDataNeg;
-    var visDataStacked;
-    var maxValue = 41;
-    var maxValueNeg = -4;
-    var maxValueStacked = 115;
+    let visData;
+    let visDataNeg;
+    let visDataStacked;
+    let maxValue = 41;
+    let maxValueNeg = -4;
+    let maxValueStacked = 115;
 
     beforeEach(function () {
-      visData = new Data(dataSeries, {});
-      visDataNeg = new Data(dataSeriesNeg, {});
-      visDataStacked = new Data(dataStacked, { type: 'histogram' });
+      visData = new Data(dataSeries, {}, persistedState);
+      visDataNeg = new Data(dataSeriesNeg, {}, persistedState);
+      visDataStacked = new Data(dataStacked, { type: 'histogram' }, persistedState);
     });
 
     // The first value in the time series is less than the min date in the
@@ -319,22 +321,22 @@ describe('Vislib Data Class Test Suite', function () {
     });
 
     it('should have a minimum date value that is greater than the max value within the date range', function () {
-      var series = _.pluck(visData.chartData(), 'series');
-      var stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
+      let series = _.pluck(visData.chartData(), 'series');
+      let stackedSeries = _.pluck(visDataStacked.chartData(), 'series');
       expect(_.min(series, function (d) { return d.x; })).to.be.greaterThan(maxValue);
       expect(_.min(stackedSeries, function (d) { return d.x; })).to.be.greaterThan(maxValueStacked);
     });
 
     it('allows passing a value getter for manipulating the values considered', function () {
-      var realMax = visData.getYMax();
-      var multiplier = 13.2;
+      let realMax = visData.getYMax();
+      let multiplier = 13.2;
       expect(visData.getYMax(function (d) { return d.y * multiplier; })).to.be(realMax * multiplier);
     });
   });
 
   describe('geohashGrid methods', function () {
-    var data;
-    var geohashGridData = {
+    let data;
+    let geohashGridData = {
       hits: 3954,
       rows: [{
         title: 'Top 5 _type: apache',
@@ -372,19 +374,19 @@ describe('Vislib Data Class Test Suite', function () {
     };
 
     beforeEach(function () {
-      data = new Data(geohashGridData, {});
+      data = new Data(geohashGridData, {}, persistedState);
     });
 
     describe('getVisData', function () {
       it('should return the rows property', function () {
-        var visData = data.getVisData();
+        let visData = data.getVisData();
         expect(visData).to.eql(geohashGridData.rows);
       });
     });
 
     describe('getGeoExtents', function () {
       it('should return the min and max geoJson properties', function () {
-        var minMax = data.getGeoExtents();
+        let minMax = data.getGeoExtents();
         expect(minMax.min).to.be(1);
         expect(minMax.max).to.be(331);
       });
@@ -393,12 +395,12 @@ describe('Vislib Data Class Test Suite', function () {
 
   describe('null value check', function () {
     it('should return false', function () {
-      var data = new Data(rowsData, {});
+      let data = new Data(rowsData, {}, persistedState);
       expect(data.hasNullValues()).to.be(false);
     });
 
     it('should return true', function () {
-      var nullRowData = { rows: rowsData.rows.slice(0) };
+      let nullRowData = { rows: rowsData.rows.slice(0) };
       nullRowData.rows.push({
         'label': 'e',
         'series': [
@@ -409,7 +411,7 @@ describe('Vislib Data Class Test Suite', function () {
         ]
       });
 
-      var data = new Data(nullRowData, {});
+      let data = new Data(nullRowData, {}, persistedState);
       expect(data.hasNullValues()).to.be(true);
     });
   });
diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js
index 7025f7dd9a874..af426ac532e29 100644
--- a/src/ui/public/vislib/__tests__/lib/dispatch.js
+++ b/src/ui/public/vislib/__tests__/lib/dispatch.js
@@ -1,12 +1,12 @@
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var d3 = require('d3');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let d3 = require('d3');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 // Data
-var data = require('fixtures/vislib/mock_data/date_histogram/_series');
+let data = require('fixtures/vislib/mock_data/date_histogram/_series');
 
 describe('Vislib Dispatch Class Test Suite', function () {
 
@@ -20,13 +20,15 @@ describe('Vislib Dispatch Class Test Suite', function () {
   }
 
   describe('', function () {
-    var vis;
-    var SimpleEmitter;
+    let vis;
+    let persistedState;
+    let SimpleEmitter;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))();
-      vis.render(data);
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
+      vis.render(data, persistedState);
       SimpleEmitter = require('ui/utils/SimpleEmitter');
     }));
 
@@ -35,7 +37,7 @@ describe('Vislib Dispatch Class Test Suite', function () {
     });
 
     it('extends the SimpleEmitter class', function () {
-      var events = _.pluck(vis.handler.charts, 'events');
+      let events = _.pluck(vis.handler.charts, 'events');
       expect(events.length).to.be.above(0);
       events.forEach(function (dispatch) {
         expect(dispatch).to.be.a(SimpleEmitter);
@@ -44,13 +46,15 @@ describe('Vislib Dispatch Class Test Suite', function () {
   });
 
   describe('Stock event handlers', function () {
-    var vis;
+    let vis;
+    let persistedState;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       vis.on('brush', _.noop);
-      vis.render(data);
+      vis.render(data, persistedState);
     }));
 
     afterEach(function () {
@@ -59,11 +63,11 @@ describe('Vislib Dispatch Class Test Suite', function () {
 
     describe('addEvent method', function () {
       it('returns a function that binds the passed event to a selection', function () {
-        var chart = _.first(vis.handler.charts);
-        var apply = chart.events.addEvent('event', _.noop);
+        let chart = _.first(vis.handler.charts);
+        let apply = chart.events.addEvent('event', _.noop);
         expect(apply).to.be.a('function');
 
-        var els = getEls(vis.el, 3, 'div');
+        let els = getEls(vis.el, 3, 'div');
         apply(els);
         els.each(function () {
           expect(d3.select(this).on('event')).to.be(_.noop);
@@ -82,11 +86,11 @@ describe('Vislib Dispatch Class Test Suite', function () {
         });
 
         it('returns a function that binds ' + event + ' events to a selection', function () {
-          var chart = _.first(vis.handler.charts);
-          var apply = chart.events[name](d3.select(document.createElement('svg')));
+          let chart = _.first(vis.handler.charts);
+          let apply = chart.events[name](d3.select(document.createElement('svg')));
           expect(apply).to.be.a('function');
 
-          var els = getEls(vis.el, 3, 'div');
+          let els = getEls(vis.el, 3, 'div');
           apply(els);
           els.each(function () {
             expect(d3.select(this).on(event)).to.be.a('function');
@@ -103,7 +107,7 @@ describe('Vislib Dispatch Class Test Suite', function () {
     describe('addMousePointer method', function () {
       it('should be a function', function () {
         vis.handler.charts.forEach(function (chart) {
-          var pointer = chart.events.addMousePointer;
+          let pointer = chart.events.addMousePointer;
 
           expect(_.isFunction(pointer)).to.be(true);
         });
@@ -113,13 +117,15 @@ describe('Vislib Dispatch Class Test Suite', function () {
 
   describe('Custom event handlers', function () {
     it('should attach whatever gets passed on vis.on() to chart.events', function (done) {
-      var vis;
-      var chart;
+      let vis;
+      let persistedState;
+      let chart;
       ngMock.module('kibana');
       ngMock.inject(function (Private) {
         vis = Private(require('fixtures/vislib/_vis_fixture'))();
+        persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
         vis.on('someEvent', _.noop);
-        vis.render(data);
+        vis.render(data, persistedState);
 
         vis.handler.charts.forEach(function (chart) {
           expect(chart.events.listenerCount('someEvent')).to.be(1);
@@ -131,12 +137,14 @@ describe('Vislib Dispatch Class Test Suite', function () {
     });
 
     it('can be added after rendering', function () {
-      var vis;
-      var chart;
+      let vis;
+      let persistedState;
+      let chart;
       ngMock.module('kibana');
       ngMock.inject(function (Private) {
         vis = Private(require('fixtures/vislib/_vis_fixture'))();
-        vis.render(data);
+        persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
+        vis.render(data, persistedState);
         vis.on('someEvent', _.noop);
 
         vis.handler.charts.forEach(function (chart) {
diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js
index a56e3135c6472..4cc6789d9fa59 100644
--- a/src/ui/public/vislib/__tests__/lib/error_handler.js
+++ b/src/ui/public/vislib/__tests__/lib/error_handler.js
@@ -1,11 +1,11 @@
 
-var expect = require('expect.js');
-var angular = require('angular');
-var ngMock = require('ngMock');
+let expect = require('expect.js');
+let angular = require('angular');
+let ngMock = require('ngMock');
 
 describe('Vislib ErrorHandler Test Suite', function () {
-  var ErrorHandler;
-  var errorHandler;
+  let ErrorHandler;
+  let errorHandler;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js
index 78bdd8462ddb9..5d806b98fe032 100644
--- a/src/ui/public/vislib/__tests__/lib/handler/handler.js
+++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js
@@ -1,21 +1,21 @@
 
-var angular = require('angular');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let angular = require('angular');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 // Data
-var series = require('fixtures/vislib/mock_data/date_histogram/_series');
-var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
-var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
-var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
-var dateHistogramArray = [
+let series = require('fixtures/vislib/mock_data/date_histogram/_series');
+let columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+let rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+let stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+let dateHistogramArray = [
   series,
   columns,
   rows,
   stackedSeries
 ];
-var names = [
+let names = [
   'series',
   'columns',
   'rows',
@@ -24,9 +24,10 @@ var names = [
 
 dateHistogramArray.forEach(function (data, i) {
   describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () {
-    var Handler;
-    var vis;
-    var events = [
+    let Handler;
+    let vis;
+    let persistedState;
+    let events = [
       'click',
       'brush'
     ];
@@ -35,7 +36,8 @@ dateHistogramArray.forEach(function (data, i) {
     beforeEach(ngMock.inject(function (Private) {
       Handler = Private(require('ui/vislib/lib/handler/handler'));
       vis = Private(require('fixtures/vislib/_vis_fixture'))();
-      vis.render(data);
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
+      vis.render(data, persistedState);
     }));
 
     afterEach(function () {
@@ -53,7 +55,7 @@ dateHistogramArray.forEach(function (data, i) {
     });
 
     describe('enable Method', function () {
-      var charts;
+      let charts;
 
       beforeEach(function () {
         charts = vis.handler.charts;
@@ -75,7 +77,7 @@ dateHistogramArray.forEach(function (data, i) {
     });
 
     describe('disable Method', function () {
-      var charts;
+      let charts;
 
       beforeEach(function () {
         charts = vis.handler.charts;
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout.js b/src/ui/public/vislib/__tests__/lib/layout/layout.js
index 61b19bf2ce5d0..cc529a5b8dcd9 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js
@@ -1,21 +1,21 @@
-var d3 = require('d3');
-var angular = require('angular');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 // Data
-var series = require('fixtures/vislib/mock_data/date_histogram/_series');
-var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
-var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
-var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
-var dateHistogramArray = [
+let series = require('fixtures/vislib/mock_data/date_histogram/_series');
+let columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+let rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+let stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+let dateHistogramArray = [
   series,
   columns,
   rows,
   stackedSeries
 ];
-var names = [
+let names = [
   'series',
   'columns',
   'rows',
@@ -24,10 +24,11 @@ var names = [
 
 dateHistogramArray.forEach(function (data, i) {
   describe('Vislib Layout Class Test Suite for ' + names[i] + ' Data', function () {
-    var Layout;
-    var vis;
-    var numberOfCharts;
-    var testLayout;
+    let Layout;
+    let vis;
+    let persistedState;
+    let numberOfCharts;
+    let testLayout;
 
     beforeEach(ngMock.module('kibana'));
 
@@ -35,7 +36,8 @@ dateHistogramArray.forEach(function (data, i) {
       ngMock.inject(function (Private) {
         Layout = Private(require('ui/vislib/lib/layout/layout'));
         vis = Private(require('fixtures/vislib/_vis_fixture'))();
-        vis.render(data);
+        persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
+        vis.render(data, persistedState);
         numberOfCharts = vis.handler.charts.length;
       });
     });
@@ -50,7 +52,6 @@ dateHistogramArray.forEach(function (data, i) {
         expect($(vis.el).find('.vis-wrapper').length).to.be(1);
         expect($(vis.el).find('.y-axis-col-wrapper').length).to.be(1);
         expect($(vis.el).find('.vis-col-wrapper').length).to.be(1);
-        expect($(vis.el).find('.legend-col-wrapper').length).to.be(1);
         expect($(vis.el).find('.y-axis-col').length).to.be(1);
         expect($(vis.el).find('.y-axis-title').length).to.be(1);
         expect($(vis.el).find('.y-axis-div-wrapper').length).to.be(1);
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
index a60a188a3f854..924ca18dda7ec 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
@@ -1,11 +1,11 @@
-var angular = require('angular');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let angular = require('angular');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib Layout Types Test Suite', function () {
-  var layoutType;
-  var layoutFunc;
+  let layoutType;
+  let layoutFunc;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
index 9cb339150214c..1c0c4dda07dc3 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
@@ -1,17 +1,17 @@
-var d3 = require('d3');
-var angular = require('angular');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib Split Function Test Suite', function () {
   describe('Column Chart', function () {
-    var chartSplit;
-    var chartTitleSplit;
-    var xAxisSplit;
-    var yAxisSplit;
-    var el;
-    var data = {
+    let chartSplit;
+    let chartTitleSplit;
+    let xAxisSplit;
+    let yAxisSplit;
+    let el;
+    let data = {
       rows: [
         {
           hits      : 621,
@@ -149,7 +149,7 @@ describe('Vislib Split Function Test Suite', function () {
     });
 
     describe('chart split function', function () {
-      var fixture;
+      let fixture;
 
       beforeEach(ngMock.inject(function () {
         fixture = d3.select('.visualization').call(chartSplit);
@@ -169,18 +169,20 @@ describe('Vislib Split Function Test Suite', function () {
     });
 
     describe('chart title split function', function () {
-      var newEl;
-      var fixture;
+      let visEl;
+      let newEl;
+      let fixture;
 
       beforeEach(ngMock.inject(function () {
-        el.append('div').attr('class', 'x-axis-chart-title');
-        el.append('div').attr('class', 'y-axis-chart-title');
-        d3.select('.x-axis-chart-title').call(chartTitleSplit);
-        d3.select('.y-axis-chart-title').call(chartTitleSplit);
+        visEl = el.append('div').attr('class', 'vis-wrapper');
+        visEl.append('div').attr('class', 'x-axis-chart-title');
+        visEl.append('div').attr('class', 'y-axis-chart-title');
+        visEl.select('.x-axis-chart-title').call(chartTitleSplit);
+        visEl.select('.y-axis-chart-title').call(chartTitleSplit);
 
         newEl = d3.select('body').append('div')
-          .attr('class', 'series')
-          .datum({ series: []});
+          .attr('class', 'vis-wrapper')
+          .datum({ series: [] });
 
         newEl.append('div').attr('class', 'x-axis-chart-title');
         newEl.append('div').attr('class', 'y-axis-chart-title');
@@ -209,8 +211,8 @@ describe('Vislib Split Function Test Suite', function () {
     });
 
     describe('x axis split function', function () {
-      var fixture;
-      var divs;
+      let fixture;
+      let divs;
 
       beforeEach(ngMock.inject(function () {
         fixture = d3.select('body').append('div')
@@ -231,8 +233,8 @@ describe('Vislib Split Function Test Suite', function () {
     });
 
     describe('y axis split function', function () {
-      var fixture;
-      var divs;
+      let fixture;
+      let divs;
 
       beforeEach(ngMock.inject(function () {
         fixture = d3.select('body').append('div')
diff --git a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
index ceef4687ee1d7..690a41f7b4653 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
@@ -1,14 +1,14 @@
-var d3 = require('d3');
-var angular = require('angular');
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib Column Layout Test Suite', function () {
-  var layoutType;
-  var columnLayout;
-  var el;
-  var data = {
+  let layoutType;
+  let columnLayout;
+  let el;
+  let data = {
     hits: 621,
     label: '',
     ordered: {
diff --git a/src/ui/public/vislib/__tests__/lib/legend.js b/src/ui/public/vislib/__tests__/lib/legend.js
deleted file mode 100644
index a0b8140de1e44..0000000000000
--- a/src/ui/public/vislib/__tests__/lib/legend.js
+++ /dev/null
@@ -1,127 +0,0 @@
-var d3 = require('d3');
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
-
-var slices = require('fixtures/vislib/mock_data/histogram/_slices');
-var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
-var histogramSlices = require('fixtures/vislib/mock_data/histogram/_slices');
-
-var dataArray = [
-  stackedSeries,
-  slices,
-  histogramSlices,
-  stackedSeries,
-  stackedSeries
-];
-
-var chartTypes = [
-  'histogram',
-  'pie',
-  'pie',
-  'area',
-  'line'
-];
-
-var chartSelectors = {
-  histogram: '.chart rect',
-  pie: '.chart path',
-  area: '.chart path',
-  line: '.chart circle'
-};
-
-describe('Vislib Legend Class', function () {
-  dataArray.forEach(function (data, i) {
-    describe(chartTypes[i] + ' data', function () {
-      var visLibParams = {
-        type: chartTypes[i],
-        addLegend: true
-      };
-      var Legend;
-      var vis;
-      var $el;
-
-      beforeEach(ngMock.module('kibana'));
-      beforeEach(ngMock.inject(function (Private) {
-        vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
-        Legend = Private(require('ui/vislib/lib/legend'));
-        $el = d3.select('body').append('div').attr('class', 'fake-legend');
-        vis.render(data);
-      }));
-
-      afterEach(function () {
-        $(vis.el).remove();
-        $('.fake-legend').remove();
-        vis = null;
-      });
-
-      describe('legend item label matches vis item label', function () {
-        it('should match the slice label', function () {
-          var chartType = chartTypes[i];
-          var paths = $(vis.el).find(chartSelectors[chartType]).toArray();
-          var items = vis.handler.legend.labels;
-
-          items.forEach(function (d) {
-            var path = _.find(paths, function (path) {
-              return path.getAttribute('data-label') === String(d.label);
-            });
-
-            expect(path).to.be.ok();
-          });
-        });
-      });
-
-      describe('header method', function () {
-        it('should append the legend header', function () {
-          expect($(vis.el).find('.header').length).to.be(1);
-          expect($(vis.el).find('.column-labels').length).to.be(1);
-        });
-      });
-
-      describe('list method', function () {
-        it('should append the legend list', function () {
-          expect($(vis.el).find('.legend-ul').length).to.be(1);
-        });
-
-        it('should contain a list of items', function () {
-          expect($(vis.el).find('li').length).to.be.greaterThan(1);
-        });
-
-        it('should not return an undefined value', function () {
-          var emptyObject = {
-            label: ''
-          };
-          var labels = [emptyObject, emptyObject, emptyObject];
-          var args = {
-            _attr: {isOpen: true},
-            color: function () { return 'blue'; }
-          };
-
-          Legend.prototype._list($el, labels, args);
-
-          $el.selectAll('li').each(function (d) {
-            expect(d.label).not.to.be(undefined);
-          });
-        });
-      });
-
-      describe('render method', function () {
-        it('should create a legend toggle', function () {
-          expect($('.legend-toggle').length).to.be(1);
-        });
-
-        it('should have an onclick listener', function () {
-          expect(!!$('.legend-toggle')[0].__onclick).to.be(true);
-          expect(!!$('li.color')[0].__onclick).to.be(true);
-        });
-
-        it('should attach onmouseover listener', function () {
-          expect(!!$('li.color')[0].__onmouseover).to.be(true);
-        });
-      });
-    });
-  });
-});
-
diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js
index 17f8610c69b8f..234d2dd45fa13 100644
--- a/src/ui/public/vislib/__tests__/lib/resize_checker.js
+++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js
@@ -1,19 +1,19 @@
 
 describe('Vislib Resize Checker', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var Promise = require('bluebird');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let Promise = require('bluebird');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
 
-  var sinon = require('auto-release-sinon');
+  let sinon = require('auto-release-sinon');
   require('testUtils/noDigestPromises').activateForSuite();
 
-  var ResizeChecker;
-  var EventEmitter;
-  var checker;
-  var reflowWatcher;
-  var reflowSpies = {};
+  let ResizeChecker;
+  let EventEmitter;
+  let checker;
+  let reflowWatcher;
+  let reflowSpies = {};
 
   beforeEach(ngMock.module('kibana'));
 
@@ -24,7 +24,7 @@ describe('Vislib Resize Checker', function () {
     reflowSpies.on = sinon.spy(reflowWatcher, 'on');
     reflowSpies.off = sinon.spy(reflowWatcher, 'off');
 
-    var $el = $(document.createElement('div'))
+    let $el = $(document.createElement('div'))
     .appendTo('body')
     .css('visibility', 'hidden')
     .get(0);
@@ -44,7 +44,7 @@ describe('Vislib Resize Checker', function () {
 
     it('listens for the "reflow" event of the reflowWatchers', function () {
       expect(reflowSpies.on).to.have.property('callCount', 1);
-      var call = reflowSpies.on.getCall(0);
+      let call = reflowSpies.on.getCall(0);
       expect(call.args[0]).to.be('reflow');
     });
 
@@ -60,8 +60,8 @@ describe('Vislib Resize Checker', function () {
 
   describe('#read', function () {
     it('gets the proper dimensions for the element', function () {
-      var dimensions = checker.read();
-      var windowWidth = document.documentElement.clientWidth;
+      let dimensions = checker.read();
+      let windowWidth = document.documentElement.clientWidth;
 
       expect(dimensions.w).to.equal(windowWidth);
       expect(dimensions.h).to.equal(0);
@@ -70,7 +70,7 @@ describe('Vislib Resize Checker', function () {
 
   describe('#saveSize', function () {
     it('calls #read() when no arg is passed', function () {
-      var stub = sinon.stub(checker, 'read').returns({});
+      let stub = sinon.stub(checker, 'read').returns({});
 
       checker.saveSize();
 
@@ -78,7 +78,7 @@ describe('Vislib Resize Checker', function () {
     });
 
     it('saves the size of the element', function () {
-      var football = {};
+      let football = {};
       checker.saveSize(football);
       expect(checker).to.have.property('_savedSize', football);
     });
@@ -93,7 +93,7 @@ describe('Vislib Resize Checker', function () {
   });
 
   describe('#check()', function () {
-    var emit;
+    let emit;
 
     beforeEach(function () {
       emit = sinon.stub(checker, 'emit');
@@ -120,12 +120,12 @@ describe('Vislib Resize Checker', function () {
     });
 
     it('emits "resize" based on MS_MAX_RESIZE_DELAY, even if el\'s constantly changing size', function () {
-      var steps = _.random(5, 10);
+      let steps = _.random(5, 10);
       this.slow(steps * 10);
 
       // we are going to fake the delay using the fake clock
-      var msStep = Math.floor(ResizeChecker.MS_MAX_RESIZE_DELAY / (steps - 1));
-      var clock = sinon.useFakeTimers();
+      let msStep = Math.floor(ResizeChecker.MS_MAX_RESIZE_DELAY / (steps - 1));
+      let clock = sinon.useFakeTimers();
 
       _.times(steps, function step(i) {
         checker.$el.css('height', 100 + i);
@@ -142,8 +142,8 @@ describe('Vislib Resize Checker', function () {
 
   describe('#destroy()', function () {
     it('removes the "reflow" event from the reflowWatcher', function () {
-      var onCall = reflowSpies.on.getCall(0);
-      var handler = onCall.args[1];
+      let onCall = reflowSpies.on.getCall(0);
+      let handler = onCall.args[1];
 
       checker.destroy();
       expect(reflowSpies.off).to.have.property('callCount', 1);
@@ -151,15 +151,15 @@ describe('Vislib Resize Checker', function () {
     });
 
     it('clears the timeout', function () {
-      var spy = sinon.spy(window, 'clearTimeout');
+      let spy = sinon.spy(window, 'clearTimeout');
       checker.destroy();
       expect(spy).to.have.property('callCount', 1);
     });
   });
 
   describe('scheduling', function () {
-    var clock;
-    var schedule;
+    let clock;
+    let schedule;
 
     beforeEach(function () {
       // prevent the checker from running automatically
@@ -173,26 +173,26 @@ describe('Vislib Resize Checker', function () {
     });
 
     it('walks the schedule, using each value as it\'s next timeout', function () {
-      var timerId = checker.startSchedule(schedule);
+      let timerId = checker.startSchedule(schedule);
 
       // start at 0 even though "start" used the first slot, we will still check it
-      for (var i = 0; i < schedule.length; i++) {
+      for (let i = 0; i < schedule.length; i++) {
         expect(clock.timers[timerId]).to.have.property('callAt', schedule[i]);
         timerId = checker.continueSchedule();
       }
     });
 
     it('repeats the last value in the schedule', function () {
-      var timerId = checker.startSchedule(schedule);
+      let timerId = checker.startSchedule(schedule);
 
       // start at 1, and go until there is one left
-      for (var i = 1; i < schedule.length - 1; i++) {
+      for (let i = 1; i < schedule.length - 1; i++) {
         timerId = checker.continueSchedule();
       }
 
-      var last = _.last(schedule);
+      let last = _.last(schedule);
       _.times(5, function () {
-        var timer = clock.timers[checker.continueSchedule()];
+        let timer = clock.timers[checker.continueSchedule()];
         expect(timer).to.have.property('callAt', last);
       });
     });
diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js
index 36d2620fa0a6b..a068a679940b2 100644
--- a/src/ui/public/vislib/__tests__/lib/x_axis.js
+++ b/src/ui/public/vislib/__tests__/lib/x_axis.js
@@ -1,18 +1,19 @@
-var d3 = require('d3');
-var angular = require('angular');
-var _ = require('lodash');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let d3 = require('d3');
+let angular = require('angular');
+let _ = require('lodash');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('Vislib xAxis Class Test Suite', function () {
-  var XAxis;
-  var Data;
-  var xAxis;
-  var el;
-  var fixture;
-  var dataObj;
-  var data = {
+  let XAxis;
+  let Data;
+  let persistedState;
+  let xAxis;
+  let el;
+  let fixture;
+  let dataObj;
+  let data = {
     hits: 621,
     label: '',
     ordered: {
@@ -77,6 +78,7 @@ describe('Vislib xAxis Class Test Suite', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
     XAxis = Private(require('ui/vislib/lib/x_axis'));
 
     el = d3.select('body').append('div')
@@ -86,7 +88,7 @@ describe('Vislib xAxis Class Test Suite', function () {
     fixture = el.append('div')
       .attr('class', 'x-axis-div');
 
-    dataObj = new Data(data, {});
+    dataObj = new Data(data, {}, persistedState);
     xAxis = new XAxis({
       el: $('.x-axis-div')[0],
       xValues: dataObj.xValues(),
@@ -122,13 +124,13 @@ describe('Vislib xAxis Class Test Suite', function () {
   });
 
   describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () {
-    var ordered;
-    var timeScale;
-    var timeDomain;
-    var ordinalScale;
-    var ordinalDomain;
-    var width;
-    var range;
+    let ordered;
+    let timeScale;
+    let timeDomain;
+    let ordinalScale;
+    let ordinalDomain;
+    let width;
+    let range;
 
     beforeEach(function () {
       timeScale = xAxis.getScale();
@@ -171,8 +173,8 @@ describe('Vislib xAxis Class Test Suite', function () {
   });
 
   describe('getXScale Method', function () {
-    var width;
-    var xScale;
+    let width;
+    let xScale;
 
     beforeEach(function () {
       width = $('.x-axis-div').width();
@@ -195,8 +197,8 @@ describe('Vislib xAxis Class Test Suite', function () {
   });
 
   describe('getXAxis Method', function () {
-    var width;
-    var axis;
+    let width;
+    let axis;
 
     beforeEach(function () {
       width = $('.x-axis-div').width();
diff --git a/src/ui/public/vislib/__tests__/lib/y_axis.js b/src/ui/public/vislib/__tests__/lib/y_axis.js
index 3bb97e55e0fab..abd597717649c 100644
--- a/src/ui/public/vislib/__tests__/lib/y_axis.js
+++ b/src/ui/public/vislib/__tests__/lib/y_axis.js
@@ -1,17 +1,18 @@
-var _ = require('lodash');
-var d3 = require('d3');
-var $ = require('jquery');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
-
-var YAxis;
-var Data;
-var el;
-var buildYAxis;
-var yAxis;
-var yAxisDiv;
-
-var timeSeries = [
+let _ = require('lodash');
+let d3 = require('d3');
+let $ = require('jquery');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
+
+let YAxis;
+let Data;
+let persistedState;
+let el;
+let buildYAxis;
+let yAxis;
+let yAxisDiv;
+
+let timeSeries = [
   1408734060000,
   1408734090000,
   1408734120000,
@@ -24,7 +25,7 @@ var timeSeries = [
   1408734330000
 ];
 
-var defaultGraphData = [
+let defaultGraphData = [
   [ 8, 23, 30, 28, 36, 30, 26, 22, 29, 24 ],
   [ 2, 13, 20, 18, 26, 20, 16, 12, 19, 14 ]
 ];
@@ -39,7 +40,7 @@ function makeSeriesData(data) {
 }
 
 function createData(seriesData) {
-  var data = {
+  let data = {
     hits: 621,
     label: 'test',
     ordered: {
@@ -55,7 +56,7 @@ function createData(seriesData) {
     yAxisLabel: 'Count'
   };
 
-  var node = $('<div>').css({
+  let node = $('<div>').css({
     height: 40,
     width: 40
   })
@@ -68,9 +69,9 @@ function createData(seriesData) {
   yAxisDiv = el.append('div')
   .attr('class', 'y-axis-div');
 
-  var dataObj = new Data(data, {
+  let dataObj = new Data(data, {
     defaultYMin: true
-  });
+  }, persistedState);
 
   buildYAxis = function (params) {
     return new YAxis(_.merge({}, params, {
@@ -94,6 +95,7 @@ describe('Vislib yAxis Class Test Suite', function () {
 
   beforeEach(ngMock.inject(function (Private) {
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
     YAxis = Private(require('ui/vislib/lib/y_axis'));
 
     expect($('.y-axis-wrapper')).to.have.length(0);
@@ -125,13 +127,13 @@ describe('Vislib yAxis Class Test Suite', function () {
   });
 
   describe('getYScale Method', function () {
-    var yScale;
-    var graphData;
-    var domain;
-    var height = 50;
+    let yScale;
+    let graphData;
+    let domain;
+    let height = 50;
 
     function checkDomain(min, max) {
-      var domain = yScale.domain();
+      let domain = yScale.domain();
       expect(domain[0]).to.be.lessThan(min + 1);
       expect(domain[1]).to.be.greaterThan(max - 1);
       return domain;
@@ -154,8 +156,8 @@ describe('Vislib yAxis Class Test Suite', function () {
     });
 
     describe('should return log values', function () {
-      var domain;
-      var extents;
+      let domain;
+      let extents;
 
       it('should return 1', function () {
         yAxis._attr.scale = 'log';
@@ -176,9 +178,9 @@ describe('Vislib yAxis Class Test Suite', function () {
 
 
       it('should have domain between 0 and max value', function () {
-        var min = 0;
-        var max = _.max(_.flattenDeep(graphData));
-        var domain = checkDomain(min, max);
+        let min = 0;
+        let max = _.max(_.flattenDeep(graphData));
+        let domain = checkDomain(min, max);
         expect(domain[1]).to.be.greaterThan(0);
         checkRange();
       });
@@ -195,9 +197,9 @@ describe('Vislib yAxis Class Test Suite', function () {
       });
 
       it('should have domain between min value and 0', function () {
-        var min = _.min(_.flattenDeep(graphData));
-        var max = 0;
-        var domain = checkDomain(min, max);
+        let min = _.min(_.flattenDeep(graphData));
+        let max = 0;
+        let domain = checkDomain(min, max);
         expect(domain[0]).to.be.lessThan(0);
         checkRange();
       });
@@ -214,9 +216,9 @@ describe('Vislib yAxis Class Test Suite', function () {
       });
 
       it('should have domain between min and max values', function () {
-        var min = _.min(_.flattenDeep(graphData));
-        var max = _.max(_.flattenDeep(graphData));
-        var domain = checkDomain(min, max);
+        let min = _.min(_.flattenDeep(graphData));
+        let max = _.max(_.flattenDeep(graphData));
+        let domain = checkDomain(min, max);
         expect(domain[0]).to.be.lessThan(0);
         expect(domain[1]).to.be.greaterThan(0);
         checkRange();
@@ -231,8 +233,8 @@ describe('Vislib yAxis Class Test Suite', function () {
       });
 
       it('should throw a NaN error', function () {
-        var min = 'Not a number';
-        var max = 12;
+        let min = 'Not a number';
+        let max = 12;
 
         expect(function () {
           yAxis._validateUserExtents(min, max);
@@ -245,7 +247,7 @@ describe('Vislib yAxis Class Test Suite', function () {
         domain = [];
         domain[0] = yAxis._attr.yAxis.min = 20;
         domain[1] = yAxis._attr.yAxis.max = 80;
-        var newDomain = yAxis._validateUserExtents(domain);
+        let newDomain = yAxis._validateUserExtents(domain);
 
         expect(newDomain[0]).to.be(domain[0] / 100);
         expect(newDomain[1]).to.be(domain[1] / 100);
@@ -253,7 +255,7 @@ describe('Vislib yAxis Class Test Suite', function () {
 
       it('should return the user defined value', function () {
         domain = [20, 50];
-        var newDomain = yAxis._validateUserExtents(domain);
+        let newDomain = yAxis._validateUserExtents(domain);
 
         expect(newDomain[0]).to.be(domain[0]);
         expect(newDomain[1]).to.be(domain[1]);
@@ -262,8 +264,8 @@ describe('Vislib yAxis Class Test Suite', function () {
 
     describe('should throw an error when', function () {
       it('min === max', function () {
-        var min = 12;
-        var max = 12;
+        let min = 12;
+        let max = 12;
 
         expect(function () {
           yAxis._validateAxisExtents(min, max);
@@ -271,8 +273,8 @@ describe('Vislib yAxis Class Test Suite', function () {
       });
 
       it('min > max', function () {
-        var min = 30;
-        var max = 10;
+        let min = 30;
+        let max = 10;
 
         expect(function () {
           yAxis._validateAxisExtents(min, max);
@@ -282,7 +284,7 @@ describe('Vislib yAxis Class Test Suite', function () {
   });
 
   describe('getScaleType method', function () {
-    var fnNames = ['linear', 'log', 'square root'];
+    let fnNames = ['linear', 'log', 'square root'];
 
     it('should return a function', function () {
       fnNames.forEach(function (fnName) {
@@ -314,15 +316,15 @@ describe('Vislib yAxis Class Test Suite', function () {
     });
 
     it('should return a yMin value of 1', function () {
-      var yMin = yAxis._logDomain(0, 200)[0];
+      let yMin = yAxis._logDomain(0, 200)[0];
       expect(yMin).to.be(1);
     });
   });
 
   describe('getYAxis method', function () {
-    var mode;
-    var yMax;
-    var yScale;
+    let mode;
+    let yMax;
+    let yScale;
     beforeEach(function () {
       createData(defaultGraphData);
       mode = yAxis._attr.mode;
@@ -338,13 +340,13 @@ describe('Vislib yAxis Class Test Suite', function () {
 
     it('should use percentage format for percentages', function () {
       yAxis._attr.mode = 'percentage';
-      var tickFormat = yAxis.getYAxis().tickFormat();
+      let tickFormat = yAxis.getYAxis().tickFormat();
       expect(tickFormat(1)).to.be('100%');
     });
 
     it('should use decimal format for small values', function () {
       yAxis.yMax = 1;
-      var tickFormat = yAxis.getYAxis().tickFormat();
+      let tickFormat = yAxis.getYAxis().tickFormat();
       expect(tickFormat(0.8)).to.be('0.8');
     });
 
@@ -379,23 +381,23 @@ describe('Vislib yAxis Class Test Suite', function () {
   });
 
   describe('#tickFormat()', function () {
-    var formatter = function () {};
+    let formatter = function () {};
 
     it('returns a basic number formatter by default', function () {
-      var yAxis = buildYAxis();
+      let yAxis = buildYAxis();
       expect(yAxis.tickFormat()).to.not.be(formatter);
       expect(yAxis.tickFormat()(1)).to.be('1');
     });
 
     it('returns the yAxisFormatter when passed', function () {
-      var yAxis = buildYAxis({
+      let yAxis = buildYAxis({
         yAxisFormatter: formatter
       });
       expect(yAxis.tickFormat()).to.be(formatter);
     });
 
     it('returns a percentage formatter when the vis is in percentage mode', function () {
-      var yAxis = buildYAxis({
+      let yAxis = buildYAxis({
         yAxisFormatter: formatter,
         _attr: {
           mode: 'percentage'
diff --git a/src/ui/public/vislib/__tests__/vis.js b/src/ui/public/vislib/__tests__/vis.js
index f5d14fcae5b04..2901796357db0 100644
--- a/src/ui/public/vislib/__tests__/vis.js
+++ b/src/ui/public/vislib/__tests__/vis.js
@@ -1,22 +1,22 @@
-var _ = require('lodash');
-var $ = require('jquery');
-var d3 = require('d3');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-
-var series = require('fixtures/vislib/mock_data/date_histogram/_series');
-var columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
-var rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
-var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
-
-var dataArray = [
+let _ = require('lodash');
+let $ = require('jquery');
+let d3 = require('d3');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+
+let series = require('fixtures/vislib/mock_data/date_histogram/_series');
+let columns = require('fixtures/vislib/mock_data/date_histogram/_columns');
+let rows = require('fixtures/vislib/mock_data/date_histogram/_rows');
+let stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+
+let dataArray = [
   series,
   columns,
   rows,
   stackedSeries
 ];
 
-var names = [
+let names = [
   'series',
   'columns',
   'rows',
@@ -26,15 +26,17 @@ var names = [
 
 dataArray.forEach(function (data, i) {
   describe('Vislib Vis Test Suite for ' + names[i] + ' Data', function () {
-    var beforeEvent = 'click';
-    var afterEvent = 'brush';
-    var vis;
-    var secondVis;
-    var numberOfCharts;
+    let beforeEvent = 'click';
+    let afterEvent = 'brush';
+    let vis;
+    let persistedState;
+    let secondVis;
+    let numberOfCharts;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))();
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       secondVis = Private(require('fixtures/vislib/_vis_fixture'))();
     }));
 
@@ -46,7 +48,7 @@ dataArray.forEach(function (data, i) {
 
     describe('render Method', function () {
       beforeEach(function () {
-        vis.render(data);
+        vis.render(data, persistedState);
         numberOfCharts = vis.handler.charts.length;
       });
 
@@ -66,7 +68,7 @@ dataArray.forEach(function (data, i) {
 
     describe('resize Method', function () {
       beforeEach(function () {
-        vis.render(data);
+        vis.render(data, persistedState);
         vis.resize();
         numberOfCharts = vis.handler.charts.length;
       });
@@ -85,8 +87,8 @@ dataArray.forEach(function (data, i) {
 
     describe('destroy Method', function () {
       beforeEach(function () {
-        vis.render(data);
-        secondVis.render(data);
+        vis.render(data, persistedState);
+        secondVis.render(data, persistedState);
         secondVis.destroy();
       });
 
@@ -101,7 +103,7 @@ dataArray.forEach(function (data, i) {
 
     describe('set Method', function () {
       beforeEach(function () {
-        vis.render(data);
+        vis.render(data, persistedState);
         vis.set('addLegend', false);
         vis.set('offset', 'wiggle');
       });
@@ -114,7 +116,7 @@ dataArray.forEach(function (data, i) {
 
     describe('get Method', function () {
       beforeEach(function () {
-        vis.render(data);
+        vis.render(data, persistedState);
       });
 
       it('should get attribue values', function () {
@@ -125,13 +127,13 @@ dataArray.forEach(function (data, i) {
     });
 
     describe('on Method', function () {
-      var events = [
+      let events = [
         beforeEvent,
         afterEvent
       ];
-      var listeners;
-      var listener1;
-      var listener2;
+      let listeners;
+      let listener1;
+      let listener2;
 
       beforeEach(function () {
         listeners = [
@@ -145,7 +147,7 @@ dataArray.forEach(function (data, i) {
         });
 
         // Render chart
-        vis.render(data);
+        vis.render(data, persistedState);
 
         // Add event after charts have rendered
         listeners.forEach(function (listener) {
@@ -169,7 +171,7 @@ dataArray.forEach(function (data, i) {
       });
 
       it('should cause a listener for each event to be attached to each chart', function () {
-        var charts = vis.handler.charts;
+        let charts = vis.handler.charts;
 
         charts.forEach(function (chart, i) {
           expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
@@ -179,9 +181,9 @@ dataArray.forEach(function (data, i) {
     });
 
     describe('off Method', function () {
-      var listeners;
-      var listener1;
-      var listener2;
+      let listeners;
+      let listener1;
+      let listener2;
 
       beforeEach(function () {
         listeners = [];
@@ -199,7 +201,7 @@ dataArray.forEach(function (data, i) {
         vis.off(beforeEvent, listener1);
 
         // Render chart
-        vis.render(data);
+        vis.render(data, persistedState);
 
         // Add event after charts have rendered
         listeners.forEach(function (listener) {
@@ -216,7 +218,7 @@ dataArray.forEach(function (data, i) {
       });
 
       it('should remove a listener', function () {
-        var charts = vis.handler.charts;
+        let charts = vis.handler.charts;
 
         expect(vis.listeners(beforeEvent)).to.not.contain(listener1);
         expect(vis.listeners(beforeEvent)).to.contain(listener2);
@@ -232,7 +234,7 @@ dataArray.forEach(function (data, i) {
       });
 
       it('should remove the event and all listeners when only event passed an argument', function () {
-        var charts = vis.handler.charts;
+        let charts = vis.handler.charts;
         vis.off(afterEvent);
 
         // should remove 'brush' event
@@ -247,7 +249,7 @@ dataArray.forEach(function (data, i) {
       });
 
       it('should remove the event from the chart when the last listener is removed', function () {
-        var charts = vis.handler.charts;
+        let charts = vis.handler.charts;
         vis.off(afterEvent, listener2);
 
         expect(vis.listenerCount(afterEvent)).to.be(0);
diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
index 66e6e292ba59e..5730761260bfa 100644
--- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
@@ -1,13 +1,13 @@
-var d3 = require('d3');
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-
-var woahLotsOfVariables = require('fixtures/vislib/mock_data/date_histogram/_series');
-var notQuiteEnoughVariables = require('fixtures/vislib/mock_data/not_enough_data/_one_point');
-var someOtherVariables = {
+let d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+
+let woahLotsOfVariables = require('fixtures/vislib/mock_data/date_histogram/_series');
+let notQuiteEnoughVariables = require('fixtures/vislib/mock_data/not_enough_data/_one_point');
+let someOtherVariables = {
   'series pos': require('fixtures/vislib/mock_data/date_histogram/_series'),
   'series pos neg': require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg'),
   'series neg': require('fixtures/vislib/mock_data/date_histogram/_series_neg'),
@@ -16,7 +16,7 @@ var someOtherVariables = {
   'stackedSeries': require('fixtures/vislib/mock_data/date_histogram/_stacked_series')
 };
 
-var visLibParams = {
+let visLibParams = {
   type: 'area',
   addLegend: true,
   addTooltip: true
@@ -25,13 +25,15 @@ var visLibParams = {
 
 _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
   describe('Vislib Area Chart Test Suite for ' + imaVariable + ' Data', function () {
-    var vis;
+    let vis;
+    let persistedState;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       vis.on('brush', _.noop);
-      vis.render(variablesAreCool);
+      vis.render(variablesAreCool, persistedState);
     }));
 
     afterEach(function () {
@@ -42,7 +44,7 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
     describe('checkIfEnoughData method throws an error when not enough data', function () {
       beforeEach(function () {
         ngMock.inject(function () {
-          vis.render(notQuiteEnoughVariables);
+          vis.render(notQuiteEnoughVariables, persistedState);
         });
       });
 
@@ -58,7 +60,7 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
     describe('checkIfEnoughData method should not throw an error when enough data', function () {
       beforeEach(function () {
         ngMock.inject(function () {
-          vis.render(woahLotsOfVariables);
+          vis.render(woahLotsOfVariables, persistedState);
         });
       });
 
@@ -72,8 +74,8 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
     });
 
     describe('stackData method', function () {
-      var stackedData;
-      var isStacked;
+      let stackedData;
+      let isStacked;
 
       beforeEach(function () {
         vis.handler.charts.forEach(function (chart) {
@@ -101,12 +103,12 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
     });
 
     describe('addCircleEvents method', function () {
-      var circle;
-      var brush;
-      var d3selectedCircle;
-      var onBrush;
-      var onClick;
-      var onMouseOver;
+      let circle;
+      let brush;
+      let d3selectedCircle;
+      let onBrush;
+      let onClick;
+      let onMouseOver;
 
       beforeEach(ngMock.inject(function () {
         vis.handler.charts.forEach(function (chart) {
@@ -154,12 +156,12 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
 
       it('should not draw circles where d.y === 0', function () {
         vis.handler.charts.forEach(function (chart) {
-          var series = chart.chartData.series;
-          var isZero = series.some(function (d) {
+          let series = chart.chartData.series;
+          let isZero = series.some(function (d) {
             return d.y === 0;
           });
-          var circles = $.makeArray($(chart.chartEl).find('circle'));
-          var isNotDrawn = circles.some(function (d) {
+          let circles = $.makeArray($(chart.chartEl).find('circle'));
+          let isNotDrawn = circles.some(function (d) {
             return d.__data__.y === 0;
           });
 
@@ -179,7 +181,7 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
 
       it('should return a yMin and yMax', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
+          let yAxis = chart.handler.yAxis;
 
           expect(yAxis.domain[0]).to.not.be(undefined);
           expect(yAxis.domain[1]).to.not.be(undefined);
@@ -188,7 +190,7 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
 
       it('should render a zero axis line', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
+          let yAxis = chart.handler.yAxis;
 
           if (yAxis.yMin < 0 && yAxis.yMax > 0) {
             expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
@@ -215,13 +217,13 @@ _.forOwn(someOtherVariables, function (variablesAreCool, imaVariable) {
     describe('defaultYExtents is true', function () {
       beforeEach(function () {
         vis._attr.defaultYExtents = true;
-        vis.render(variablesAreCool);
+        vis.render(variablesAreCool, persistedState);
       });
 
       it('should return yAxis extents equal to data extents', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
-          var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
+          let yAxis = chart.handler.yAxis;
+          let yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
 
           expect(yAxis.domain[0]).to.equal(yVals[0]);
           expect(yAxis.domain[1]).to.equal(yVals[1]);
diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js
index 8fb2e758d45bb..8dbc40ea874b5 100644
--- a/src/ui/public/vislib/__tests__/visualizations/chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/chart.js
@@ -1,19 +1,20 @@
-var d3 = require('d3');
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
+let d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
 
 describe('Vislib _chart Test Suite', function () {
-  var ColumnChart;
-  var Chart;
-  var Data;
-  var Vis;
-  var chartData = {};
-  var vis;
-  var el;
-  var myChart;
-  var config;
-  var data = {
+  let ColumnChart;
+  let Chart;
+  let Data;
+  let persistedState;
+  let Vis;
+  let chartData = {};
+  let vis;
+  let el;
+  let myChart;
+  let config;
+  let data = {
     hits      : 621,
     label     : '',
     ordered   : {
@@ -82,6 +83,7 @@ describe('Vislib _chart Test Suite', function () {
   beforeEach(ngMock.inject(function (Private) {
     Vis = Private(require('ui/vislib/vis'));
     Data = Private(require('ui/vislib/lib/data'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
     ColumnChart = Private(require('ui/vislib/visualizations/column_chart'));
     Chart = Private(require('ui/vislib/visualizations/_chart'));
 
@@ -96,7 +98,7 @@ describe('Vislib _chart Test Suite', function () {
     };
 
     vis = new Vis(el[0][0], config);
-    vis.data = new Data(data, config);
+    vis.data = new Data(data, config, persistedState);
 
     myChart = new ColumnChart(vis, el, chartData);
   }));
diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
index eb211d04e72f6..287e73cfe6e81 100644
--- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
@@ -1,21 +1,21 @@
 
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let d3 = require('d3');
 
 // Data
-var series = require('fixtures/vislib/mock_data/date_histogram/_series');
-var seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
-var seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
-var termsColumns = require('fixtures/vislib/mock_data/terms/_columns');
-//var histogramRows = require('fixtures/vislib/mock_data/histogram/_rows');
-var stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
+let series = require('fixtures/vislib/mock_data/date_histogram/_series');
+let seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
+let seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+let termsColumns = require('fixtures/vislib/mock_data/terms/_columns');
+//let histogramRows = require('fixtures/vislib/mock_data/histogram/_rows');
+let stackedSeries = require('fixtures/vislib/mock_data/date_histogram/_stacked_series');
 
 // tuple, with the format [description, mode, data]
-var dataTypesArray = [
+let dataTypesArray = [
   ['series', 'stacked', series],
   ['series with positive and negative values', 'stacked', seriesPosNeg],
   ['series with negative values', 'stacked', seriesNeg],
@@ -25,14 +25,16 @@ var dataTypesArray = [
 ];
 
 dataTypesArray.forEach(function (dataType, i) {
-  var name = dataType[0];
-  var mode = dataType[1];
-  var data = dataType[2];
+  let name = dataType[0];
+  let mode = dataType[1];
+  let data = dataType[2];
 
   describe('Vislib Column Chart Test Suite for ' + name + ' Data', function () {
-    var vis;
-    var visLibParams = {
+    let vis;
+    let persistedState;
+    let visLibParams = {
       type: 'histogram',
+      hasTimeField: true,
       addLegend: true,
       addTooltip: true,
       mode: mode
@@ -41,8 +43,9 @@ dataTypesArray.forEach(function (dataType, i) {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       vis.on('brush', _.noop);
-      vis.render(data);
+      vis.render(data, persistedState);
     }));
 
     afterEach(function () {
@@ -51,8 +54,8 @@ dataTypesArray.forEach(function (dataType, i) {
     });
 
     describe('stackData method', function () {
-      var stackedData;
-      var isStacked;
+      let stackedData;
+      let isStacked;
 
       beforeEach(function () {
         vis.handler.charts.forEach(function (chart) {
@@ -73,9 +76,9 @@ dataTypesArray.forEach(function (dataType, i) {
 
     describe('addBars method', function () {
       it('should append rects', function () {
-        var numOfSeries;
-        var numOfValues;
-        var product;
+        let numOfSeries;
+        let numOfValues;
+        let product;
 
         vis.handler.charts.forEach(function (chart) {
           numOfSeries = chart.chartData.series.length;
@@ -89,7 +92,7 @@ dataTypesArray.forEach(function (dataType, i) {
     describe('updateBars method', function () {
       beforeEach(function () {
         vis.handler._attr.mode = 'grouped';
-        vis.render(vis.data);
+        vis.render(vis.data, persistedState);
       });
 
       it('should returned grouped bars', function () {
@@ -99,7 +102,7 @@ dataTypesArray.forEach(function (dataType, i) {
 
     describe('addBarEvents method', function () {
       function checkChart(chart) {
-        var rect = $(chart.chartEl).find('.series rect').get(0);
+        let rect = $(chart.chartEl).find('.series rect').get(0);
 
         // check for existance of stuff and things
         return {
@@ -116,23 +119,23 @@ dataTypesArray.forEach(function (dataType, i) {
 
       it('should attach the brush if data is a set of ordered dates', function () {
         vis.handler.charts.forEach(function (chart) {
-          var has = checkChart(chart);
-          var ordered = vis.handler.data.get('ordered');
-          var date = Boolean(ordered && ordered.date);
+          let has = checkChart(chart);
+          let ordered = vis.handler.data.get('ordered');
+          let date = Boolean(ordered && ordered.date);
           expect(has.brush).to.be(date);
         });
       });
 
       it('should attach a click event', function () {
         vis.handler.charts.forEach(function (chart) {
-          var has = checkChart(chart);
+          let has = checkChart(chart);
           expect(has.click).to.be(true);
         });
       });
 
       it('should attach a hover event', function () {
         vis.handler.charts.forEach(function (chart) {
-          var has = checkChart(chart);
+          let has = checkChart(chart);
           expect(has.mouseOver).to.be(true);
         });
       });
@@ -147,7 +150,7 @@ dataTypesArray.forEach(function (dataType, i) {
 
       it('should return a yMin and yMax', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
+          let yAxis = chart.handler.yAxis;
 
           expect(yAxis.domain[0]).to.not.be(undefined);
           expect(yAxis.domain[1]).to.not.be(undefined);
@@ -156,7 +159,7 @@ dataTypesArray.forEach(function (dataType, i) {
 
       it('should render a zero axis line', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
+          let yAxis = chart.handler.yAxis;
 
           if (yAxis.yMin < 0 && yAxis.yMax > 0) {
             expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
@@ -183,14 +186,14 @@ dataTypesArray.forEach(function (dataType, i) {
     describe('defaultYExtents is true', function () {
       beforeEach(function () {
         vis._attr.defaultYExtents = true;
-        vis.render(data);
+        vis.render(data, persistedState);
       });
 
       it('should return yAxis extents equal to data extents', function () {
         vis.handler.charts.forEach(function (chart) {
-          var yAxis = chart.handler.yAxis;
-          var min = vis.handler.data.getYMin();
-          var max = vis.handler.data.getYMax();
+          let yAxis = chart.handler.yAxis;
+          let min = vis.handler.data.getYMin();
+          let max = vis.handler.data.getYMax();
 
           expect(yAxis.domain[0]).to.equal(min);
           expect(yAxis.domain[1]).to.equal(max);
diff --git a/src/ui/public/vislib/__tests__/visualizations/line_chart.js b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
index 4b169437736e2..20d20cb4de8c7 100644
--- a/src/ui/public/vislib/__tests__/visualizations/line_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
@@ -1,19 +1,19 @@
-var d3 = require('d3');
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
+let d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
 
 // Data
-var seriesPos = require('fixtures/vislib/mock_data/date_histogram/_series');
-var seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
-var seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
-var histogramColumns = require('fixtures/vislib/mock_data/histogram/_columns');
-var rangeRows = require('fixtures/vislib/mock_data/range/_rows');
-var termSeries = require('fixtures/vislib/mock_data/terms/_series');
-
-var dataTypes = [
+let seriesPos = require('fixtures/vislib/mock_data/date_histogram/_series');
+let seriesPosNeg = require('fixtures/vislib/mock_data/date_histogram/_series_pos_neg');
+let seriesNeg = require('fixtures/vislib/mock_data/date_histogram/_series_neg');
+let histogramColumns = require('fixtures/vislib/mock_data/histogram/_columns');
+let rangeRows = require('fixtures/vislib/mock_data/range/_rows');
+let termSeries = require('fixtures/vislib/mock_data/terms/_series');
+
+let dataTypes = [
   ['series pos', seriesPos],
   ['series pos neg', seriesPosNeg],
   ['series neg', seriesNeg],
@@ -24,15 +24,16 @@ var dataTypes = [
 
 describe('Vislib Line Chart', function () {
   dataTypes.forEach(function (type, i) {
-    var name = type[0];
-    var data = type[1];
+    let name = type[0];
+    let data = type[1];
 
     describe(name + ' Data', function () {
-      var vis;
+      let vis;
+      let persistedState;
 
       beforeEach(ngMock.module('kibana'));
       beforeEach(ngMock.inject(function (Private) {
-        var visLibParams = {
+        let visLibParams = {
           type: 'line',
           addLegend: true,
           addTooltip: true,
@@ -40,8 +41,9 @@ describe('Vislib Line Chart', function () {
         };
 
         vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
+        persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
         vis.on('brush', _.noop);
-        vis.render(data);
+        vis.render(data, persistedState);
       }));
 
       afterEach(function () {
@@ -50,12 +52,12 @@ describe('Vislib Line Chart', function () {
       });
 
       describe('addCircleEvents method', function () {
-        var circle;
-        var brush;
-        var d3selectedCircle;
-        var onBrush;
-        var onClick;
-        var onMouseOver;
+        let circle;
+        let brush;
+        let d3selectedCircle;
+        let onBrush;
+        let onClick;
+        let onMouseOver;
 
         beforeEach(ngMock.inject(function () {
           vis.handler.charts.forEach(function (chart) {
@@ -129,7 +131,7 @@ describe('Vislib Line Chart', function () {
 
         it('should return a yMin and yMax', function () {
           vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
+            let yAxis = chart.handler.yAxis;
 
             expect(yAxis.domain[0]).to.not.be(undefined);
             expect(yAxis.domain[1]).to.not.be(undefined);
@@ -138,7 +140,7 @@ describe('Vislib Line Chart', function () {
 
         it('should render a zero axis line', function () {
           vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
+            let yAxis = chart.handler.yAxis;
 
             if (yAxis.yMin < 0 && yAxis.yMax > 0) {
               expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
@@ -165,13 +167,13 @@ describe('Vislib Line Chart', function () {
       describe('defaultYExtents is true', function () {
         beforeEach(function () {
           vis._attr.defaultYExtents = true;
-          vis.render(data);
+          vis.render(data, persistedState);
         });
 
         it('should return yAxis extents equal to data extents', function () {
           vis.handler.charts.forEach(function (chart) {
-            var yAxis = chart.handler.yAxis;
-            var yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
+            let yAxis = chart.handler.yAxis;
+            let yVals = [vis.handler.data.getYMin(), vis.handler.data.getYMax()];
 
             expect(yAxis.domain[0]).to.equal(yVals[0]);
             expect(yAxis.domain[1]).to.equal(yVals[1]);
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
index 86353f1de78ad..f37574e84f78b 100644
--- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -1,44 +1,44 @@
-var d3 = require('d3');
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var fixtures = require('fixtures/fake_hierarchical_data');
-
-var rowAgg = [
+let d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let fixtures = require('fixtures/fake_hierarchical_data');
+
+let rowAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
   { type: 'terms', schema: 'split', params: { field: 'extension', rows: true }},
   { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
   { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
 ];
 
-var colAgg = [
+let colAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
   { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
   { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
   { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
 ];
 
-var sliceAgg = [
+let sliceAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
   { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
   { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
 ];
 
-var aggArray = [
+let aggArray = [
   rowAgg,
   colAgg,
   sliceAgg
 ];
 
-var names = [
+let names = [
   'rows',
   'columns',
   'slices'
 ];
 
-var sizes = [
+let sizes = [
   0,
   5,
   15,
@@ -48,41 +48,43 @@ var sizes = [
 ];
 
 describe('No global chart settings', function () {
-  var visLibParams1 = {
+  let visLibParams1 = {
     el: '<div class=chart1></div>',
     type: 'pie',
     addLegend: true,
     addTooltip: true
   };
-  var visLibParams2 = {
+  let visLibParams2 = {
     el: '<div class=chart2></div>',
     type: 'pie',
     addLegend: true,
     addTooltip: true
   };
-  var chart1;
-  var chart2;
-  var Vis;
-  var indexPattern;
-  var buildHierarchicalData;
-  var data1;
-  var data2;
+  let chart1;
+  let chart2;
+  let Vis;
+  let persistedState;
+  let indexPattern;
+  let buildHierarchicalData;
+  let data1;
+  let data2;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     chart1 = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams1);
     chart2 = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams2);
     Vis = Private(require('ui/Vis'));
+    persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
     indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
     buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
 
-    var id1 = 1;
-    var id2 = 1;
-    var stubVis1 = new Vis(indexPattern, {
+    let id1 = 1;
+    let id2 = 1;
+    let stubVis1 = new Vis(indexPattern, {
       type: 'pie',
       aggs: rowAgg
     });
-    var stubVis2 = new Vis(indexPattern, {
+    let stubVis2 = new Vis(indexPattern, {
       type: 'pie',
       aggs: colAgg
     });
@@ -98,8 +100,8 @@ describe('No global chart settings', function () {
     data1 = buildHierarchicalData(stubVis1, fixtures.threeTermBuckets);
     data2 = buildHierarchicalData(stubVis2, fixtures.threeTermBuckets);
 
-    chart1.render(data1);
-    chart2.render(data2);
+    chart1.render(data1, persistedState);
+    chart2.render(data2, persistedState);
   }));
 
   afterEach(function () {
@@ -113,19 +115,19 @@ describe('No global chart settings', function () {
   });
 
   describe('_validatePieData method', function () {
-    var allZeros = [
+    let allZeros = [
       { slices: { children: [] } },
       { slices: { children: [] } },
       { slices: { children: [] } }
     ];
 
-    var someZeros = [
+    let someZeros = [
       { slices: { children: [{}] } },
       { slices: { children: [{}] } },
       { slices: { children: [] } }
     ];
 
-    var noZeros = [
+    let noZeros = [
       { slices: { children: [{}] } },
       { slices: { children: [{}] } },
       { slices: { children: [{}] } }
@@ -150,26 +152,28 @@ describe('No global chart settings', function () {
 
 aggArray.forEach(function (dataAgg, i) {
   describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () {
-    var visLibParams = {
+    let visLibParams = {
       type: 'pie',
       addLegend: true,
       addTooltip: true
     };
-    var vis;
-    var Vis;
-    var indexPattern;
-    var buildHierarchicalData;
-    var data;
+    let vis;
+    let Vis;
+    let persistedState;
+    let indexPattern;
+    let buildHierarchicalData;
+    let data;
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       vis = Private(require('fixtures/vislib/_vis_fixture'))(visLibParams);
       Vis = Private(require('ui/Vis'));
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
       buildHierarchicalData = Private(require('ui/agg_response/hierarchical/build_hierarchical_data'));
 
-      var id = 1;
-      var stubVis = new Vis(indexPattern, {
+      let id = 1;
+      let stubVis = new Vis(indexPattern, {
         type: 'pie',
         aggs: dataAgg
       });
@@ -179,7 +183,7 @@ aggArray.forEach(function (dataAgg, i) {
 
       data = buildHierarchicalData(stubVis, fixtures.threeTermBuckets);
 
-      vis.render(data);
+      vis.render(data, persistedState);
     }));
 
     afterEach(function () {
@@ -188,10 +192,10 @@ aggArray.forEach(function (dataAgg, i) {
     });
 
     describe('addPathEvents method', function () {
-      var path;
-      var d3selectedPath;
-      var onClick;
-      var onMouseOver;
+      let path;
+      let d3selectedPath;
+      let onClick;
+      let onMouseOver;
 
       beforeEach(function () {
         vis.handler.charts.forEach(function (chart) {
@@ -218,10 +222,10 @@ aggArray.forEach(function (dataAgg, i) {
     });
 
     describe('addPath method', function () {
-      var width;
-      var height;
-      var svg;
-      var slices;
+      let width;
+      let height;
+      let svg;
+      let slices;
 
       beforeEach(ngMock.inject(function () {
         vis.handler.charts.forEach(function (chart) {
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
index c10ef8dde5dff..76c6e9ed9412d 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
@@ -1,22 +1,22 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var L = require('leaflet');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let L = require('leaflet');
 
-var sinon = require('auto-release-sinon');
-var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+let sinon = require('auto-release-sinon');
+let geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
 
 // // Data
-// var dataArray = [
+// let dataArray = [
 //   ['geojson', require('fixtures/vislib/mock_data/geohash/_geo_json')],
 //   ['columns', require('fixtures/vislib/mock_data/geohash/_columns')],
 //   ['rows', require('fixtures/vislib/mock_data/geohash/_rows')],
 // ];
 
 // // TODO: Test the specific behavior of each these
-// var mapTypes = [
+// let mapTypes = [
 //   'Scaled Circle Markers',
 //   'Shaded Circle Markers',
 //   'Shaded Geohash Grid',
@@ -24,10 +24,10 @@ var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
 // ];
 
 describe('TileMap Map Tests', function () {
-  var $mockMapEl = $('<div>');
-  var TileMapMap;
-  var leafletStubs = {};
-  var leafletMocks = {};
+  let $mockMapEl = $('<div>');
+  let TileMapMap;
+  let leafletStubs = {};
+  let leafletMocks = {};
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -43,8 +43,8 @@ describe('TileMap Map Tests', function () {
   }));
 
   describe('instantiation', function () {
-    var map;
-    var createStub;
+    let map;
+    let createStub;
 
     beforeEach(function () {
       createStub = sinon.stub(TileMapMap.prototype, '_createMap', _.noop);
@@ -56,7 +56,7 @@ describe('TileMap Map Tests', function () {
     });
 
     it('should add zoom controls', function () {
-      var mapOptions = createStub.firstCall.args[0];
+      let mapOptions = createStub.firstCall.args[0];
 
       expect(mapOptions).to.be.an('object');
       if (mapOptions.zoomControl) expect(mapOptions.zoomControl).to.be.ok();
@@ -65,8 +65,8 @@ describe('TileMap Map Tests', function () {
   });
 
   describe('createMap', function () {
-    var map;
-    var mapStubs;
+    let map;
+    let mapStubs;
 
     beforeEach(function () {
       mapStubs = {
@@ -81,8 +81,8 @@ describe('TileMap Map Tests', function () {
       expect(leafletStubs.tileLayer.callCount).to.equal(1);
       expect(leafletStubs.map.callCount).to.equal(1);
 
-      var callArgs = leafletStubs.map.firstCall.args;
-      var mapOptions = callArgs[1];
+      let callArgs = leafletStubs.map.firstCall.args;
+      let mapOptions = callArgs[1];
       expect(callArgs[0]).to.be($mockMapEl.get(0));
       expect(mapOptions).to.have.property('zoom');
       expect(mapOptions).to.have.property('center');
@@ -109,7 +109,7 @@ describe('TileMap Map Tests', function () {
   });
 
   describe('attachEvents', function () {
-    var map;
+    let map;
 
     beforeEach(function () {
       sinon.stub(TileMapMap.prototype, '_createMap', function () {
@@ -121,21 +121,21 @@ describe('TileMap Map Tests', function () {
     });
 
     it('should attach interaction events', function () {
-      var expectedTileEvents = ['tileload'];
-      var expectedMapEvents = ['draw:created', 'moveend', 'zoomend', 'unload'];
-      var matchedEvents = {
+      let expectedTileEvents = ['tileload'];
+      let expectedMapEvents = ['draw:created', 'moveend', 'zoomend', 'unload'];
+      let matchedEvents = {
         tiles: 0,
         maps: 0,
       };
 
       _.times(leafletMocks.tileLayer.on.callCount, function (index) {
-        var ev = leafletMocks.tileLayer.on.getCall(index).args[0];
+        let ev = leafletMocks.tileLayer.on.getCall(index).args[0];
         if (_.includes(expectedTileEvents, ev)) matchedEvents.tiles++;
       });
       expect(matchedEvents.tiles).to.equal(expectedTileEvents.length);
 
       _.times(leafletMocks.map.on.callCount, function (index) {
-        var ev = leafletMocks.map.on.getCall(index).args[0];
+        let ev = leafletMocks.map.on.getCall(index).args[0];
         if (_.includes(expectedMapEvents, ev)) matchedEvents.maps++;
       });
       expect(matchedEvents.maps).to.equal(expectedMapEvents.length);
@@ -144,8 +144,8 @@ describe('TileMap Map Tests', function () {
 
 
   describe('addMarkers', function () {
-    var map;
-    var createStub;
+    let map;
+    let createStub;
 
     beforeEach(function () {
       sinon.stub(TileMapMap.prototype, '_createMap');
@@ -156,14 +156,14 @@ describe('TileMap Map Tests', function () {
     it('should pass the map options to the marker', function () {
       map._addMarkers();
 
-      var args = createStub.firstCall.args[0];
+      let args = createStub.firstCall.args[0];
       expect(args).to.have.property('tooltipFormatter');
       expect(args).to.have.property('valueFormatter');
       expect(args).to.have.property('attr');
     });
 
     it('should destroy existing markers', function () {
-      var destroyStub = sinon.stub();
+      let destroyStub = sinon.stub();
       map._markers = { destroy: destroyStub };
       map._addMarkers();
 
@@ -172,7 +172,7 @@ describe('TileMap Map Tests', function () {
   });
 
   describe('getDataRectangles', function () {
-    var map;
+    let map;
 
     beforeEach(function () {
       sinon.stub(TileMapMap.prototype, '_createMap');
@@ -181,20 +181,20 @@ describe('TileMap Map Tests', function () {
 
     it('should return an empty array if no data', function () {
       map = new TileMapMap($mockMapEl, {}, {});
-      var rects = map._getDataRectangles();
+      let rects = map._getDataRectangles();
       expect(rects).to.have.length(0);
     });
 
     it('should return an array of arrays of rectangles', function () {
-      var rects = map._getDataRectangles();
+      let rects = map._getDataRectangles();
       _.times(5, function () {
-        var index = _.random(rects.length - 1);
-        var rect = rects[index];
-        var featureRect = geoJsonData.geoJson.features[index].properties.rectangle;
+        let index = _.random(rects.length - 1);
+        let rect = rects[index];
+        let featureRect = geoJsonData.geoJson.features[index].properties.rectangle;
         expect(rect.length).to.equal(featureRect.length);
 
         // should swap the array
-        var checkIndex = _.random(rect.length - 1);
+        let checkIndex = _.random(rect.length - 1);
         expect(rect[checkIndex]).to.eql(featureRect[checkIndex]);
       });
     });
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
index 9bdcb96d8ec2e..81919d923d906 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
@@ -1,18 +1,18 @@
 
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var L = require('leaflet');
-var sinon = require('auto-release-sinon');
-var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let L = require('leaflet');
+let sinon = require('auto-release-sinon');
+let geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
 // defaults to roughly the lower 48 US states
-var defaultSWCoords = [13.496, -143.789];
-var defaultNECoords = [55.526, -57.919];
-var bounds = {};
-var MarkerType;
-var map;
+let defaultSWCoords = [13.496, -143.789];
+let defaultNECoords = [55.526, -57.919];
+let bounds = {};
+let MarkerType;
+let map;
 
 angular.module('MarkerFactory', ['kibana']);
 
@@ -25,7 +25,7 @@ function getBounds() {
   return L.latLngBounds(bounds.southWest, bounds.northEast);
 }
 
-var mockMap = {
+let mockMap = {
   addLayer: _.noop,
   closePopup: _.noop,
   getBounds: getBounds,
@@ -35,8 +35,8 @@ var mockMap = {
 };
 
 describe('Marker Tests', function () {
-  var mapData;
-  var markerLayer;
+  let mapData;
+  let markerLayer;
 
   function createMarker(MarkerClass, geoJson) {
     mapData = _.assign({}, geoJsonData.geoJson, geoJson || {});
@@ -60,7 +60,7 @@ describe('Marker Tests', function () {
   });
 
   describe('Base Methods', function () {
-    var MarkerClass;
+    let MarkerClass;
 
     beforeEach(ngMock.module('MarkerFactory'));
     beforeEach(ngMock.inject(function (Private) {
@@ -72,8 +72,8 @@ describe('Marker Tests', function () {
       it('should not filter any features', function () {
         // set bounds to the entire world
         setBounds([-87.252, -343.828], [87.252, 343.125]);
-        var boundFilter = markerLayer._filterToMapBounds();
-        var mapFeature = mapData.features.filter(boundFilter);
+        let boundFilter = markerLayer._filterToMapBounds();
+        let mapFeature = mapData.features.filter(boundFilter);
 
         expect(mapFeature.length).to.equal(mapData.features.length);
       });
@@ -81,8 +81,8 @@ describe('Marker Tests', function () {
       it('should filter out data points that are outside of the map bounds', function () {
         // set bounds to roughly US southwest
         setBounds([31.690, -124.387], [42.324, -102.919]);
-        var boundFilter = markerLayer._filterToMapBounds();
-        var mapFeature = mapData.features.filter(boundFilter);
+        let boundFilter = markerLayer._filterToMapBounds();
+        let mapFeature = mapData.features.filter(boundFilter);
 
         expect(mapFeature.length).to.be.lessThan(mapData.features.length);
       });
@@ -90,8 +90,8 @@ describe('Marker Tests', function () {
 
     describe('legendQuantizer', function () {
       it('should return a range of hex colors', function () {
-        var minColor = markerLayer._legendQuantizer(mapData.properties.allmin);
-        var maxColor = markerLayer._legendQuantizer(mapData.properties.allmax);
+        let minColor = markerLayer._legendQuantizer(mapData.properties.allmin);
+        let maxColor = markerLayer._legendQuantizer(mapData.properties.allmax);
 
         expect(minColor.substring(0, 1)).to.equal('#');
         expect(minColor).to.have.length(7);
@@ -101,18 +101,18 @@ describe('Marker Tests', function () {
       });
 
       it('should return a color with 1 color', function () {
-        var geoJson = { properties: { min: 1, max: 1 } };
+        let geoJson = { properties: { min: 1, max: 1 } };
         markerLayer = createMarker(MarkerClass, geoJson);
 
         // ensure the quantizer domain is correct
-        var color = markerLayer._legendQuantizer(1);
+        let color = markerLayer._legendQuantizer(1);
         expect(color).to.not.be(undefined);
         expect(color.substring(0, 1)).to.equal('#');
 
         // should always get the same color back
         _.times(5, function () {
-          var num = _.random(0, 100);
-          var randColor = markerLayer._legendQuantizer(0);
+          let num = _.random(0, 100);
+          let randColor = markerLayer._legendQuantizer(0);
           expect(randColor).to.equal(color);
         });
       });
@@ -120,29 +120,29 @@ describe('Marker Tests', function () {
 
     describe('applyShadingStyle', function () {
       it('should return a style object', function () {
-        var style = markerLayer.applyShadingStyle(100);
+        let style = markerLayer.applyShadingStyle(100);
         expect(style).to.be.an('object');
 
-        var keys = _.keys(style);
-        var expected = ['fillColor', 'color'];
+        let keys = _.keys(style);
+        let expected = ['fillColor', 'color'];
         _.each(expected, function (key) {
           expect(keys).to.contain(key);
         });
       });
 
       it('should use the legendQuantizer', function () {
-        var spy = sinon.spy(markerLayer, '_legendQuantizer');
-        var style = markerLayer.applyShadingStyle(100);
+        let spy = sinon.spy(markerLayer, '_legendQuantizer');
+        let style = markerLayer.applyShadingStyle(100);
         expect(spy.callCount).to.equal(1);
       });
     });
 
     describe('showTooltip', function () {
       it('should use the tooltip formatter', function () {
-        var content;
-        var sample = _.sample(mapData.features);
+        let content;
+        let sample = _.sample(mapData.features);
 
-        var stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) {
+        let stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) {
           return;
         });
 
@@ -154,8 +154,8 @@ describe('Marker Tests', function () {
     });
 
     describe('addLegend', function () {
-      var addToSpy;
-      var leafletControlStub;
+      let addToSpy;
+      let leafletControlStub;
 
       beforeEach(function () {
         addToSpy = sinon.spy();
@@ -182,12 +182,12 @@ describe('Marker Tests', function () {
       });
 
       it('should use the value formatter', function () {
-        var formatterSpy = sinon.spy(markerLayer, '_valueFormatter');
+        let formatterSpy = sinon.spy(markerLayer, '_valueFormatter');
         // called twice for every legend color defined
-        var expectedCallCount = markerLayer._legendColors.length * 2;
+        let expectedCallCount = markerLayer._legendColors.length * 2;
 
         markerLayer.addLegend();
-        var legend = markerLayer._legend.onAdd();
+        let legend = markerLayer._legend.onAdd();
 
         expect(formatterSpy.callCount).to.equal(expectedCallCount);
         expect(legend).to.be.a(HTMLDivElement);
@@ -198,14 +198,14 @@ describe('Marker Tests', function () {
   describe('Shaded Circles', function () {
     beforeEach(ngMock.module('MarkerFactory'));
     beforeEach(ngMock.inject(function (Private) {
-      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/shaded_circles'));
+      let MarkerClass = Private(require('ui/vislib/visualizations/marker_types/shaded_circles'));
       markerLayer = createMarker(MarkerClass);
     }));
 
     describe('geohashMinDistance method', function () {
       it('should return a finite number', function () {
-        var sample = _.sample(mapData.features);
-        var distance = markerLayer._geohashMinDistance(sample);
+        let sample = _.sample(mapData.features);
+        let distance = markerLayer._geohashMinDistance(sample);
 
         expect(distance).to.be.a('number');
         expect(_.isFinite(distance)).to.be(true);
@@ -214,40 +214,40 @@ describe('Marker Tests', function () {
   });
 
   describe('Scaled Circles', function () {
-    var zoom;
+    let zoom;
 
     beforeEach(ngMock.module('MarkerFactory'));
     beforeEach(ngMock.inject(function (Private) {
       zoom = _.random(1, 18);
       sinon.stub(mockMap, 'getZoom', _.constant(zoom));
-      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/scaled_circles'));
+      let MarkerClass = Private(require('ui/vislib/visualizations/marker_types/scaled_circles'));
       markerLayer = createMarker(MarkerClass);
     }));
 
     describe('radiusScale method', function () {
-      var valueArray = [10, 20, 30, 40, 50, 60];
-      var max = _.max(valueArray);
-      var prev = -1;
+      let valueArray = [10, 20, 30, 40, 50, 60];
+      let max = _.max(valueArray);
+      let prev = -1;
 
       it('should return 0 for value of 0', function () {
         expect(markerLayer._radiusScale(0)).to.equal(0);
       });
 
       it('should return a scaled value for negative and positive numbers', function () {
-        var upperBound = markerLayer._radiusScale(max);
-        var results = [];
+        let upperBound = markerLayer._radiusScale(max);
+        let results = [];
 
         function roundValue(value) {
           // round number to 6 decimal places
-          var r = Math.pow(10, 6);
+          let r = Math.pow(10, 6);
           return Math.round(value * r) / r;
         }
 
         _.each(valueArray, function (value, i) {
-          var ratio = Math.pow(value / max, 0.5);
-          var comparison = ratio * upperBound;
-          var radius = markerLayer._radiusScale(value);
-          var negRadius = markerLayer._radiusScale(value * -1);
+          let ratio = Math.pow(value / max, 0.5);
+          let comparison = ratio * upperBound;
+          let radius = markerLayer._radiusScale(value);
+          let negRadius = markerLayer._radiusScale(value * -1);
           results.push(radius);
 
           expect(negRadius).to.equal(radius);
@@ -265,19 +265,19 @@ describe('Marker Tests', function () {
   describe('Heatmaps', function () {
     beforeEach(ngMock.module('MarkerFactory'));
     beforeEach(ngMock.inject(function (Private) {
-      var MarkerClass = Private(require('ui/vislib/visualizations/marker_types/heatmap'));
+      let MarkerClass = Private(require('ui/vislib/visualizations/marker_types/heatmap'));
       markerLayer = createMarker(MarkerClass);
     }));
 
     describe('dataToHeatArray', function () {
-      var max;
+      let max;
 
       beforeEach(function () {
         max = mapData.properties.allmax;
       });
 
       it('should return an array or values for each feature', function () {
-        var arr = markerLayer._dataToHeatArray(max);
+        let arr = markerLayer._dataToHeatArray(max);
         expect(arr).to.be.an('array');
         expect(arr).to.have.length(mapData.features.length);
 
@@ -285,11 +285,11 @@ describe('Marker Tests', function () {
 
       it('should return an array item with lat, lng, metric for each feature', function () {
         _.times(3, function () {
-          var arr = markerLayer._dataToHeatArray(max);
-          var index = _.random(mapData.features.length - 1);
-          var feature = mapData.features[index];
-          var featureValue = feature.properties.value;
-          var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
+          let arr = markerLayer._dataToHeatArray(max);
+          let index = _.random(mapData.features.length - 1);
+          let feature = mapData.features[index];
+          let featureValue = feature.properties.value;
+          let featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
           expect(arr[index]).to.eql(featureArr);
         });
       });
@@ -298,11 +298,11 @@ describe('Marker Tests', function () {
         _.times(5, function () {
           markerLayer._attr.heatNormalizeData = true;
 
-          var arr = markerLayer._dataToHeatArray(max);
-          var index = _.random(mapData.features.length - 1);
-          var feature = mapData.features[index];
-          var featureValue = parseInt(feature.properties.value / max * 100);
-          var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
+          let arr = markerLayer._dataToHeatArray(max);
+          let index = _.random(mapData.features.length - 1);
+          let feature = mapData.features[index];
+          let featureValue = feature.properties.value / max;
+          let featureArr = feature.geometry.coordinates.slice(0).concat(featureValue);
           expect(arr[index]).to.eql(featureArr);
         });
       });
@@ -311,18 +311,18 @@ describe('Marker Tests', function () {
     describe('tooltipProximity', function () {
       it('should return true if feature is close enough to event latlng', function () {
         _.times(5, function () {
-          var feature = _.sample(mapData.features);
-          var point = markerLayer._getLatLng(feature);
-          var arr = markerLayer._tooltipProximity(point, feature);
+          let feature = _.sample(mapData.features);
+          let point = markerLayer._getLatLng(feature);
+          let arr = markerLayer._tooltipProximity(point, feature);
           expect(arr).to.be(true);
         });
       });
 
       it('should return false if feature is not close enough to event latlng', function () {
         _.times(5, function () {
-          var feature = _.sample(mapData.features);
-          var point = L.latLng(90, -180);
-          var arr = markerLayer._tooltipProximity(point, feature);
+          let feature = _.sample(mapData.features);
+          let point = L.latLng(90, -180);
+          let arr = markerLayer._tooltipProximity(point, feature);
           expect(arr).to.be(false);
         });
       });
@@ -331,9 +331,9 @@ describe('Marker Tests', function () {
     describe('nearestFeature', function () {
       it('should return nearest geoJson feature object', function () {
         _.times(5, function () {
-          var feature = _.sample(mapData.features);
-          var point = markerLayer._getLatLng(feature);
-          var nearestPoint = markerLayer._nearestFeature(point);
+          let feature = _.sample(mapData.features);
+          let point = markerLayer._getLatLng(feature);
+          let nearestPoint = markerLayer._nearestFeature(point);
           expect(nearestPoint).to.equal(feature);
         });
       });
@@ -341,15 +341,15 @@ describe('Marker Tests', function () {
 
     describe('getLatLng', function () {
       it('should return a leaflet latLng object', function () {
-        var feature = _.sample(mapData.features);
-        var latLng = markerLayer._getLatLng(feature);
-        var compare = L.latLng(feature.geometry.coordinates.slice(0).reverse());
+        let feature = _.sample(mapData.features);
+        let latLng = markerLayer._getLatLng(feature);
+        let compare = L.latLng(feature.geometry.coordinates.slice(0).reverse());
         expect(latLng).to.eql(compare);
       });
 
       it('should memoize the result', function () {
-        var spy = sinon.spy(L, 'latLng');
-        var feature = _.sample(mapData.features);
+        let spy = sinon.spy(L, 'latLng');
+        let feature = _.sample(mapData.features);
 
         markerLayer._getLatLng(feature);
         expect(spy.callCount).to.be(1);
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
index 74c520a756b65..edc38c5e0e2d4 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
@@ -1,28 +1,28 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var sinon = require('auto-release-sinon');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let sinon = require('auto-release-sinon');
 
-var geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
-var MockMap = require('fixtures/tilemap_map');
-var mockChartEl = $('<div>');
+let geoJsonData = require('fixtures/vislib/mock_data/geohash/_geo_json');
+let MockMap = require('fixtures/tilemap_map');
+let mockChartEl = $('<div>');
 
-var TileMap;
-var extentsStub;
+let TileMap;
+let extentsStub;
 
 function createTileMap(handler, chartEl, chartData) {
   handler = handler || {};
   chartEl = chartEl || mockChartEl;
   chartData = chartData || geoJsonData;
 
-  var tilemap = new TileMap(handler, chartEl, chartData);
+  let tilemap = new TileMap(handler, chartEl, chartData);
   return tilemap;
 }
 
 describe('TileMap Tests', function () {
-  var tilemap;
+  let tilemap;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -51,14 +51,14 @@ describe('TileMap Tests', function () {
     });
 
     it('should call destroy for clean state', function () {
-      var destroySpy = sinon.spy(tilemap, 'destroy');
+      let destroySpy = sinon.spy(tilemap, 'destroy');
       tilemap.draw();
       expect(destroySpy.callCount).to.equal(1);
     });
   });
 
   describe('appendMap', function () {
-    var $selection;
+    let $selection;
 
     beforeEach(function () {
       $selection = $('<div>');
@@ -72,14 +72,14 @@ describe('TileMap Tests', function () {
 
     it('should append maps and required controls', function () {
       expect(tilemap.maps).to.have.length(1);
-      var map = tilemap.maps[0];
+      let map = tilemap.maps[0];
       expect(map.addTitle.callCount).to.equal(0);
       expect(map.addFitControl.callCount).to.equal(1);
       expect(map.addBoundingControl.callCount).to.equal(1);
     });
 
     it('should only add controls if data exists', function () {
-      var noData = {
+      let noData = {
         geoJson: {
           features: [],
           properties: {},
@@ -91,17 +91,17 @@ describe('TileMap Tests', function () {
       tilemap._appendMap($selection);
       expect(tilemap.maps).to.have.length(1);
 
-      var map = tilemap.maps[0];
+      let map = tilemap.maps[0];
       expect(map.addTitle.callCount).to.equal(0);
       expect(map.addFitControl.callCount).to.equal(0);
       expect(map.addBoundingControl.callCount).to.equal(0);
     });
 
     it('should append title if set in the data object', function () {
-      var mapTitle = 'Test Title';
+      let mapTitle = 'Test Title';
       tilemap = createTileMap(null, null, _.assign({ title: mapTitle }, geoJsonData));
       tilemap._appendMap($selection);
-      var map = tilemap.maps[0];
+      let map = tilemap.maps[0];
 
       expect(map.addTitle.callCount).to.equal(1);
       expect(map.addTitle.firstCall.calledWith(mapTitle)).to.equal(true);
@@ -109,8 +109,8 @@ describe('TileMap Tests', function () {
   });
 
   describe('destroy', function () {
-    var maps = [];
-    var mapCount = 5;
+    let maps = [];
+    let mapCount = 5;
 
     beforeEach(function () {
       _.times(mapCount, function () {
diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
index b60bd0cab4b6f..1c575e1c27503 100644
--- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js
+++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -1,21 +1,21 @@
-var d3 = require('d3');
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
-var $ = require('jquery');
-var fixtures = require('fixtures/fake_hierarchical_data');
-var series = require('fixtures/vislib/mock_data/date_histogram/_series');
-var terms = require('fixtures/vislib/mock_data/terms/_columns');
+let d3 = require('d3');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
+let $ = require('jquery');
+let fixtures = require('fixtures/fake_hierarchical_data');
+let series = require('fixtures/vislib/mock_data/date_histogram/_series');
+let terms = require('fixtures/vislib/mock_data/terms/_columns');
 
 describe('Vislib Time Marker Test Suite', function () {
-  var height = 50;
-  var color = '#ff0000';
-  var opacity = 0.5;
-  var width = 3;
-  var customClass = 'custom-time-marker';
-  var dateMathTimes = ['now-1m', 'now-5m', 'now-15m'];
-  var myTimes = dateMathTimes.map(function (dateMathString) {
+  let height = 50;
+  let color = '#ff0000';
+  let opacity = 0.5;
+  let width = 3;
+  let customClass = 'custom-time-marker';
+  let dateMathTimes = ['now-1m', 'now-5m', 'now-15m'];
+  let myTimes = dateMathTimes.map(function (dateMathString) {
     return {
       time: dateMathString,
       class: customClass,
@@ -24,22 +24,22 @@ describe('Vislib Time Marker Test Suite', function () {
       width: width
     };
   });
-  var getExtent = function (dataArray, func) {
+  let getExtent = function (dataArray, func) {
     return func(dataArray, function (obj) {
       return func(obj.values, function (d) {
         return d.x;
       });
     });
   };
-  var times = [];
-  var TimeMarker;
-  var defaultMarker;
-  var customMarker;
-  var selection;
-  var xScale;
-  var minDomain;
-  var maxDomain;
-  var domain;
+  let times = [];
+  let TimeMarker;
+  let defaultMarker;
+  let customMarker;
+  let selection;
+  let xScale;
+  let minDomain;
+  let maxDomain;
+  let domain;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -62,8 +62,8 @@ describe('Vislib Time Marker Test Suite', function () {
   });
 
   describe('_isTimeBaseChart method', function () {
-    var boolean;
-    var newSelection;
+    let boolean;
+    let newSelection;
 
     it('should return true when data is time based', function () {
       boolean = defaultMarker._isTimeBasedChart(selection);
@@ -78,7 +78,7 @@ describe('Vislib Time Marker Test Suite', function () {
   });
 
   describe('render method', function () {
-    var lineArray;
+    let lineArray;
 
     beforeEach(function () {
       defaultMarker.render(selection);
diff --git a/src/ui/public/vislib/__tests__/visualizations/vis_types.js b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
index 24a401ab89aeb..32092cbf544ae 100644
--- a/src/ui/public/vislib/__tests__/visualizations/vis_types.js
+++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
@@ -1,11 +1,11 @@
-var angular = require('angular');
-var expect = require('expect.js');
-var ngMock = require('ngMock');
-var _ = require('lodash');
+let angular = require('angular');
+let expect = require('expect.js');
+let ngMock = require('ngMock');
+let _ = require('lodash');
 
 describe('Vislib Vis Types Test Suite', function () {
-  var visTypes;
-  var visFunc;
+  let visTypes;
+  let visFunc;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
diff --git a/src/ui/public/vislib/components/Tooltip/Tooltip.js b/src/ui/public/vislib/components/Tooltip/Tooltip.js
index dcea82c4afd06..4521cd1bbefe9 100644
--- a/src/ui/public/vislib/components/Tooltip/Tooltip.js
+++ b/src/ui/public/vislib/components/Tooltip/Tooltip.js
@@ -1,10 +1,10 @@
-var d3 = require('d3');
-var _ = require('lodash');
-var $ = require('jquery');
-var Binder = require('ui/Binder');
-var positionTooltip = require('./positionTooltip');
+let d3 = require('d3');
+let _ = require('lodash');
+let $ = require('jquery');
+let Binder = require('ui/Binder');
+let positionTooltip = require('./positionTooltip');
 
-var allContents = [];
+let allContents = [];
 
 /**
  * Add tooltip and listeners to visualization elements
@@ -59,13 +59,13 @@ Tooltip.prototype.$getSizer = _.once(function () {
  * Show the tooltip, positioning it based on the content and chart container
  */
 Tooltip.prototype.show = function () {
-  var $tooltip = this.$get();
-  var $chart = this.$getChart();
-  var html = $tooltip.html();
+  let $tooltip = this.$get();
+  let $chart = this.$getChart();
+  let html = $tooltip.html();
 
   if (!$chart) return;
 
-  var placement = positionTooltip({
+  let placement = positionTooltip({
     $window: $(window),
     $chart: $chart,
     $el: $tooltip,
@@ -84,7 +84,7 @@ Tooltip.prototype.show = function () {
  * Hide the tooltip, clearing its contents
  */
 Tooltip.prototype.hide = function () {
-  var $tooltip = this.$get();
+  let $tooltip = this.$get();
   allContents = [];
   $tooltip.css({
     visibility: 'hidden',
@@ -100,7 +100,7 @@ Tooltip.prototype.hide = function () {
  * @return {Object} jQuery node for the chart
  */
 Tooltip.prototype.$getChart = function () {
-  var chart = $(this.container && this.container.node());
+  let chart = $(this.container && this.container.node());
   return chart.size() ? chart : false;
 };
 
@@ -111,7 +111,7 @@ Tooltip.prototype.$getChart = function () {
  * @return {Function} Renders tooltip on a D3 selection
  */
 Tooltip.prototype.render = function () {
-  var self = this;
+  let self = this;
 
   /**
    * Calculates values for the tooltip placement
@@ -119,17 +119,17 @@ Tooltip.prototype.render = function () {
    * @param {Object} selection D3 selection object
    */
   return function (selection) {
-    var $tooltip = self.$get();
-    var id = self.id;
-    var order = self.order;
+    let $tooltip = self.$get();
+    let id = self.id;
+    let order = self.order;
 
-    var tooltipSelection = d3.select($tooltip.get(0));
+    let tooltipSelection = d3.select($tooltip.get(0));
 
     if (self.container === undefined || self.container !== d3.select(self.el).select('.' + self.containerClass)) {
       self.container = d3.select(self.el).select('.' + self.containerClass);
     }
 
-    var $chart = self.$getChart();
+    let $chart = self.$getChart();
     if ($chart) {
       self.binder.jqOn($chart, 'mouseleave', function (event) {
         // only clear when we leave the chart, so that
@@ -139,7 +139,7 @@ Tooltip.prototype.render = function () {
     }
 
     selection.each(function (d, i) {
-      var element = d3.select(this);
+      let element = d3.select(this);
 
       function render(html) {
         allContents = _.filter(allContents, function (content) {
@@ -148,7 +148,7 @@ Tooltip.prototype.render = function () {
 
         if (html) allContents.push({ id: id, html: html, order: order });
 
-        var allHtml = _(allContents)
+        let allHtml = _(allContents)
         .sortBy('order')
         .pluck('html')
         .compact()
@@ -167,7 +167,7 @@ Tooltip.prototype.render = function () {
           return render();
         }
 
-        var events = self.events ? self.events.eventResponse(d, i) : d;
+        let events = self.events ? self.events.eventResponse(d, i) : d;
         return render(self.formatter(events));
       });
 
diff --git a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
index e205afaf1cc73..03fb2ae5e4edc 100644
--- a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
+++ b/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
@@ -1,22 +1,22 @@
-var expect = require('expect.js');
+let expect = require('expect.js');
 
 describe('Tooltip Positioning', function () {
-  var $ = require('jquery');
-  var _ = require('lodash');
-  var sinon = require('auto-release-sinon');
-
-  var posTT = require('../positionTooltip');
-  var positions = ['north', 'south', 'east', 'west'];
-  var bounds = ['top', 'left', 'bottom', 'right'];
-  var $window;
-  var $chart;
-  var $tooltip;
-  var $sizer;
+  let $ = require('jquery');
+  let _ = require('lodash');
+  let sinon = require('auto-release-sinon');
+
+  let posTT = require('../positionTooltip');
+  let positions = ['north', 'south', 'east', 'west'];
+  let bounds = ['top', 'left', 'bottom', 'right'];
+  let $window;
+  let $chart;
+  let $tooltip;
+  let $sizer;
 
   function testEl(width, height, $children) {
-    var $el = $('<div>');
+    let $el = $('<div>');
 
-    var size = {
+    let size = {
       width: _.random(width[0], width[1]),
       height: _.random(height[0], height[1])
     };
@@ -57,7 +57,7 @@ describe('Tooltip Positioning', function () {
     xPercent = xPercent || 0.5;
     yPercent = yPercent || 0.5;
 
-    var base = $chart.offset();
+    let base = $chart.offset();
 
     return {
       clientX: base.left + ($chart.testSize.width * xPercent),
@@ -67,14 +67,14 @@ describe('Tooltip Positioning', function () {
 
   describe('getTtSize()', function () {
     it('should measure the outer-size of the tooltip using an un-obstructed clone', function () {
-      var w = sinon.spy($.fn, 'outerWidth');
-      var h = sinon.spy($.fn, 'outerHeight');
+      let w = sinon.spy($.fn, 'outerWidth');
+      let h = sinon.spy($.fn, 'outerHeight');
 
       posTT.getTtSize($tooltip.html(), $sizer);
 
       [w, h].forEach(function (spy) {
         expect(spy).to.have.property('callCount', 1);
-        var matchHtml = w.thisValues.filter(function ($t) {
+        let matchHtml = w.thisValues.filter(function ($t) {
           return !$t.is($tooltip) && $t.html() === $tooltip.html();
         });
         expect(matchHtml).to.have.length(1);
@@ -84,8 +84,8 @@ describe('Tooltip Positioning', function () {
 
   describe('getBasePosition()', function () {
     it('calculates the offset values for the four positions', function () {
-      var size = posTT.getTtSize($tooltip.html(), $sizer);
-      var pos = posTT.getBasePosition(size, makeEvent());
+      let size = posTT.getTtSize($tooltip.html(), $sizer);
+      let pos = posTT.getBasePosition(size, makeEvent());
 
       positions.forEach(function (p) {
         expect(pos).to.have.property(p);
@@ -98,7 +98,7 @@ describe('Tooltip Positioning', function () {
 
   describe('getBounds()', function () {
     it('returns the offsets for the tlrb of the element', function () {
-      var cbounds = posTT.getBounds($chart);
+      let cbounds = posTT.getBounds($chart);
 
       bounds.forEach(function (b) {
         expect(cbounds).to.have.property(b);
@@ -114,14 +114,14 @@ describe('Tooltip Positioning', function () {
       // size the tooltip very small so it won't collide with the edges
       $tooltip.css({ width: 15, height: 15 });
       $sizer.css({ width: 15, height: 15 });
-      var size = posTT.getTtSize($tooltip.html(), $sizer);
+      let size = posTT.getTtSize($tooltip.html(), $sizer);
       expect(size).to.have.property('width', 15);
       expect(size).to.have.property('height', 15);
 
       // position the element based on a mouse that is in the middle of the chart
-      var pos = posTT.getBasePosition(size, makeEvent(0.5, 0.5));
+      let pos = posTT.getBasePosition(size, makeEvent(0.5, 0.5));
 
-      var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
+      let overflow = posTT.getOverflow(size, pos, [$chart, $window]);
       positions.forEach(function (p) {
         expect(overflow).to.have.property(p);
 
@@ -131,11 +131,11 @@ describe('Tooltip Positioning', function () {
     });
 
     it('identifies an overflow with a positive value in that direction', function () {
-      var size = posTT.getTtSize($tooltip.html(), $sizer);
+      let size = posTT.getTtSize($tooltip.html(), $sizer);
 
       // position the element based on a mouse that is in the bottom right hand courner of the chart
-      var pos = posTT.getBasePosition(size, makeEvent(0.99, 0.99));
-      var overflow = posTT.getOverflow(size, pos, [$chart, $window]);
+      let pos = posTT.getBasePosition(size, makeEvent(0.99, 0.99));
+      let overflow = posTT.getOverflow(size, pos, [$chart, $window]);
 
       positions.forEach(function (p) {
         expect(overflow).to.have.property(p);
@@ -157,9 +157,9 @@ describe('Tooltip Positioning', function () {
     });
 
     function check(xPercent, yPercent/*, prev, directions... */) {
-      var directions = _.drop(arguments, 2);
-      var event = makeEvent(xPercent, yPercent);
-      var placement = posTT({
+      let directions = _.drop(arguments, 2);
+      let event = makeEvent(xPercent, yPercent);
+      let placement = posTT({
         $window: $window,
         $chart: $chart,
         $sizer: $sizer,
@@ -214,12 +214,12 @@ describe('Tooltip Positioning', function () {
 
     describe('maintain the direction of the tooltip on reposition', function () {
       it('mouse moves from the top right to the middle', function () {
-        var pos = check(0.99, 0.10, 'bottom', 'left');
+        let pos = check(0.99, 0.10, 'bottom', 'left');
         check(0.50, 0.50, pos, 'bottom', 'left');
       });
 
       it('mouse moves from the bottom left to the middle', function () {
-        var pos = check(0.10, 0.99, 'top', 'right');
+        let pos = check(0.10, 0.99, 'top', 'right');
         check(0.50, 0.50, pos, 'top', 'right');
       });
     });
diff --git a/src/ui/public/vislib/components/Tooltip/positionTooltip.js b/src/ui/public/vislib/components/Tooltip/positionTooltip.js
index cd299af804d34..9fb0cc576378e 100644
--- a/src/ui/public/vislib/components/Tooltip/positionTooltip.js
+++ b/src/ui/public/vislib/components/Tooltip/positionTooltip.js
@@ -1,31 +1,31 @@
-var _ = require('lodash');
-var $ = require('jquery');
+let _ = require('lodash');
+let $ = require('jquery');
 
-var OFFSET = 10;
-var $clone;
+let OFFSET = 10;
+let $clone;
 
 // translate css properties into their basic direction
-var propDirs = {
+let propDirs = {
   top: 'north',
   left: 'west'
 };
 
 function positionTooltip(opts, html) {
   if (!opts) return;
-  var $chart = $(opts.$chart);
-  var $el = $(opts.$el);
-  var $window = $(opts.$window || window);
-  var $sizer = $(opts.$sizer);
-  var prev = $chart.data('previousPlacement') || {};
-  var event = opts.event;
+  let $chart = $(opts.$chart);
+  let $el = $(opts.$el);
+  let $window = $(opts.$window || window);
+  let $sizer = $(opts.$sizer);
+  let prev = $chart.data('previousPlacement') || {};
+  let event = opts.event;
 
   if (!$chart.size() || !$el.size()) return;
 
-  var size = getTtSize(html || $el.html(), $sizer);
-  var pos = getBasePosition(size, event);
-  var overflow = getOverflow(size, pos, [$chart, $window]);
+  let size = getTtSize(html || $el.html(), $sizer);
+  let pos = getBasePosition(size, event);
+  let overflow = getOverflow(size, pos, [$chart, $window]);
 
-  var placement = placeToAvoidOverflow(pos, prev, overflow);
+  let placement = placeToAvoidOverflow(pos, prev, overflow);
   $chart.data('previousPlacement', placement);
   return placement;
 }
@@ -35,7 +35,7 @@ function getTtSize(ttHtml, $sizer) {
     $sizer.html(ttHtml);
   }
 
-  var size = {
+  let size = {
     width: $sizer.outerWidth(),
     height: $sizer.outerHeight()
   };
@@ -55,7 +55,7 @@ function getBasePosition(size, event) {
 function getBounds($el) {
   // in testing, $window is not actually a window, so we need to add
   // the offsets to make it work right.
-  var bounds = $el.offset() || { top: 0, left: 0 };
+  let bounds = $el.offset() || { top: 0, left: 0 };
   bounds.top += $el.scrollTop();
   bounds.left += $el.scrollLeft();
   bounds.bottom = bounds.top + $el.outerHeight();
@@ -64,7 +64,7 @@ function getBounds($el) {
 }
 
 function getOverflow(size, pos, containers) {
-  var overflow = {};
+  let overflow = {};
 
   containers.map(getBounds).forEach(function (bounds) {
     // number of pixels that the toolip would overflow it's far
@@ -90,16 +90,16 @@ function mergeOverflows(dest, src) {
 }
 
 function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
-  var stash = '_' + prop;
+  let stash = '_' + prop;
 
   // list of directions in order of preference
-  var dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
+  let dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
 
-  var dir;
-  var value;
+  let dir;
+  let value;
 
   // find the first direction that doesn't overflow
-  for (var i = 0; i < dirs.length; i++) {
+  for (let i = 0; i < dirs.length; i++) {
     dir = dirs[i];
     if (overflow[dir] > 0) continue;
     value = pos[dir];
@@ -111,7 +111,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
   if (value == null) {
     dir = dirs[0];
 
-    var offset = overflow[dir];
+    let offset = overflow[dir];
     if (propDirs[prop] === dir) {
       // when the property represents the same direction
       // as dir, we flip the overflow
@@ -126,7 +126,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
 }
 
 function placeToAvoidOverflow(pos, prev, overflow) {
-  var placement = {};
+  let placement = {};
   pickPlacement('top', pos, overflow, prev, 'south', 'north', placement);
   pickPlacement('left', pos, overflow, prev, 'east', 'west', placement);
   return placement;
diff --git a/src/ui/public/vislib/components/color/color.js b/src/ui/public/vislib/components/color/color.js
index 29fe7fac327a6..3a64c0dce4a03 100644
--- a/src/ui/public/vislib/components/color/color.js
+++ b/src/ui/public/vislib/components/color/color.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function ColorUtilService(Private) {
-    var _ = require('lodash');
-    var mappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
+    let _ = require('lodash');
+    let mappedColors = Private(require('ui/vislib/components/color/mapped_colors'));
 
     /*
      * Accepts an array of strings or numbers that are used to create a
@@ -10,7 +10,8 @@ define(function (require) {
      * and returns a hex color associated with that value.
      */
 
-    return function (arrayOfStringsOrNumbers) {
+    return function (arrayOfStringsOrNumbers, colorMapping) {
+      colorMapping = colorMapping || {};
       if (!_.isArray(arrayOfStringsOrNumbers)) {
         throw new Error('ColorUtil expects an array');
       }
@@ -24,7 +25,7 @@ define(function (require) {
       mappedColors.mapKeys(arrayOfStringsOrNumbers);
 
       return function (value) {
-        return mappedColors.get(value);
+        return colorMapping[value] || mappedColors.get(value);
       };
     };
   };
diff --git a/src/ui/public/vislib/components/color/color_palette.js b/src/ui/public/vislib/components/color/color_palette.js
index 6213d1c201c85..82a1c0e1e53dd 100644
--- a/src/ui/public/vislib/components/color/color_palette.js
+++ b/src/ui/public/vislib/components/color/color_palette.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function ColorPaletteUtilService(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let _ = require('lodash');
 
-    var seedColors = Private(require('ui/vislib/components/color/seed_colors'));
+    let seedColors = Private(require('ui/vislib/components/color/seed_colors'));
 
 
     /*
@@ -12,10 +12,10 @@ define(function (require) {
      * new colors are generated up to the value of the input number.
      */
 
-    var offset = 300; // Hue offset to start at
+    let offset = 300; // Hue offset to start at
 
-    var fraction = function (goal) {
-      var walkTree = function (numerator, denominator, bytes) {
+    let fraction = function (goal) {
+      let walkTree = function (numerator, denominator, bytes) {
         if (bytes.length) {
           return walkTree(
             (numerator * 2) + (bytes.pop() ? 1 : -1),
@@ -28,7 +28,7 @@ define(function (require) {
         }
       };
 
-      var b = (goal + 2)
+      let b = (goal + 2)
         .toString(2)
         .split('')
         .map(function (num) {
@@ -45,9 +45,9 @@ define(function (require) {
         throw new TypeError('ColorPaletteUtilService expects a number');
       }
 
-      var colors = seedColors;
+      let colors = seedColors;
 
-      var seedLength = seedColors.length;
+      let seedLength = seedColors.length;
 
       _.times(num - seedLength, function (i) {
         colors.push(d3.hsl((fraction(i + seedLength + 1) * 360 + offset) % 360, 0.5, 0.5).toString());
diff --git a/src/ui/public/vislib/components/color/mapped_colors.js b/src/ui/public/vislib/components/color/mapped_colors.js
index f992aea831c78..c05a0067654d5 100644
--- a/src/ui/public/vislib/components/color/mapped_colors.js
+++ b/src/ui/public/vislib/components/color/mapped_colors.js
@@ -1,4 +1,4 @@
-define((require) => (Private, config) => {
+define((require) => (Private, config, $rootScope) => {
   const _ = require('lodash');
   const d3 = require('d3');
   const createColorPalette = Private(require('ui/vislib/components/color/color_palette'));
@@ -14,7 +14,10 @@ define((require) => (Private, config) => {
    * Provides functions to interact with the lookup table
    */
   class MappedColors {
+
     constructor() {
+      $rootScope.$on('$routeChangeStart', () => this.purge());
+      this.oldMap = {};
       this.mapping = {};
     }
 
@@ -22,9 +25,20 @@ define((require) => (Private, config) => {
       return getConfigColorMapping()[key] || this.mapping[key];
     }
 
+    flush() {
+      this.oldMap = _.clone(this.mapping);
+      this.mapping = {};
+    }
+
+    purge() {
+      this.oldMap = {};
+      this.mapping = {};
+    }
+
     mapKeys(keys) {
       const configMapping = getConfigColorMapping();
       const configColors = _.values(configMapping);
+      const oldColors = _.values(this.oldMap);
 
       const keysToMap = [];
       _.each(keys, (key) => {
@@ -34,17 +48,25 @@ define((require) => (Private, config) => {
         // If this key is mapped to a color used by the config color mapping, we need to remap it
         if (_.contains(configColors, this.mapping[key])) keysToMap.push(key);
 
+        // if key exist in oldMap, move it to mapping
+        if (this.oldMap[key]) this.mapping[key] = this.oldMap[key];
+
         // If this key isn't mapped, we need to map it
         if (this.get(key) == null) keysToMap.push(key);
       });
 
       // Generate a color palette big enough that all new keys can have unique color values
-      const allColors = _(this.mapping).values().union(configColors).value();
+      const allColors = _(this.mapping).values().union(configColors).union(oldColors).value();
       const colorPalette = createColorPalette(allColors.length + keysToMap.length);
-      const newColors = _.difference(colorPalette, allColors);
+      let newColors = _.difference(colorPalette, allColors);
+
+      while (keysToMap.length > newColors.length) {
+        newColors = newColors.concat(_.sample(allColors, keysToMap.length - newColors.length));
+      }
+
       _.merge(this.mapping, _.zipObject(keysToMap, newColors));
     }
   }
 
   return new MappedColors();
-});
+});
\ No newline at end of file
diff --git a/src/ui/public/vislib/components/labels/data_array.js b/src/ui/public/vislib/components/labels/data_array.js
index 8ba95c0c94b6c..6d38d053a0a32 100644
--- a/src/ui/public/vislib/components/labels/data_array.js
+++ b/src/ui/public/vislib/components/labels/data_array.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function GetArrayUtilService(Private) {
-    var _ = require('lodash');
-    var flattenSeries = Private(require('ui/vislib/components/labels/flatten_series'));
+    let _ = require('lodash');
+    let flattenSeries = Private(require('ui/vislib/components/labels/flatten_series'));
 
     /*
      * Accepts a Kibana data object and returns an array of values objects.
diff --git a/src/ui/public/vislib/components/labels/flatten_series.js b/src/ui/public/vislib/components/labels/flatten_series.js
index 862112ea09a17..004fd6aad9ccd 100644
--- a/src/ui/public/vislib/components/labels/flatten_series.js
+++ b/src/ui/public/vislib/components/labels/flatten_series.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function GetSeriesUtilService() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /*
      * Accepts a Kibana data object with a rows or columns key
diff --git a/src/ui/public/vislib/components/labels/labels.js b/src/ui/public/vislib/components/labels/labels.js
index b9440c660f3cf..769fdbb2de25b 100644
--- a/src/ui/public/vislib/components/labels/labels.js
+++ b/src/ui/public/vislib/components/labels/labels.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function LabelUtilService(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var createArr = Private(require('ui/vislib/components/labels/data_array'));
-    var getArrOfUniqLabels = Private(require('ui/vislib/components/labels/uniq_labels'));
-    var getPieLabels = Private(require('ui/vislib/components/labels/pie/pie_labels'));
+    let createArr = Private(require('ui/vislib/components/labels/data_array'));
+    let getArrOfUniqLabels = Private(require('ui/vislib/components/labels/uniq_labels'));
+    let getPieLabels = Private(require('ui/vislib/components/labels/pie/pie_labels'));
 
     /*
      * Accepts a Kibana data object and returns an array of unique labels (strings).
diff --git a/src/ui/public/vislib/components/labels/pie/get_pie_names.js b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
index 808812c003feb..161d5bc8fa608 100644
--- a/src/ui/public/vislib/components/labels/pie/get_pie_names.js
+++ b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
@@ -1,11 +1,11 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function GetPieNames(Private) {
-    var returnNames = Private(require('ui/vislib/components/labels/pie/return_pie_names'));
+    let returnNames = Private(require('ui/vislib/components/labels/pie/return_pie_names'));
 
     return function (data, columns) {
-      var slices = data.slices;
+      let slices = data.slices;
 
       if (slices.children) {
         return _(returnNames(slices.children, 0, columns))
diff --git a/src/ui/public/vislib/components/labels/pie/pie_labels.js b/src/ui/public/vislib/components/labels/pie/pie_labels.js
index b57f6b4a6b25a..c47e3f8fabf5c 100644
--- a/src/ui/public/vislib/components/labels/pie/pie_labels.js
+++ b/src/ui/public/vislib/components/labels/pie/pie_labels.js
@@ -1,18 +1,18 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function PieLabels(Private) {
-    var removeZeroSlices = Private(require('ui/vislib/components/labels/pie/remove_zero_slices'));
-    var getNames = Private(require('ui/vislib/components/labels/pie/get_pie_names'));
+    let removeZeroSlices = Private(require('ui/vislib/components/labels/pie/remove_zero_slices'));
+    let getNames = Private(require('ui/vislib/components/labels/pie/get_pie_names'));
 
     return function (obj) {
       if (!_.isObject(obj)) { throw new TypeError('PieLabel expects an object'); }
 
-      var data = obj.columns || obj.rows || [obj];
-      var names = [];
+      let data = obj.columns || obj.rows || [obj];
+      let names = [];
 
       data.forEach(function (obj) {
-        var columns = obj.raw ? obj.raw.columns : undefined;
+        let columns = obj.raw ? obj.raw.columns : undefined;
         obj.slices = removeZeroSlices(obj.slices);
 
         getNames(obj, columns).forEach(function (name) {
diff --git a/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js b/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
index 31275f68796b1..efcd8703d957d 100644
--- a/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
+++ b/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   return function RemoveZeroSlices() {
     return function removeZeroSlices(slices) {
diff --git a/src/ui/public/vislib/components/labels/pie/return_pie_names.js b/src/ui/public/vislib/components/labels/pie/return_pie_names.js
index 8f82535babe6e..e62f71499222b 100644
--- a/src/ui/public/vislib/components/labels/pie/return_pie_names.js
+++ b/src/ui/public/vislib/components/labels/pie/return_pie_names.js
@@ -1,7 +1,7 @@
 define(function () {
   return function ReturnPieNames() {
     return function returnNames(array, index, columns) {
-      var names = [];
+      let names = [];
 
       array.forEach(function (obj) {
         names.push({ key: obj.name, index: index });
diff --git a/src/ui/public/vislib/components/labels/uniq_labels.js b/src/ui/public/vislib/components/labels/uniq_labels.js
index 699bbd401ad22..78635a182b8d5 100644
--- a/src/ui/public/vislib/components/labels/uniq_labels.js
+++ b/src/ui/public/vislib/components/labels/uniq_labels.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function UniqLabelUtilService() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /*
      * Accepts an array of data objects and a formatter function.
diff --git a/src/ui/public/vislib/components/zero_injection/flatten_data.js b/src/ui/public/vislib/components/zero_injection/flatten_data.js
index 1f5a73fb3d9b5..825f724b3d1cd 100644
--- a/src/ui/public/vislib/components/zero_injection/flatten_data.js
+++ b/src/ui/public/vislib/components/zero_injection/flatten_data.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function FlattenDataObjectUtilService() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /*
      * Accepts a Kibana data object, flattens the data.series values array,
@@ -8,7 +8,7 @@ define(function (require) {
      */
 
     return function (obj) {
-      var charts;
+      let charts;
 
       if (!_.isObject(obj) || !obj.rows && !obj.columns && !obj.series) {
         throw new TypeError('FlattenDataObjUtilService expects an object with a series, rows, or columns key');
diff --git a/src/ui/public/vislib/components/zero_injection/inject_zeros.js b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
index 35e527544a333..f99ac61e62797 100644
--- a/src/ui/public/vislib/components/zero_injection/inject_zeros.js
+++ b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function ZeroInjectionUtilService(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var orderXValues = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
-    var createZeroFilledArray = Private(require('ui/vislib/components/zero_injection/zero_filled_array'));
-    var zeroFillDataArray = Private(require('ui/vislib/components/zero_injection/zero_fill_data_array'));
+    let orderXValues = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
+    let createZeroFilledArray = Private(require('ui/vislib/components/zero_injection/zero_filled_array'));
+    let zeroFillDataArray = Private(require('ui/vislib/components/zero_injection/zero_fill_data_array'));
 
     /*
      * A Kibana data object may have multiple series with different array lengths.
@@ -32,12 +32,12 @@ define(function (require) {
         throw new TypeError('ZeroInjectionUtilService expects an object with a series, rows, or columns key');
       }
 
-      var keys = orderXValues(obj);
-      var arr = getDataArray(obj);
+      let keys = orderXValues(obj);
+      let arr = getDataArray(obj);
 
       arr.forEach(function (object) {
         object.series.forEach(function (series) {
-          var zeroArray = createZeroFilledArray(keys);
+          let zeroArray = createZeroFilledArray(keys);
 
           series.values = zeroFillDataArray(zeroArray, series.values);
         });
diff --git a/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
index 0f93f272a61d8..0c30da2a12754 100644
--- a/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function OrderedXKeysUtilService(Private) {
-    var _ = require('lodash');
-    var moment = require('moment');
-    var getUniqKeys = Private(require('ui/vislib/components/zero_injection/uniq_keys'));
+    let _ = require('lodash');
+    let moment = require('moment');
+    let getUniqKeys = Private(require('ui/vislib/components/zero_injection/uniq_keys'));
 
     /*
      * Accepts a Kibana data object and returns
@@ -16,11 +16,11 @@ define(function (require) {
         throw new Error('OrderedXKeysUtilService expects an object');
       }
 
-      var uniqKeys = getUniqKeys(obj);
-      var uniqKeysPairs = [...uniqKeys.entries()];
+      let uniqKeys = getUniqKeys(obj);
+      let uniqKeysPairs = [...uniqKeys.entries()];
 
-      var interval = _.get(obj, 'ordered.interval');
-      var dateInterval = moment.isDuration(interval) ? interval : false;
+      let interval = _.get(obj, 'ordered.interval');
+      let dateInterval = moment.isDuration(interval) ? interval : false;
 
       return _(uniqKeysPairs)
       .sortBy(function (d) {
@@ -32,14 +32,14 @@ define(function (require) {
       .map(function (d, i, list) {
         if (!d[1].isNumber) return d[0];
 
-        var val = +d[0];
+        let val = +d[0];
         if (interval == null) return val;
 
-        var gapEdge = parseFloat(_.get(list, [i + 1, 0]));
+        let gapEdge = parseFloat(_.get(list, [i + 1, 0]));
         if (isNaN(gapEdge)) return val;
 
-        var vals = [];
-        var next = val;
+        let vals = [];
+        let next = val;
 
         if (dateInterval) {
           next = moment(val);
diff --git a/src/ui/public/vislib/components/zero_injection/uniq_keys.js b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
index 848cd6044827d..19a405afc2d83 100644
--- a/src/ui/public/vislib/components/zero_injection/uniq_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function UniqueXValuesUtilService(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var flattenDataArray = Private(require('ui/vislib/components/zero_injection/flatten_data'));
+    let flattenDataArray = Private(require('ui/vislib/components/zero_injection/flatten_data'));
 
     /*
      * Accepts a Kibana data object.
@@ -16,27 +16,27 @@ define(function (require) {
         throw new TypeError('UniqueXValuesUtilService expects an object');
       }
 
-      var flattenedData = flattenDataArray(obj);
-      var uniqueXValues = new Map();
+      let flattenedData = flattenDataArray(obj);
+      let uniqueXValues = new Map();
 
-      var charts;
+      let charts;
       if (!obj.series) {
         charts = obj.rows ? obj.rows : obj.columns;
       } else {
         charts = [obj];
       }
 
-      var isDate = charts.every(function (chart) {
+      let isDate = charts.every(function (chart) {
         return chart.ordered && chart.ordered.date;
       });
 
-      var isOrdered = charts.every(function (chart) {
+      let isOrdered = charts.every(function (chart) {
         return chart.ordered;
       });
 
       flattenedData.forEach(function (d, i) {
-        var key = d.x;
-        var prev = uniqueXValues.get(key);
+        let key = d.x;
+        let prev = uniqueXValues.get(key);
 
         if (d.xi != null) {
           i = d.xi;
diff --git a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
index dd89d2644400f..f344220f156a7 100644
--- a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
+++ b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function ZeroFillDataArrayUtilService(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /*
      * Accepts an array of zero-filled y value objects (arr1)
@@ -13,12 +13,12 @@ define(function (require) {
         throw new TypeError('ZeroFillDataArrayUtilService expects 2 arrays');
       }
 
-      var i;
-      var val;
-      var index;
-      var max = arr2.length;
+      let i;
+      let val;
+      let index;
+      let max = arr2.length;
 
-      var getX = function (d) {
+      let getX = function (d) {
         return d.x === val.x;
       };
 
diff --git a/src/ui/public/vislib/components/zero_injection/zero_filled_array.js b/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
index 4f5de4760301e..a4d969c6bd200 100644
--- a/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
+++ b/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
@@ -1,6 +1,6 @@
 define(function () {
   return function ZeroFilledArrayUtilService() {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     /*
      * Accepts an array of x axis values (strings or numbers).
@@ -12,7 +12,7 @@ define(function () {
         throw new Error('ZeroFilledArrayUtilService expects an array of strings or numbers');
       }
 
-      var zeroFilledArray = [];
+      let zeroFilledArray = [];
 
       arr.forEach(function (val) {
         zeroFilledArray.push({
diff --git a/src/ui/public/vislib/lib/_data_label.js b/src/ui/public/vislib/lib/_data_label.js
index aecef9949c85d..0d007fc78afd7 100644
--- a/src/ui/public/vislib/lib/_data_label.js
+++ b/src/ui/public/vislib/lib/_data_label.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var d3 = require('d3');
+  let d3 = require('d3');
   /**
    * Creates a string based on the hex color passed in
    *
diff --git a/src/ui/public/vislib/lib/_error_handler.js b/src/ui/public/vislib/lib/_error_handler.js
index ca1d2a6f51122..2e145b7be54ec 100644
--- a/src/ui/public/vislib/lib/_error_handler.js
+++ b/src/ui/public/vislib/lib/_error_handler.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var _ = require('lodash');
-  var errors = require('ui/errors');
+  let _ = require('lodash');
+  let errors = require('ui/errors');
 
   return function ErrorHandlerFactory() {
 
@@ -22,8 +22,8 @@ define(function (require) {
      * @returns {HTMLElement} HTML div with an error message
      */
     ErrorHandler.prototype.validateWidthandHeight = function (width, height) {
-      var badWidth = _.isNaN(width) || width <= 0;
-      var badHeight = _.isNaN(height) || height <= 0;
+      let badWidth = _.isNaN(width) || width <= 0;
+      let badHeight = _.isNaN(height) || height <= 0;
 
       if (badWidth || badHeight) {
         throw new errors.ContainerTooSmall();
diff --git a/src/ui/public/vislib/lib/alerts.js b/src/ui/public/vislib/lib/alerts.js
index 5adc7af71c622..f87d40040b6f1 100644
--- a/src/ui/public/vislib/lib/alerts.js
+++ b/src/ui/public/vislib/lib/alerts.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function AlertsFactory(Private) {
-    var d3 = require('d3');
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var Binder = require('ui/Binder');
+    let d3 = require('d3');
+    let $ = require('jquery');
+    let _ = require('lodash');
+    let Binder = require('ui/Binder');
 
     /**
      * Adds allerts that float in front of a visualization
@@ -23,7 +23,7 @@ define(function (require) {
       this.alertDefs = alertDefs || [];
 
       this.binder.jqOn(vis.el, 'mouseenter', '.vis-alerts-tray', function () {
-        var $tray = $(this);
+        let $tray = $(this);
         hide();
         $(vis.el).on('mousemove', checkForExit);
 
@@ -43,13 +43,13 @@ define(function (require) {
         }
 
         function checkForExit(event) {
-          var pos = $tray.offset();
+          let pos = $tray.offset();
           if (pos.top > event.clientY || pos.left > event.clientX) return show();
 
-          var bottom = pos.top + $tray.height();
+          let bottom = pos.top + $tray.height();
           if (event.clientY > bottom) return show();
 
-          var right = pos.left + $tray.width();
+          let right = pos.left + $tray.width();
           if (event.clientX > right) return show();
         }
       });
@@ -62,21 +62,21 @@ define(function (require) {
      * @returns {D3.Selection|D3.Transition.Transition} DOM element with chart titles
      */
     Alerts.prototype.render = function () {
-      var vis = this.vis;
-      var data = this.data;
+      let vis = this.vis;
+      let data = this.data;
 
-      var alerts = _(this.alertDefs)
+      let alerts = _(this.alertDefs)
       .map(function (alertDef) {
         if (!alertDef) return;
         if (alertDef.test && !alertDef.test(vis, data)) return;
 
-        var type = alertDef.type || 'info';
-        var icon = alertDef.icon || type;
-        var msg = alertDef.msg;
+        let type = alertDef.type || 'info';
+        let icon = alertDef.icon || type;
+        let msg = alertDef.msg;
 
         // alert container
-        var $icon = $('<i>').addClass('vis-alerts-icon fa fa-' + icon);
-        var $text = $('<p>').addClass('vis-alerts-text').text(msg);
+        let $icon = $('<i>').addClass('vis-alerts-icon fa fa-' + icon);
+        let $text = $('<p>').addClass('vis-alerts-text').text(msg);
 
         return $('<div>').addClass('vis-alert vis-alert-' + type).append([$icon, $text]);
       })
diff --git a/src/ui/public/vislib/lib/axis_title.js b/src/ui/public/vislib/lib/axis_title.js
index 97410107361e7..d81e955071b4c 100644
--- a/src/ui/public/vislib/lib/axis_title.js
+++ b/src/ui/public/vislib/lib/axis_title.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function AxisTitleFactory(Private) {
-    var d3 = require('d3');
-    var $ = require('jquery');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let $ = require('jquery');
+    let _ = require('lodash');
 
-    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    let ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
 
     /**
      * Appends axis title(s) to the visualization
@@ -45,14 +45,14 @@ define(function (require) {
      * @returns {Function} Appends axis title to a D3 selection
      */
     AxisTitle.prototype.draw = function (title) {
-      var self = this;
+      let self = this;
 
       return function (selection) {
         selection.each(function () {
-          var el = this;
-          var div = d3.select(el);
-          var width = $(el).width();
-          var height = $(el).height();
+          let el = this;
+          let div = d3.select(el);
+          let width = $(el).width();
+          let height = $(el).height();
 
           self.validateWidthandHeight(width, height);
 
diff --git a/src/ui/public/vislib/lib/chart_title.js b/src/ui/public/vislib/lib/chart_title.js
index 9ca6eb9a4f9bb..3cf68c4da8b3e 100644
--- a/src/ui/public/vislib/lib/chart_title.js
+++ b/src/ui/public/vislib/lib/chart_title.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function ChartTitleFactory(Private) {
-    var d3 = require('d3');
-    var $ = require('jquery');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let $ = require('jquery');
+    let _ = require('lodash');
 
-    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
-    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    let ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    let Tooltip = Private(require('ui/vislib/components/Tooltip'));
 
     /**
      * Appends chart titles to the visualization
@@ -33,9 +33,9 @@ define(function (require) {
      * @returns {D3.Selection|D3.Transition.Transition} DOM element with chart titles
      */
     ChartTitle.prototype.render = function () {
-      var el = d3.select(this.el).select('.chart-title').node();
-      var width = el ? el.clientWidth : 0;
-      var height = el ? el.clientHeight : 0;
+      let el = d3.select(this.el).select('.chart-title').node();
+      let width = el ? el.clientWidth : 0;
+      let height = el ? el.clientHeight : 0;
 
       return d3.select(this.el).selectAll('.chart-title').call(this.draw(width, height));
     };
@@ -48,17 +48,17 @@ define(function (require) {
      * @returns {Function} Truncates text
      */
     ChartTitle.prototype.truncate = function (size) {
-      var self = this;
+      let self = this;
 
       return function (selection) {
         selection.each(function () {
-          var text = d3.select(this);
-          var n = text[0].length;
-          var maxWidth = size / n * 0.9;
-          var length = this.getComputedTextLength();
-          var str;
-          var avg;
-          var end;
+          let text = d3.select(this);
+          let n = text[0].length;
+          let maxWidth = size / n * 0.9;
+          let length = this.getComputedTextLength();
+          let str;
+          let avg;
+          let end;
 
           if (length > maxWidth) {
             str = text.text();
@@ -95,14 +95,14 @@ define(function (require) {
      * @returns {Function} Appends chart titles to a D3 selection
      */
     ChartTitle.prototype.draw = function (width, height) {
-      var self = this;
+      let self = this;
 
       return function (selection) {
         selection.each(function () {
-          var div = d3.select(this);
-          var dataType = this.parentNode.__data__.rows ? 'rows' : 'columns';
-          var size = dataType === 'rows' ? height : width;
-          var txtHtOffset = 11;
+          let div = d3.select(this);
+          let dataType = this.parentNode.__data__.rows ? 'rows' : 'columns';
+          let size = dataType === 'rows' ? height : width;
+          let txtHtOffset = 11;
 
           self.validateWidthandHeight(width, height);
 
diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js
index 743b8eeeec747..ef5c37fc680ba 100644
--- a/src/ui/public/vislib/lib/data.js
+++ b/src/ui/public/vislib/lib/data.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function DataFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let _ = require('lodash');
 
-    var injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
-    var orderKeys = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
-    var getLabels = Private(require('ui/vislib/components/labels/labels'));
-    var color = Private(require('ui/vislib/components/color/color'));
-    var errors = require('ui/errors');
+    let injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+    let orderKeys = Private(require('ui/vislib/components/zero_injection/ordered_x_keys'));
+    let getLabels = Private(require('ui/vislib/components/labels/labels'));
+    let color = Private(require('ui/vislib/components/color/color'));
+    let errors = require('ui/errors');
 
     /**
      * Provides an API for pulling values off the data
@@ -18,13 +18,15 @@ define(function (require) {
      * @param data {Object} Elasticsearch query results
      * @param attr {Object|*} Visualization options
      */
-    function Data(data, attr) {
+    function Data(data, attr, uiState) {
       if (!(this instanceof Data)) {
-        return new Data(data, attr);
+        return new Data(data, attr, uiState);
       }
 
-      var self = this;
-      var offset;
+      this.uiState = uiState;
+
+      let self = this;
+      let offset;
 
       if (attr.mode === 'stacked') {
         offset = 'zero';
@@ -40,7 +42,7 @@ define(function (require) {
       this.type = this.getDataType();
 
       this.labels = this._getLabels(this.data);
-      this.color = this.labels ? color(this.labels) : undefined;
+      this.color = this.labels ? color(this.labels, uiState.get('vis.colors')) : undefined;
       this._normalizeOrdered();
 
       this._attr = _.defaults(attr || {}, {
@@ -80,7 +82,7 @@ define(function (require) {
 
     Data.prototype._getLabels = function (data) {
       if (this.type === 'series') {
-        var noLabel = getLabels(data).length === 1 && getLabels(data)[0] === '';
+        let noLabel = getLabels(data).length === 1 && getLabels(data)[0] === '';
         if (noLabel) {
           this._updateData();
           return [(this.get('yAxisLabel'))];
@@ -115,7 +117,7 @@ define(function (require) {
      * Returns the results of the addition of numbers in a filtered array.
      */
     Data.prototype._sumYs = function (arr, callback) {
-      var filteredArray = arr.filter(callback);
+      let filteredArray = arr.filter(callback);
 
       return (filteredArray.length) ? filteredArray.reduce(this._addVals) : 0;
     };
@@ -132,8 +134,8 @@ define(function (require) {
      *
      */
     Data.prototype._getCounts = function (i, j) {
-      var data = this.chartData();
-      var dataLengths = {};
+      let data = this.chartData();
+      let dataLengths = {};
 
       dataLengths.charts = data.length;
       dataLengths.stacks = dataLengths.charts ? data[i].series.length : 0;
@@ -146,7 +148,7 @@ define(function (require) {
      *
      */
     Data.prototype._createCache = function () {
-      var cache = {
+      let cache = {
         index: {
           chart: 0,
           stack: 0,
@@ -167,7 +169,7 @@ define(function (require) {
      * mixed datasets containing both positive and negative values.
      */
     Data.prototype._stackNegAndPosVals = function (d, y0, y) {
-      var data = this.chartData();
+      let data = this.chartData();
 
       // Storing counters and data characteristics needed to stack values properly
       if (!this._cache) {
@@ -179,7 +181,7 @@ define(function (require) {
 
 
       // last stack, or last value, reset the stack count and y value array
-      var lastStack = (this._cache.index.stack >= this._cache.count.stacks);
+      let lastStack = (this._cache.index.stack >= this._cache.count.stacks);
       if (lastStack) {
         this._cache.index.stack = 0;
         ++this._cache.index.value;
@@ -190,7 +192,7 @@ define(function (require) {
       }
 
       // last value, prepare for the next chart, if one exists
-      var lastValue = (this._cache.index.value >= this._cache.count.values);
+      let lastValue = (this._cache.index.value >= this._cache.count.values);
       if (lastValue) {
         this._cache.index.value = 0;
         ++this._cache.index.chart;
@@ -202,15 +204,15 @@ define(function (require) {
         }
 
         // get stack and value count for next chart
-        var chartSeries = data[this._cache.index.chart].series;
+        let chartSeries = data[this._cache.index.chart].series;
         this._cache.count.stacks = chartSeries.length;
         this._cache.count.values = chartSeries.length ? chartSeries[this._cache.index.stack].values.length : 0;
       }
     };
 
     Data.prototype.getDataType = function () {
-      var data = this.getVisData();
-      var type;
+      let data = this.getVisData();
+      let type;
 
       data.forEach(function (obj) {
         if (obj.series) {
@@ -234,7 +236,7 @@ define(function (require) {
      */
     Data.prototype.chartData = function () {
       if (!this.data.series) {
-        var arr = this.data.rows ? this.data.rows : this.data.columns;
+        let arr = this.data.rows ? this.data.rows : this.data.columns;
         return _.toArray(arr);
       }
       return [this.data];
@@ -247,7 +249,7 @@ define(function (require) {
      * @returns {*} Array of chart data objects
      */
     Data.prototype.getVisData = function () {
-      var visData;
+      let visData;
 
       if (this.data.rows) {
         visData = this.data.rows;
@@ -267,7 +269,7 @@ define(function (require) {
      * @return {Object}
      */
     Data.prototype.getGeoExtents = function () {
-      var visData = this.getVisData();
+      let visData = this.getVisData();
 
       return _.reduce(_.pluck(visData, 'geoJson.properties'), function (minMax, props) {
         return {
@@ -301,7 +303,7 @@ define(function (require) {
      * @returns {*} Data object value
      */
     Data.prototype.get = function (thing, def) {
-      var source = (this.data.rows || this.data.columns || [this.data])[0];
+      let source = (this.data.rows || this.data.columns || [this.data])[0];
       return _.get(source, thing, def);
     };
 
@@ -310,7 +312,7 @@ define(function (require) {
      * @returns {*}
      */
     Data.prototype.hasNullValues = function () {
-      var chartData = this.chartData();
+      let chartData = this.chartData();
 
       return chartData.some(function (chart) {
         return chart.series.some(function (obj) {
@@ -346,13 +348,13 @@ define(function (require) {
      * @returns {boolean}
      */
     Data.prototype.shouldBeStacked = function () {
-      var isHistogram = (this._attr.type === 'histogram');
-      var isArea = (this._attr.type === 'area');
-      var isOverlapping = (this._attr.mode === 'overlap');
-      var grouped = (this._attr.mode === 'grouped');
+      let isHistogram = (this._attr.type === 'histogram');
+      let isArea = (this._attr.type === 'area');
+      let isOverlapping = (this._attr.mode === 'overlap');
+      let grouped = (this._attr.mode === 'grouped');
 
-      var stackedHisto = isHistogram && !grouped;
-      var stackedArea = isArea && !isOverlapping;
+      let stackedHisto = isHistogram && !grouped;
+      let stackedArea = isArea && !isOverlapping;
 
       return stackedHisto || stackedArea;
     };
@@ -382,27 +384,27 @@ define(function (require) {
      * @returns {Number} Min y axis value
      */
     Data.prototype.getYMin = function (getValue) {
-      var self = this;
-      var arr = [];
+      let self = this;
+      let arr = [];
 
       if (this._attr.mode === 'percentage' || this._attr.mode === 'wiggle' ||
         this._attr.mode === 'silhouette') {
         return 0;
       }
 
-      var flat = this.flatten();
+      let flat = this.flatten();
       // if there is only one data point and its less than zero,
       // return 0 as the yMax value.
       if (!flat.length || flat.length === 1 && flat[0].y > 0) {
         return 0;
       }
 
-      var min = Infinity;
+      let min = Infinity;
 
       // for each object in the dataArray,
       // push the calculated y value to the initialized array (arr)
       _.each(this.chartData(), function (chart) {
-        var calculatedMin = self._getYExtent(chart, 'min', getValue);
+        let calculatedMin = self._getYExtent(chart, 'min', getValue);
         if (!_.isUndefined(calculatedMin)) {
           min = Math.min(min, calculatedMin);
         }
@@ -422,26 +424,26 @@ define(function (require) {
      * @returns {Number} Max y axis value
      */
     Data.prototype.getYMax = function (getValue) {
-      var self = this;
-      var arr = [];
+      let self = this;
+      let arr = [];
 
       if (self._attr.mode === 'percentage') {
         return 1;
       }
 
-      var flat = this.flatten();
+      let flat = this.flatten();
       // if there is only one data point and its less than zero,
       // return 0 as the yMax value.
       if (!flat.length || flat.length === 1 && flat[0].y < 0) {
         return 0;
       }
 
-      var max = -Infinity;
+      let max = -Infinity;
 
       // for each object in the dataArray,
       // push the calculated y value to the initialized array (arr)
       _.each(this.chartData(), function (chart) {
-        var calculatedMax = self._getYExtent(chart, 'max', getValue);
+        let calculatedMax = self._getYExtent(chart, 'max', getValue);
         if (!_.isUndefined(calculatedMax)) {
           max = Math.max(max, calculatedMax);
         }
@@ -479,7 +481,7 @@ define(function (require) {
         getValue = getValue || this._getY;
       }
 
-      var points = chart.series
+      let points = chart.series
       .reduce(function (points, series) {
         return points.concat(series.values);
       }, [])
@@ -514,8 +516,8 @@ define(function (require) {
      * @returns {Array} Array of labels (strings)
      */
     Data.prototype.returnNames = function (array, index, columns) {
-      var names = [];
-      var self = this;
+      let names = [];
+      let self = this;
 
       _.forEach(array, function (obj, i) {
         names.push({
@@ -525,7 +527,7 @@ define(function (require) {
         });
 
         if (obj.children) {
-          var plusIndex = index + 1;
+          let plusIndex = index + 1;
 
           _.forEach(self.returnNames(obj.children, plusIndex, columns), function (namedObj) {
             names.push(namedObj);
@@ -547,10 +549,10 @@ define(function (require) {
      * @returns {Array} Array of names (strings)
      */
     Data.prototype.getNames = function (data, columns) {
-      var slices = data.slices;
+      let slices = data.slices;
 
       if (slices.children) {
-        var namedObj = this.returnNames(slices.children, 0, columns);
+        let namedObj = this.returnNames(slices.children, 0, columns);
 
         return _(namedObj)
         .sortBy(function (obj) {
@@ -569,7 +571,7 @@ define(function (require) {
      * @returns {*}
      */
     Data.prototype._removeZeroSlices = function (slices) {
-      var self = this;
+      let self = this;
 
       if (!slices.children) return slices;
 
@@ -592,11 +594,11 @@ define(function (require) {
      * @returns {Array} Array of unique names (strings)
      */
     Data.prototype.pieNames = function (data) {
-      var self = this;
-      var names = [];
+      let self = this;
+      let names = [];
 
       _.forEach(data, function (obj) {
-        var columns = obj.raw ? obj.raw.columns : undefined;
+        let columns = obj.raw ? obj.raw.columns : undefined;
         obj.slices = self._removeZeroSlices(obj.slices);
 
         _.forEach(self.getNames(obj, columns), function (name) {
@@ -646,7 +648,7 @@ define(function (require) {
      * @returns {Function} Performs lookup on string and returns hex color
      */
     Data.prototype.getColorFunc = function () {
-      return color(this.getLabels());
+      return color(this.getLabels(), this.uiState.get('vis.colors'));
     };
 
     /**
@@ -658,7 +660,7 @@ define(function (require) {
     Data.prototype.getPieColorFunc = function () {
       return color(this.pieNames(this.getVisData()).map(function (d) {
         return d.label;
-      }));
+      }), this.uiState.get('vis.colors'));
     };
 
     /**
@@ -668,17 +670,17 @@ define(function (require) {
      * @return {undefined}
      */
     Data.prototype._normalizeOrdered = function () {
-      var data = this.getVisData();
-      var self = this;
+      let data = this.getVisData();
+      let self = this;
 
       data.forEach(function (d) {
         if (!d.ordered || !d.ordered.date) return;
 
-        var missingMin = d.ordered.min == null;
-        var missingMax = d.ordered.max == null;
+        let missingMin = d.ordered.min == null;
+        let missingMax = d.ordered.max == null;
 
         if (missingMax || missingMin) {
-          var extent = d3.extent(self.xValues());
+          let extent = d3.extent(self.xValues());
           if (missingMin) d.ordered.min = extent[0];
           if (missingMax) d.ordered.max = extent[1];
         }
@@ -696,11 +698,11 @@ define(function (require) {
      * @returns {Array} min and max values
      */
     Data.prototype.mapDataExtents = function (series) {
-      var values;
+      let values;
       values = _.map(series.rows, function (row) {
         return row[row.length - 1];
       });
-      var extents = [_.min(values), _.max(values)];
+      let extents = [_.min(values), _.max(values)];
       return extents;
     };
 
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index fb13291d038d7..810c481a0c042 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function DispatchClass(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
-    var SimpleEmitter = require('ui/utils/SimpleEmitter');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    let SimpleEmitter = require('ui/utils/SimpleEmitter');
 
     /**
      * Handles event responses
@@ -35,19 +35,19 @@ define(function (require) {
      * e: (d3.event|*), handler: (Object|*)}} Event response object
      */
     Dispatch.prototype.eventResponse = function (d, i) {
-      var datum = d._input || d;
-      var data = d3.event.target.nearestViewportElement ?
+      let datum = d._input || d;
+      let data = d3.event.target.nearestViewportElement ?
         d3.event.target.nearestViewportElement.__data__ : d3.event.target.__data__;
-      var label = d.label ? d.label : d.name;
-      var isSeries = !!(data && data.series);
-      var isSlices = !!(data && data.slices);
-      var series = isSeries ? data.series : undefined;
-      var slices = isSlices ? data.slices : undefined;
-      var handler = this.handler;
-      var color = _.get(handler, 'data.color');
-      var isPercentage = (handler && handler._attr.mode === 'percentage');
-
-      var eventData = {
+      let label = d.label ? d.label : d.name;
+      let isSeries = !!(data && data.series);
+      let isSlices = !!(data && data.slices);
+      let series = isSeries ? data.series : undefined;
+      let slices = isSlices ? data.slices : undefined;
+      let handler = this.handler;
+      let color = _.get(handler, 'data.color');
+      let isPercentage = (handler && handler._attr.mode === 'percentage');
+
+      let eventData = {
         value: d.y,
         point: datum,
         datum: datum,
@@ -64,7 +64,7 @@ define(function (require) {
 
       if (isSeries) {
         // Find object with the actual d value and add it to the point object
-        var object = _.find(series, { 'label': d.label });
+        let object = _.find(series, { 'label': d.label });
         eventData.value = +object.values[i].y;
 
         if (isPercentage) {
@@ -87,7 +87,7 @@ define(function (require) {
     Dispatch.prototype.addEvent = function (event, callback) {
       return function (selection) {
         selection.each(function () {
-          var element = d3.select(this);
+          let element = d3.select(this);
 
           if (typeof callback === 'function') {
             return element.on(event, callback);
@@ -102,10 +102,13 @@ define(function (require) {
      * @returns {Function}
      */
     Dispatch.prototype.addHoverEvent = function () {
-      var self = this;
-      var isClickable = this.listenerCount('click') > 0;
-      var addEvent = this.addEvent;
-      var $el = this.handler.el;
+      let self = this;
+      let isClickable = this.listenerCount('click') > 0;
+      let addEvent = this.addEvent;
+      let $el = this.handler.el;
+      if (!this.handler.highlight) {
+        this.handler.highlight = self.highlight;
+      }
 
       function hover(d, i) {
         // Add pointer if item is clickable
@@ -113,7 +116,7 @@ define(function (require) {
           self.addMousePointer.call(this, arguments);
         }
 
-        self.highlightLegend.call(this, $el);
+        self.handler.highlight.call(this, $el);
         self.emit('hover', self.eventResponse(d, i));
       }
 
@@ -126,12 +129,15 @@ define(function (require) {
      * @returns {Function}
      */
     Dispatch.prototype.addMouseoutEvent = function () {
-      var self = this;
-      var addEvent = this.addEvent;
-      var $el = this.handler.el;
+      let self = this;
+      let addEvent = this.addEvent;
+      let $el = this.handler.el;
+      if (!this.handler.unHighlight) {
+        this.handler.unHighlight = self.unHighlight;
+      }
 
       function mouseout() {
-        self.unHighlightLegend.call(this, $el);
+        self.handler.unHighlight.call(this, $el);
       }
 
       return addEvent('mouseout', mouseout);
@@ -143,8 +149,8 @@ define(function (require) {
      * @returns {Function}
      */
     Dispatch.prototype.addClickEvent = function () {
-      var self = this;
-      var addEvent = this.addEvent;
+      let self = this;
+      let addEvent = this.addEvent;
 
       function click(d, i) {
         self.emit('click', self.eventResponse(d, i));
@@ -160,8 +166,11 @@ define(function (require) {
      * @returns {Boolean}
      */
     Dispatch.prototype.allowBrushing = function () {
-      var xAxis = this.handler.xAxis;
-      return Boolean(xAxis.ordered && xAxis.xScale && _.isFunction(xAxis.xScale.invert));
+      let xAxis = this.handler.xAxis;
+      // Don't allow brushing for time based charts from non-time-based indices
+      let hasTimeField = this.handler.vis._attr.hasTimeField;
+
+      return Boolean(hasTimeField && xAxis.ordered && xAxis.xScale && _.isFunction(xAxis.xScale.invert));
     };
 
     /**
@@ -182,16 +191,16 @@ define(function (require) {
     Dispatch.prototype.addBrushEvent = function (svg) {
       if (!this.isBrushable()) return;
 
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.xAxis.yScale;
-      var brush = this.createBrush(xScale, svg);
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.xAxis.yScale;
+      let brush = this.createBrush(xScale, svg);
 
       function brushEnd() {
         if (!validBrushClick(d3.event)) return;
 
-        var bar = d3.select(this);
-        var startX = d3.mouse(svg.node());
-        var startXInv = xScale.invert(startX[0]);
+        let bar = d3.select(this);
+        let startX = d3.mouse(svg.node());
+        let startXInv = xScale.invert(startX[0]);
 
         // Reset the brush value
         brush.extent([startXInv, startXInv]);
@@ -222,33 +231,27 @@ define(function (require) {
      * Mouseover Behavior
      *
      * @param element {D3.Selection}
-     * @method highlightLegend
+     * @method highlight
      */
-    Dispatch.prototype.highlightLegend = function (element) {
-      var label = this.getAttribute('data-label');
-
+    Dispatch.prototype.highlight = function (element) {
+      let label = this.getAttribute('data-label');
       if (!label) return;
-
-      d3.select(element)
-        .select('.legend-ul')
-        .selectAll('li.color')
-        .filter(function (d, i) {
-          return String(d.label) !== label;
-        })
-        .classed('blur_shape', true);
+      //Opacity 1 is needed to avoid the css application
+      $('[data-label]', element.parentNode).css('opacity', 1).not(
+        function (els, el) {
+          return `${$(el).data('label')}` === label;
+        }
+      ).css('opacity', 0.5);
     };
 
     /**
      * Mouseout Behavior
      *
      * @param element {D3.Selection}
-     * @method unHighlightLegend
+     * @method unHighlight
      */
-    Dispatch.prototype.unHighlightLegend = function (element) {
-      d3.select(element)
-        .select('.legend-ul')
-        .selectAll('li.color')
-        .classed('blur_shape', false);
+    Dispatch.prototype.unHighlight = function (element) {
+      $('[data-label]', element.parentNode).css('opacity', 1);
     };
 
     /**
@@ -259,26 +262,26 @@ define(function (require) {
      * @returns {*} Returns a D3 brush function and a SVG with a brush group attached
      */
     Dispatch.prototype.createBrush = function (xScale, svg) {
-      var self = this;
-      var attr = self.handler._attr;
-      var height = attr.height;
-      var margin = attr.margin;
+      let self = this;
+      let attr = self.handler._attr;
+      let height = attr.height;
+      let margin = attr.margin;
 
       // Brush scale
-      var brush = d3.svg.brush()
+      let brush = d3.svg.brush()
       .x(xScale)
       .on('brushend', function brushEnd() {
 
         // Assumes data is selected at the chart level
         // In this case, the number of data objects should always be 1
-        var data = d3.select(this).data()[0];
-        var isTimeSeries = (data.ordered && data.ordered.date);
+        let data = d3.select(this).data()[0];
+        let isTimeSeries = (data.ordered && data.ordered.date);
 
         // Allows for brushing on d3.scale.ordinal()
-        var selected = xScale.domain().filter(function (d) {
+        let selected = xScale.domain().filter(function (d) {
           return (brush.extent()[0] <= xScale(d)) && (xScale(d) <= brush.extent()[1]);
         });
-        var range = isTimeSeries ? brush.extent() : selected;
+        let range = isTimeSeries ? brush.extent() : selected;
 
         return self.emit('brush', {
           range: range,
@@ -295,7 +298,7 @@ define(function (require) {
         .call(brush)
         .call(function (brushG) {
           // hijack the brush start event to filter out right/middle clicks
-          var brushHandler = brushG.on('mousedown.brush');
+          let brushHandler = brushG.on('mousedown.brush');
           if (!brushHandler) return; // touch events in use
           brushG.on('mousedown.brush', function () {
             if (validBrushClick(d3.event)) brushHandler.apply(this, arguments);
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
index c711e9cf49b94..32f1944eee4a0 100644
--- a/src/ui/public/vislib/lib/handler/handler.js
+++ b/src/ui/public/vislib/lib/handler/handler.js
@@ -1,13 +1,12 @@
 define(function (require) {
   return function HandlerBaseClass(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var errors = require('ui/errors');
-    var Binder = require('ui/Binder');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let errors = require('ui/errors');
+    let Binder = require('ui/Binder');
 
-    var Data = Private(require('ui/vislib/lib/data'));
-    var Layout = Private(require('ui/vislib/lib/layout/layout'));
-    var Legend = Private(require('ui/vislib/lib/legend'));
+    let Data = Private(require('ui/vislib/lib/data'));
+    let Layout = Private(require('ui/vislib/lib/layout/layout'));
 
     /**
      * Handles building all the components of the visualization
@@ -23,7 +22,7 @@ define(function (require) {
         return new Handler(vis, opts);
       }
 
-      this.data = opts.data || new Data(vis.data, vis._attr);
+      this.data = opts.data || new Data(vis.data, vis._attr, vis.uiState);
       this.vis = vis;
       this.el = vis.el;
       this.ChartClass = vis.ChartClass;
@@ -39,15 +38,10 @@ define(function (require) {
       this.axisTitle = opts.axisTitle;
       this.alerts = opts.alerts;
 
-      if (this._attr.addLegend) {
-        this.legend = opts.legend;
-      }
-
       this.layout = new Layout(vis.el, vis.data, vis._attr.type, opts);
       this.binder = new Binder();
       this.renderArray = _.filter([
         this.layout,
-        this.legend,
         this.axisTitle,
         this.chartTitle,
         this.alerts,
@@ -58,7 +52,7 @@ define(function (require) {
       // memoize so that the same function is returned every time,
       // allowing us to remove/re-add the same function
       this.getProxyHandler = _.memoize(function (event) {
-        var self = this;
+        let self = this;
         return function (e) {
           self.vis.emit(event, e);
         };
@@ -73,7 +67,7 @@ define(function (require) {
      * @private
      */
     Handler.prototype._validateData = function () {
-      var dataType = this.data.type;
+      let dataType = this.data.type;
 
       if (!dataType) {
         throw new errors.NoResults();
@@ -88,20 +82,14 @@ define(function (require) {
      * @returns {HTMLElement} With the visualization child element
      */
     Handler.prototype.render = function () {
-      var self = this;
-      var charts = this.charts = [];
-      var selection = d3.select(this.el);
+      let self = this;
+      let charts = this.charts = [];
+      let selection = d3.select(this.el);
 
       selection.selectAll('*').remove();
 
       this._validateData();
       this.renderArray.forEach(function (property) {
-        if (property instanceof Legend) {
-          self.vis.activeEvents().forEach(function (event) {
-            self.enable(event, property);
-          });
-        }
-
         if (typeof property.render === 'function') {
           property.render();
         }
@@ -110,7 +98,7 @@ define(function (require) {
       // render the chart(s)
       selection.selectAll('.chart')
       .each(function (chartData) {
-        var chart = new self.ChartClass(self, this, chartData);
+        let chart = new self.ChartClass(self, this, chartData);
 
         self.vis.activeEvents().forEach(function (event) {
           self.enable(event, chart);
@@ -146,7 +134,7 @@ define(function (require) {
 
     function chartEventProxyToggle(method) {
       return function (event, chart) {
-        var proxyHandler = this.getProxyHandler(event);
+        let proxyHandler = this.getProxyHandler(event);
 
         _.each(chart ? [chart] : this.charts, function (chart) {
           chart.events[method](event, proxyHandler);
@@ -177,7 +165,7 @@ define(function (require) {
     Handler.prototype.error = function (message) {
       this.removeAll(this.el);
 
-      var div = d3.select(this.el)
+      let div = d3.select(this.el)
       .append('div')
       // class name needs `chart` in it for the polling checkSize function
       // to continuously call render on resize
diff --git a/src/ui/public/vislib/lib/handler/handler_types.js b/src/ui/public/vislib/lib/handler/handler_types.js
index 9d9c160285865..9be531fa15aef 100644
--- a/src/ui/public/vislib/lib/handler/handler_types.js
+++ b/src/ui/public/vislib/lib/handler/handler_types.js
@@ -1,6 +1,6 @@
 define(function (require) {
   return function HandlerTypeFactory(Private) {
-    var pointSeries = Private(require('ui/vislib/lib/handler/types/point_series'));
+    let pointSeries = Private(require('ui/vislib/lib/handler/types/point_series'));
 
     /**
      * Handles the building of each visualization
diff --git a/src/ui/public/vislib/lib/handler/types/pie.js b/src/ui/public/vislib/lib/handler/types/pie.js
index 33a29c81257c4..927d7d1722fae 100644
--- a/src/ui/public/vislib/lib/handler/types/pie.js
+++ b/src/ui/public/vislib/lib/handler/types/pie.js
@@ -1,9 +1,8 @@
 define(function (require) {
   return function PieHandler(Private) {
-    var Handler = Private(require('ui/vislib/lib/handler/handler'));
-    var Data = Private(require('ui/vislib/lib/data'));
-    var Legend = Private(require('ui/vislib/lib/legend'));
-    var ChartTitle = Private(require('ui/vislib/lib/chart_title'));
+    let Handler = Private(require('ui/vislib/lib/handler/handler'));
+    let Data = Private(require('ui/vislib/lib/data'));
+    let ChartTitle = Private(require('ui/vislib/lib/chart_title'));
 
     /*
      * Handler for Pie visualizations.
@@ -11,7 +10,6 @@ define(function (require) {
 
     return function (vis) {
       return new Handler(vis, {
-        legend: new Legend(vis),
         chartTitle: new ChartTitle(vis.el)
       });
     };
diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js
index 0762350658bfa..6ba7e38f6019e 100644
--- a/src/ui/public/vislib/lib/handler/types/point_series.js
+++ b/src/ui/public/vislib/lib/handler/types/point_series.js
@@ -1,14 +1,13 @@
 define(function (require) {
   return function ColumnHandler(Private) {
-    var injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
-    var Handler = Private(require('ui/vislib/lib/handler/handler'));
-    var Data = Private(require('ui/vislib/lib/data'));
-    var Legend = Private(require('ui/vislib/lib/legend'));
-    var XAxis = Private(require('ui/vislib/lib/x_axis'));
-    var YAxis = Private(require('ui/vislib/lib/y_axis'));
-    var AxisTitle = Private(require('ui/vislib/lib/axis_title'));
-    var ChartTitle = Private(require('ui/vislib/lib/chart_title'));
-    var Alerts = Private(require('ui/vislib/lib/alerts'));
+    let injectZeros = Private(require('ui/vislib/components/zero_injection/inject_zeros'));
+    let Handler = Private(require('ui/vislib/lib/handler/handler'));
+    let Data = Private(require('ui/vislib/lib/data'));
+    let XAxis = Private(require('ui/vislib/lib/x_axis'));
+    let YAxis = Private(require('ui/vislib/lib/y_axis'));
+    let AxisTitle = Private(require('ui/vislib/lib/axis_title'));
+    let ChartTitle = Private(require('ui/vislib/lib/chart_title'));
+    let Alerts = Private(require('ui/vislib/lib/alerts'));
 
     /*
      * Create handlers for Area, Column, and Line charts which
@@ -18,18 +17,17 @@ define(function (require) {
       opts = opts || {};
 
       return function (vis) {
-        var isUserDefinedYAxis = vis._attr.setYExtents;
-        var data;
+        let isUserDefinedYAxis = vis._attr.setYExtents;
+        let data;
 
         if (opts.zeroFill) {
-          data = new Data(injectZeros(vis.data), vis._attr);
+          data = new Data(injectZeros(vis.data), vis._attr, vis.uiState);
         } else {
-          data = new Data(vis.data, vis._attr);
+          data = new Data(vis.data, vis._attr, vis.uiState);
         }
 
         return new Handler(vis, {
           data: data,
-          legend: new Legend(vis, vis.data),
           axisTitle: new AxisTitle(vis.el, data.get('xAxisLabel'), data.get('yAxisLabel')),
           chartTitle: new ChartTitle(vis.el),
           xAxis: new XAxis({
@@ -72,8 +70,8 @@ define(function (require) {
             test: function (vis, data) {
               if (!data.shouldBeStacked() || data.maxNumberOfSeries() < 2) return;
 
-              var hasPos = data.getYMax(data._getY) > 0;
-              var hasNeg = data.getYMin(data._getY) < 0;
+              let hasPos = data.getYMax(data._getY) > 0;
+              let hasNeg = data.getYMin(data._getY) < 0;
               return (hasPos && hasNeg);
             }
           },
diff --git a/src/ui/public/vislib/lib/handler/types/tile_map.js b/src/ui/public/vislib/lib/handler/types/tile_map.js
index a711886fcd4c0..fc722ab4f39bd 100644
--- a/src/ui/public/vislib/lib/handler/types/tile_map.js
+++ b/src/ui/public/vislib/lib/handler/types/tile_map.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function MapHandlerProvider(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
-    var Handler = Private(require('ui/vislib/lib/handler/handler'));
-    var Data = Private(require('ui/vislib/lib/data'));
+    let Handler = Private(require('ui/vislib/lib/handler/handler'));
+    let Data = Private(require('ui/vislib/lib/data'));
 
     return function (vis) {
-      var data = new Data(vis.data, vis._attr);
+      let data = new Data(vis.data, vis._attr, vis.uiState);
 
-      var MapHandler = new Handler(vis, {
+      let MapHandler = new Handler(vis, {
         data: data
       });
 
diff --git a/src/ui/public/vislib/lib/layout/layout.js b/src/ui/public/vislib/lib/layout/layout.js
index e6de6681e1ed3..c1e5ad4f96cc3 100644
--- a/src/ui/public/vislib/lib/layout/layout.js
+++ b/src/ui/public/vislib/lib/layout/layout.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function LayoutFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let _ = require('lodash');
 
-    var layoutType = Private(require('ui/vislib/lib/layout/layout_types'));
+    let layoutType = Private(require('ui/vislib/lib/layout/layout_types'));
 
     /**
      * Builds the visualization DOM layout
@@ -53,7 +53,7 @@ define(function (require) {
      * @returns {*} Creates the visualization layout
      */
     Layout.prototype.createLayout = function (arr) {
-      var self = this;
+      let self = this;
 
       return _.each(arr, function (obj) {
         self.layout(obj);
@@ -86,7 +86,7 @@ define(function (require) {
         obj.parent = '.' + obj.parent;
       }
 
-      var childEl = this.appendElem(obj.parent, obj.type, obj.class);
+      let childEl = this.appendElem(obj.parent, obj.type, obj.class);
 
       if (obj.datum) {
         childEl.datum(obj.datum);
@@ -97,7 +97,7 @@ define(function (require) {
       }
 
       if (obj.children) {
-        var newParent = childEl[0][0];
+        let newParent = childEl[0][0];
 
         _.forEach(obj.children, function (obj) {
           if (!obj.parent) {
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
index e9f00a8d642f1..2d0137cefccab 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function ChartSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
@@ -9,7 +9,7 @@ define(function () {
      */
     return function split(selection) {
       selection.each(function (data) {
-        var div = d3.select(this)
+        let div = d3.select(this)
         .attr('class', function () {
           if (data.rows) {
             return 'chart-wrapper-row';
@@ -19,9 +19,9 @@ define(function () {
             return 'chart-wrapper';
           }
         });
-        var divClass;
+        let divClass;
 
-        var charts = div.selectAll('charts')
+        let charts = div.selectAll('charts')
         .append('div')
         .data(function (d) {
           if (d.rows) {
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
index 03c80a66b1148..c1c81f1b2e946 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
@@ -1,6 +1,7 @@
 define(function () {
   return function ChartTitleSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
+    let $ = require('jquery');
 
     /*
      * Adds div DOM elements to either the `.y-axis-chart-title` element or the
@@ -11,11 +12,11 @@ define(function () {
      */
     return function (selection) {
       selection.each(function (data) {
-        var div = d3.select(this);
+        let div = d3.select(this);
+        let parent = $(this).parents('.vis-wrapper');
 
         if (!data.series) {
           div.selectAll('.chart-title')
-          .append('div')
           .data(function (d) {
             return d.rows ? d.rows : d.columns;
           })
@@ -24,9 +25,9 @@ define(function () {
             .attr('class', 'chart-title');
 
           if (data.rows) {
-            d3.select('.x-axis-chart-title').remove();
+            parent.find('.x-axis-chart-title').remove();
           } else {
-            d3.select('.y-axis-chart-title').remove();
+            parent.find('.y-axis-chart-title').remove();
           }
 
           return div;
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
index 16839fdcc05f9..6420cc547f756 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function XAxisSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.x-axis-div-wrapper` element based on the data layout.
@@ -10,7 +10,7 @@ define(function () {
 
     return function (selection) {
       selection.each(function () {
-        var div = d3.select(this);
+        let div = d3.select(this);
 
         div.selectAll('.x-axis-div')
         .append('div')
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
index d694452fbb802..e6ec2d07b784f 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function YAxisSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.y-axis-div-wrapper` element based on the data layout.
@@ -10,10 +10,10 @@ define(function () {
 
     // render and get bounding box width
     return function (selection, parent, opts) {
-      var yAxis = opts && opts.yAxis;
+      let yAxis = opts && opts.yAxis;
 
       selection.each(function () {
-        var div = d3.select(this);
+        let div = d3.select(this);
 
         div.call(setWidth, yAxis);
 
@@ -31,14 +31,14 @@ define(function () {
     function setWidth(el, yAxis) {
       if (!yAxis) return;
 
-      var padding = 5;
-      var height = parseInt(el.node().clientHeight, 10);
+      let padding = 5;
+      let height = parseInt(el.node().clientHeight, 10);
 
       // render svg and get the width of the bounding box
-      var svg = d3.select('body')
+      let svg = d3.select('body')
       .append('svg')
       .attr('style', 'position:absolute; top:-10000; left:-10000');
-      var width = svg.append('g')
+      let width = svg.append('g')
       .call(yAxis.getYAxis(height)).node().getBBox().width + padding;
       svg.remove();
 
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
index e1299da592f8a..5d6516641e06b 100644
--- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function ChartSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
@@ -10,7 +10,7 @@ define(function () {
 
     return function split(selection) {
       selection.each(function (data) {
-        var div = d3.select(this)
+        let div = d3.select(this)
         .attr('class', function () {
           if (data.rows) {
             return 'chart-wrapper-row';
@@ -20,9 +20,9 @@ define(function () {
             return 'chart-wrapper';
           }
         });
-        var divClass;
+        let divClass;
 
-        var charts = div.selectAll('charts')
+        let charts = div.selectAll('charts')
         .append('div')
         .data(function (d) {
           if (d.rows) {
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
index 9841bcfe3d294..9bb0dfc7ce06a 100644
--- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function ChartTitleSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to either the `.y-axis-chart-title` element or the
@@ -12,7 +12,7 @@ define(function () {
 
     return function (selection, parent) {
       selection.each(function (data) {
-        var div = d3.select(this);
+        let div = d3.select(this);
 
         if (!data.slices) {
           div.selectAll('.chart-title')
diff --git a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
index f1af47399684a..cbc43b310cf13 100644
--- a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
@@ -1,6 +1,6 @@
 define(function () {
   return function ChartSplitFactory() {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
     /*
      * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
@@ -9,7 +9,7 @@ define(function () {
      */
     return function split(selection) {
       selection.each(function (data) {
-        var div = d3.select(this)
+        let div = d3.select(this)
           .attr('class', function () {
             // Determine the parent class
             if (data.rows) {
@@ -20,9 +20,9 @@ define(function () {
               return 'chart-wrapper';
             }
           });
-        var divClass;
+        let divClass;
 
-        var charts = div.selectAll('charts')
+        let charts = div.selectAll('charts')
           .append('div')
           .data(function (d) {
             // Determine the child class
diff --git a/src/ui/public/vislib/lib/layout/types/column_layout.js b/src/ui/public/vislib/lib/layout/types/column_layout.js
index 0dfea45abfc28..106e5ad3002e1 100644
--- a/src/ui/public/vislib/lib/layout/types/column_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/column_layout.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function ColumnLayoutFactory(Private) {
-    var d3 = require('d3');
+    let d3 = require('d3');
 
-    var chartSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_split'));
-    var yAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/y_axis_split'));
-    var xAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/x_axis_split'));
-    var chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_title_split'));
+    let chartSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_split'));
+    let yAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/y_axis_split'));
+    let xAxisSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/x_axis_split'));
+    let chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/column_chart/chart_title_split'));
 
     /**
      * Specifies the visualization layout for column charts.
@@ -100,10 +100,6 @@ define(function (require) {
                   ]
                 }
               ]
-            },
-            {
-              type: 'div',
-              class: 'legend-col-wrapper'
             }
           ]
         }
diff --git a/src/ui/public/vislib/lib/layout/types/map_layout.js b/src/ui/public/vislib/lib/layout/types/map_layout.js
index cb4db6f2aede9..11c03392872c5 100644
--- a/src/ui/public/vislib/lib/layout/types/map_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/map_layout.js
@@ -1,7 +1,7 @@
 define(function (require) {
   return function ColumnLayoutFactory(Private) {
-    var d3 = require('d3');
-    var mapSplit = Private(require('ui/vislib/lib/layout/splits/tile_map/map_split'));
+    let d3 = require('d3');
+    let mapSplit = Private(require('ui/vislib/lib/layout/splits/tile_map/map_split'));
 
     /*
      * Specifies the visualization layout for tile maps.
diff --git a/src/ui/public/vislib/lib/layout/types/pie_layout.js b/src/ui/public/vislib/lib/layout/types/pie_layout.js
index 1753bc0f01c0b..8277f7441427f 100644
--- a/src/ui/public/vislib/lib/layout/types/pie_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/pie_layout.js
@@ -1,8 +1,8 @@
 define(function (require) {
   return function ColumnLayoutFactory(Private) {
-    var d3 = require('d3');
-    var chartSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_split'));
-    var chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_title_split'));
+    let d3 = require('d3');
+    let chartSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_split'));
+    let chartTitleSplit = Private(require('ui/vislib/lib/layout/splits/pie_chart/chart_title_split'));
 
     /**
      * Specifies the visualization layout for column charts.
diff --git a/src/ui/public/vislib/lib/legend.js b/src/ui/public/vislib/lib/legend.js
deleted file mode 100644
index a925ee0316d50..0000000000000
--- a/src/ui/public/vislib/lib/legend.js
+++ /dev/null
@@ -1,219 +0,0 @@
-define(function (require) {
-  return function LegendFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var Dispatch = Private(require('ui/vislib/lib/dispatch'));
-    var Data = Private(require('ui/vislib/lib/data'));
-    var legendHeaderTemplate = _.template(require('ui/vislib/partials/legend_header.html'));
-    var dataLabel = require('ui/vislib/lib/_data_label');
-    var color = Private(require('ui/vislib/components/color/color'));
-
-    /**
-     * Appends legend to the visualization
-     *
-     * @class Legend
-     * @constructor
-     * @param vis {Object} Reference to Vis Constructor
-     */
-    function Legend(vis) {
-      if (!(this instanceof Legend)) {
-        return new Legend(vis);
-      }
-
-      var data = vis.data.columns || vis.data.rows || [vis.data];
-      var type = vis._attr.type;
-      var labels = this.labels = this._getLabels(data, type);
-      var labelsArray = labels.map(function (obj) { return obj.label; });
-
-      this.events = new Dispatch();
-      this.vis = vis;
-      this.el = vis.el;
-      this.color = color(labelsArray);
-      this._attr = _.defaults({}, vis._attr || {}, {
-        'legendClass' : 'legend-col-wrapper',
-        'blurredOpacity' : 0.3,
-        'focusOpacity' : 1,
-        'defaultOpacity' : 1,
-        'legendDefaultOpacity': 1
-      });
-    }
-
-    Legend.prototype._getPieLabels = function (data) {
-      return Data.prototype.pieNames(data);
-    };
-
-    Legend.prototype._getSeriesLabels = function (data) {
-      var isOneSeries = data.every(function (chart) {
-        return chart.series.length === 1;
-      });
-
-      var values = data.map(function (chart) {
-        var yLabel = isOneSeries ? chart.yAxisLabel : undefined;
-
-        return chart.series.map(function (series) {
-          if (yLabel) series.label = yLabel;
-          return series;
-        });
-      })
-      .reduce(function (a, b) {
-        return a.concat(b);
-      }, []);
-
-      return _.uniq(values, 'label');
-    };
-
-    Legend.prototype._getLabels = function (data, type) {
-      if (type === 'pie') return this._getPieLabels(data);
-      return this._getSeriesLabels(data);
-    };
-
-    /**
-     * Adds legend header
-     *
-     * @method header
-     * @param el {HTMLElement} Reference to DOM element
-     * @param args {Object|*} Legend options
-     * @returns {*} HTML element
-     */
-    Legend.prototype._header = function (el, args) {
-      var self = this;
-      return el.append('div')
-      .attr('class', 'header')
-      .append('div')
-      .attr('class', 'column-labels')
-      .html(function () {
-        return legendHeaderTemplate({ isOpen: self.vis.get('legendOpen') });
-      });
-    };
-
-    /**
-     * Adds list to legend
-     *
-     * @method list
-     * @param el {HTMLElement} Reference to DOM element
-     * @param arrOfLabels {Array} Array of labels
-     * @param args {Object|*} Legend options
-     * @returns {D3.Selection} HTML element with list of labels attached
-     */
-    Legend.prototype._list = function (el, data, args) {
-      var self = this;
-
-      return el.append('ul')
-      .attr('class', function () {
-        var className = 'legend-ul';
-        if (self.vis && !self.vis.get('legendOpen')) className += ' hidden';
-        return className;
-      })
-      .selectAll('li')
-      .data(data)
-      .enter()
-        .append('li')
-        .attr('class', 'color')
-        .each(function (d) {
-          var li = d3.select(this);
-          self._addIdentifier.call(this, d);
-
-          li.append('i')
-          .attr('class', 'fa fa-circle dots')
-          .attr('style', 'color:' + args.color(d.label));
-
-          li.append('span').text(d.label);
-        });
-    };
-
-    /**
-     * Append the data label to the element
-     *
-     * @method _addIdentifier
-     * @param label {string} label to use
-     */
-    Legend.prototype._addIdentifier = function (d) {
-      dataLabel(this, d.label);
-    };
-
-    /**
-     * Renders legend
-     *
-     * @method render
-     * @return {HTMLElement} Legend
-     */
-    Legend.prototype.render = function () {
-      var self = this;
-      var visEl = d3.select(this.el);
-      var legendDiv = visEl.select('.' + this._attr.legendClass);
-      var items = this.labels;
-      this._header(legendDiv, this);
-      this._list(legendDiv, items, this);
-
-      var headerIcon = visEl.select('.legend-toggle');
-
-      // toggle legend open and closed
-      headerIcon
-      .on('click', function legendClick() {
-        var legendOpen = !self.vis.get('legendOpen');
-        self.vis.set('legendOpen', legendOpen);
-
-        visEl.select('ul.legend-ul').classed('hidden', legendOpen);
-        self.vis.resize();
-      });
-
-      legendDiv.select('.legend-ul').selectAll('li')
-      .on('mouseover', function (d) {
-        var label = d.label;
-        var charts = visEl.selectAll('.chart');
-
-        function filterLabel() {
-          var pointLabel = this.getAttribute('data-label');
-          return pointLabel !== label.toString();
-        }
-
-        if (label && label !== 'Count') {
-          d3.select(this).style('cursor', 'pointer');
-        }
-
-        // legend
-        legendDiv.selectAll('li')
-        .filter(filterLabel)
-        .classed('blur_shape', true);
-
-        // all data-label attribute
-        charts.selectAll('[data-label]')
-        .filter(filterLabel)
-        .classed('blur_shape', true);
-
-        var eventEl =  d3.select(this);
-        eventEl.style('white-space', 'inherit');
-        eventEl.style('word-break', 'break-all');
-      })
-      .on('mouseout', function () {
-        /*
-         * The default opacity of elements in charts may be modified by the
-         * chart constructor, and so may differ from that of the legend
-         */
-
-        var charts = visEl.selectAll('.chart');
-
-        // legend
-        legendDiv.selectAll('li')
-        .classed('blur_shape', false);
-
-        // all data-label attribute
-        charts.selectAll('[data-label]')
-        .classed('blur_shape', false);
-
-        var eventEl =  d3.select(this);
-        eventEl.style('white-space', 'nowrap');
-        eventEl.style('word-break', 'inherit');
-      });
-
-      legendDiv.selectAll('li.color').each(function (d) {
-        var label = d.label;
-        if (label !== undefined && label !== 'Count') {
-          d3.select(this).call(self.events.addClickEvent());
-        }
-      });
-    };
-
-    return Legend;
-  };
-});
diff --git a/src/ui/public/vislib/lib/resize_checker.js b/src/ui/public/vislib/lib/resize_checker.js
index 447e9556155e4..97709fdeb8086 100644
--- a/src/ui/public/vislib/lib/resize_checker.js
+++ b/src/ui/public/vislib/lib/resize_checker.js
@@ -1,13 +1,13 @@
 define(function (require) {
   return function ResizeCheckerFactory(Private, Notifier, $rootScope) {
-    var $ = require('jquery');
-    var _ = require('lodash');
+    let $ = require('jquery');
+    let _ = require('lodash');
 
-    var EventEmitter = Private(require('ui/events'));
-    var reflowWatcher = Private(require('ui/reflow_watcher'));
-    var sequencer = require('ui/utils/sequencer');
+    let EventEmitter = Private(require('ui/events'));
+    let reflowWatcher = Private(require('ui/reflow_watcher'));
+    let sequencer = require('ui/utils/sequencer');
 
-    var SCHEDULE = ResizeChecker.SCHEDULE = sequencer.createEaseIn(
+    let SCHEDULE = ResizeChecker.SCHEDULE = sequencer.createEaseIn(
       100,      // shortest delay
       10000,  // longest delay
       50     // tick count
@@ -15,7 +15,7 @@ define(function (require) {
 
     // maximum ms that we can delay emitting 'resize'. This is only used
     // to debounce resizes when the size of the element is constantly changing
-    var MS_MAX_RESIZE_DELAY = ResizeChecker.MS_MAX_RESIZE_DELAY = 500;
+    let MS_MAX_RESIZE_DELAY = ResizeChecker.MS_MAX_RESIZE_DELAY = 500;
 
     /**
      * Checks the size of an element on a regular basis. Provides
@@ -87,7 +87,7 @@ define(function (require) {
      * @return {boolean} - true if the passed in value matches the saved size
      */
     ResizeChecker.prototype._equalsSavedSize = function (a) {
-      var b = this._savedSize || {};
+      let b = this._savedSize || {};
       return a.w === b.w && a.h === b.h;
     };
 
@@ -128,12 +128,12 @@ define(function (require) {
      * @return {void}
      */
     ResizeChecker.prototype.check = function () {
-      var newSize = this.read();
-      var dirty = this.saveSize(newSize);
-      var dirtyChanged = this.saveDirty(dirty);
+      let newSize = this.read();
+      let dirty = this.saveSize(newSize);
+      let dirtyChanged = this.saveDirty(dirty);
 
-      var doneDirty = !dirty && dirtyChanged;
-      var muchDirty = dirty && (this.lastDirtyChange() - Date.now() > MS_MAX_RESIZE_DELAY);
+      let doneDirty = !dirty && dirtyChanged;
+      let muchDirty = dirty && (this.lastDirtyChange() - Date.now() > MS_MAX_RESIZE_DELAY);
       if (doneDirty || muchDirty) {
         this.emit('resize', newSize);
       }
@@ -174,10 +174,10 @@ define(function (require) {
         this._tick += 1;
       }
 
-      var check = this.check; // already bound
-      var tick = this._tick;
-      var notify = this.notify;
-      var ms = this._currentSchedule[this._tick];
+      let check = this.check; // already bound
+      let tick = this._tick;
+      let notify = this.notify;
+      let ms = this._currentSchedule[this._tick];
       return (this._timerId = setTimeout(function () {
         check();
       }, ms));
diff --git a/src/ui/public/vislib/lib/x_axis.js b/src/ui/public/vislib/lib/x_axis.js
index 2c12b0e6f2f12..86ba0dfab8331 100644
--- a/src/ui/public/vislib/lib/x_axis.js
+++ b/src/ui/public/vislib/lib/x_axis.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function XAxisFactory(Private) {
-    var d3 = require('d3');
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var moment = require('moment');
+    let d3 = require('d3');
+    let $ = require('jquery');
+    let _ = require('lodash');
+    let moment = require('moment');
 
-    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    let ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
 
     /**
      * Adds an x axis to the visualization
@@ -47,7 +47,7 @@ define(function (require) {
      * @returns {*} D3 scale function
      */
     XAxis.prototype.getScale = function () {
-      var ordered = this.ordered;
+      let ordered = this.ordered;
 
       if (ordered && ordered.date) {
         return d3.time.scale.utc();
@@ -65,7 +65,7 @@ define(function (require) {
      * @returns {*} D3 scale function
      */
     XAxis.prototype.getDomain = function (scale) {
-      var ordered = this.ordered;
+      let ordered = this.ordered;
 
       if (ordered && ordered.date) {
         return this.getTimeDomain(scale, this.xValues);
@@ -99,10 +99,10 @@ define(function (require) {
      * @param extent
      */
     XAxis.prototype._calculateExtent = function (data, extent) {
-      var ordered = this.ordered;
-      var opts = [ordered[extent]];
+      let ordered = this.ordered;
+      let opts = [ordered[extent]];
 
-      var point = d3[extent](data);
+      let point = d3[extent](data);
       if (this.expandLastBucket && extent === 'max') {
         point = this.addInterval(point);
       }
@@ -146,17 +146,17 @@ define(function (require) {
      * @returns {number} - x + n intervals
      */
     XAxis.prototype.modByInterval = function (x, n) {
-      var ordered = this.ordered;
+      let ordered = this.ordered;
       if (!ordered) return x;
-      var interval = ordered.interval;
+      let interval = ordered.interval;
       if (!interval) return x;
 
       if (!ordered.date) {
         return x += (ordered.interval * n);
       }
 
-      var y = moment(x);
-      var method = n > 0 ? 'add' : 'subtract';
+      let y = moment(x);
+      let method = n > 0 ? 'add' : 'subtract';
 
       _.times(Math.abs(n), function () {
         y[method](interval);
@@ -187,7 +187,7 @@ define(function (require) {
      * @returns {*} D3 scale function
      */
     XAxis.prototype.getRange = function (domain, width) {
-      var ordered = this.ordered;
+      let ordered = this.ordered;
 
       if (ordered && ordered.date) {
         return domain.range([0, width]);
@@ -203,7 +203,7 @@ define(function (require) {
      * @returns {*} D3 x scale function
      */
     XAxis.prototype.getXScale = function (width) {
-      var domain = this.getDomain(this.getScale());
+      let domain = this.getDomain(this.getScale());
 
       return this.getRange(domain, width);
     };
@@ -235,13 +235,13 @@ define(function (require) {
      * @returns {Function} Renders the x axis to a D3 selection
      */
     XAxis.prototype.draw = function () {
-      var self = this;
-      var div;
-      var width;
-      var height;
-      var svg;
-      var parentWidth;
-      var n;
+      let self = this;
+      let div;
+      let width;
+      let height;
+      let svg;
+      let parentWidth;
+      let n;
       this._attr.isRotated = false;
 
       return function (selection) {
@@ -283,10 +283,10 @@ define(function (require) {
      * @returns {Function} Filters or rotates x axis tick labels
      */
     XAxis.prototype.filterOrRotate = function () {
-      var self = this;
-      var ordered = self.ordered;
-      var axis;
-      var labels;
+      let self = this;
+      let ordered = self.ordered;
+      let axis;
+      let labels;
 
       return function (selection) {
         selection.each(function () {
@@ -312,14 +312,14 @@ define(function (require) {
      * @returns {Function} Rotates x axis tick labels of a D3 selection
      */
     XAxis.prototype.rotateAxisLabels = function () {
-      var self = this;
-      var text;
-      var barWidth = self.xScale.rangeBand();
-      var maxRotatedLength = 180;
-      var xAxisPadding = 15;
-      var svg;
-      var lengths = [];
-      var length;
+      let self = this;
+      let text;
+      let barWidth = self.xScale.rangeBand();
+      let maxRotatedLength = 180;
+      let xAxisPadding = 15;
+      let svg;
+      let lengths = [];
+      let length;
       self._attr.isRotated = false;
 
       return function (selection) {
@@ -367,13 +367,13 @@ define(function (require) {
      * @returns {*|jQuery}
      */
     XAxis.prototype.truncateLabel = function (text, size) {
-      var node = d3.select(text).node();
-      var str = $(node).text();
-      var width = node.getBBox().width;
-      var chars = str.length;
-      var pxPerChar = width / chars;
-      var endChar = 0;
-      var ellipsesPad = 4;
+      let node = d3.select(text).node();
+      let str = $(node).text();
+      let width = node.getBBox().width;
+      let chars = str.length;
+      let pxPerChar = width / chars;
+      let endChar = 0;
+      let ellipsesPad = 4;
 
       if (width > size) {
         endChar = Math.floor((size / pxPerChar) - ellipsesPad);
@@ -396,14 +396,14 @@ define(function (require) {
      * @returns {Function}
      */
     XAxis.prototype.filterAxisLabels = function () {
-      var self = this;
-      var startX = 0;
-      var maxW;
-      var par;
-      var myX;
-      var myWidth;
-      var halfWidth;
-      var padding = 1.1;
+      let self = this;
+      let startX = 0;
+      let maxW;
+      let par;
+      let myX;
+      let myWidth;
+      let halfWidth;
+      let padding = 1.1;
 
       return function (selection) {
         selection.selectAll('.tick text')
@@ -435,21 +435,21 @@ define(function (require) {
      * @returns {Function}
      */
     XAxis.prototype.fitTitles = function () {
-      var visEls = $('.vis-wrapper');
-      var xAxisChartTitle;
-      var yAxisChartTitle;
-      var text;
-      var titles;
+      let visEls = $('.vis-wrapper');
+      let xAxisChartTitle;
+      let yAxisChartTitle;
+      let text;
+      let titles;
 
       return function () {
 
         visEls.each(function () {
-          var visEl = d3.select(this);
-          var $visEl = $(this);
-          var xAxisTitle = $visEl.find('.x-axis-title');
-          var yAxisTitle = $visEl.find('.y-axis-title');
-          var titleWidth = xAxisTitle.width();
-          var titleHeight = yAxisTitle.height();
+          let visEl = d3.select(this);
+          let $visEl = $(this);
+          let xAxisTitle = $visEl.find('.x-axis-title');
+          let yAxisTitle = $visEl.find('.y-axis-title');
+          let titleWidth = xAxisTitle.width();
+          let titleHeight = yAxisTitle.height();
 
           text = visEl.select('.x-axis-title')
           .select('svg')
@@ -503,17 +503,17 @@ define(function (require) {
      * @method updateXaxisHeight
      */
     XAxis.prototype.updateXaxisHeight = function () {
-      var selection = d3.select(this.el).selectAll('.vis-wrapper');
+      let selection = d3.select(this.el).selectAll('.vis-wrapper');
 
       selection.each(function () {
-        var visEl = d3.select(this);
+        let visEl = d3.select(this);
 
         if (visEl.select('.inner-spacer-block').node() === null) {
           visEl.select('.y-axis-spacer-block')
           .append('div')
           .attr('class', 'inner-spacer-block');
         }
-        var xAxisHt = visEl.select('.x-axis-wrapper').style('height');
+        let xAxisHt = visEl.select('.x-axis-wrapper').style('height');
 
         visEl.select('.inner-spacer-block').style('height', xAxisHt);
       });
diff --git a/src/ui/public/vislib/lib/y_axis.js b/src/ui/public/vislib/lib/y_axis.js
index ecbcc90fc6685..1860ddbc0c7a7 100644
--- a/src/ui/public/vislib/lib/y_axis.js
+++ b/src/ui/public/vislib/lib/y_axis.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function YAxisFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var errors = require('ui/errors');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let errors = require('ui/errors');
 
-    var ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
+    let ErrorHandler = Private(require('ui/vislib/lib/_error_handler'));
 
     /**
      * Appends y axis to the visualization
@@ -46,7 +46,7 @@ define(function (require) {
     };
 
     YAxis.prototype._validateUserExtents = function (domain) {
-      var self = this;
+      let self = this;
 
       return domain.map(function (val) {
         val = parseInt(val, 10);
@@ -58,8 +58,8 @@ define(function (require) {
     };
 
     YAxis.prototype._getExtents = function (domain) {
-      var min = domain[0];
-      var max = domain[1];
+      let min = domain[0];
+      let max = domain[1];
 
       if (this._isUserDefined()) return this._validateUserExtents(domain);
       if (this._isYExtents()) return domain;
@@ -113,8 +113,8 @@ define(function (require) {
      * @returns {D3.Scale.QuantitiveScale|*} D3 yScale function
      */
     YAxis.prototype.getYScale = function (height) {
-      var scale = this._getScaleType(this._attr.scale);
-      var domain = this._getExtents(this.domain);
+      let scale = this._getScaleType(this._attr.scale);
+      let domain = this._getExtents(this.domain);
 
       this.yScale = scale
       .domain(domain)
@@ -131,7 +131,7 @@ define(function (require) {
     };
 
     YAxis.prototype.tickFormat = function () {
-      var isPercentage = this._attr.mode === 'percentage';
+      let isPercentage = this._attr.mode === 'percentage';
       if (isPercentage) return d3.format('%');
       if (this.yAxisFormatter) return this.yAxisFormatter;
       return d3.format('n');
@@ -149,7 +149,7 @@ define(function (require) {
      * @returns {D3.Svg.Axis|*} D3 yAxis function
      */
     YAxis.prototype.getYAxis = function (height) {
-      var yScale = this.getYScale(height);
+      let yScale = this.getYScale(height);
       this._validateYScale(yScale);
 
       // Create the d3 yAxis function
@@ -173,7 +173,7 @@ define(function (require) {
      * @returns {number} Number of y axis ticks
      */
     YAxis.prototype.tickScale = function (height) {
-      var yTickScale = d3.scale.linear()
+      let yTickScale = d3.scale.linear()
       .clamp(true)
       .domain([20, 40, 1000])
       .range([0, 3, 11]);
@@ -188,29 +188,29 @@ define(function (require) {
      * @returns {Function} Renders y axis to visualization
      */
     YAxis.prototype.draw = function () {
-      var self = this;
-      var margin = this._attr.margin;
-      var mode = this._attr.mode;
-      var isWiggleOrSilhouette = (mode === 'wiggle' || mode === 'silhouette');
+      let self = this;
+      let margin = this._attr.margin;
+      let mode = this._attr.mode;
+      let isWiggleOrSilhouette = (mode === 'wiggle' || mode === 'silhouette');
 
       return function (selection) {
         selection.each(function () {
-          var el = this;
+          let el = this;
 
-          var div = d3.select(el);
-          var width = $(el).parent().width();
-          var height = $(el).height();
-          var adjustedHeight = height - margin.top - margin.bottom;
+          let div = d3.select(el);
+          let width = $(el).parent().width();
+          let height = $(el).height();
+          let adjustedHeight = height - margin.top - margin.bottom;
 
           // Validate whether width and height are not 0 or `NaN`
           self.validateWidthandHeight(width, adjustedHeight);
 
-          var yAxis = self.getYAxis(adjustedHeight);
+          let yAxis = self.getYAxis(adjustedHeight);
 
           // The yAxis should not appear if mode is set to 'wiggle' or 'silhouette'
           if (!isWiggleOrSilhouette) {
             // Append svg and y axis
-            var svg = div.append('svg')
+            let svg = div.append('svg')
             .attr('width', width)
             .attr('height', height);
 
@@ -219,9 +219,9 @@ define(function (require) {
             .attr('transform', 'translate(' + (width - 2) + ',' + margin.top + ')')
             .call(yAxis);
 
-            var container = svg.select('g.y.axis').node();
+            let container = svg.select('g.y.axis').node();
             if (container) {
-              var cWidth = Math.max(width, container.getBBox().width);
+              let cWidth = Math.max(width, container.getBBox().width);
               svg.attr('width', cWidth);
               svg.select('g')
               .attr('transform', 'translate(' + (cWidth - 2) + ',' + margin.top + ')');
diff --git a/src/ui/public/vislib/partials/legend_header.html b/src/ui/public/vislib/partials/legend_header.html
deleted file mode 100644
index 7c909bcee9920..0000000000000
--- a/src/ui/public/vislib/partials/legend_header.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="legend-toggle">
-  <strong>
-    <%= (isOpen) ?
-      '<span class="legend-open">Legend <i class="fa fa-arrow-circle-right"></i></span>' :
-      '<span class="legend-closed"><i class="fa fa-arrow-circle-left"></i></span>'
-    %>
-  </strong>
-</div>
\ No newline at end of file
diff --git a/src/ui/public/vislib/styles/_layout.less b/src/ui/public/vislib/styles/_layout.less
index ade389dc2da48..e704d18745ccf 100644
--- a/src/ui/public/vislib/styles/_layout.less
+++ b/src/ui/public/vislib/styles/_layout.less
@@ -1,6 +1,6 @@
 .visualize-chart {
   display: flex;
-  flex: 1 1 100%;
+  flex: 1 1 auto;
   min-height: 0;
   min-width: 0;
 }
diff --git a/src/ui/public/vislib/styles/_legend.less b/src/ui/public/vislib/styles/_legend.less
index 41f7184db3034..0be44579421d8 100644
--- a/src/ui/public/vislib/styles/_legend.less
+++ b/src/ui/public/vislib/styles/_legend.less
@@ -1,25 +1,34 @@
 @import "~ui/styles/mixins";
 @import "~ui/styles/variables";
 
+visualize-legend {
+  display: flex;
+  flex-direction: row;
+}
+
 .legend-col-wrapper {
   .flex-parent(0, 0, auto);
+  flex-direction: row;
   z-index: 10;
   min-height: 0;
+  overflow: hidden;
 
-  .legend-toggle {
+  .header {
     cursor: pointer;
-    opacity: 0.75;
-    white-space: nowrap;
-    font-size: 0.9em;
+    width: 15px;
+  }
 
-    .legend-open {
-      margin-right: 20px;
+  .legend-toggle {
+    &:hover {
+      color: @sidebar-hover-color;
+      background-color: @sidebar-hover-bg;
     }
 
-    .legend-closed {
-      font-size: 1.5em;
-      padding-left: 5px;
-    }
+    background-color: @sidebar-bg;
+    font-size: 10px;
+    height: 30px;
+    padding: 8px 3px;
+    border-bottom-left-radius: @border-radius-small;
   }
 
   .column-labels {
@@ -27,41 +36,85 @@
   }
 
   .legend-ul {
-    flex: 1 1 1px;
+    border-left: 1px solid @sidebar-bg;
+    width: 150px;
+    flex: 1 1 auto;
     overflow-x: hidden;
     overflow-y: auto;
-
+    color: @legend-item-color;
     list-style-type: none;
     padding: 0;
+    margin-bottom: 0;
     visibility: visible;
     min-height: 0;
-    min-width: 60px;
-    margin-right: 5px;
-
-    li.color {
-      min-height: 22px;
-      padding: 3px 0 3px 0;
-      text-align: left;
-      font-size: 12px;
-      line-height: 13px;
-      color: @legend-item-color;
-      cursor: default;
-      text-align: left;
-      white-space: nowrap;
-      overflow-x: hidden;
-      text-overflow: ellipsis;
-      max-width: 150px;
-
-      .dots {
-        padding-right: 5px;
-      }
-    }
+    font-size: 12px;
+    line-height: 13px;
+    text-align: left;
+
+    flex-direction: column;
   }
 
   .legend-ul.hidden {
     visibility: hidden;
   }
+}
 
-  .legend-toggle {
+.legend-value {
+  &-title {
+    padding: 3px;
+
+    &:hover {
+      background-color: @sidebar-hover-bg;
+    }
+  }
+
+  &-truncate {
+    overflow-x: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  &-full {
+    white-space: normal;
+    word-break: break-all;
+    background-color: @sidebar-hover-bg;
+  }
+
+  &-details {
+    border-bottom: 1px solid @sidebar-bg;
+
+    .filter-button {
+      display: block;
+      float: left;
+      width: 50%;
+      border-radius: 0px;
+      background-color: @sidebar-bg;
+
+      &:hover {
+        background-color: @sidebar-hover-bg;
+      }
+    }
+  }
+
+  &-color-picker {
+    width: 130px;
+    margin: auto;
+
+    .dot {
+      line-height: 14px;
+      margin: 2px;
+      font-size: 14px;
+    }
+
+    .dot:hover {
+      margin: 0px;
+      font-size: 18px
+    }
   }
 }
+
+.legend-value:hover {
+  cursor: pointer;
+}
+
+
diff --git a/src/ui/public/vislib/vis.js b/src/ui/public/vislib/vis.js
index 09819cf8e6f9e..bf5d9510732ba 100644
--- a/src/ui/public/vislib/vis.js
+++ b/src/ui/public/vislib/vis.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function VisFactory(Private) {
-    var _ = require('lodash');
-    var d3 = require('d3');
+    let _ = require('lodash');
+    let d3 = require('d3');
 
-    var Binder = require('ui/Binder');
+    let Binder = require('ui/Binder');
 
-    var ResizeChecker = Private(require('ui/vislib/lib/resize_checker'));
-    var Events = Private(require('ui/events'));
-    var handlerTypes = Private(require('ui/vislib/lib/handler/handler_types'));
-    var chartTypes = Private(require('ui/vislib/visualizations/vis_types'));
-    var errors = require('ui/errors');
+    let ResizeChecker = Private(require('ui/vislib/lib/resize_checker'));
+    let Events = Private(require('ui/events'));
+    let handlerTypes = Private(require('ui/vislib/lib/handler/handler_types'));
+    let chartTypes = Private(require('ui/vislib/visualizations/vis_types'));
+    let errors = require('ui/errors');
     require('ui/vislib/styles/main.less');
 
     /**
@@ -45,8 +45,8 @@ define(function (require) {
      * @method render
      * @param data {Object} Elasticsearch query results
      */
-    Vis.prototype.render = function (data) {
-      var chartType = this._attr.type;
+    Vis.prototype.render = function (data, uiState) {
+      let chartType = this._attr.type;
 
       if (!data) {
         throw new Error('No valid data!');
@@ -58,6 +58,12 @@ define(function (require) {
       }
 
       this.data = data;
+
+      if (!this.uiState) {
+        this.uiState = uiState;
+        uiState.on('change', this._uiStateChangeHandler = () => this.render(this.data, this.uiState));
+      }
+
       this.handler = handlerTypes[chartType](this) || handlerTypes.column(this);
       this._runOnHandler('render');
     };
@@ -76,7 +82,7 @@ define(function (require) {
       if (this.handler && _.isFunction(this.handler.resize)) {
         this._runOnHandler('resize');
       } else {
-        this.render(this.data);
+        this.render(this.data, this.uiState);
       }
     };
 
@@ -109,10 +115,11 @@ define(function (require) {
      * @method destroy
      */
     Vis.prototype.destroy = function () {
-      var selection = d3.select(this.el).select('.vis-wrapper');
+      let selection = d3.select(this.el).select('.vis-wrapper');
 
       this.binder.destroy();
       this.resizeChecker.destroy();
+      if (this.uiState) this.uiState.off('change', this._uiStateChangeHandler);
       if (this.handler) this._runOnHandler('destroy');
 
       selection.remove();
@@ -128,7 +135,7 @@ define(function (require) {
      */
     Vis.prototype.set = function (name, val) {
       this._attr[name] = val;
-      this.render(this.data);
+      this.render(this.data, this.uiState);
     };
 
     /**
@@ -150,9 +157,9 @@ define(function (require) {
      * @returns {*}
      */
     Vis.prototype.on = function (event, listener) {
-      var first = this.listenerCount(event) === 0;
-      var ret = Events.prototype.on.call(this, event, listener);
-      var added = this.listenerCount(event) > 0;
+      let first = this.listenerCount(event) === 0;
+      let ret = Events.prototype.on.call(this, event, listener);
+      let added = this.listenerCount(event) > 0;
 
       // if this is the first listener added for the event
       // enable the event in the handler
@@ -169,9 +176,9 @@ define(function (require) {
      * @returns {*}
      */
     Vis.prototype.off = function (event, listener) {
-      var last = this.listenerCount(event) === 1;
-      var ret = Events.prototype.off.call(this, event, listener);
-      var removed = this.listenerCount(event) === 0;
+      let last = this.listenerCount(event) === 1;
+      let ret = Events.prototype.off.call(this, event, listener);
+      let removed = this.listenerCount(event) === 0;
 
       // Once all listeners are removed, disable the events in the handler
       if (last && removed && this.handler) this.handler.disable(event);
diff --git a/src/ui/public/vislib/visualizations/_chart.js b/src/ui/public/vislib/visualizations/_chart.js
index 4080e8aa53220..8a4b4735e2021 100644
--- a/src/ui/public/vislib/visualizations/_chart.js
+++ b/src/ui/public/vislib/visualizations/_chart.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function ChartBaseClass(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var errors = require('ui/errors');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let errors = require('ui/errors');
 
-    var Dispatch = Private(require('ui/vislib/lib/dispatch'));
-    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
-    var dataLabel = require('ui/vislib/lib/_data_label');
+    let Dispatch = Private(require('ui/vislib/lib/dispatch'));
+    let Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    let dataLabel = require('ui/vislib/lib/_data_label');
 
     /**
      * The Base Class for all visualizations.
@@ -27,11 +27,11 @@ define(function (require) {
       this.chartData = chartData;
       this.tooltips = [];
 
-      var events = this.events = new Dispatch(handler);
+      let events = this.events = new Dispatch(handler);
 
       if (_.get(this.handler, '_attr.addTooltip')) {
-        var $el = this.handler.el;
-        var formatter = this.handler.data.get('tooltipFormatter');
+        let $el = this.handler.el;
+        let formatter = this.handler.data.get('tooltipFormatter');
 
         // Add tooltip
         this.tooltip = new Tooltip('chart', $el, formatter, events);
@@ -49,7 +49,7 @@ define(function (require) {
      * @returns {HTMLElement} Contains the D3 chart
      */
     Chart.prototype.render = function () {
-      var selection = d3.select(this.chartEl);
+      let selection = d3.select(this.chartEl);
 
       selection.selectAll('*').remove();
       selection.call(this.draw());
@@ -63,7 +63,7 @@ define(function (require) {
      */
     Chart.prototype._addIdentifier = function (selection, labelProp) {
       labelProp = labelProp || 'label';
-      var labels = this.handler.data.labels;
+      let labels = this.handler.data.labels;
 
       function resolveLabel(datum) {
         if (labels.length === 1) return labels[0];
@@ -72,7 +72,7 @@ define(function (require) {
       }
 
       selection.each(function (datum) {
-        var label = resolveLabel(datum);
+        let label = resolveLabel(datum);
         if (label != null) dataLabel(this, label);
       });
     };
@@ -83,7 +83,7 @@ define(function (require) {
      * @method destroy
      */
     Chart.prototype.destroy = function () {
-      var selection = d3.select(this.chartEl);
+      let selection = d3.select(this.chartEl);
       this.events.removeAllListeners();
       this.tooltips.forEach(function (tooltip) {
         tooltip.destroy();
diff --git a/src/ui/public/vislib/visualizations/_map.js b/src/ui/public/vislib/visualizations/_map.js
index 368705c9e0545..5fa0b78ad05f0 100644
--- a/src/ui/public/vislib/visualizations/_map.js
+++ b/src/ui/public/vislib/visualizations/_map.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function MapFactory(Private) {
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var L = require('leaflet');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let L = require('leaflet');
 
-    var defaultMapZoom = 2;
-    var defaultMapCenter = [15, 5];
-    var defaultMarkerType = 'Scaled Circle Markers';
+    let defaultMapZoom = 2;
+    let defaultMapCenter = [15, 5];
+    let defaultMarkerType = 'Scaled Circle Markers';
 
-    var mapTiles = {
+    let mapTiles = {
       url: 'https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpeg',
       options: {
         attribution: 'Tiles by <a href="http://www.mapquest.com/">MapQuest</a> &mdash; ' +
@@ -18,7 +18,7 @@ define(function (require) {
       }
     };
 
-    var markerTypes = {
+    let markerTypes = {
       'Scaled Circle Markers': Private(require('ui/vislib/visualizations/marker_types/scaled_circles')),
       'Shaded Circle Markers': Private(require('ui/vislib/visualizations/marker_types/shaded_circles')),
       'Shaded Geohash Grid': Private(require('ui/vislib/visualizations/marker_types/geohash_grid')),
@@ -46,7 +46,7 @@ define(function (require) {
       this._geoJson = _.get(this._chartData, 'geoJson');
       this._attr = params.attr || {};
 
-      var mapOptions = {
+      let mapOptions = {
         minZoom: 1,
         maxZoom: 18,
         noWrap: true,
@@ -61,8 +61,8 @@ define(function (require) {
     TileMapMap.prototype.addBoundingControl = function () {
       if (this._boundingControl) return;
 
-      var self = this;
-      var drawOptions = { draw: {} };
+      let self = this;
+      let drawOptions = { draw: {} };
 
       _.each(['polyline', 'polygon', 'circle', 'marker', 'rectangle'], function (drawShape) {
         if (self._events && !self._events.listenerCount(drawShape)) {
@@ -84,11 +84,11 @@ define(function (require) {
     TileMapMap.prototype.addFitControl = function () {
       if (this._fitControl) return;
 
-      var self = this;
-      var fitContainer = L.DomUtil.create('div', 'leaflet-control leaflet-bar leaflet-control-fit');
+      let self = this;
+      let fitContainer = L.DomUtil.create('div', 'leaflet-control leaflet-bar leaflet-control-fit');
 
       // Add button to fit container to points
-      var FitControl = L.Control.extend({
+      let FitControl = L.Control.extend({
         options: {
           position: 'topleft'
         },
@@ -120,7 +120,7 @@ define(function (require) {
     TileMapMap.prototype.addTitle = function (mapLabel) {
       if (this._label) return;
 
-      var label = this._label = L.control();
+      let label = this._label = L.control();
 
       label.onAdd = function () {
         this._div = L.DomUtil.create('div', 'tilemap-info tilemap-label');
@@ -191,13 +191,13 @@ define(function (require) {
      * @return {Object} marker layer
      */
     TileMapMap.prototype._createMarkers = function (options) {
-      var MarkerType = markerTypes[this._markerType];
+      let MarkerType = markerTypes[this._markerType];
       return new MarkerType(this.map, this._geoJson, options);
     };
 
     TileMapMap.prototype._attachEvents = function () {
-      var self = this;
-      var saturateTiles = self.saturateTiles.bind(self);
+      let self = this;
+      let saturateTiles = self.saturateTiles.bind(self);
 
       this._tileLayer.on('tileload', saturateTiles);
 
@@ -223,11 +223,11 @@ define(function (require) {
       });
 
       this.map.on('draw:created', function (e) {
-        var drawType = e.layerType;
+        let drawType = e.layerType;
         if (!self._events || !self._events.listenerCount(drawType)) return;
 
         // TODO: Different drawTypes need differ info. Need a switch on the object creation
-        var bounds = e.layer.getBounds();
+        let bounds = e.layer.getBounds();
 
         self._events.emit(drawType, {
           e: e,
diff --git a/src/ui/public/vislib/visualizations/_point_series_chart.js b/src/ui/public/vislib/visualizations/_point_series_chart.js
index 3b193da7ad2fb..4f9a3e1a74250 100644
--- a/src/ui/public/vislib/visualizations/_point_series_chart.js
+++ b/src/ui/public/vislib/visualizations/_point_series_chart.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function PointSeriesChartProvider(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
+    let d3 = require('d3');
+    let _ = require('lodash');
 
-    var Chart = Private(require('ui/vislib/visualizations/_chart'));
-    var Tooltip = Private(require('ui/vislib/components/Tooltip'));
-    var touchdownTmpl = _.template(require('ui/vislib/partials/touchdown.tmpl.html'));
+    let Chart = Private(require('ui/vislib/visualizations/_chart'));
+    let Tooltip = Private(require('ui/vislib/components/Tooltip'));
+    let touchdownTmpl = _.template(require('ui/vislib/partials/touchdown.tmpl.html'));
 
     _.class(PointSeriesChart).inherits(Chart);
     function PointSeriesChart(handler, chartEl, chartData) {
@@ -17,12 +17,12 @@ define(function (require) {
     }
 
     PointSeriesChart.prototype._stackMixedValues = function (stackCount) {
-      var currentStackOffsets = [0, 0];
-      var currentStackIndex = 0;
+      let currentStackOffsets = [0, 0];
+      let currentStackIndex = 0;
 
       return function (d, y0, y) {
-        var firstStack = currentStackIndex % stackCount === 0;
-        var lastStack = ++currentStackIndex === stackCount;
+        let firstStack = currentStackIndex % stackCount === 0;
+        let lastStack = ++currentStackIndex === stackCount;
 
         if (firstStack) {
           currentStackOffsets = [0, 0];
@@ -48,14 +48,14 @@ define(function (require) {
      * @returns {Array} Stacked data objects with x, y, and y0 values
      */
     PointSeriesChart.prototype.stackData = function (data) {
-      var self = this;
-      var isHistogram = (this._attr.type === 'histogram' && this._attr.mode === 'stacked');
-      var stack = this._attr.stack;
+      let self = this;
+      let isHistogram = (this._attr.type === 'histogram' && this._attr.mode === 'stacked');
+      let stack = this._attr.stack;
 
       if (isHistogram) stack.out(self._stackMixedValues(data.series.length));
 
       return stack(data.series.map(function (d) {
-        var label = d.label;
+        let label = d.label;
         return d.values.map(function (e, i) {
           return {
             _input: e,
@@ -84,37 +84,37 @@ define(function (require) {
      * @returns {D3.Selection}
      */
     PointSeriesChart.prototype.createEndZones = function (svg) {
-      var self = this;
-      var xAxis = this.handler.xAxis;
-      var xScale = xAxis.xScale;
-      var ordered = xAxis.ordered;
-      var missingMinMax = !ordered || _.isUndefined(ordered.min) || _.isUndefined(ordered.max);
+      let self = this;
+      let xAxis = this.handler.xAxis;
+      let xScale = xAxis.xScale;
+      let ordered = xAxis.ordered;
+      let missingMinMax = !ordered || _.isUndefined(ordered.min) || _.isUndefined(ordered.max);
 
       if (missingMinMax || ordered.endzones === false) return;
 
-      var attr = this.handler._attr;
-      var height = attr.height;
-      var width = attr.width;
-      var margin = attr.margin;
-      var color = '#004c99';
+      let attr = this.handler._attr;
+      let height = attr.height;
+      let width = attr.width;
+      let margin = attr.margin;
+      let color = '#004c99';
 
       // we don't want to draw endzones over our min and max values, they
       // are still a part of the dataset. We want to start the endzones just
       // outside of them so we will use these values rather than ordered.min/max
-      var oneUnit = (ordered.units || _.identity)(1);
-      var beyondMin = ordered.min - oneUnit;
-      var beyondMax = ordered.max + oneUnit;
+      let oneUnit = (ordered.units || _.identity)(1);
+      let beyondMin = ordered.min - oneUnit;
+      let beyondMax = ordered.max + oneUnit;
 
       // points on this axis represent the amount of time they cover,
       // so draw the endzones at the actual time bounds
-      var leftEndzone = {
+      let leftEndzone = {
         x: 0,
         w: Math.max(xScale(ordered.min), 0)
       };
 
-      var rightLastVal = xAxis.expandLastBucket ? ordered.max : Math.min(ordered.max, _.last(xAxis.xValues));
-      var rightStart = rightLastVal + oneUnit;
-      var rightEndzone = {
+      let rightLastVal = xAxis.expandLastBucket ? ordered.max : Math.min(ordered.max, _.last(xAxis.xValues));
+      let rightStart = rightLastVal + oneUnit;
+      let rightEndzone = {
         x: xScale(rightStart),
         w: Math.max(width - xScale(rightStart), 0)
       };
@@ -136,17 +136,17 @@ define(function (require) {
       });
 
       function callPlay(event) {
-        var boundData = event.target.__data__;
-        var mouseChartXCoord = event.clientX - self.chartEl.getBoundingClientRect().left;
-        var wholeBucket = boundData && boundData.x != null;
+        let boundData = event.target.__data__;
+        let mouseChartXCoord = event.clientX - self.chartEl.getBoundingClientRect().left;
+        let wholeBucket = boundData && boundData.x != null;
 
         // the min and max that the endzones start in
-        var min = leftEndzone.w;
-        var max = rightEndzone.x;
+        let min = leftEndzone.w;
+        let max = rightEndzone.x;
 
         // bounds of the cursor to consider
-        var xLeft = mouseChartXCoord;
-        var xRight = mouseChartXCoord;
+        let xLeft = mouseChartXCoord;
+        let xRight = mouseChartXCoord;
         if (wholeBucket) {
           xLeft = xScale(boundData.x);
           xRight = xScale(xAxis.addInterval(boundData.x));
@@ -163,7 +163,7 @@ define(function (require) {
         return touchdownTmpl(callPlay(d3.event));
       }
 
-      var endzoneTT = new Tooltip('endzones', this.handler.el, textFormatter, null);
+      let endzoneTT = new Tooltip('endzones', this.handler.el, textFormatter, null);
       this.tooltips.push(endzoneTT);
       endzoneTT.order = 0;
       endzoneTT.showCondition = function inEndzone() {
diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
index 447d24a6885d4..86a6faf448f67 100644
--- a/src/ui/public/vislib/visualizations/area_chart.js
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function AreaChartFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
 
-    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
-    var errors = require('ui/errors');
+    let PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    let TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    let errors = require('ui/errors');
 
     /**
      * Area chart visualization
@@ -32,7 +32,26 @@ define(function (require) {
       if (this.isOverlapping) {
 
         // Default opacity should return to 0.6 on mouseout
-        handler._attr.defaultOpacity = 0.6;
+        let defaultOpacity = 0.6;
+        handler._attr.defaultOpacity = defaultOpacity;
+        handler.highlight = function (element) {
+          let label = this.getAttribute('data-label');
+          if (!label) return;
+
+          let highlightOpacity = 0.8;
+          let highlightElements = $('[data-label]', element.parentNode).filter(
+            function (els, el) {
+              return `${$(el).data('label')}` === label;
+            });
+          $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity
+          highlightElements.css('opacity', highlightOpacity);
+        };
+        handler.unHighlight = function (element) {
+          $('[data-label]', element).css('opacity', defaultOpacity);
+
+          //The legend should keep max opacity
+          $('[data-label]', $(element).siblings()).css('opacity', 1);
+        };
       }
 
       this.checkIfEnoughData();
@@ -52,15 +71,15 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with path added
      */
     AreaChart.prototype.addPath = function (svg, layers) {
-      var self = this;
-      var ordered = this.handler.data.get('ordered');
-      var isTimeSeries = (ordered && ordered.date);
-      var isOverlapping = this.isOverlapping;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
-      var area = d3.svg.area()
+      let self = this;
+      let ordered = this.handler.data.get('ordered');
+      let isTimeSeries = (ordered && ordered.date);
+      let isOverlapping = this.isOverlapping;
+      let color = this.handler.data.getColorFunc();
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
+      let area = d3.svg.area()
       .x(function (d) {
         if (isTimeSeries) {
           return xScale(d.x);
@@ -85,7 +104,7 @@ define(function (require) {
       .interpolate(interpolate);
 
       // Data layers
-      var layer = svg.selectAll('.layer')
+      let layer = svg.selectAll('.layer')
       .data(layers)
       .enter()
       .append('g')
@@ -94,7 +113,7 @@ define(function (require) {
       });
 
       // Append path
-      var path = layer.append('path')
+      let path = layer.append('path')
       .call(this._addIdentifier)
       .style('fill', function (d) {
         return color(d[0].label);
@@ -119,13 +138,13 @@ define(function (require) {
      * @returns {D3.Selection} circles with event listeners attached
      */
     AreaChart.prototype.addCircleEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
+      let events = this.events;
+      let isBrushable = events.isBrushable();
+      let brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      let hover = events.addHoverEvent();
+      let mouseout = events.addMouseoutEvent();
+      let click = events.addClickEvent();
+      let attachedEvents = element.call(hover).call(mouseout).call(click);
 
       if (isBrushable) {
         attachedEvents.call(brush);
@@ -143,18 +162,18 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with circles added
      */
     AreaChart.prototype.addCircles = function (svg, data) {
-      var self = this;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var ordered = this.handler.data.get('ordered');
-      var circleRadius = 12;
-      var circleStrokeWidth = 0;
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-      var isOverlapping = this.isOverlapping;
-      var layer;
-      var circles;
+      let self = this;
+      let color = this.handler.data.getColorFunc();
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let ordered = this.handler.data.get('ordered');
+      let circleRadius = 12;
+      let circleStrokeWidth = 0;
+      let tooltip = this.tooltip;
+      let isTooltip = this._attr.addTooltip;
+      let isOverlapping = this.isOverlapping;
+      let layer;
+      let circles;
 
       layer = svg.selectAll('.points')
       .data(data)
@@ -220,9 +239,9 @@ define(function (require) {
      */
     AreaChart.prototype.addClipPath = function (svg, width, height) {
       // Prevents circles from being clipped at the top of the chart
-      var startX = 0;
-      var startY = 0;
-      var id = 'chart-area' + _.uniqueId();
+      let startX = 0;
+      let startY = 0;
+      let id = 'chart-area' + _.uniqueId();
 
       // Creating clipPath
       return svg
@@ -237,11 +256,11 @@ define(function (require) {
     };
 
     AreaChart.prototype.checkIfEnoughData = function () {
-      var series = this.chartData.series;
-      var message = 'Area charts require more than one data point. Try adding ' +
+      let series = this.chartData.series;
+      let message = 'Area charts require more than one data point. Try adding ' +
         'an X-Axis Aggregation';
 
-      var notEnoughData = series.some(function (obj) {
+      let notEnoughData = series.some(function (obj) {
         return obj.values.length < 2;
       });
 
@@ -251,8 +270,8 @@ define(function (require) {
     };
 
     AreaChart.prototype.validateWiggleSelection = function () {
-      var isWiggle = this._attr.mode === 'wiggle';
-      var ordered = this.handler.data.get('ordered');
+      let isWiggle = this._attr.mode === 'wiggle';
+      let ordered = this.handler.data.get('ordered');
 
       if (isWiggle && !ordered) throw new errors.InvalidWiggleSelection();
     };
@@ -265,26 +284,26 @@ define(function (require) {
      */
     AreaChart.prototype.draw = function () {
       // Attributes
-      var self = this;
-      var xScale = this.handler.xAxis.xScale;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var layers;
-      var circles;
-      var path;
+      let self = this;
+      let xScale = this.handler.xAxis.xScale;
+      let $elem = $(this.chartEl);
+      let margin = this._attr.margin;
+      let elWidth = this._attr.width = $elem.width();
+      let elHeight = this._attr.height = $elem.height();
+      let yMin = this.handler.yAxis.yMin;
+      let yScale = this.handler.yAxis.yScale;
+      let minWidth = 20;
+      let minHeight = 20;
+      let addTimeMarker = this._attr.addTimeMarker;
+      let times = this._attr.times || [];
+      let timeMarker;
+      let div;
+      let svg;
+      let width;
+      let height;
+      let layers;
+      let circles;
+      let path;
 
       return function (selection) {
         selection.each(function (data) {
@@ -341,7 +360,7 @@ define(function (require) {
           self.addCircleEvents(circles, svg);
 
           // chart base line
-          var line = svg.append('line')
+          let line = svg.append('line')
           .attr('class', 'base-line')
           .attr('x1', 0)
           .attr('y1', yScale(0))
diff --git a/src/ui/public/vislib/visualizations/column_chart.js b/src/ui/public/vislib/visualizations/column_chart.js
index b981a4dc86eac..eb0847fb03d4a 100644
--- a/src/ui/public/vislib/visualizations/column_chart.js
+++ b/src/ui/public/vislib/visualizations/column_chart.js
@@ -1,15 +1,15 @@
 define(function (require) {
   return function ColumnChartFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var moment = require('moment');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let moment = require('moment');
 
-    var DataClass = Private(require('ui/vislib/lib/data'));
+    let DataClass = Private(require('ui/vislib/lib/data'));
 
-    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
-    var errors = require('ui/errors');
+    let PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    let TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    let errors = require('ui/errors');
 
     /**
      * Vertical Bar Chart Visualization: renders vertical and/or stacked bars
@@ -45,12 +45,12 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with rect added
      */
     ColumnChart.prototype.addBars = function (svg, layers) {
-      var self = this;
-      var color = this.handler.data.getColorFunc();
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-      var layer;
-      var bars;
+      let self = this;
+      let color = this.handler.data.getColorFunc();
+      let tooltip = this.tooltip;
+      let isTooltip = this._attr.addTooltip;
+      let layer;
+      let bars;
 
       layer = svg.selectAll('.layer')
       .data(layers)
@@ -95,7 +95,7 @@ define(function (require) {
      * @returns {D3.UpdateSelection}
      */
     ColumnChart.prototype.updateBars = function (bars) {
-      var offset = this._attr.mode;
+      let offset = this._attr.mode;
 
       if (offset === 'grouped') {
         return this.addGroupedBars(bars);
@@ -111,17 +111,17 @@ define(function (require) {
      * @returns {D3.UpdateSelection}
      */
     ColumnChart.prototype.addStackedBars = function (bars) {
-      var data = this.chartData;
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var height = yScale.range()[0];
-      var yMin = this.handler.yAxis.yScale.domain()[0];
-      var self = this;
-
-      var barWidth;
+      let data = this.chartData;
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let height = yScale.range()[0];
+      let yMin = this.handler.yAxis.yScale.domain()[0];
+      let self = this;
+
+      let barWidth;
       if (data.ordered && data.ordered.date) {
-        var start = data.ordered.min;
-        var end = moment(data.ordered.min).add(data.ordered.interval).valueOf();
+        let start = data.ordered.min;
+        let end = moment(data.ordered.min).add(data.ordered.interval).valueOf();
 
         barWidth = xScale(end) - xScale(start);
         barWidth = barWidth - Math.min(barWidth * 0.25, 15);
@@ -174,24 +174,24 @@ define(function (require) {
      * @returns {D3.UpdateSelection}
      */
     ColumnChart.prototype.addGroupedBars = function (bars) {
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var yMin = this.handler.yAxis.yMin;
-      var data = this.chartData;
-      var n = data.series.length;
-      var height = yScale.range()[0];
-      var groupSpacingPercentage = 0.15;
-      var isTimeScale = (data.ordered && data.ordered.date);
-      var minWidth = 1;
-      var barWidth;
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let yMin = this.handler.yAxis.yMin;
+      let data = this.chartData;
+      let n = data.series.length;
+      let height = yScale.range()[0];
+      let groupSpacingPercentage = 0.15;
+      let isTimeScale = (data.ordered && data.ordered.date);
+      let minWidth = 1;
+      let barWidth;
 
       // update
       bars
       .attr('x', function (d, i, j) {
         if (isTimeScale) {
-          var groupWidth = xScale(data.ordered.min + data.ordered.interval) -
+          let groupWidth = xScale(data.ordered.min + data.ordered.interval) -
             xScale(data.ordered.min);
-          var groupSpacing = groupWidth * groupSpacingPercentage;
+          let groupSpacing = groupWidth * groupSpacingPercentage;
 
           barWidth = (groupWidth - groupSpacing) / n;
 
@@ -234,13 +234,13 @@ define(function (require) {
      * @returns {D3.Selection} rect with event listeners attached
      */
     ColumnChart.prototype.addBarEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
+      let events = this.events;
+      let isBrushable = events.isBrushable();
+      let brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      let hover = events.addHoverEvent();
+      let mouseout = events.addMouseoutEvent();
+      let click = events.addClickEvent();
+      let attachedEvents = element.call(hover).call(mouseout).call(click);
 
       if (isBrushable) {
         attachedEvents.call(brush);
@@ -256,25 +256,25 @@ define(function (require) {
      * @returns {Function} Creates the vertical bar chart
      */
     ColumnChart.prototype.draw = function () {
-      var self = this;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var xScale = this.handler.xAxis.xScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var layers;
-      var bars;
+      let self = this;
+      let $elem = $(this.chartEl);
+      let margin = this._attr.margin;
+      let elWidth = this._attr.width = $elem.width();
+      let elHeight = this._attr.height = $elem.height();
+      let yMin = this.handler.yAxis.yMin;
+      let yScale = this.handler.yAxis.yScale;
+      let xScale = this.handler.xAxis.xScale;
+      let minWidth = 20;
+      let minHeight = 20;
+      let addTimeMarker = this._attr.addTimeMarker;
+      let times = this._attr.times || [];
+      let timeMarker;
+      let div;
+      let svg;
+      let width;
+      let height;
+      let layers;
+      let bars;
 
       return function (selection) {
         selection.each(function (data) {
@@ -305,7 +305,7 @@ define(function (require) {
           // Adds event listeners
           self.addBarEvents(bars, svg);
 
-          var line = svg.append('line')
+          let line = svg.append('line')
           .attr('class', 'base-line')
           .attr('x1', 0)
           .attr('y1', yScale(0))
diff --git a/src/ui/public/vislib/visualizations/line_chart.js b/src/ui/public/vislib/visualizations/line_chart.js
index 067fb049b924f..b421b9267ca87 100644
--- a/src/ui/public/vislib/visualizations/line_chart.js
+++ b/src/ui/public/vislib/visualizations/line_chart.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function LineChartFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var errors = require('ui/errors');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let errors = require('ui/errors');
 
-    var PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
-    var TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
+    let PointSeriesChart = Private(require('ui/vislib/visualizations/_point_series_chart'));
+    let TimeMarker = Private(require('ui/vislib/visualizations/time_marker'));
 
     /**
      * Line Chart Visualization
@@ -42,13 +42,13 @@ define(function (require) {
      * @returns {D3.Selection} SVG circles with event listeners attached
      */
     LineChart.prototype.addCircleEvents = function (element, svg) {
-      var events = this.events;
-      var isBrushable = events.isBrushable();
-      var brush = isBrushable ? events.addBrushEvent(svg) : undefined;
-      var hover = events.addHoverEvent();
-      var mouseout = events.addMouseoutEvent();
-      var click = events.addClickEvent();
-      var attachedEvents = element.call(hover).call(mouseout).call(click);
+      let events = this.events;
+      let isBrushable = events.isBrushable();
+      let brush = isBrushable ? events.addBrushEvent(svg) : undefined;
+      let hover = events.addHoverEvent();
+      let mouseout = events.addMouseoutEvent();
+      let click = events.addClickEvent();
+      let attachedEvents = element.call(hover).call(mouseout).call(click);
 
       if (isBrushable) {
         attachedEvents.call(brush);
@@ -66,16 +66,16 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with circles added
      */
     LineChart.prototype.addCircles = function (svg, data) {
-      var self = this;
-      var showCircles = this._attr.showCircles;
-      var color = this.handler.data.getColorFunc();
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var ordered = this.handler.data.get('ordered');
-      var tooltip = this.tooltip;
-      var isTooltip = this._attr.addTooltip;
-
-      var radii = _(data)
+      let self = this;
+      let showCircles = this._attr.showCircles;
+      let color = this.handler.data.getColorFunc();
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let ordered = this.handler.data.get('ordered');
+      let tooltip = this.tooltip;
+      let isTooltip = this._attr.addTooltip;
+
+      let radii = _(data)
       .map(function (series) {
         return _.pluck(series, '_input.z');
       })
@@ -89,15 +89,15 @@ define(function (require) {
         max: -Infinity
       });
 
-      var radiusStep = ((radii.max - radii.min) || (radii.max * 100)) / Math.pow(this._attr.radiusRatio, 2);
+      let radiusStep = ((radii.max - radii.min) || (radii.max * 100)) / Math.pow(this._attr.radiusRatio, 2);
 
-      var layer = svg.selectAll('.points')
+      let layer = svg.selectAll('.points')
       .data(data)
       .enter()
         .append('g')
         .attr('class', 'points line');
 
-      var circles = layer
+      let circles = layer
       .selectAll('circle')
       .data(function appendData(data) {
         return data.filter(function (d) {
@@ -125,9 +125,9 @@ define(function (require) {
       }
 
       function colorCircle(d) {
-        var parent = d3.select(this).node().parentNode;
-        var lengthOfParent = d3.select(parent).data()[0].length;
-        var isVisible = (lengthOfParent === 1);
+        let parent = d3.select(this).node().parentNode;
+        let lengthOfParent = d3.select(parent).data()[0].length;
+        let isVisible = (lengthOfParent === 1);
 
         // If only 1 point exists, show circle
         if (!showCircles && !isVisible) return 'none';
@@ -135,10 +135,10 @@ define(function (require) {
       }
       function getCircleRadiusFn(modifier) {
         return function getCircleRadius(d) {
-          var margin = self._attr.margin;
-          var width = self._attr.width - margin.left - margin.right;
-          var height = self._attr.height - margin.top - margin.bottom;
-          var circleRadius = (d._input.z - radii.min) / radiusStep;
+          let margin = self._attr.margin;
+          let width = self._attr.width - margin.left - margin.right;
+          let height = self._attr.height - margin.top - margin.bottom;
+          let circleRadius = (d._input.z - radii.min) / radiusStep;
 
           return _.min([Math.sqrt((circleRadius || 2) + 2), width, height]) + (modifier || 0);
         };
@@ -184,14 +184,14 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with paths added
      */
     LineChart.prototype.addLines = function (svg, data) {
-      var self = this;
-      var xScale = this.handler.xAxis.xScale;
-      var yScale = this.handler.yAxis.yScale;
-      var xAxisFormatter = this.handler.data.get('xAxisFormatter');
-      var color = this.handler.data.getColorFunc();
-      var ordered = this.handler.data.get('ordered');
-      var interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
-      var line = d3.svg.line()
+      let self = this;
+      let xScale = this.handler.xAxis.xScale;
+      let yScale = this.handler.yAxis.yScale;
+      let xAxisFormatter = this.handler.data.get('xAxisFormatter');
+      let color = this.handler.data.getColorFunc();
+      let ordered = this.handler.data.get('ordered');
+      let interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
+      let line = d3.svg.line()
       .defined(function (d) { return !_.isNull(d.y); })
       .interpolate(interpolate)
       .x(function x(d) {
@@ -203,7 +203,7 @@ define(function (require) {
       .y(function y(d) {
         return yScale(d.y);
       });
-      var lines;
+      let lines;
 
       lines = svg
       .selectAll('.lines')
@@ -236,10 +236,10 @@ define(function (require) {
      * @returns {D3.UpdateSelection} SVG with clipPath added
      */
     LineChart.prototype.addClipPath = function (svg, width, height) {
-      var clipPathBuffer = 5;
-      var startX = 0;
-      var startY = 0 - clipPathBuffer;
-      var id = 'chart-area' + _.uniqueId();
+      let clipPathBuffer = 5;
+      let startX = 0;
+      let startY = 0 - clipPathBuffer;
+      let id = 'chart-area' + _.uniqueId();
 
       return svg
       .attr('clip-path', 'url(#' + id + ')')
@@ -261,35 +261,35 @@ define(function (require) {
      * @returns {Function} Creates the line chart
      */
     LineChart.prototype.draw = function () {
-      var self = this;
-      var $elem = $(this.chartEl);
-      var margin = this._attr.margin;
-      var elWidth = this._attr.width = $elem.width();
-      var elHeight = this._attr.height = $elem.height();
-      var scaleType = this.handler.yAxis.getScaleType();
-      var yMin = this.handler.yAxis.yMin;
-      var yScale = this.handler.yAxis.yScale;
-      var xScale = this.handler.xAxis.xScale;
-      var minWidth = 20;
-      var minHeight = 20;
-      var startLineX = 0;
-      var lineStrokeWidth = 1;
-      var addTimeMarker = this._attr.addTimeMarker;
-      var times = this._attr.times || [];
-      var timeMarker;
-      var div;
-      var svg;
-      var width;
-      var height;
-      var lines;
-      var circles;
+      let self = this;
+      let $elem = $(this.chartEl);
+      let margin = this._attr.margin;
+      let elWidth = this._attr.width = $elem.width();
+      let elHeight = this._attr.height = $elem.height();
+      let scaleType = this.handler.yAxis.getScaleType();
+      let yMin = this.handler.yAxis.yMin;
+      let yScale = this.handler.yAxis.yScale;
+      let xScale = this.handler.xAxis.xScale;
+      let minWidth = 20;
+      let minHeight = 20;
+      let startLineX = 0;
+      let lineStrokeWidth = 1;
+      let addTimeMarker = this._attr.addTimeMarker;
+      let times = this._attr.times || [];
+      let timeMarker;
+      let div;
+      let svg;
+      let width;
+      let height;
+      let lines;
+      let circles;
 
       return function (selection) {
         selection.each(function (data) {
-          var el = this;
+          let el = this;
 
-          var layers = data.series.map(function mapSeries(d) {
-            var label = d.label;
+          let layers = data.series.map(function mapSeries(d) {
+            let label = d.label;
             return d.values.map(function mapValues(e, i) {
               return {
                 _input: e,
@@ -331,7 +331,7 @@ define(function (require) {
           self.addCircleEvents(circles, svg);
           self.createEndZones(svg);
 
-          var scale = (scaleType === 'log') ? yScale(1) : yScale(0);
+          let scale = (scaleType === 'log') ? yScale(1) : yScale(0);
           if (scale) {
             svg.append('line')
             .attr('class', 'base-line')
diff --git a/src/ui/public/vislib/visualizations/marker_types/base_marker.js b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
index 1e5cba5c7c5fc..22d42f6899c9a 100644
--- a/src/ui/public/vislib/visualizations/marker_types/base_marker.js
+++ b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function MarkerFactory() {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
-    var L = require('leaflet');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
+    let L = require('leaflet');
 
     /**
      * Base map marker overlay, all other markers inherit from this class
@@ -36,7 +36,7 @@ define(function (require) {
       // ensure we only ever create 1 legend
       if (this._legend) return;
 
-      var self = this;
+      let self = this;
 
       // create the legend control, keep a reference
       self._legend = L.control({position: 'bottomright'});
@@ -44,17 +44,17 @@ define(function (require) {
       self._legend.onAdd = function () {
         // creates all the neccessary DOM elements for the control, adds listeners
         // on relevant map events, and returns the element containing the control
-        var $div = $('<div>').addClass('tilemap-legend');
+        let $div = $('<div>').addClass('tilemap-legend');
 
         _.each(self._legendColors, function (color, i) {
-          var labelText = self._legendQuantizer
+          let labelText = self._legendQuantizer
           .invertExtent(color)
           .map(self._valueFormatter)
           .join(' – ');
 
-          var label = $('<div>').text(labelText);
+          let label = $('<div>').text(labelText);
 
-          var icon = $('<i>').css({
+          let icon = $('<i>').css({
             background: color,
             'border-color': self.darkerColor(color)
           });
@@ -77,7 +77,7 @@ define(function (require) {
      * @return {Object}
      */
     BaseMarker.prototype.applyShadingStyle = function (value) {
-      var color = this._legendQuantizer(value);
+      let color = this._legendQuantizer(value);
 
       return {
         fillColor: color,
@@ -97,11 +97,11 @@ define(function (require) {
      * return {undefined}
      */
     BaseMarker.prototype.bindPopup = function (feature, layer) {
-      var self = this;
+      let self = this;
 
-      var popup = layer.on({
+      let popup = layer.on({
         mouseover: function (e) {
-          var layer = e.target;
+          let layer = e.target;
           // bring layer to front if not older browser
           if (!L.Browser.ie && !L.Browser.opera) {
             layer.bringToFront();
@@ -131,7 +131,7 @@ define(function (require) {
     };
 
     BaseMarker.prototype.destroy = function () {
-      var self = this;
+      let self = this;
 
       // remove popups
       self.popups = self.popups.filter(function (popup) {
@@ -161,13 +161,13 @@ define(function (require) {
      * @param options {Object} Options to pass to L.geoJson
      */
     BaseMarker.prototype._createMarkerGroup = function (options) {
-      var self = this;
-      var defaultOptions = {
+      let self = this;
+      let defaultOptions = {
         onEachFeature: function (feature, layer) {
           self.bindPopup(feature, layer);
         },
         style: function (feature) {
-          var value = _.get(feature, 'properties.value');
+          let value = _.get(feature, 'properties.value');
           return self.applyShadingStyle(value);
         },
         filter: self._filterToMapBounds()
@@ -185,10 +185,10 @@ define(function (require) {
      * @return {boolean}
      */
     BaseMarker.prototype._filterToMapBounds = function () {
-      var self = this;
+      let self = this;
       return function (feature) {
-        var mapBounds = self.map.getBounds();
-        var bucketRectBounds = _.get(feature, 'properties.rectangle');
+        let mapBounds = self.map.getBounds();
+        let bucketRectBounds = _.get(feature, 'properties.rectangle');
         return mapBounds.intersects(bucketRectBounds);
       };
     };
@@ -204,11 +204,11 @@ define(function (require) {
      */
     BaseMarker.prototype._showTooltip = function (feature, latLng) {
       if (!this.map) return;
-      var lat = _.get(feature, 'geometry.coordinates.1');
-      var lng = _.get(feature, 'geometry.coordinates.0');
+      let lat = _.get(feature, 'geometry.coordinates.1');
+      let lng = _.get(feature, 'geometry.coordinates.0');
       latLng = latLng || L.latLng(lat, lng);
 
-      var content = this._tooltipFormatter(feature);
+      let content = this._tooltipFormatter(feature);
 
       if (!content) return;
       this._createTooltip(content, latLng);
@@ -240,15 +240,15 @@ define(function (require) {
      * return {undefined}
      */
     BaseMarker.prototype.quantizeLegendColors = function () {
-      var min = _.get(this.geoJson, 'properties.allmin', 0);
-      var max = _.get(this.geoJson, 'properties.allmax', 1);
-      var quantizeDomain = (min !== max) ? [min, max] : d3.scale.quantize().domain();
-
-      var reds1 = ['#ff6128'];
-      var reds3 = ['#fecc5c', '#fd8d3c', '#e31a1c'];
-      var reds5 = ['#fed976', '#feb24c', '#fd8d3c', '#f03b20', '#bd0026'];
-      var bottomCutoff = 2;
-      var middleCutoff = 24;
+      let min = _.get(this.geoJson, 'properties.allmin', 0);
+      let max = _.get(this.geoJson, 'properties.allmax', 1);
+      let quantizeDomain = (min !== max) ? [min, max] : d3.scale.quantize().domain();
+
+      let reds1 = ['#ff6128'];
+      let reds3 = ['#fecc5c', '#fd8d3c', '#e31a1c'];
+      let reds5 = ['#fed976', '#feb24c', '#fd8d3c', '#f03b20', '#bd0026'];
+      let bottomCutoff = 2;
+      let middleCutoff = 24;
 
       if (max - min <= bottomCutoff) {
         this._legendColors = reds1;
diff --git a/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
index f93b4573af53c..61ab6087de216 100644
--- a/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
+++ b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function GeohashGridMarkerFactory(Private) {
-    var _ = require('lodash');
-    var L = require('leaflet');
+    let _ = require('lodash');
+    let L = require('leaflet');
 
-    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
+    let BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: rectangles that show the geohash grid bounds
@@ -14,19 +14,19 @@ define(function (require) {
      */
     _.class(GeohashGridMarker).inherits(BaseMarker);
     function GeohashGridMarker(map, geoJson, params) {
-      var self = this;
+      let self = this;
       GeohashGridMarker.Super.apply(this, arguments);
 
       // super min and max from all chart data
-      var min = this.geoJson.properties.allmin;
-      var max = this.geoJson.properties.allmax;
+      let min = this.geoJson.properties.allmin;
+      let max = this.geoJson.properties.allmax;
 
       this._createMarkerGroup({
         pointToLayer: function (feature, latlng) {
-          var geohashRect = feature.properties.rectangle;
+          let geohashRect = feature.properties.rectangle;
           // get bounds from northEast[3] and southWest[1]
           // corners in geohash rectangle
-          var corners = [
+          let corners = [
             [geohashRect[3][0], geohashRect[3][1]],
             [geohashRect[1][0], geohashRect[1][1]]
           ];
diff --git a/src/ui/public/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
index 2ce548f57c6cb..c9681b56637f8 100644
--- a/src/ui/public/vislib/visualizations/marker_types/heatmap.js
+++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
@@ -1,10 +1,10 @@
 define(function (require) {
   return function HeatmapMarkerFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var L = require('leaflet');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let L = require('leaflet');
 
-    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
+    let BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: canvas layer with leaflet.heat plugin
@@ -15,7 +15,7 @@ define(function (require) {
      */
     _.class(HeatmapMarker).inherits(BaseMarker);
     function HeatmapMarker(map, geoJson, params) {
-      var self = this;
+      let self = this;
       this._disableTooltips = false;
       HeatmapMarker.Super.apply(this, arguments);
 
@@ -36,8 +36,8 @@ define(function (require) {
     HeatmapMarker.prototype.addLegend = _.noop;
 
     HeatmapMarker.prototype._createMarkerGroup = function (options) {
-      var max = _.get(this.geoJson, 'properties.allmax');
-      var points = this._dataToHeatArray(max);
+      let max = _.get(this.geoJson, 'properties.allmax');
+      let points = this._dataToHeatArray(max);
 
       this._markerGroup = L.heatLayer(points, options);
       this._fixTooltips();
@@ -45,8 +45,8 @@ define(function (require) {
     };
 
     HeatmapMarker.prototype._fixTooltips = function () {
-      var self = this;
-      var debouncedMouseMoveLocation = _.debounce(mouseMoveLocation.bind(this), 15, {
+      let self = this;
+      let debouncedMouseMoveLocation = _.debounce(mouseMoveLocation.bind(this), 15, {
         'leading': true,
         'trailing': false
       });
@@ -66,7 +66,7 @@ define(function (require) {
       }
 
       function mouseMoveLocation(e) {
-        var latlng = e.latlng;
+        let latlng = e.latlng;
 
         this.map.closePopup();
 
@@ -78,7 +78,7 @@ define(function (require) {
         }
 
         // find nearest feature to event latlng
-        var feature = this._nearestFeature(latlng);
+        let feature = this._nearestFeature(latlng);
 
         // show tooltip if close enough to event latlng
         if (this._tooltipProximity(latlng, feature)) {
@@ -112,16 +112,16 @@ define(function (require) {
      * @return nearestPoint {Leaflet latLng}
      */
     HeatmapMarker.prototype._nearestFeature = function (latLng) {
-      var self = this;
-      var nearest;
+      let self = this;
+      let nearest;
 
       if (latLng.lng < -180 || latLng.lng > 180) {
         return;
       }
 
       _.reduce(this.geoJson.features, function (distance, feature) {
-        var featureLatLng = self._getLatLng(feature);
-        var dist = latLng.distanceTo(featureLatLng);
+        let featureLatLng = self._getLatLng(feature);
+        let dist = latLng.distanceTo(featureLatLng);
 
         if (dist < distance) {
           nearest = feature;
@@ -145,31 +145,31 @@ define(function (require) {
     HeatmapMarker.prototype._tooltipProximity = function (latlng, feature) {
       if (!feature) return;
 
-      var showTip = false;
-      var featureLatLng = this._getLatLng(feature);
+      let showTip = false;
+      let featureLatLng = this._getLatLng(feature);
 
       // zoomScale takes map zoom and returns proximity value for tooltip display
       // domain (input values) is map zoom (min 1 and max 18)
       // range (output values) is distance in meters
       // used to compare proximity of event latlng to feature latlng
-      var zoomScale = d3.scale.linear()
+      let zoomScale = d3.scale.linear()
       .domain([1, 4, 7, 10, 13, 16, 18])
       .range([1000000, 300000, 100000, 15000, 2000, 150, 50]);
 
-      var proximity = zoomScale(this.map.getZoom());
-      var distance = latlng.distanceTo(featureLatLng);
+      let proximity = zoomScale(this.map.getZoom());
+      let distance = latlng.distanceTo(featureLatLng);
 
       // maxLngDif is max difference in longitudes
       // to prevent feature tooltip from appearing 360°
       // away from event latlng
-      var maxLngDif = 40;
-      var lngDif = Math.abs(latlng.lng - featureLatLng.lng);
+      let maxLngDif = 40;
+      let lngDif = Math.abs(latlng.lng - featureLatLng.lng);
 
       if (distance < proximity && lngDif < maxLngDif) {
         showTip = true;
       }
 
-      var testScale = d3.scale.pow().exponent(0.2)
+      let testScale = d3.scale.pow().exponent(0.2)
       .domain([1, 18])
       .range([1500000, 50]);
       return showTip;
@@ -186,20 +186,20 @@ define(function (require) {
      * @return {Array}
      */
     HeatmapMarker.prototype._dataToHeatArray = function (max) {
-      var self = this;
-      var mapData = this.geoJson;
+      let self = this;
+      let mapData = this.geoJson;
 
       return this.geoJson.features.map(function (feature) {
-        var lat = feature.properties.center[0];
-        var lng = feature.properties.center[1];
-        var heatIntensity;
+        let lat = feature.properties.center[0];
+        let lng = feature.properties.center[1];
+        let heatIntensity;
 
         if (!self._attr.heatNormalizeData) {
           // show bucket value on heatmap
           heatIntensity = feature.properties.value;
         } else {
           // show bucket value normalized to max value
-          heatIntensity = parseInt(feature.properties.value / max * 100);
+          heatIntensity = feature.properties.value / max;
         }
 
         return [lat, lng, heatIntensity];
diff --git a/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
index 6de9e3804f5d4..7adac45eefc48 100644
--- a/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function ScaledCircleMarkerFactory(Private) {
-    var _ = require('lodash');
-    var L = require('leaflet');
+    let _ = require('lodash');
+    let L = require('leaflet');
 
-    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
+    let BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: circle markers that are scaled to illustrate values
@@ -14,16 +14,16 @@ define(function (require) {
      */
     _.class(ScaledCircleMarker).inherits(BaseMarker);
     function ScaledCircleMarker(map, geoJson, params) {
-      var self = this;
+      let self = this;
       ScaledCircleMarker.Super.apply(this, arguments);
 
       // multiplier to reduce size of all circles
-      var scaleFactor = 0.6;
+      let scaleFactor = 0.6;
 
       this._createMarkerGroup({
         pointToLayer: function (feature, latlng) {
-          var value = feature.properties.value;
-          var scaledRadius = self._radiusScale(value) * scaleFactor;
+          let value = feature.properties.value;
+          let scaledRadius = self._radiusScale(value) * scaleFactor;
           return L.circleMarker(latlng).setRadius(scaledRadius);
         }
       });
@@ -38,17 +38,17 @@ define(function (require) {
      * @return {Number}
      */
     ScaledCircleMarker.prototype._radiusScale = function (value) {
-      var precisionBiasBase = 5;
-      var precisionBiasNumerator = 200;
-      var zoom = this.map.getZoom();
-      var maxValue = this.geoJson.properties.allmax;
-      var precision = _.max(this.geoJson.features.map(function (feature) {
+      let precisionBiasBase = 5;
+      let precisionBiasNumerator = 200;
+      let zoom = this.map.getZoom();
+      let maxValue = this.geoJson.properties.allmax;
+      let precision = _.max(this.geoJson.features.map(function (feature) {
         return String(feature.properties.geohash).length;
       }));
 
-      var pct = Math.abs(value) / Math.abs(maxValue);
-      var zoomRadius = 0.5 * Math.pow(2, zoom);
-      var precisionScale = precisionBiasNumerator / Math.pow(precisionBiasBase, precision);
+      let pct = Math.abs(value) / Math.abs(maxValue);
+      let zoomRadius = 0.5 * Math.pow(2, zoom);
+      let precisionScale = precisionBiasNumerator / Math.pow(precisionBiasBase, precision);
 
       // square root value percentage
       return Math.pow(pct, 0.5) * zoomRadius * precisionScale;
diff --git a/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
index eea55803ed702..21155f430d70b 100644
--- a/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
@@ -1,9 +1,9 @@
 define(function (require) {
   return function ShadedCircleMarkerFactory(Private) {
-    var _ = require('lodash');
-    var L = require('leaflet');
+    let _ = require('lodash');
+    let L = require('leaflet');
 
-    var BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
+    let BaseMarker = Private(require('ui/vislib/visualizations/marker_types/base_marker'));
 
     /**
      * Map overlay: circle markers that are shaded to illustrate values
@@ -14,19 +14,19 @@ define(function (require) {
      */
     _.class(ShadedCircleMarker).inherits(BaseMarker);
     function ShadedCircleMarker(map, geoJson, params) {
-      var self = this;
+      let self = this;
       ShadedCircleMarker.Super.apply(this, arguments);
 
       // super min and max from all chart data
-      var min = this.geoJson.properties.allmin;
-      var max = this.geoJson.properties.allmax;
+      let min = this.geoJson.properties.allmin;
+      let max = this.geoJson.properties.allmax;
 
       // multiplier to reduce size of all circles
-      var scaleFactor = 0.8;
+      let scaleFactor = 0.8;
 
       this._createMarkerGroup({
         pointToLayer: function (feature, latlng) {
-          var radius = self._geohashMinDistance(feature) * scaleFactor;
+          let radius = self._geohashMinDistance(feature) * scaleFactor;
           return L.circle(latlng, radius);
         }
       });
@@ -41,8 +41,8 @@ define(function (require) {
      * @return {Number}
      */
     ShadedCircleMarker.prototype._geohashMinDistance = function (feature) {
-      var centerPoint = _.get(feature, 'properties.center');
-      var geohashRect = _.get(feature, 'properties.rectangle');
+      let centerPoint = _.get(feature, 'properties.center');
+      let geohashRect = _.get(feature, 'properties.rectangle');
 
       // centerPoint is an array of [lat, lng]
       // geohashRect is the 4 corners of the geoHash rectangle
@@ -50,16 +50,16 @@ define(function (require) {
       //   clockwise, each value being an array of [lat, lng]
 
       // center lat and southeast lng
-      var east   = L.latLng([centerPoint[0], geohashRect[2][1]]);
+      let east   = L.latLng([centerPoint[0], geohashRect[2][1]]);
       // southwest lat and center lng
-      var north  = L.latLng([geohashRect[3][0], centerPoint[1]]);
+      let north  = L.latLng([geohashRect[3][0], centerPoint[1]]);
 
       // get latLng of geohash center point
-      var center = L.latLng([centerPoint[0], centerPoint[1]]);
+      let center = L.latLng([centerPoint[0], centerPoint[1]]);
 
       // get smallest radius at center of geohash grid rectangle
-      var eastRadius  = Math.floor(center.distanceTo(east));
-      var northRadius = Math.floor(center.distanceTo(north));
+      let eastRadius  = Math.floor(center.distanceTo(east));
+      let northRadius = Math.floor(center.distanceTo(north));
       return _.min([eastRadius, northRadius]);
     };
 
diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js
index baad87fa733e0..dc991f313d74f 100644
--- a/src/ui/public/vislib/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/visualizations/pie_chart.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function PieChartFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
 
-    var Chart = Private(require('ui/vislib/visualizations/_chart'));
-    var errors = require('ui/errors');
+    let Chart = Private(require('ui/vislib/visualizations/_chart'));
+    let errors = require('ui/errors');
 
     /**
      * Pie Chart Visualization
@@ -24,7 +24,7 @@ define(function (require) {
       }
       PieChart.Super.apply(this, arguments);
 
-      var charts = this.handler.data.getVisData();
+      let charts = this.handler.data.getVisData();
       this._validatePieData(charts);
 
       this._attr = _.defaults(handler._attr || {}, {
@@ -37,7 +37,7 @@ define(function (require) {
      * If so, an error is thrown.
      */
     PieChart.prototype._validatePieData = function (charts) {
-      var isAllZeros = charts.every(function (chart) {
+      let isAllZeros = charts.every(function (chart) {
         return chart.slices.children.length === 0;
       });
 
@@ -52,7 +52,7 @@ define(function (require) {
      * @returns {D3.Selection} SVG path with event listeners attached
      */
     PieChart.prototype.addPathEvents = function (element) {
-      var events = this.events;
+      let events = this.events;
 
       return element
         .call(events.addHoverEvent())
@@ -64,11 +64,11 @@ define(function (require) {
       (function assignPercentages(slices) {
         if (slices.sumOfChildren != null) return;
 
-        var parent = slices;
-        var children = parent.children;
-        var parentPercent = parent.percentOfParent;
+        let parent = slices;
+        let children = parent.children;
+        let parentPercent = parent.percentOfParent;
 
-        var sum = parent.sumOfChildren = Math.abs(children.reduce(function (sum, child) {
+        let sum = parent.sumOfChildren = Math.abs(children.reduce(function (sum, child) {
           return sum + Math.abs(child.size);
         }, 0));
 
@@ -98,24 +98,24 @@ define(function (require) {
      * @returns {D3.Selection} SVG with paths attached
      */
     PieChart.prototype.addPath = function (width, height, svg, slices) {
-      var self = this;
-      var marginFactor = 0.95;
-      var isDonut = self._attr.isDonut;
-      var radius = (Math.min(width, height) / 2) * marginFactor;
-      var color = self.handler.data.getPieColorFunc();
-      var tooltip = self.tooltip;
-      var isTooltip = self._attr.addTooltip;
-
-      var partition = d3.layout.partition()
+      let self = this;
+      let marginFactor = 0.95;
+      let isDonut = self._attr.isDonut;
+      let radius = (Math.min(width, height) / 2) * marginFactor;
+      let color = self.handler.data.getPieColorFunc();
+      let tooltip = self.tooltip;
+      let isTooltip = self._attr.addTooltip;
+
+      let partition = d3.layout.partition()
       .sort(null)
       .value(function (d) {
         return d.percentOfParent * 100;
       });
-      var x = d3.scale.linear()
+      let x = d3.scale.linear()
       .range([0, 2 * Math.PI]);
-      var y = d3.scale.sqrt()
+      let y = d3.scale.sqrt()
       .range([0, radius]);
-      var arc = d3.svg.arc()
+      let arc = d3.svg.arc()
       .startAngle(function (d) {
         return Math.max(0, Math.min(2 * Math.PI, x(d.x)));
       })
@@ -135,7 +135,7 @@ define(function (require) {
         return Math.max(0, y(d.y + d.dy));
       });
 
-      var path = svg
+      let path = svg
       .datum(slices)
       .selectAll('path')
       .data(partition.nodes)
@@ -161,8 +161,8 @@ define(function (require) {
     };
 
     PieChart.prototype._validateContainerSize = function (width, height) {
-      var minWidth = 20;
-      var minHeight = 20;
+      let minWidth = 20;
+      let minHeight = 20;
 
       if (width <= minWidth || height <= minHeight) {
         throw new errors.ContainerTooSmall();
@@ -176,22 +176,22 @@ define(function (require) {
      * @returns {Function} Creates the pie chart
      */
     PieChart.prototype.draw = function () {
-      var self = this;
+      let self = this;
 
       return function (selection) {
         selection.each(function (data) {
-          var slices = data.slices;
-          var div = d3.select(this);
-          var width = $(this).width();
-          var height = $(this).height();
-          var path;
+          let slices = data.slices;
+          let div = d3.select(this);
+          let width = $(this).width();
+          let height = $(this).height();
+          let path;
 
           if (!slices.children.length) return;
 
           self.convertToPercentage(slices);
           self._validateContainerSize(width, height);
 
-          var svg = div.append('svg')
+          let svg = div.append('svg')
           .attr('width', width)
           .attr('height', height)
           .append('g')
diff --git a/src/ui/public/vislib/visualizations/tile_map.js b/src/ui/public/vislib/visualizations/tile_map.js
index 15f6fe5cfddcf..395ee436770d0 100644
--- a/src/ui/public/vislib/visualizations/tile_map.js
+++ b/src/ui/public/vislib/visualizations/tile_map.js
@@ -1,11 +1,11 @@
 define(function (require) {
   return function TileMapFactory(Private) {
-    var d3 = require('d3');
-    var _ = require('lodash');
-    var $ = require('jquery');
+    let d3 = require('d3');
+    let _ = require('lodash');
+    let $ = require('jquery');
 
-    var Chart = Private(require('ui/vislib/visualizations/_chart'));
-    var TileMapMap = Private(require('ui/vislib/visualizations/_map'));
+    let Chart = Private(require('ui/vislib/visualizations/_chart'));
+    let TileMapMap = Private(require('ui/vislib/visualizations/_map'));
 
     /**
      * Tile Map Visualization: renders maps
@@ -40,7 +40,7 @@ define(function (require) {
      * @return {Function} - function to add a map to a selection
      */
     TileMap.prototype.draw = function () {
-      var self = this;
+      let self = this;
 
       // clean up old maps
       self.destroy();
@@ -85,7 +85,7 @@ define(function (require) {
      */
     TileMap.prototype._appendGeoExtents = function () {
       // add allmin and allmax to geoJson
-      var geoMinMax = this.handler.data.getGeoExtents();
+      let geoMinMax = this.handler.data.getGeoExtents();
       this.geoJson.properties.allmin = geoMinMax.min;
       this.geoJson.properties.allmax = geoMinMax.max;
     };
@@ -97,9 +97,9 @@ define(function (require) {
      * @param selection {Object} d3 selection
      */
     TileMap.prototype._appendMap = function (selection) {
-      var container = $(selection).addClass('tilemap');
+      let container = $(selection).addClass('tilemap');
 
-      var map = new TileMapMap(container, this._chartData, {
+      let map = new TileMapMap(container, this._chartData, {
         // center: this._attr.mapCenter,
         // zoom: this._attr.mapZoom,
         events: this.events,
diff --git a/src/ui/public/vislib/visualizations/time_marker.js b/src/ui/public/vislib/visualizations/time_marker.js
index 840f09ee93d6c..1551d21720c57 100644
--- a/src/ui/public/vislib/visualizations/time_marker.js
+++ b/src/ui/public/vislib/visualizations/time_marker.js
@@ -1,14 +1,14 @@
 define(function (require) {
   return function TimeMarkerFactory() {
-    var d3 = require('d3');
-    var dateMath = require('ui/utils/dateMath');
+    let d3 = require('d3');
+    let dateMath = require('ui/utils/dateMath');
 
     function TimeMarker(times, xScale, height) {
       if (!(this instanceof TimeMarker)) {
         return new TimeMarker(times, xScale, height);
       }
 
-      var currentTimeArr = [{
+      let currentTimeArr = [{
         'time': new Date().getTime(),
         'class': 'time-marker',
         'color': '#c80000',
@@ -30,14 +30,14 @@ define(function (require) {
     }
 
     TimeMarker.prototype._isTimeBasedChart = function (selection) {
-      var data = selection.data();
+      let data = selection.data();
       return data.every(function (datum) {
         return (datum.ordered && datum.ordered.date);
       });
     };
 
     TimeMarker.prototype.render = function (selection) {
-      var self = this;
+      let self = this;
 
       // return if not time based chart
       if (!self._isTimeBasedChart(selection)) return;
diff --git a/src/ui/public/vislib_vis_type/VislibRenderbot.js b/src/ui/public/vislib_vis_type/VislibRenderbot.js
index b20a688cae726..9133c79aef273 100644
--- a/src/ui/public/vislib_vis_type/VislibRenderbot.js
+++ b/src/ui/public/vislib_vis_type/VislibRenderbot.js
@@ -1,17 +1,17 @@
 module.exports = function VislibRenderbotFactory(Private) {
-  var _ = require('lodash');
-  var vislib = Private(require('ui/vislib'));
-  var Renderbot = Private(require('ui/Vis/Renderbot'));
-  var buildChartData = Private(require('ui/vislib_vis_type/buildChartData'));
+  let _ = require('lodash');
+  let vislib = Private(require('ui/vislib'));
+  let Renderbot = Private(require('ui/Vis/Renderbot'));
+  let buildChartData = Private(require('ui/vislib_vis_type/buildChartData'));
 
   _.class(VislibRenderbot).inherits(Renderbot);
-  function VislibRenderbot(vis, $el) {
-    VislibRenderbot.Super.call(this, vis, $el);
+  function VislibRenderbot(vis, $el, uiState) {
+    VislibRenderbot.Super.call(this, vis, $el, uiState);
     this._createVis();
   }
 
   VislibRenderbot.prototype._createVis = function () {
-    var self = this;
+    let self = this;
 
     if (self.vislibVis) self.destroy();
 
@@ -22,16 +22,20 @@ module.exports = function VislibRenderbotFactory(Private) {
       self.vislibVis.on(event, listener);
     });
 
-    if (this.chartData) self.vislibVis.render(this.chartData);
+    if (this.chartData) self.vislibVis.render(this.chartData, this.uiState);
   };
 
   VislibRenderbot.prototype._getVislibParams = function () {
-    var self = this;
+    let self = this;
 
     return _.assign(
       {},
       self.vis.type.params.defaults,
-      { type: self.vis.type.name },
+      {
+        type: self.vis.type.name,
+        // Add attribute which determines whether an index is time based or not.
+        hasTimeField: self.vis.indexPattern && self.vis.indexPattern.hasTimeField()
+      },
       self.vis.params
     );
   };
@@ -39,13 +43,13 @@ module.exports = function VislibRenderbotFactory(Private) {
   VislibRenderbot.prototype.buildChartData = buildChartData;
   VislibRenderbot.prototype.render = function (esResponse) {
     this.chartData = this.buildChartData(esResponse);
-    this.vislibVis.render(this.chartData);
+    this.vislibVis.render(this.chartData, this.uiState);
   };
 
   VislibRenderbot.prototype.destroy = function () {
-    var self = this;
+    let self = this;
 
-    var vislibVis = self.vislibVis;
+    let vislibVis = self.vislibVis;
 
     _.forOwn(self.vis.listeners, function (listener, event) {
       vislibVis.off(event, listener);
@@ -55,10 +59,10 @@ module.exports = function VislibRenderbotFactory(Private) {
   };
 
   VislibRenderbot.prototype.updateParams = function () {
-    var self = this;
+    let self = this;
 
     // get full vislib params object
-    var newParams = self._getVislibParams();
+    let newParams = self._getVislibParams();
 
     // if there's been a change, replace the vis
     if (!_.isEqual(newParams, self.vislibParams)) self._createVis();
diff --git a/src/ui/public/vislib_vis_type/VislibVisType.js b/src/ui/public/vislib_vis_type/VislibVisType.js
index 32dbb8503d99d..2957deddbb60d 100644
--- a/src/ui/public/vislib_vis_type/VislibVisType.js
+++ b/src/ui/public/vislib_vis_type/VislibVisType.js
@@ -1,12 +1,12 @@
 define(function (require) {
   return function VislibVisTypeFactory(Private) {
-    var _ = require('lodash');
+    let _ = require('lodash');
 
     require('ui/vislib');
-    var VisTypeSchemas = Private(require('ui/Vis/Schemas'));
-    var VisType = Private(require('ui/Vis/VisType'));
-    var pointSeries = Private(require('ui/agg_response/point_series/point_series'));
-    var VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
+    let VisTypeSchemas = Private(require('ui/Vis/Schemas'));
+    let VisType = Private(require('ui/Vis/VisType'));
+    let pointSeries = Private(require('ui/agg_response/point_series/point_series'));
+    let VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
 
     require('plugins/kbn_vislib_vis_types/controls/vislib_basic_options');
     require('plugins/kbn_vislib_vis_types/controls/point_series_options');
@@ -25,8 +25,8 @@ define(function (require) {
       this.listeners = opts.listeners || {};
     }
 
-    VislibVisType.prototype.createRenderbot = function (vis, $el) {
-      return new VislibRenderbot(vis, $el);
+    VislibVisType.prototype.createRenderbot = function (vis, $el, uiState) {
+      return new VislibRenderbot(vis, $el, uiState);
     };
 
     return VislibVisType;
diff --git a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
index 7e612c815d968..2e28d8a450f6d 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
@@ -1,15 +1,16 @@
 describe('renderbot', function exportWrapper() {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var sinon = require('auto-release-sinon');
-  var vislib;
-  var Vis;
-  var Renderbot;
-  var VislibRenderbot;
-  var normalizeChartData;
-  var mockVisType = {
+  let _ = require('lodash');
+  let $ = require('jquery');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let sinon = require('auto-release-sinon');
+  let vislib;
+  let Vis;
+  let Renderbot;
+  let VislibRenderbot;
+  let persistedState;
+  let normalizeChartData;
+  let mockVisType = {
     name: 'test'
   };
 
@@ -21,6 +22,7 @@ describe('renderbot', function exportWrapper() {
       Vis = Private(require('ui/vislib/vis'));
       Renderbot = Private(require('ui/Vis/Renderbot'));
       VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
+      persistedState = new (Private(require('ui/persisted_state/persisted_state')))();
       normalizeChartData = Private(require('ui/agg_response/index'));
     });
   }
@@ -28,14 +30,14 @@ describe('renderbot', function exportWrapper() {
   beforeEach(init);
 
   describe('creation', function () {
-    var vis = { type: mockVisType };
-    var $el = 'element';
-    var createVisStub;
-    var renderbot;
+    let vis = { type: mockVisType };
+    let $el = 'element';
+    let createVisStub;
+    let renderbot;
 
     beforeEach(function () {
       createVisStub = sinon.stub(VislibRenderbot.prototype, '_createVis', _.noop);
-      renderbot = new VislibRenderbot(vis, $el);
+      renderbot = new VislibRenderbot(vis, $el, persistedState);
     });
 
     it('should be a Renderbot', function () {
@@ -48,7 +50,7 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('_createVis', function () {
-    var vis = {
+    let vis = {
       type: mockVisType,
       listeners: {
         'test': _.noop,
@@ -56,14 +58,14 @@ describe('renderbot', function exportWrapper() {
         'test3': _.noop
       }
     };
-    var $el = $('<div>testing</div>');
-    var listenerSpy;
-    var renderbot;
+    let $el = $('<div>testing</div>');
+    let listenerSpy;
+    let renderbot;
 
     beforeEach(function () {
       sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
       listenerSpy = sinon.spy(vislib.Vis.prototype, 'on');
-      renderbot = new VislibRenderbot(vis, $el);
+      renderbot = new VislibRenderbot(vis, $el, persistedState);
     });
 
     it('should attach listeners and set vislibVis', function () {
@@ -74,24 +76,24 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('param update', function () {
-    var params = { one: 'fish', two: 'fish' };
-    var vis = {
+    let params = { one: 'fish', two: 'fish' };
+    let vis = {
       type: _.defaults({
         params: {
           defaults: params
         }
       }, mockVisType)
     };
-    var $el = $('<div>testing</div>');
-    var createVisSpy;
-    var getParamsStub;
-    var renderbot;
+    let $el = $('<div>testing</div>');
+    let createVisSpy;
+    let getParamsStub;
+    let renderbot;
 
     beforeEach(function () {
       createVisSpy = sinon.spy(VislibRenderbot.prototype, '_createVis');
       // getParamsStub = sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _identity);
       // getParamsStub.returns(params);
-      renderbot = new VislibRenderbot(vis, $el);
+      renderbot = new VislibRenderbot(vis, $el, persistedState);
     });
 
     it('should create a new Vis object when params change', function () {
@@ -111,22 +113,22 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('render', function () {
-    var vis = { type: mockVisType, isHierarchical: _.constant(false) };
-    var $el = $('<div>testing</div>');
-    var stubs = {};
+    let vis = { type: mockVisType, isHierarchical: _.constant(false) };
+    let $el = $('<div>testing</div>');
+    let stubs = {};
 
     beforeEach(function () {
       sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
     });
 
     it('should use #buildChartData', function () {
-      var renderbot = new VislibRenderbot(vis, $el);
+      let renderbot = new VislibRenderbot(vis, $el, persistedState);
 
-      var football = {};
-      var buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
-      var renderStub = sinon.stub(renderbot.vislibVis, 'render');
+      let football = {};
+      let buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
+      let renderStub = sinon.stub(renderbot.vislibVis, 'render');
 
-      renderbot.render('flat data');
+      renderbot.render('flat data', persistedState);
       expect(renderStub.callCount).to.be(1);
       expect(buildStub.callCount).to.be(1);
       expect(renderStub.firstCall.args[0]).to.be(football);
@@ -134,7 +136,7 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('destroy', function () {
-    var vis = {
+    let vis = {
       type: mockVisType,
       listeners: {
         'test': _.noop,
@@ -142,14 +144,14 @@ describe('renderbot', function exportWrapper() {
         'test3': _.noop
       }
     };
-    var $el = $('<div>testing</div>');
-    var listenerSpy;
-    var renderbot;
+    let $el = $('<div>testing</div>');
+    let listenerSpy;
+    let renderbot;
 
     beforeEach(function () {
       sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
       listenerSpy = sinon.spy(vislib.Vis.prototype, 'off');
-      renderbot = new VislibRenderbot(vis, $el);
+      renderbot = new VislibRenderbot(vis, $el, persistedState);
     });
 
     it('should detatch listeners', function () {
@@ -159,7 +161,7 @@ describe('renderbot', function exportWrapper() {
     });
 
     it('should destroy the vis', function () {
-      var spy = sinon.spy(renderbot.vislibVis, 'destroy');
+      let spy = sinon.spy(renderbot.vislibVis, 'destroy');
       renderbot.destroy();
       expect(spy.callCount).to.be(1);
     });
diff --git a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
index a623a83d08e9a..2778597602fc4 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
@@ -1,34 +1,32 @@
 describe('renderbot#buildChartData', function () {
-  var _ = require('lodash');
-  var ngMock = require('ngMock');
-  var expect = require('expect.js');
-  var sinon = require('auto-release-sinon');
+  let _ = require('lodash');
+  let ngMock = require('ngMock');
+  let expect = require('expect.js');
+  let sinon = require('auto-release-sinon');
 
-  var VislibRenderbot;
-  var buildChartData;
-  var aggResponse;
-  var TableGroup;
-  var Table;
+  let buildChartData;
+  let aggResponse;
+  let TableGroup;
+  let Table;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Table = Private(require('ui/agg_response/tabify/_table'));
     TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
     aggResponse = Private(require('ui/agg_response/index'));
-    VislibRenderbot = Private(require('ui/vislib_vis_type/VislibRenderbot'));
     buildChartData = Private(require('ui/vislib_vis_type/buildChartData'));
   }));
 
   describe('for hierarchical vis', function () {
     it('defers to hierarchical aggResponse converter', function () {
-      var football = {};
-      var renderbot = {
+      let football = {};
+      let renderbot = {
         vis: {
           isHierarchical: _.constant(true)
         }
       };
 
-      var stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
+      let stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
       expect(buildChartData.call(renderbot, football)).to.be(football);
       expect(stub).to.have.property('callCount', 1);
       expect(stub.firstCall.args[0]).to.be(renderbot.vis);
@@ -38,14 +36,14 @@ describe('renderbot#buildChartData', function () {
 
   describe('for point plot', function () {
     it('calls tabify to simplify the data into a table', function () {
-      var renderbot = {
+      let renderbot = {
         vis: {
           isHierarchical: _.constant(false)
         }
       };
-      var football = { tables: [], hits: { total: 1 } };
+      let football = { tables: [], hits: { total: 1 } };
 
-      var stub = sinon.stub(aggResponse, 'tabify').returns(football);
+      let stub = sinon.stub(aggResponse, 'tabify').returns(football);
       expect(buildChartData.call(renderbot, football)).to.eql({ rows: [], hits: 1 });
       expect(stub).to.have.property('callCount', 1);
       expect(stub.firstCall.args[0]).to.be(renderbot.vis);
@@ -53,8 +51,8 @@ describe('renderbot#buildChartData', function () {
     });
 
     it('returns a single chart if the tabify response contains only a single table', function () {
-      var chart = { hits: 1, rows: [], columns: [] };
-      var renderbot = {
+      let chart = { hits: 1, rows: [], columns: [] };
+      let renderbot = {
         vis: {
           isHierarchical: _.constant(false),
           type: {
@@ -62,20 +60,20 @@ describe('renderbot#buildChartData', function () {
           }
         }
       };
-      var esResp = { hits: { total: 1 } };
-      var tabbed = { tables: [ new Table() ] };
+      let esResp = { hits: { total: 1 } };
+      let tabbed = { tables: [ new Table() ] };
 
       sinon.stub(aggResponse, 'tabify').returns(tabbed);
       expect(buildChartData.call(renderbot, esResp)).to.eql(chart);
     });
 
     it('converts table groups into rows/columns wrappers for charts', function () {
-      var chart = { hits: 1, rows: [], columns: [] };
-      var converter = sinon.stub().returns('chart');
-      var esResp = { hits: { total: 1 } };
-      var tables = [new Table(), new Table(), new Table(), new Table()];
+      let chart = { hits: 1, rows: [], columns: [] };
+      let converter = sinon.stub().returns('chart');
+      let esResp = { hits: { total: 1 } };
+      let tables = [new Table(), new Table(), new Table(), new Table()];
 
-      var renderbot = {
+      let renderbot = {
         vis: {
           isHierarchical: _.constant(false),
           type: {
@@ -84,7 +82,7 @@ describe('renderbot#buildChartData', function () {
         }
       };
 
-      var tabify = sinon.stub(aggResponse, 'tabify').returns({
+      let tabify = sinon.stub(aggResponse, 'tabify').returns({
         tables: [
           {
             aggConfig: { params: { row: true } },
@@ -115,7 +113,7 @@ describe('renderbot#buildChartData', function () {
         ]
       });
 
-      var chartData = buildChartData.call(renderbot, esResp);
+      let chartData = buildChartData.call(renderbot, esResp);
 
       // verify tables were converted
       expect(converter).to.have.property('callCount', 4);
diff --git a/src/ui/public/vislib_vis_type/buildChartData.js b/src/ui/public/vislib_vis_type/buildChartData.js
index 29f956f9e9693..22373c8632648 100644
--- a/src/ui/public/vislib_vis_type/buildChartData.js
+++ b/src/ui/public/vislib_vis_type/buildChartData.js
@@ -1,22 +1,22 @@
 define(function (require) {
   return function VislibVisBuildChartData(Private) {
-    var aggResponse = Private(require('ui/agg_response/index'));
-    var Table = Private(require('ui/agg_response/tabify/_table'));
+    let aggResponse = Private(require('ui/agg_response/index'));
+    let Table = Private(require('ui/agg_response/tabify/_table'));
 
     return function (esResponse) {
-      var vis = this.vis;
+      let vis = this.vis;
 
       if (vis.isHierarchical()) {
         // the hierarchical converter is very self-contained (woot!)
         return aggResponse.hierarchical(vis, esResponse);
       }
 
-      var tableGroup = aggResponse.tabify(vis, esResponse, {
+      let tableGroup = aggResponse.tabify(vis, esResponse, {
         canSplit: true,
         asAggConfigResults: true
       });
 
-      var converted = convertTableGroup(vis, tableGroup);
+      let converted = convertTableGroup(vis, tableGroup);
       if (!converted) {
         // mimic a row of tables that doesn't have any tables
         // https://github.com/elastic/kibana/blob/7bfb68cd24ed42b1b257682f93c50cd8d73e2520/src/kibana/components/vislib/components/zero_injection/inject_zeros.js#L32
@@ -29,11 +29,11 @@ define(function (require) {
     };
 
     function convertTableGroup(vis, tableGroup) {
-      var tables = tableGroup.tables;
-      var firstChild = tables[0];
+      let tables = tableGroup.tables;
+      let firstChild = tables[0];
       if (firstChild instanceof Table) {
 
-        var chart = convertTable(vis, firstChild);
+        let chart = convertTable(vis, firstChild);
         // if chart is within a split, assign group title to its label
         if (tableGroup.$parent) {
           chart.label = tableGroup.title;
@@ -42,17 +42,17 @@ define(function (require) {
       }
 
       if (!tables.length) return;
-      var out = {};
-      var outList;
+      let out = {};
+      let outList;
 
       tables.forEach(function (table) {
         if (!outList) {
-          var aggConfig = table.aggConfig;
-          var direction = aggConfig.params.row ? 'rows' : 'columns';
+          let aggConfig = table.aggConfig;
+          let direction = aggConfig.params.row ? 'rows' : 'columns';
           outList = out[direction] = [];
         }
 
-        var output;
+        let output;
         if (output = convertTableGroup(vis, table)) {
           outList.push(output);
         }
diff --git a/src/ui/public/visualize/spy.html b/src/ui/public/visualize/spy.html
index e0778b5c65164..689a4151e5eb9 100644
--- a/src/ui/public/visualize/spy.html
+++ b/src/ui/public/visualize/spy.html
@@ -15,7 +15,7 @@
       </a>
     </div>
     <div class="button-group visualize-spy-fill">
-      <a ng-if="!fullScreenSpy" ng-click="toggleFullPage()">
+      <a ng-click="toggleFullPage()">
         <i ng-if="!spy.mode.fill" class="fa fa-expand"></i>
         <i ng-if="spy.mode.fill" class="fa fa-compress"></i>
       </a>
diff --git a/src/ui/public/visualize/spy.js b/src/ui/public/visualize/spy.js
index d58299769b921..fd4db67aa085e 100644
--- a/src/ui/public/visualize/spy.js
+++ b/src/ui/public/visualize/spy.js
@@ -2,20 +2,21 @@ define(function (require) {
   require('ui/modules')
     .get('app/visualize')
     .directive('visualizeSpy', function (Private, $compile) {
-      var $ = require('jquery');
-      var _ = require('lodash');
+      let $ = require('jquery');
+      let _ = require('lodash');
 
-      var spyModes = Private(require('ui/registry/spy_modes'));
-      var defaultMode = spyModes.inOrder[0].name;
+      let spyModes = Private(require('ui/registry/spy_modes'));
+      let defaultMode = spyModes.inOrder[0].name;
 
       return {
         restrict: 'E',
         template: require('ui/visualize/spy.html'),
         link: function ($scope, $el) {
-          var currentSpy;
-          var $container = $el.find('.visualize-spy-container');
-          var fullPageSpy = _.get($scope.spy, 'mode.fill', false);
+          let currentSpy;
+          let $container = $el.find('.visualize-spy-container');
+          let fullPageSpy = _.get($scope.spy, 'mode.fill', false);
           $scope.modes = spyModes;
+          $scope.spy.params = $scope.spy.params || {};
 
           function getSpyObject(name) {
             name = _.isUndefined(name) ? $scope.spy.mode.name : name;
@@ -27,8 +28,8 @@ define(function (require) {
             };
           }
 
-          var renderSpy = function (spyName) {
-            var newMode = $scope.modes.byName[spyName];
+          let renderSpy = function (spyName) {
+            let newMode = $scope.modes.byName[spyName];
 
             // clear the current value
             if (currentSpy) {
@@ -54,7 +55,7 @@ define(function (require) {
           };
 
           $scope.toggleDisplay = function () {
-            var modeName = _.get($scope.spy, 'mode.name');
+            let modeName = _.get($scope.spy, 'mode.name');
             $scope.setSpyMode(modeName ? null : defaultMode);
           };
 
@@ -71,7 +72,7 @@ define(function (require) {
 
           if ($scope.uiState) {
             // sync external uiState changes
-            var syncUIState = () => $scope.spy.mode = $scope.uiState.get('spy.mode');
+            let syncUIState = () => $scope.spy.mode = $scope.uiState.get('spy.mode');
             $scope.uiState.on('change', syncUIState);
             $scope.$on('$destroy', () => $scope.uiState.off('change', syncUIState));
           }
@@ -82,7 +83,7 @@ define(function (require) {
             'spy.mode.fill'
           ], function (newVals, oldVals) {
             // update the ui state, but only if it really changes
-            var changedVals = newVals.filter((val) => !_.isUndefined(val)).length > 0;
+            let changedVals = newVals.filter((val) => !_.isUndefined(val)).length > 0;
             if (changedVals && !_.isEqual(newVals, oldVals)) {
               if ($scope.uiState) $scope.uiState.set('spy.mode', $scope.spy.mode);
             }
diff --git a/src/ui/public/visualize/visualize.html b/src/ui/public/visualize/visualize.html
index 6b105e5c8fab9..5b1a55a0a4441 100644
--- a/src/ui/public/visualize/visualize.html
+++ b/src/ui/public/visualize/visualize.html
@@ -1,4 +1,4 @@
-<div ng-if="vis.type.requiresSearch && esResp.hits.total === 0"
+<div ng-if="showNoResultsMessage()"
   class="text-center visualize-error visualize-chart">
   <div class="item top"></div>
   <div class="item">
@@ -7,9 +7,12 @@ <h4>No results found</h4>
   </div>
   <div class="item bottom"></div>
 </div>
-<div ng-hide="vis.type.requiresSearch && esResp.hits.total === 0"
-  ng-style="loadingStyle"
-  ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
-  class="visualize-chart"></div>
+<div ng-hide="showNoResultsMessage()" class="vis-container">
+  <div ng-style="loadingStyle"
+    ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
+    class="visualize-chart">
+  </div>
+  <visualize-legend></visualize-legend>
+</div>
 <!-- <pre>{{chartData | json}}</pre> -->
 <visualize-spy ng-if="vis.type.requiresSearch && showSpyPanel"></visualize-spy>
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
index 10d9b0dfd01a1..522764dd21ac2 100644
--- a/src/ui/public/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -1,15 +1,17 @@
 define(function (require) {
   require('ui/modules')
   .get('kibana/directive')
-  .directive('visualize', function (Notifier, SavedVis, indexPatterns, Private, config) {
+  .directive('visualize', function (Notifier, SavedVis, indexPatterns, Private, config, $timeout) {
 
     require('ui/visualize/spy');
     require('ui/visualize/visualize.less');
-    var $ = require('jquery');
-    var _ = require('lodash');
-    var visTypes = Private(require('ui/registry/vis_types'));
+    require('ui/visualize/visualize_legend');
 
-    var notify = new Notifier({
+    let $ = require('jquery');
+    let _ = require('lodash');
+    let visTypes = Private(require('ui/registry/vis_types'));
+
+    let notify = new Notifier({
       location: 'Visualize'
     });
 
@@ -25,8 +27,8 @@ define(function (require) {
       },
       template: require('ui/visualize/visualize.html'),
       link: function ($scope, $el, attr) {
-        var chart; // set in "vis" watcher
-        var minVisChartHeight = 180;
+        let chart; // set in "vis" watcher
+        let minVisChartHeight = 180;
 
         if (_.isUndefined($scope.showSpyPanel)) {
           $scope.showSpyPanel = true;
@@ -34,38 +36,44 @@ define(function (require) {
 
         function getter(selector) {
           return function () {
-            var $sel = $el.find(selector);
+            let $sel = $el.find(selector);
             if ($sel.size()) return $sel;
           };
         }
 
-        var getVisEl = getter('.visualize-chart');
-        var getSpyEl = getter('visualize-spy');
+        let getVisEl = getter('.visualize-chart');
+        let getVisContainer = getter('.vis-container');
+
+        // Show no results message when isZeroHits is true and it requires search
+        $scope.showNoResultsMessage = function () {
+          let requiresSearch = _.get($scope, 'vis.type.requiresSearch');
+          let isZeroHits = _.get($scope,'esResp.hits.total') === 0;
+          let shouldShowMessage = !_.get($scope, 'vis.params.handleNoResults');
+
+          return Boolean(requiresSearch && isZeroHits && shouldShowMessage);
+        };
 
         $scope.fullScreenSpy = false;
         $scope.spy = {};
         $scope.spy.mode = ($scope.uiState) ? $scope.uiState.get('spy.mode', {}) : {};
 
-        var applyClassNames = function () {
-          var $spyEl = getSpyEl();
-          var $visEl = getVisEl();
-          var fullSpy = ($scope.spy.mode && ($scope.spy.mode.fill || $scope.fullScreenSpy));
+        let applyClassNames = function () {
+          let $visEl = getVisContainer();
+          let fullSpy = ($scope.spy.mode && ($scope.spy.mode.fill || $scope.fullScreenSpy));
 
-          // external
-          $el.toggleClass('only-visualization', !$scope.spy.mode);
-          $el.toggleClass('visualization-and-spy', $scope.spy.mode && !fullSpy);
-          $el.toggleClass('only-spy', Boolean(fullSpy));
-          if ($spyEl) $spyEl.toggleClass('only', Boolean(fullSpy));
-
-          // internal
-          $visEl.toggleClass('spy-visible', Boolean($scope.spy.mode));
           $visEl.toggleClass('spy-only', Boolean(fullSpy));
+
+          $timeout(function () {
+            if (shouldHaveFullSpy()) {
+              $visEl.addClass('spy-only');
+            };
+          }, 0);
         };
 
         // we need to wait for some watchers to fire at least once
         // before we are "ready", this manages that
-        var prereq = (function () {
-          var fns = [];
+        let prereq = (function () {
+          let fns = [];
 
           return function register(fn) {
             fns.push(fn);
@@ -83,29 +91,31 @@ define(function (require) {
           };
         }());
 
-        var loadingDelay = config.get('visualization:loadingDelay');
+        let loadingDelay = config.get('visualization:loadingDelay');
         $scope.loadingStyle = {
           '-webkit-transition-delay': loadingDelay,
           'transition-delay': loadingDelay
         };
 
-        // spy watchers
-        $scope.$watch('fullScreenSpy', applyClassNames);
-
-        $scope.$watchCollection('spy.mode', function (spyMode, oldSpyMode) {
-          var $visEl = getVisEl();
+        function shouldHaveFullSpy() {
+          let $visEl = getVisEl();
           if (!$visEl) return;
 
-          // if the spy has been opened, check chart height
-          if (spyMode && !oldSpyMode) {
-            $scope.fullScreenSpy = $visEl.height() < minVisChartHeight;
-          }
+          return ($visEl.height() < minVisChartHeight)
+            && _.get($scope.spy, 'mode.fill')
+            && _.get($scope.spy, 'mode.name');
+        }
+
+        // spy watchers
+        $scope.$watch('fullScreenSpy', applyClassNames);
 
+        $scope.$watchCollection('spy.mode', function () {
+          $scope.fullScreenSpy = shouldHaveFullSpy();
           applyClassNames();
         });
 
         $scope.$watch('vis', prereq(function (vis, oldVis) {
-          var $visEl = getVisEl();
+          let $visEl = getVisEl();
           if (!$visEl) return;
 
           if (!attr.editableVis) {
@@ -113,7 +123,7 @@ define(function (require) {
           }
 
           if (oldVis) $scope.renderbot = null;
-          if (vis) $scope.renderbot = vis.type.createRenderbot(vis, $visEl);
+          if (vis) $scope.renderbot = vis.type.createRenderbot(vis, $visEl, $scope.uiState);
         }));
 
         $scope.$watchCollection('vis.params', prereq(function () {
diff --git a/src/ui/public/visualize/visualize.less b/src/ui/public/visualize/visualize.less
index 6290045efcdcc..6879cf173d088 100644
--- a/src/ui/public/visualize/visualize.less
+++ b/src/ui/public/visualize/visualize.less
@@ -12,20 +12,20 @@ visualize {
     white-space: pre-line;
   }
 
-  .visualize-chart {
+  .vis-container {
+    height: 1px;
+    display: flex;
+    flex-direction: row;
+
     flex: 1 1 auto;
     overflow: auto;
     -webkit-transition: opacity 0.01s;
     transition: opacity 0.01s;
 
-    &.spy-visible {
-      margin-bottom: 10px;
-      height: 0px;
-    }
-
     &.spy-only {
       display: none;
     }
+
   }
 
   .loading {
@@ -181,3 +181,4 @@ visualize-spy {
     white-space: pre-wrap;
   }
 }
+
diff --git a/src/ui/public/visualize/visualize_legend.html b/src/ui/public/visualize/visualize_legend.html
new file mode 100644
index 0000000000000..3f8e2b4a09b39
--- /dev/null
+++ b/src/ui/public/visualize/visualize_legend.html
@@ -0,0 +1,41 @@
+<div class="legend-col-wrapper" ng-if="labels.length">
+  <div ng-click="toggleLegend()" class="legend-toggle">
+    <i class="fa" ng-class="open ? 'fa-chevron-right' : 'fa-chevron-left'"></i>
+  </div>
+  <ul class="legend-ul" ng-show="open">
+
+    <li
+      ng-repeat="legendData in labels track by legendData.label"
+      ng-mouseenter="highlight($event)"
+      ng-mouseleave="unhighlight($event)"
+      data-label="{{legendData.label}}"
+      class="legend-value color">
+
+      <div class="legend-value-container">
+        <div
+          ng-click="showDetails = !showDetails"
+          ng-class="showDetails ? 'legend-value-full' : 'legend-value-truncate'"
+          class="legend-value-title">
+          <i class="fa fa-circle" ng-style="{color: getColor(legendData.label)}"></i> {{legendData.label}}
+        </div>
+
+        <div ng-if="showDetails" class="legend-value-details">
+          <div ng-show="canFilter(legendData)">
+            <button class="btn btn-xs filter-button" ng-click="filter(legendData, false)"><i class="fa fa-search-plus"></i></button>
+            <button class="btn btn-xs filter-button" ng-click="filter(legendData, true)"><i class="fa fa-search-minus"></i></button>
+          </div>
+
+          <div class="legend-value-color-picker">
+            <i ng-repeat="choice in colors"
+              ng-click="setColor(legendData.label, choice)"
+              ng-class="choice == getColor(legendData.label) ? 'fa-circle-o' : 'fa-circle'"
+              ng-style="{color: choice}" class="fa dot">
+            </i>
+          </div>
+
+        </div>
+      </div>
+
+    </li>
+  </ul>
+</div>
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
new file mode 100644
index 0000000000000..2e9a8f3a7e068
--- /dev/null
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -0,0 +1,109 @@
+define(function (require) {
+  let _ = require('lodash');
+  let html = require('ui/visualize/visualize_legend.html');
+
+  let $ = require('jquery');
+  let d3 = require('d3');
+  let findByParam = require('ui/utils/find_by_param');
+
+  require('ui/modules').get('kibana')
+  .directive('visualizeLegend', function (Private, getAppState) {
+    let Data = Private(require('ui/vislib/lib/data'));
+    let colorPalette = Private(require('ui/vislib/components/color/color'));
+    let filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler'));
+
+    return {
+      restrict: 'E',
+      template: html,
+      link: function ($scope, $elem) {
+        let $state = getAppState();
+        let clickHandler = filterBarClickHandler($state);
+        $scope.open = $scope.uiState.get('vis.legendOpen', true);
+
+        $scope.$watch('renderbot.chartData', function (data) {
+          if (!data) return;
+          $scope.data = data;
+          refresh();
+        });
+
+        $scope.highlight = function (event) {
+          let el = event.currentTarget;
+          let handler = $scope.renderbot.vislibVis.handler;
+          if (!handler) return;
+          handler.highlight.call(el, handler.el);
+        };
+
+        $scope.unhighlight = function (event) {
+          let el = event.currentTarget;
+          let handler = $scope.renderbot.vislibVis.handler;
+          if (!handler) return;
+          handler.unHighlight.call(el, handler.el);
+        };
+
+        $scope.setColor = function (label, color) {
+          let colors = $scope.uiState.get('vis.colors') || {};
+          colors[label] = color;
+          $scope.uiState.set('vis.colors', colors);
+          refresh();
+        };
+
+        $scope.toggleLegend = function () {
+          let bwcAddLegend = $scope.renderbot.vislibVis._attr.addLegend;
+          let bwcLegendStateDefault = bwcAddLegend == null ? true : bwcAddLegend;
+          $scope.open = !$scope.uiState.get('vis.legendOpen', bwcLegendStateDefault);
+          $scope.uiState.set('vis.legendOpen', $scope.open);
+        };
+
+        $scope.filter = function (legendData, negate) {
+          clickHandler({point: legendData, negate: negate});
+        };
+
+        $scope.canFilter = function (legendData) {
+          let filters = clickHandler({point: legendData}, true) || [];
+          return filters.length;
+        };
+
+        $scope.colors = [
+          '#3F6833', '#967302', '#2F575E', '#99440A', '#58140C', '#052B51', '#511749', '#3F2B5B', //6
+          '#508642', '#CCA300', '#447EBC', '#C15C17', '#890F02', '#0A437C', '#6D1F62', '#584477', //2
+          '#629E51', '#E5AC0E', '#64B0C8', '#E0752D', '#BF1B00', '#0A50A1', '#962D82', '#614D93', //4
+          '#7EB26D', '#EAB839', '#6ED0E0', '#EF843C', '#E24D42', '#1F78C1', '#BA43A9', '#705DA0', // Normal
+          '#9AC48A', '#F2C96D', '#65C5DB', '#F9934E', '#EA6460', '#5195CE', '#D683CE', '#806EB7', //5
+          '#B7DBAB', '#F4D598', '#70DBED', '#F9BA8F', '#F29191', '#82B5D8', '#E5A8E2', '#AEA2E0', //3
+          '#E0F9D7', '#FCEACA', '#CFFAFF', '#F9E2D2', '#FCE2DE', '#BADFF4', '#F9D9F9', '#DEDAF7'  //7
+        ];
+
+        function refresh() {
+          let vislibVis = $scope.renderbot.vislibVis;
+
+          if ($scope.uiState.get('vis.legendOpen') == null && vislibVis._attr.addLegend != null) {
+            $scope.open = vislibVis._attr.addLegend;
+          }
+
+          $scope.labels = getLabels($scope.data, vislibVis._attr.type);
+          $scope.getColor = colorPalette(_.pluck($scope.labels, 'label'), $scope.uiState.get('vis.colors'));
+        }
+
+        // Most of these functions were moved directly from the old Legend class. Not a fan of this.
+        function getLabels(data, type) {
+          if (!data) return [];
+          data = data.columns || data.rows || [data];
+          if (type === 'pie') return Data.prototype.pieNames(data);
+          return getSeriesLabels(data);
+        };
+
+        function getSeriesLabels(data) {
+          let values = data.map(function (chart) {
+            return chart.series;
+          })
+          .reduce(function (a, b) {
+            return a.concat(b);
+          }, []);
+          return _.compact(_.uniq(values, 'label'));
+        }
+
+
+      }
+    };
+  });
+});
diff --git a/src/ui/public/watch_multi/__tests__/watch_multi.js b/src/ui/public/watch_multi/__tests__/watch_multi.js
index db72e78ceb72a..3c54d82e565d9 100644
--- a/src/ui/public/watch_multi/__tests__/watch_multi.js
+++ b/src/ui/public/watch_multi/__tests__/watch_multi.js
@@ -1,13 +1,13 @@
 
-var _ = require('lodash');
-var ngMock = require('ngMock');
-var expect = require('expect.js');
+let _ = require('lodash');
+let ngMock = require('ngMock');
+let expect = require('expect.js');
 
 describe('$scope.$watchMulti', function () {
-  var sinon = require('auto-release-sinon');
+  let sinon = require('auto-release-sinon');
 
-  var $rootScope;
-  var $scope;
+  let $rootScope;
+  let $scope;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -20,15 +20,15 @@ describe('$scope.$watchMulti', function () {
       expect($rootScope.$watchMulti).to.be.a('function');
       expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
 
-      var $isoScope = $scope.$new(true);
+      let $isoScope = $scope.$new(true);
       expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
     });
 
     it('returns a working unwatch function', function () {
       $scope.a = 0;
       $scope.b = 0;
-      var triggers = 0;
-      var unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
+      let triggers = 0;
+      let unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
 
       // initial watch
       $scope.$apply();
@@ -53,7 +53,7 @@ describe('$scope.$watchMulti', function () {
 
   describe('simple scope watchers', function () {
     it('only triggers a single watch on initialization', function () {
-      var stub = sinon.stub();
+      let stub = sinon.stub();
 
       $scope.$watchMulti([
         'one',
@@ -66,7 +66,7 @@ describe('$scope.$watchMulti', function () {
     });
 
     it('only triggers a single watch when multiple values change', function () {
-      var stub = sinon.spy(function (a, b) {});
+      let stub = sinon.spy(function (a, b) {});
 
       $scope.$watchMulti([
         'one',
@@ -87,7 +87,7 @@ describe('$scope.$watchMulti', function () {
 
     it('passes an array of the current and previous values, in order',
     function () {
-      var stub = sinon.spy(function (a, b) {});
+      let stub = sinon.spy(function (a, b) {});
 
       $scope.one = 'a';
       $scope.two = 'b';
@@ -116,7 +116,7 @@ describe('$scope.$watchMulti', function () {
     });
 
     it('always has an up to date value', function () {
-      var count = 0;
+      let count = 0;
 
       $scope.vals = [1, 0];
       $scope.$watchMulti([ 'vals[0]', 'vals[1]' ], function (cur, prev) {
@@ -124,7 +124,7 @@ describe('$scope.$watchMulti', function () {
         count++;
       });
 
-      var $child = $scope.$new();
+      let $child = $scope.$new();
       $child.$watch('vals[0]', function (cur) {
         $child.vals[1] = cur;
       });
@@ -135,16 +135,16 @@ describe('$scope.$watchMulti', function () {
   });
 
   describe('complex watch expressions', function () {
-    var stateWatchers;
-    var firstValue;
-    var secondValue;
+    let stateWatchers;
+    let firstValue;
+    let secondValue;
 
     beforeEach(function () {
-      var firstGetter = function () {
+      let firstGetter = function () {
         return firstValue;
       };
 
-      var secondGetter = function () {
+      let secondGetter = function () {
         return secondValue;
       };
 
@@ -158,7 +158,7 @@ describe('$scope.$watchMulti', function () {
     });
 
     it('should trigger the watcher on initialization', function () {
-      var stub = sinon.stub();
+      let stub = sinon.stub();
       firstValue = 'first';
       secondValue = 'second';
 
@@ -174,7 +174,7 @@ describe('$scope.$watchMulti', function () {
 
   describe('nested watchers', function () {
     it('should trigger the handler at least once', function () {
-      var $scope = $rootScope.$new();
+      let $scope = $rootScope.$new();
       $scope.$$watchers = [{
         get: _.noop,
         fn: _.noop,
@@ -187,8 +187,8 @@ describe('$scope.$watchMulti', function () {
         last: false
       }];
 
-      var first = sinon.stub();
-      var second = sinon.stub();
+      let first = sinon.stub();
+      let second = sinon.stub();
 
       function registerWatchers() {
         $scope.$watchMulti([first, second], function () {
diff --git a/src/ui/public/watch_multi/watch_multi.js b/src/ui/public/watch_multi/watch_multi.js
index 4bfcadfacf29e..9544597b7223e 100644
--- a/src/ui/public/watch_multi/watch_multi.js
+++ b/src/ui/public/watch_multi/watch_multi.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  var _ = require('lodash');
+  let _ = require('lodash');
 
   require('ui/modules').get('kibana')
   .config(function ($provide) {
@@ -37,15 +37,15 @@ define(function (require) {
         if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
         if (!_.isFunction(fn)) throw new TypeError('expected a function that is triggered on each watch');
 
-        var $scope = this;
-        var vals = new Array(expressions.length);
-        var prev = new Array(expressions.length);
-        var fire = false;
-        var init = 0;
-        var neededInits = expressions.length;
+        let $scope = this;
+        let vals = new Array(expressions.length);
+        let prev = new Array(expressions.length);
+        let fire = false;
+        let init = 0;
+        let neededInits = expressions.length;
 
         // first, register all of the multi-watchers
-        var unwatchers = expressions.map(function (expr, i) {
+        let unwatchers = expressions.map(function (expr, i) {
           expr = normalizeExpression($scope, expr);
           if (!expr) return;
 
@@ -62,7 +62,7 @@ define(function (require) {
 
         // then, the watcher that checks to see if any of
         // the other watchers triggered this cycle
-        var flip = false;
+        let flip = false;
         unwatchers.push($scope.$watch(function () {
           if (init < neededInits) return init;
 
@@ -85,7 +85,7 @@ define(function (require) {
 
       function normalizeExpression($scope, expr) {
         if (!expr) return;
-        var norm = {
+        let norm = {
           fn: $scope.$watch,
           deep: false
         };
diff --git a/src/ui/views/uiApp.jade b/src/ui/views/ui_app.jade
similarity index 90%
rename from src/ui/views/uiApp.jade
rename to src/ui/views/ui_app.jade
index 09407d5586b21..316805251f4f2 100644
--- a/src/ui/views/uiApp.jade
+++ b/src/ui/views/ui_app.jade
@@ -38,12 +38,13 @@ block content
         loading.removeChild(loading.lastChild);
       }
 
+      var buildNum = #{kibanaPayload.buildNum};
+      var cacheParam = buildNum ? '?v=' + buildNum : '';
       function bundleFile(filename) {
         var anchor = document.createElement('a');
-        anchor.setAttribute('href', !{JSON.stringify(bundlePath)} + '/' + filename);
+        anchor.setAttribute('href', !{JSON.stringify(bundlePath)} + '/' + filename + cacheParam);
         return anchor.href;
       }
-
       var files = [
         bundleFile('commons.style.css'),
         bundleFile('#{app.id}.style.css'),
@@ -55,7 +56,7 @@ block content
         var file = files.shift();
         if (!file) return;
 
-        var type = /\.js$/.test(file) ? 'script' : 'link';
+        var type = /\.js(\?.+)?$/.test(file) ? 'script' : 'link';
         var dom = document.createElement(type);
         dom.setAttribute('async', '');
 
diff --git a/src/utils/fromRoot.js b/src/utils/fromRoot.js
index f22b7a153b5c5..6ae644670d8d6 100644
--- a/src/utils/fromRoot.js
+++ b/src/utils/fromRoot.js
@@ -1,5 +1,5 @@
-var _ = require('lodash');
-var root = require('./packageJson').__dirname;
+let _ = require('lodash');
+let root = require('./packageJson').__dirname;
 var { join, dirname, normalize } = require('path');
 
 module.exports = _.flow(_.partial(join, root), normalize);
diff --git a/src/utils/packageJson.js b/src/utils/packageJson.js
index 9c896f0610275..b1a4c1d21e762 100644
--- a/src/utils/packageJson.js
+++ b/src/utils/packageJson.js
@@ -1,11 +1,11 @@
 var { join } = require('path');
-var existsSync = require('fs').existsSync;
+let existsSync = require('fs').existsSync;
 
-var packageDir;
-var packagePath;
+let packageDir;
+let packagePath;
 
 while (!packagePath || !existsSync(packagePath)) {
-  var prev = packageDir;
+  let prev = packageDir;
   packageDir = prev ? join(prev, '..') : __dirname;
   packagePath = join(packageDir, 'package.json');
 
diff --git a/tasks/build/archives.js b/tasks/build/archives.js
index 2639ab86e28fc..538a18a721fc5 100644
--- a/tasks/build/archives.js
+++ b/tasks/build/archives.js
@@ -4,6 +4,7 @@ module.exports = function createPackages(grunt) {
   let { execFile } = require('child_process');
   let { all, fromNode } = require('bluebird');
 
+  const targetDir = config.get('target');
   let buildPath = resolve(config.get('root'), 'build');
   let exec = async (cmd, args) => {
     grunt.log.writeln(` > ${cmd} ${args.join(' ')}`);
@@ -29,7 +30,7 @@ module.exports = function createPackages(grunt) {
       grunt.config.get('platforms')
       .map(async platform => {
 
-        grunt.file.mkdir('target');
+        grunt.file.mkdir(targetDir);
         await archives(platform);
       })
     )
diff --git a/tasks/build/babel_cache.js b/tasks/build/babel_cache.js
new file mode 100644
index 0000000000000..d7ea3d87569cc
--- /dev/null
+++ b/tasks/build/babel_cache.js
@@ -0,0 +1,8 @@
+export default function (grunt) {
+  grunt.registerTask('_build:babelCache', function () {
+    //When running from built packages, if a plugin is installed before babelcache
+    //exists it can become owned by root.  This causes server startup to fail because
+    //the optimization process can't write to .babelcache.json.
+    grunt.file.write('build/kibana/optimize/.babelcache.json', '{}\n');
+  });
+};
diff --git a/tasks/build/downloadNodeBuilds.js b/tasks/build/downloadNodeBuilds.js
index dbb583fd19700..f3938549aa4e1 100644
--- a/tasks/build/downloadNodeBuilds.js
+++ b/tasks/build/downloadNodeBuilds.js
@@ -37,7 +37,7 @@ module.exports = function (grunt) {
     // use an async iife to store promise for download
     // then store platform in active downloads list
     // which we will read from in the finish task
-    platform.downloadPromise = (async () => {
+    platform.downloadPromise = (async function () {
       grunt.file.mkdir(downloadDir);
 
       if (platform.name === 'windows') {
@@ -82,4 +82,3 @@ module.exports = function (grunt) {
     .nodeify(this.async());
   });
 };
-
diff --git a/tasks/build/index.js b/tasks/build/index.js
index 22341871639d8..000ea9095d3f0 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -1,31 +1,34 @@
 module.exports = function (grunt) {
   let { flatten } = require('lodash');
 
-  grunt.registerTask('build', flatten([
-    '_build:getProps',
-    'clean:build',
-    'clean:target',
-    '_build:downloadNodeBuilds:start',
-    'copy:devSource',
-    'babel:build',
-    '_build:babelOptions',
-    '_build:installedPlugins',
-    '_build:packageJson',
-    '_build:readme',
-    '_build:installNpmDeps',
-    '_build:removePkgJsonDeps',
-    'clean:testsFromModules',
-    'clean:deepModuleBins',
-    'clean:deepModules',
-    'run:optimizeBuild',
-    'stop:optimizeBuild',
-    '_build:downloadNodeBuilds:finish',
-    '_build:versionedLinks',
-    '_build:archives',
-    !grunt.option('os-packages') ? [] : [
-      '_build:pleaseRun',
-      '_build:osPackages',
-    ],
-    '_build:shasums'
-  ]));
+  grunt.registerTask('build', 'Build packages', function () {
+    grunt.task.run(flatten([
+      '_build:getProps',
+      'clean:build',
+      'clean:target',
+      '_build:downloadNodeBuilds:start',
+      'copy:devSource',
+      'babel:build',
+      '_build:babelOptions',
+      '_build:installedPlugins',
+      '_build:packageJson',
+      '_build:readme',
+      '_build:babelCache',
+      '_build:installNpmDeps',
+      '_build:removePkgJsonDeps',
+      'clean:testsFromModules',
+      'clean:deepModuleBins',
+      'clean:deepModules',
+      'run:optimizeBuild',
+      'stop:optimizeBuild',
+      '_build:downloadNodeBuilds:finish',
+      '_build:versionedLinks',
+      '_build:archives',
+      grunt.option('os-packages') ? [
+        '_build:pleaseRun',
+        '_build:osPackages',
+      ] : [],
+      '_build:shasums'
+    ]));
+  });
 };
diff --git a/tasks/build/installedPlugins.js b/tasks/build/installedPlugins.js
index 7d8d6618ff488..5d2fcc4d4ed37 100644
--- a/tasks/build/installedPlugins.js
+++ b/tasks/build/installedPlugins.js
@@ -1,5 +1,6 @@
 module.exports = function (grunt) {
   grunt.registerTask('_build:installedPlugins', function () {
     grunt.file.mkdir('build/kibana/installedPlugins');
+    grunt.file.mkdir('build/kibana/installedPlugins/.data');
   });
 };
diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
index d62dcec88d2b1..4532ccb302b33 100644
--- a/tasks/build/osPackages.js
+++ b/tasks/build/osPackages.js
@@ -1,48 +1,76 @@
-module.exports = function (grunt) {
-  let { resolve } = require('path');
-  let { indexBy } = require('lodash');
+import { resolve } from 'path';
+import { indexBy } from 'lodash';
+import exec from '../utils/exec';
 
-  let { config } = grunt;
-  let exec = require('../utils/exec');
-  let targetDir = config.get('target');
-  let version = config.get('pkg.version');
-  let userScriptsDir = config.get('userScriptsDir');
-  let servicesByName = indexBy(config.get('services'), 'name');
+export default (grunt) => {
+  const targetDir = grunt.config.get('target');
+  const packageScriptsDir = grunt.config.get('packageScriptsDir');
+  const servicesByName = indexBy(grunt.config.get('services'), 'name');
+  const config = grunt.config.get('packages');
+  const fpm = args => exec('fpm', args);
 
   grunt.registerTask('_build:osPackages', function () {
-    grunt.config.get('platforms').forEach(({ name, buildDir }) => {
-      // TODO(sissel): Check if `fpm` is available
+    grunt.file.mkdir(targetDir);
 
-      let arch = /x64$/.test(name) ? 'x86_64' : 'i686';
-      let fpm = args => exec('fpm', args);
-
-      let args = [
+    grunt.config.get('platforms')
+    .filter(({ name }) => /linux-x(86|64)$/.test(name))
+    .map(({ name, buildDir }) => {
+      const architecture = /x64$/.test(name) ? 'x86_64' : 'i386';
+      return {
+        buildDir,
+        architecture
+      };
+    })
+    .forEach(({ buildDir, architecture }) => {
+      const baseOptions = [
         '--force',
         '--package', targetDir,
         '-s', 'dir', // input type
-        '--name', 'kibana',
-        '--version', version,
-        '--after-install', resolve(userScriptsDir, 'installer.sh'),
-        '--after-remove', resolve(userScriptsDir, 'remover.sh'),
-        '--config-files', '/opt/kibana/config/kibana.yml'
+        '--architecture', architecture,
+        '--name', config.name,
+        '--description', config.description,
+        '--version', config.version,
+        '--url', config.site,
+        '--vendor', config.vendor,
+        '--maintainer', config.maintainer,
+        '--license', config.license,
+        '--after-install', resolve(packageScriptsDir, 'post_install.sh'),
+        '--before-install', resolve(packageScriptsDir, 'pre_install.sh'),
+        '--before-remove', resolve(packageScriptsDir, 'pre_remove.sh'),
+        '--after-remove', resolve(packageScriptsDir, 'post_remove.sh'),
+        '--config-files', config.path.kibanaConfig,
+        '--template-value', `user=${config.user}`,
+        '--template-value', `group=${config.group}`,
+        '--template-value', `optimizeDir=${config.path.home}/optimize`,
+        '--template-value', `pluginsDir=${config.path.plugins}`,
+        '--template-value', `dataDir=${config.path.data}`,
+        //uses relative path to --prefix, strip the leading /
+        '--exclude', `${config.path.home.slice(1)}/installedPlugins/.data`
+      ];
+      const debOptions = [
+        '-t', 'deb',
+        '--deb-priority', 'optional'
+      ];
+      const rpmOptions = [
+        '-t', 'rpm',
+        '--rpm-os', 'linux'
+      ];
+      const args = [
+        `${buildDir}/=${config.path.home}/`,
+        `${buildDir}/installedPlugins/.data/=${config.path.data}/`,
+        `${servicesByName.sysv.outputDir}/etc/=/etc/`,
+        `${servicesByName.systemd.outputDir}/lib/=/lib/`
       ];
 
-      let files = buildDir + '/=/opt/kibana';
-      grunt.file.mkdir(targetDir);
-
-      // kibana.rpm and kibana.deb
-      if (/linux-x(86|64)$/.test(name)) {
-        let sysv = servicesByName.sysv.outputDir + '/etc/=/etc/';
-        fpm(args.concat('-t', 'rpm', '-a', arch, '--rpm-os', 'linux', files, sysv));
-        fpm(args.concat('-t', 'deb', '-a', arch, files, sysv));
-        return;
+      //Manually find flags, multiple args without assignment are not entirely parsed
+      const flags = grunt.option.flags().filter(flag => /deb|rpm/.test(flag)).join(',');
+      const buildDeb = flags.includes('deb') || !flags.length;
+      const buildRpm = flags.includes('rpm') || !flags.length;
+      if (buildDeb) {
+        fpm([...baseOptions, ...debOptions, ...args]);
       }
-
-      // kibana.pkg
-      if (/darwin-x(86|64)$/.test(name)) {
-        let launchd = servicesByName.launchd.outputDir + '/=/';
-        fpm(args.concat('-t', 'osxpkg', '-a', arch, files, launchd));
-        return;
+      if (buildRpm) {
+        fpm([...baseOptions, ...rpmOptions, ...args]);
       }
 
     });
diff --git a/tasks/build/package_scripts/post_install.sh b/tasks/build/package_scripts/post_install.sh
new file mode 100644
index 0000000000000..bc31f19f19953
--- /dev/null
+++ b/tasks/build/package_scripts/post_install.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+user_check() {
+  getent passwd "$1" > /dev/null 2>&1
+}
+
+user_create() {
+  # Create a system user. A system user is one within the system uid range and
+  # has no expiration
+  useradd -r "$1"
+}
+
+if ! user_check "<%= user %>" ; then
+  user_create "<%= user %>"
+fi
+chown -R <%= user %>:<%= group %> <%= optimizeDir %>
+chown <%= user %>:<%= group %> <%= dataDir %>
+chown <%= user %>:<%= group %> <%= pluginsDir %>
diff --git a/tasks/build/package_scripts/post_remove.sh b/tasks/build/package_scripts/post_remove.sh
new file mode 100644
index 0000000000000..4e33c25aaa767
--- /dev/null
+++ b/tasks/build/package_scripts/post_remove.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+set -e
+
+user_check() {
+  getent passwd "$1" > /dev/null 2>&1
+}
+
+user_remove() {
+  userdel "$1"
+}
+
+REMOVE_USER=false
+REMOVE_DIRS=false
+
+case $1 in
+  # Includes cases for all valid arguments, exit 1 otherwise
+  # Debian
+  purge)
+    REMOVE_USER=true
+    REMOVE_DIRS=true
+  ;;
+  remove)
+    REMOVE_DIRS=true
+  ;;
+
+  failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear)
+  ;;
+
+  # Red Hat
+  0)
+    REMOVE_USER=true
+    REMOVE_DIRS=true
+  ;;
+
+  1)
+  ;;
+
+  *)
+      echo "post remove script called with unknown argument \`$1'" >&2
+      exit 1
+  ;;
+esac
+
+if [ "$REMOVE_USER" = "true" ]; then
+  if user_check "<%= user %>"  ; then
+    user_remove "<%= user %>"
+  fi
+fi
+
+if [ "$REMOVE_DIRS" = "true" ]; then
+  if [ -d "<%= optimizeDir %>" ]; then
+    rm -rf "<%= optimizeDir %>"
+  fi
+
+  if [ -d "<%= pluginsDir %>" ]; then
+    rm -rf "<%= pluginsDir %>"
+  fi
+
+  if [ -d "<%= dataDir %>" ]; then
+    rmdir --ignore-fail-on-non-empty "<%= dataDir %>"
+  fi
+fi
diff --git a/tasks/build/package_scripts/pre_install.sh b/tasks/build/package_scripts/pre_install.sh
new file mode 100644
index 0000000000000..4f3b6590a3a3e
--- /dev/null
+++ b/tasks/build/package_scripts/pre_install.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+if command -v systemctl >/dev/null && systemctl is-active kibana.service >/dev/null; then
+    systemctl --no-reload stop kibana.service
+elif [ -x /etc/init.d/kibana ]; then
+    if command -v invoke-rc.d >/dev/null; then
+        invoke-rc.d kibana stop
+    elif command -v service >/dev/null; then
+        service kibana stop
+    else
+        /etc/init.d/kibana stop
+    fi
+fi
diff --git a/tasks/build/package_scripts/pre_remove.sh b/tasks/build/package_scripts/pre_remove.sh
new file mode 100644
index 0000000000000..07d0f341ccefc
--- /dev/null
+++ b/tasks/build/package_scripts/pre_remove.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+echo -n "Stopping kibana service..."
+if command -v systemctl >/dev/null && systemctl is-active kibana.service >/dev/null; then
+    systemctl --no-reload stop kibana.service
+elif [ -x /etc/init.d/kibana ]; then
+    if command -v invoke-rc.d >/dev/null; then
+        invoke-rc.d kibana stop
+    elif command -v service >/dev/null; then
+        service kibana stop
+    else
+        /etc/init.d/kibana stop
+    fi
+fi
+echo " OK"
diff --git a/tasks/build/pleaserun.js b/tasks/build/pleaserun.js
index 3b8b21da01b76..ee608228bdd1c 100644
--- a/tasks/build/pleaserun.js
+++ b/tasks/build/pleaserun.js
@@ -1,30 +1,29 @@
-module.exports = function createServices(grunt) {
-  var { resolve } = require('path');
+import { resolve } from 'path';
+import { appendFileSync } from 'fs';
+import exec from '../utils/exec';
+import { capitalize } from 'lodash';
 
-  let exec = require('../utils/exec');
-  let userScriptsPath = grunt.config.get('userScriptsPath');
+export default (grunt) => {
+  const userScriptsDir = grunt.config.get('userScriptsDir');
+  const { path, user, group, name } = grunt.config.get('packages');
 
   grunt.registerTask('_build:pleaseRun', function () {
-    // TODO(sissel): Detect if 'pleaserun' is found, and provide a useful error
-    // to the user if it is missing.
-
-    grunt.config.get('services').forEach(function (service) {
+    grunt.config.get('services').forEach((service) => {
       grunt.file.mkdir(service.outputDir);
       exec('pleaserun', [
         '--install',
         '--no-install-actions',
         '--install-prefix', service.outputDir,
         '--overwrite',
-        '--user', 'kibana',
-        '--sysv-log-path', '/var/log/kibana/',
+        '--name', name,
+        '--description', capitalize(name),
+        '--user', user,
+        '--group', group,
+        '--sysv-log-path', `${path.logs}/`,
         '-p', service.name,
         '-v', service.version,
-        '/opt/kibana/bin/kibana'
+        path.kibanaBin
       ]);
     });
-
-    grunt.file.mkdir(userScriptsPath);
-    exec('please-manage-user', ['--output', userScriptsPath, 'kibana']);
-
   });
 };
diff --git a/tasks/build/shasums.js b/tasks/build/shasums.js
index c5dcedeba8f29..7071c3e1f1d79 100644
--- a/tasks/build/shasums.js
+++ b/tasks/build/shasums.js
@@ -8,8 +8,8 @@ module.exports = function (grunt) {
 
     readdir(targetDir)
     .map(function (archive) {
-      // only sha the archives
-      if (!archive.match(/\.zip$|\.tar.gz$/)) return;
+      // only sha the archives and packages
+      if (!archive.match(/\.zip$|\.tar.gz$|\.deb$|\.rpm$/)) return;
 
       return exec('shasum ' + archive + ' > ' + archive + '.sha1.txt', {
         cwd: targetDir
diff --git a/tasks/build/versionedLinks.js b/tasks/build/versionedLinks.js
index c78b2b84bb1e5..449321bd009ad 100644
--- a/tasks/build/versionedLinks.js
+++ b/tasks/build/versionedLinks.js
@@ -12,18 +12,21 @@ module.exports = function (grunt) {
       return resolve(rootPath, file);
     });
 
-    let ln = (source, link) => exec('ln', ['-s', source, link]);
+    //We don't want to build os packages with symlinks
+    let transferFiles = (source, link) => grunt.option('os-packages')
+      ? exec('cp', ['-r', source, link])
+      : exec('ln', ['-s', source, link]);
 
     grunt.config.get('platforms').forEach(function (platform) {
       grunt.file.mkdir(platform.buildDir);
 
       // link all files at the root of the build
       buildFiles.forEach(function (source) {
-        ln(source, resolve(platform.buildDir, basename(source)));
+        transferFiles(source, resolve(platform.buildDir, basename(source)));
       });
 
       // link the node modules
-      ln(platform.nodeDir, resolve(platform.buildDir, 'node'));
+      transferFiles(platform.nodeDir, resolve(platform.buildDir, 'node'));
     });
   });
 };
diff --git a/tasks/check_added_filenames.js b/tasks/check_added_filenames.js
new file mode 100644
index 0000000000000..be3a2ef2f865d
--- /dev/null
+++ b/tasks/check_added_filenames.js
@@ -0,0 +1,18 @@
+import { isAdded, getFilename } from './utils/files_to_commit';
+
+export default function registerCheckAddedFilenames(grunt) {
+  grunt.registerTask('checkAddedFilenames', function () {
+    grunt.task.requires('collectFilesToCommit');
+
+    const invalid = grunt.config
+    .get('filesToCommit')
+    .filter(isAdded)
+    .map(getFilename)
+    .filter(name => name.match(/[A-Z \-]/))
+    .reduce((all, name) => `${all}  ${name}\n`, '');
+
+    if (invalid) {
+      grunt.fail.fatal(`Filenames must use snake_case.\n${invalid}`);
+    }
+  });
+}
diff --git a/tasks/collect_files_to_commit.js b/tasks/collect_files_to_commit.js
new file mode 100644
index 0000000000000..d38f29fa04e34
--- /dev/null
+++ b/tasks/collect_files_to_commit.js
@@ -0,0 +1,15 @@
+import filesToCommit from './utils/files_to_commit';
+import { resolve } from 'path';
+
+export default function registerCollectFilesToCommit(grunt) {
+  const root = grunt.config.get('root');
+
+  grunt.registerTask('collectFilesToCommit', function () {
+    filesToCommit(root)
+    .then(files => {
+      grunt.log.ok(`${files.length} files with changes to commit`);
+      grunt.config.set('filesToCommit', files);
+    })
+    .nodeify(this.async());
+  });
+};
diff --git a/tasks/config/clean.js b/tasks/config/clean.js
index 10a7d1fe2a7c0..f83a816085567 100644
--- a/tasks/config/clean.js
+++ b/tasks/config/clean.js
@@ -3,7 +3,7 @@ module.exports = function (grunt) {
   return {
     build: 'build',
     target: 'target',
-    testsFromModules: 'build/kibana/node_modules/**/*test*/**',
+    testsFromModules: 'build/kibana/node_modules/**/{test,tests}/**',
     deepModuleBins: 'build/kibana/node_modules/*/node_modules/**/.bin/{' + modules.join(',') + '}',
     deepModules: 'build/kibana/node_modules/*/node_modules/**/{' + modules.join(',') + '}/',
   };
diff --git a/tasks/config/downloadSelenium.js b/tasks/config/downloadSelenium.js
deleted file mode 100644
index c70610b1e5536..0000000000000
--- a/tasks/config/downloadSelenium.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var path = require('path');
-
-
-module.exports = function (grunt) {
-  return {
-    options: {
-      selenium: {
-        filename: 'selenium-server-standalone-2.47.1.jar',
-        server: 'https://selenium-release.storage.googleapis.com/2.47/',
-        md5: 'e6cb10b8f0f353c6ca4a8f62fb5cb472',
-        directory: path.join(grunt.config.get('root'), 'selenium')
-      }
-    }
-  };
-};
diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index 571ca7e12388a..06882a02c2bba 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -6,7 +6,7 @@ module.exports = function (grunt) {
 
   return {
     options: {
-      branch: '2.1',
+      branch: '2.x',
       fresh: !grunt.option('esvm-no-fresh'),
       config: {
         network: {
@@ -28,6 +28,9 @@ module.exports = function (grunt) {
         config: {
           path: {
             data: dataDir
+          },
+          cluster: {
+            name: 'esvm-dev'
           }
         }
       }
@@ -35,7 +38,15 @@ module.exports = function (grunt) {
     test: {
       options: {
         directory: resolve(directory, 'test'),
-        purge: true
+        purge: true,
+        config: {
+          http: {
+            port: 9210
+          },
+          cluster: {
+            name: 'esvm-test'
+          }
+        }
       }
     },
     ui: {
@@ -45,6 +56,9 @@ module.exports = function (grunt) {
         config: {
           http: {
             port: uiConfig.servers.elasticsearch.port
+          },
+          cluster: {
+            name: 'esvm-ui'
           }
         }
       }
diff --git a/tasks/config/karma.js b/tasks/config/karma.js
index a51ed55d6d21b..af707e9de07e5 100644
--- a/tasks/config/karma.js
+++ b/tasks/config/karma.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
       browsers: ['<%= karmaBrowser %>'],
 
       // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-      reporters: process.env.CI ? ['dots'] : ['progress', 'growl'],
+      reporters: process.env.CI ? ['dots'] : ['progress'],
 
       // list of files / patterns to load in the browser
       files: [
diff --git a/tasks/config/packages.js b/tasks/config/packages.js
new file mode 100644
index 0000000000000..2aa45957ec4cc
--- /dev/null
+++ b/tasks/config/packages.js
@@ -0,0 +1,56 @@
+export default (grunt) => {
+  const VERSION = grunt.config.get('pkg.version');
+
+  const FOLDER_STAGING = `kibana/staging/${VERSION.match(/\d\.\d\.\d/)[0]}-XXXXXXX/repos/${VERSION.match(/\d\./)[0]}x`;
+  const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\./)[0]}x`;
+
+  const FOLDERNAME_DEB = 'debian';
+  const FOLDERNAME_RPM = 'centos';
+
+  const PREFIX_STAGING_DEB = `${FOLDER_STAGING}/${FOLDERNAME_DEB}`;
+  const PREFIX_STAGING_RPM = `${FOLDER_STAGING}/${FOLDERNAME_RPM}`;
+  const PREFIX_PRODUCTION_DEB = `${FOLDER_PRODUCTION}/${FOLDERNAME_DEB}`;
+  const PREFIX_PRODUCTION_RPM = `${FOLDER_PRODUCTION}/${FOLDERNAME_RPM}`;
+
+  const FOLDER_CONFIG = '/opt/kibana/config';
+  const FOLDER_HOME = '/opt/kibana';
+  const FOLDER_DATA = '/var/lib/kibana';
+  const FOLDER_LOGS = '/var/log/kibana';
+  const FOLDER_PLUGINS = `${FOLDER_HOME}/installedPlugins`;
+
+  const FILE_KIBANA_CONF = `${FOLDER_CONFIG}/kibana.yml`;
+  const FILE_KIBANA_BINARY = `${FOLDER_HOME}/bin/kibana`;
+
+  return {
+    publish: {
+      staging: {
+        bucket: 'download.elasticsearch.org',
+        debPrefix: PREFIX_STAGING_DEB,
+        rpmPrefix: PREFIX_STAGING_RPM
+      },
+      production: {
+        bucket: 'packages.elasticsearch.org',
+        debPrefix: PREFIX_STAGING_DEB,
+        rpmPrefix: PREFIX_STAGING_RPM
+      }
+    },
+    user: 'kibana',
+    group: 'kibana',
+    name: 'kibana',
+    description: 'Explore\ and\ visualize\ your\ Elasticsearch\ data',
+    site: 'https://www.elastic.co',
+    vendor: 'Elasticsearch,\ Inc.',
+    maintainer: 'Kibana Team\ \<info@elastic.co\>',
+    license: 'Apache\ 2.0',
+    version: VERSION,
+    path: {
+      conf: FOLDER_CONFIG,
+      data: FOLDER_DATA,
+      plugins: FOLDER_PLUGINS,
+      logs: FOLDER_LOGS,
+      home: FOLDER_HOME,
+      kibanaBin: FILE_KIBANA_BINARY,
+      kibanaConfig: FILE_KIBANA_CONF
+    }
+  };
+};
diff --git a/tasks/config/platforms.js b/tasks/config/platforms.js
index 752a5e6884fec..4a39f1b7dcc32 100644
--- a/tasks/config/platforms.js
+++ b/tasks/config/platforms.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
   ].map(function (name) {
     let win = name === 'windows';
 
-    let nodeUrl = win ? `${baseUri}/node.exe` : `${baseUri}/node-v${nodeVersion}-${name}.tar.gz`;
+    let nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${name}.tar.gz`;
     let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${name}`);
 
     let buildName = `kibana-${version}-${name}`;
@@ -26,12 +26,27 @@ module.exports = function (grunt) {
     let zipName = `${buildName}.zip`;
     let zipPath = resolve(rootPath, `target/${zipName}`);
 
+    let debName;
+    let debPath;
+    let rpmName;
+    let rpmPath;
+    if (name.match('linux')) {
+      let debArch = name.match('x64') ? 'amd64' : 'i386';
+      debName = `kibana_${version}_${debArch}.deb`;
+      debPath = resolve(rootPath, `target/${debName}`);
+
+      let rpmArch = name.match('x64') ? 'x86_64' : 'i386';
+      rpmName = `kibana-${version.replace('-', '_')}-1.${rpmArch}.rpm`;
+      rpmPath = resolve(rootPath, `target/${rpmName}`);
+    }
     return {
       name, win,
       nodeUrl, nodeDir,
       buildName, buildDir,
       tarName, tarPath,
       zipName, zipPath,
+      debName, debPath,
+      rpmName, rpmPath
     };
   });
 };
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 6905572e30486..dc7f2e0062db9 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -5,6 +5,7 @@ module.exports = function (grunt) {
   let root = p => resolve(__dirname, '../../', p);
   let binScript =  /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
   let uiConfig = require(root('test/serverConfig'));
+  let chromedriver = require('chromedriver');
 
   return {
     testServer: {
@@ -78,35 +79,31 @@ module.exports = function (grunt) {
       ]
     },
 
-    seleniumServer: {
+    chromeDriver: {
       options: {
         wait: false,
-        ready: /Selenium Server is up and running/,
-        quiet: true,
+        ready: /Starting ChromeDriver/,
+        quiet: false,
         failOnError: false
       },
-      cmd: 'java',
+      cmd: chromedriver.path,
       args: [
-        '-jar',
-        'selenium/selenium-server-standalone-2.47.1.jar',
-        '-port',
-        uiConfig.servers.webdriver.port
+        `--port=${uiConfig.servers.webdriver.port}`,
+        '--url-base=wd/hub'
       ]
     },
 
-    devSeleniumServer: {
+    devChromeDriver: {
       options: {
         wait: false,
-        ready: /Selenium Server is up and running/,
+        ready: /Starting ChromeDriver/,
         quiet: false,
         failOnError: false
       },
-      cmd: 'java',
+      cmd: chromedriver.path,
       args: [
-        '-jar',
-        'selenium/selenium-server-standalone-2.47.1.jar',
-        '-port',
-        uiConfig.servers.webdriver.port
+        `--port=${uiConfig.servers.webdriver.port}`,
+        '--url-base=wd/hub'
       ]
     },
 
diff --git a/tasks/config/s3.js b/tasks/config/s3.js
index edea5f487f585..19a1491412e2c 100644
--- a/tasks/config/s3.js
+++ b/tasks/config/s3.js
@@ -1,4 +1,3 @@
-var _ = require('lodash');
 module.exports = function (grunt) {
   var { config } = grunt;
 
@@ -6,22 +5,7 @@ module.exports = function (grunt) {
     release: {
       bucket: 'download.elasticsearch.org',
       access: 'private',
-      debug: false,
-      upload: config.get('platforms')
-      .reduce(function (files, platform) {
-        return files.concat(
-          platform.tarName,
-          platform.tarName + '.sha1.txt',
-          platform.zipName,
-          platform.zipName + '.sha1.txt'
-        );
-      }, [])
-      .map(function (filename) {
-        return {
-          src: 'target/' + filename,
-          dest: 'kibana/kibana/' + filename
-        };
-      })
+      debug: false
     }
   };
 };
diff --git a/tasks/downloadSelenium.js b/tasks/downloadSelenium.js
deleted file mode 100644
index 62840493ee2a8..0000000000000
--- a/tasks/downloadSelenium.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var _ = require('lodash');
-var request = require('request');
-var fs = require('fs');
-var path = require('path');
-var colors = require('ansicolors');
-var crypto = require('crypto');
-var {spawn} = require('child_process');
-
-module.exports = function (grunt) {
-  grunt.registerTask('downloadSelenium', 'Download selenium standalone', function (keepalive) {
-    const done = this.async();
-    const config = this.options();
-
-    const SELENIUM_FILE_PATH = path.join(config.selenium.directory, config.selenium.filename);
-    const SELENIUM_DOWNLOAD_URL = config.selenium.server + config.selenium.filename;
-
-    function validateDownload(path, expectedHash, success) {
-      grunt.log.write('Validating hash...');
-      fs.readFile(path, function checkHash(err, data) {
-        if (err) grunt.fail.warn(err);
-
-        const calculatedHash = crypto.createHash('md5').update(data).digest('hex');
-        if (calculatedHash !== expectedHash) return grunt.fail.warn('Selenium download has an invalid hash');
-
-        grunt.log.writeln('done');
-        success();
-      });
-    }
-
-    function downloadSelenium(success) {
-      grunt.log.write(`Downloading ${SELENIUM_DOWNLOAD_URL}...`);
-      request.get(SELENIUM_DOWNLOAD_URL)
-      .pipe(fs.createWriteStream(SELENIUM_FILE_PATH))
-      .on('error', function downloadError(err) {
-        grunt.fail.warn(err);
-      })
-      .on('finish', function downloadFinish() {
-        grunt.log.writeln('done');
-        validateDownload(SELENIUM_FILE_PATH, config.selenium.md5, success);
-      });
-    }
-
-    function start() {
-      try {
-        fs.mkdirSync(config.selenium.directory);
-      } catch (err) {
-        if (err && err.code !== 'EEXIST') grunt.fail.warn(err);
-      }
-
-      if (fs.existsSync(SELENIUM_FILE_PATH)) {
-        validateDownload(SELENIUM_FILE_PATH, config.selenium.md5, done);
-      } else {
-        downloadSelenium(done);
-      }
-    }
-
-    start();
-
-  });
-};
diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index f043e92d0cc76..141f8084a9ec3 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -1,9 +1,25 @@
+import { compact } from 'lodash';
+import { delimiter } from 'path';
+
 module.exports = function (grunt) {
-  let { compact } = require('lodash');
+  grunt.registerTask('jenkins', 'Jenkins build script', function () {
+    // make sure JAVA_HOME points to JDK8
+    const HOME = '/usr/lib/jvm/jdk8';
+    process.env.JAVA_HOME = HOME;
+
+    // extend PATH to point to JDK8
+    const path = process.env.PATH.split(delimiter);
+    path.unshift(`${HOME}/bin`);
+    process.env.PATH = path.join(delimiter);
+
+    // always build os packages on jenkins
+    grunt.option('os-packages', true);
 
-  grunt.registerTask('jenkins', 'Jenkins build script', compact([
-    'test',
-    process.env.JOB_NAME === 'kibana_core' ? 'build' : null
-  ]));
+    grunt.task.run(compact([
+      'rejectRejFiles',
+      'test',
+      process.env.JOB_NAME === 'kibana_core' ? 'build' : null
+    ]));
+  });
 
 };
diff --git a/tasks/lintStagedFiles.js b/tasks/lintStagedFiles.js
deleted file mode 100644
index a0c1da811d387..0000000000000
--- a/tasks/lintStagedFiles.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var _ = require('lodash');
-var resolve = require('path').resolve;
-var root = resolve(__dirname, '..');
-var simpleGit = require('simple-git')(root);
-var diff = require('bluebird').promisify(simpleGit.diff, simpleGit);
-
-module.exports = function (grunt) {
-
-  grunt.registerTask(
-    'lintStagedFiles',
-    'Run staged files through JSHint/JSCS',
-    function () {
-
-      diff(['--name-only', '--cached'])
-      .then(function (files) {
-        // match these patterns
-        var patterns = grunt.config.get('eslint.source.files.src');
-        if (!patterns) grunt.fail.warn('eslint file pattern is not defined');
-
-        files = files.split('\n').filter(Boolean)
-        .map(function (file) {
-          return resolve(root, file);
-        })
-        .filter(function (file) {
-          return grunt.file.isMatch(patterns, file);
-        });
-
-        grunt.log.ok('Staged files to lint: ' + files.length);
-        if (!_.size(files)) return;
-
-        grunt.config.set('eslint.staged.files.src', files);
-        grunt.task.run(['eslint:staged']);
-      })
-      .nodeify(this.async());
-
-    }
-  );
-};
-
diff --git a/tasks/lint_staged_files.js b/tasks/lint_staged_files.js
new file mode 100644
index 0000000000000..e7c2f95752d13
--- /dev/null
+++ b/tasks/lint_staged_files.js
@@ -0,0 +1,24 @@
+import { resolve } from 'path';
+import { isStaged, getFilename } from './utils/files_to_commit';
+
+const root = resolve(__dirname, '..');
+
+export default function (grunt) {
+  grunt.registerTask('lintStagedFiles', function () {
+    grunt.task.requires('collectFilesToCommit');
+
+    // match these patterns
+    var patterns = grunt.config.get('eslint.source.files.src');
+    if (!patterns) grunt.fail.warn('eslint file pattern is not defined');
+
+    const files = grunt.config
+    .get('filesToCommit')
+    .filter(isStaged)
+    .map(getFilename)
+    .map(file => resolve(root, file))
+    .filter(file => grunt.file.isMatch(patterns, file));
+
+    grunt.config.set('eslint.staged.files.src', files);
+    grunt.task.run(['eslint:staged']);
+  });
+}
diff --git a/tasks/precommit.js b/tasks/precommit.js
new file mode 100644
index 0000000000000..55004ead1307d
--- /dev/null
+++ b/tasks/precommit.js
@@ -0,0 +1,7 @@
+export default function (grunt) {
+  grunt.registerTask('precommit', [
+    'collectFilesToCommit',
+    'checkAddedFilenames',
+    'lintStagedFiles'
+  ]);
+};
diff --git a/tasks/reject_rej_files.js b/tasks/reject_rej_files.js
new file mode 100644
index 0000000000000..33c8c3273fa51
--- /dev/null
+++ b/tasks/reject_rej_files.js
@@ -0,0 +1,30 @@
+import { startsWith } from 'lodash';
+
+// Fails if any .rej files are found
+// .rej files are an artifact from a failed git-apply or a jasper backport
+
+// This check is intentionally performed on the files in the repo rather than
+// on the files that are to be committed.
+
+export default grunt => {
+  grunt.registerTask('rejectRejFiles', 'Reject any git-apply .rej files', () => {
+    const ignoredTopLevelDirs = [
+      'esvm',
+      'installedPlugins',
+      'node_modules',
+      'optimize'
+    ];
+
+    const matchBase = true;
+    const filter = file => (
+      ignoredTopLevelDirs.every(dir => !startsWith(file, dir))
+    );
+
+    const files = grunt.file.expand({ filter, matchBase }, '*.rej');
+    if (files.length > 0) {
+      const err = `.rej files are not allowed:\n${files.join('\n')}`;
+      grunt.log.error(err);
+      return false;
+    }
+  });
+};
diff --git a/tasks/release.js b/tasks/release.js
index 6aed4fbc7e6d1..fe57142fbb84d 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -1,11 +1,15 @@
 module.exports = function (grunt) {
   var readline = require('readline');
+  var url = require('url');
+  var fs = require('fs');
+  var _ = require('lodash');
 
   // build, then zip and upload to s3
   grunt.registerTask('release', [
     '_release:confirmUpload',
     '_release:loadS3Config',
     'build',
+    '_release:setS3Uploads',
     's3:release',
     '_release:complete'
   ]);
@@ -33,18 +37,48 @@ module.exports = function (grunt) {
     });
   });
 
+  grunt.registerTask('_release:setS3Uploads', function () {
+    var uploads = grunt.config.get('platforms')
+    .reduce(function (files, platform) {
+      return files.concat(
+        platform.tarName,
+        platform.tarName + '.sha1.txt',
+        platform.zipName,
+        platform.zipName + '.sha1.txt',
+        platform.rpmName,
+        platform.rpmName && platform.rpmName + '.sha1.txt',
+        platform.debName,
+        platform.debName && platform.debName + '.sha1.txt'
+      );
+    }, [])
+    .filter(function (filename) {
+      if (_.isUndefined(filename)) return false;
+      try {
+        fs.accessSync('target/' + filename, fs.F_OK);
+        return true;
+      } catch (e) {
+        return false;
+      }
+    })
+    .map(function (filename) {
+      return {
+        src: 'target/' + filename,
+        dest: 'kibana/kibana/' + filename
+      };
+    });
+    grunt.config.set('s3.release.upload', uploads);
+  });
+
   grunt.registerTask('_release:complete', function () {
     grunt.log.ok('Builds released');
-    grunt.log.write(
-`
-${grunt.config.get('platforms').reduce((t, p) => {
-  return (
-`${t}https://download.elastic.co/kibana/kibana/${p.buildName}.tar.gz
-https://download.elastic.co/kibana/kibana/${p.buildName}.zip
-`
-  );
-}, '')}
-`
-);
+    var links = grunt.config.get('s3.release.upload').reduce((t, {dest}) => {
+      var link = url.format({
+        protocol: 'https',
+        hostname: 'download.elastic.co',
+        pathname: dest
+      });
+      return `${t}${link}\n`;
+    }, '');
+    grunt.log.write(links);
   });
 };
diff --git a/tasks/release_packages.js b/tasks/release_packages.js
new file mode 100644
index 0000000000000..f542481d7007a
--- /dev/null
+++ b/tasks/release_packages.js
@@ -0,0 +1,113 @@
+import exec from './utils/exec';
+import SimpleGit from 'simple-git';
+import { promisify } from 'bluebird';
+import readline from 'readline';
+
+export default (grunt) => {
+  const publishConfig = grunt.config.get('packages').publish;
+  const platforms = grunt.config.get('platforms');
+
+  function debS3(deb) {
+    exec('deb-s3', [
+      'upload',
+      '--preserve-versions',
+      deb.filePath,
+      '--bucket', deb.bucket,
+      '--prefix', deb.prefix,
+      '--sign', deb.signatureKeyId,
+      '--arch', deb.arch,
+      `--access-key-id=${deb.awsKey}`,
+      `--secret-access-key=${deb.awsSecret}`
+    ]);
+  }
+
+  function rpmS3(rpm) {
+    exec('rpm', [
+      '--resign', rpm.filePath,
+      '--define', '_signature gpg',
+      '--define', `_gpg_name ${rpm.signingKeyName}`
+    ]);
+
+    exec('rpm-s3', [
+      '-v',
+      '-b', rpm.bucket,
+      '-p', rpm.prefix,
+      '--sign',
+      '--visibility', 'public-read',
+      '-k', '100',
+      rpm.filePath,
+      '-r', 'external-1'
+    ], {
+      env: Object.assign({}, {
+        'AWS_ACCESS_KEY': rpm.awsKey,
+        'AWS_SECRET_KEY': rpm.awsSecret
+      }, process.env)
+    });
+  }
+
+  grunt.registerTask('publishPackages:staging', [
+    '_publishPackages:confirm',
+    '_publishPackages:upload:staging',
+  ]);
+
+  grunt.registerTask('publishPackages:production', [
+    '_publishPackages:confirm',
+    '_publishPackages:upload:production',
+  ]);
+
+  grunt.registerTask('_publishPackages:confirm', function () {
+    function abort() {
+      grunt.fail.fatal('Aborting publish');
+    }
+
+    var rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.on('close', this.async());
+    rl.on('SIGINT', () => abort());
+    rl.question('Publish packages to s3? [N/y] ', function (resp) {
+      if (resp.toLowerCase().trim()[0] === 'y') return rl.close();
+      abort();
+    });
+  });
+
+  grunt.registerTask('_publishPackages:upload', function (environment) {
+    const aws = grunt.file.readJSON('.aws-config.json');
+    const signature = grunt.file.readJSON('.signing-config.json');
+    const done = this.async();
+    const simpleGit = new SimpleGit();
+    const revparse = promisify(simpleGit.revparse, simpleGit);
+
+    return revparse(['--short', 'HEAD'])
+    .then(hash => {
+      const trimmedHash = hash.trim();
+      platforms.forEach((platform) => {
+        if (platform.debPath) {
+          debS3({
+            filePath: platform.debPath,
+            bucket: publishConfig[environment].bucket,
+            prefix: publishConfig[environment].debPrefix.replace('XXXXXXX', trimmedHash),
+            signatureKeyId: signature.id,
+            arch: platform.name.match('x64') ? 'amd64' : 'i386',
+            awsKey: aws.key,
+            awsSecret: aws.secret
+          });
+        }
+
+        if (platform.rpmPath) {
+          rpmS3({
+            filePath: platform.rpmPath,
+            bucket: publishConfig[environment].bucket,
+            prefix: publishConfig[environment].rpmPrefix.replace('XXXXXXX', trimmedHash),
+            signingKeyName: signature.name,
+            awsKey: aws.key,
+            awsSecret: aws.secret
+          });
+        }
+      });
+      done();
+    });
+  });
+};
diff --git a/tasks/test.js b/tasks/test.js
index 8d3170d327b28..9d9769957806b 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -18,19 +18,17 @@ module.exports = function (grunt) {
   grunt.registerTask('test:ui', [
     'esvm:ui',
     'run:testUIServer',
-    'downloadSelenium',
-    'run:seleniumServer',
+    'run:chromeDriver',
     'intern:dev',
     'esvm_shutdown:ui',
-    'stop:seleniumServer',
+    'stop:chromeDriver',
     'stop:testUIServer'
   ]);
 
   grunt.registerTask('test:ui:server', [
     'esvm:ui',
     'run:testUIServer',
-    'downloadSelenium',
-    'run:devSeleniumServer:keepalive'
+    'run:devChromeDriver:keepalive'
   ]);
 
   grunt.registerTask('test:ui:runner', [
diff --git a/tasks/travis.js b/tasks/travis.js
index b10070eb958f7..a034818f0f3e7 100644
--- a/tasks/travis.js
+++ b/tasks/travis.js
@@ -1,7 +1,9 @@
 module.exports = function (grunt) {
 
   grunt.registerTask('travis', 'Travis CI build script', [
-    'test'
+    'eslint:source',
+    'test:server',
+    'test:browser'
   ]);
 
 };
diff --git a/tasks/utils/files_to_commit.js b/tasks/utils/files_to_commit.js
new file mode 100644
index 0000000000000..61f55fcc02a19
--- /dev/null
+++ b/tasks/utils/files_to_commit.js
@@ -0,0 +1,41 @@
+import SimpleGit from 'simple-git';
+import { promisify } from 'bluebird';
+import { includes } from 'lodash';
+
+export default function filesToCommit(path) {
+  const simpleGit = new SimpleGit(path);
+  const gitDiff = promisify(simpleGit.diff, simpleGit);
+
+  return gitDiff(['--name-status', '--cached'])
+  .then(output => {
+    return output
+    .split('\n')
+    .map(line => line.trim().split('\t'))
+    .filter(parts => parts.length === 2)
+    .map(parts => {
+      const status = parts.shift();
+      const name = parts.join('\t').trim();
+      return { status, name };
+    });
+  });
+};
+
+export function getFilename(file) {
+  return file.name;
+}
+
+export function isAdded(file) {
+  return file.status === 'A';
+};
+
+export function isDeleted(file) {
+  return file.status === 'D';
+}
+
+export function isUnmerged(file) {
+  return file.status === 'U';
+}
+
+export function isStaged(file) {
+  return !isDeleted(file) && !isUnmerged(file);
+}
diff --git a/test/fixtures/__tests__/scenarioManager.js b/test/fixtures/__tests__/scenario_manager.js
similarity index 98%
rename from test/fixtures/__tests__/scenarioManager.js
rename to test/fixtures/__tests__/scenario_manager.js
index bccce64e7ade9..144f6c1cfaa80 100644
--- a/test/fixtures/__tests__/scenarioManager.js
+++ b/test/fixtures/__tests__/scenario_manager.js
@@ -2,7 +2,7 @@ var expect = require('expect.js');
 var sinon = require('sinon');
 var Promise = require('bluebird');
 
-var ScenarioManager = require('../scenarioManager');
+var ScenarioManager = require('../scenario_manager');
 
 describe('scenario manager', function () {
   var manager = new ScenarioManager('http://localhost:9200');
diff --git a/test/fixtures/scenarioManager.js b/test/fixtures/scenario_manager.js
similarity index 88%
rename from test/fixtures/scenarioManager.js
rename to test/fixtures/scenario_manager.js
index 84376c0f70caa..224b640cad816 100644
--- a/test/fixtures/scenarioManager.js
+++ b/test/fixtures/scenario_manager.js
@@ -6,8 +6,10 @@ var config = require('./config').scenarios;
 function ScenarioManager(server) {
   if (!server) throw new Error('No server defined');
 
+  // NOTE: some large sets of test data can take several minutes to load
   this.client = new elasticsearch.Client({
-    host: server
+    host: server,
+    requestTimeout: 300000
   });
 }
 
@@ -40,6 +42,18 @@ ScenarioManager.prototype.load = function (id) {
         body: body
       });
     })
+    .then(function (response) {
+      if (response.errors) {
+        throw new Error(
+          'bulk failed\n' +
+            response.items
+            .map(i => i[Object.keys(i)[0]].error)
+            .filter(Boolean)
+            .map(err => '  ' + JSON.stringify(err))
+            .join('\n')
+        );
+      }
+    })
     .catch(function (err) {
       if (bulk.haltOnFailure === false) return;
       throw err;
@@ -106,7 +120,6 @@ ScenarioManager.prototype.loadIfEmpty = function (id) {
   var scenario = config[id];
   if (!scenario) throw new Error('No scenario found for ' + id);
 
-  var self = this;
   return Promise.all(scenario.bulk.map(function mapBulk(bulk) {
     var loadIndexDefinition;
 
diff --git a/test/fixtures/scenarios/emptyKibana/kibana.js b/test/fixtures/scenarios/emptyKibana/kibana.js
index 71c31c2dfb76f..58ebb4f29d2e7 100644
--- a/test/fixtures/scenarios/emptyKibana/kibana.js
+++ b/test/fixtures/scenarios/emptyKibana/kibana.js
@@ -1,12 +1,10 @@
 module.exports = [{
   'index': {
     '_index': '.kibana',
-    '_type': 'config'
+    '_type': 'config',
+    '_id': require('../../../../package.json').version
   }
 }, {
-  'index': '.kibana',
-  'body': {
-    'buildNum': '@@buildNum'
-  },
-  'id': '@@version'
+  'buildNum': require('../../../../package.json').build.number,
+  'dateFormat:tz': 'UTC'
 }];
diff --git a/test/fixtures/scenarios/emptyKibana/kibanaDefinition.js b/test/fixtures/scenarios/emptyKibana/kibanaDefinition.js
index 8fd0657726757..699190ad981c1 100644
--- a/test/fixtures/scenarios/emptyKibana/kibanaDefinition.js
+++ b/test/fixtures/scenarios/emptyKibana/kibanaDefinition.js
@@ -1,7 +1,6 @@
 module.exports = {
   settings: {
-    number_of_shards: 1,
-    number_of_replicas: 1
+    number_of_shards: 1
   },
   mappings: {
     config: {
diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js
new file mode 100644
index 0000000000000..5e271d29724bc
--- /dev/null
+++ b/test/functional/apps/discover/_collapse_expand.js
@@ -0,0 +1,128 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('discover tab', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var baseUrl;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+
+        baseUrl = common.getHostPort();
+
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        // start each test with an empty kibana index
+        return scenarioManager.reload('emptyKibana')
+        // and load a set of makelogs data
+        .then(function loadIfEmptyMakelogs() {
+          return scenarioManager.loadIfEmpty('logstashFunctional');
+        })
+        .then(function (navigateTo) {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          common.debug('discover');
+          return common.navigateToApp('discover');
+        })
+        .then(function () {
+          common.debug('setAbsoluteRange');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('legend', function () {
+
+        bdd.it('should initially be collapsed', function () {
+          return discoverPage.getLegendWidth()
+          .then(function (actualwidth) {
+            common.debug('collapsed legend width = ' + actualwidth);
+            expect(actualwidth < 20).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should expand when clicked', function () {
+          return discoverPage.clickLegendExpand()
+          .then(function () {
+            return discoverPage.getLegendWidth();
+          })
+          .then(function (actualwidth) {
+            common.debug('expanded legend width = ' + actualwidth);
+            expect(actualwidth > 140).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should collapse when clicked', function () {
+          return discoverPage.clickLegendCollapse()
+          .then(function () {
+            return discoverPage.getLegendWidth();
+          })
+          .then(function (actualwidth) {
+            expect(actualwidth < 20).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+      });
+
+      bdd.describe('field data', function () {
+
+        bdd.it('should initially be expanded', function () {
+          return discoverPage.getSidebarWidth()
+          .then(function (actualwidth) {
+            common.debug('expanded sidebar width = ' + actualwidth);
+            expect(actualwidth > 180).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should collapse when clicked', function () {
+          return discoverPage.clickSidebarCollapse()
+          .then(function () {
+            return discoverPage.getSidebarWidth();
+          })
+          .then(function (actualwidth) {
+            common.debug('collapsed sidebar width = ' + actualwidth);
+            expect(actualwidth < 20).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should expand when clicked', function () {
+          return discoverPage.clickSidebarExpand()
+          .then(function () {
+            return discoverPage.getSidebarWidth();
+          })
+          .then(function (actualwidth) {
+            common.debug('expanded sidebar width = ' + actualwidth);
+            expect(actualwidth > 180).to.be(true);
+          })
+          .catch(common.handleError(this));
+        });
+
+      });
+
+    });
+  };
+});
diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index b17af315284d5..44525ad24d45c 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -1,8 +1,8 @@
 define(function (require) {
-  var Common = require('../../../support/pages/Common');
-  var HeaderPage = require('../../../support/pages/HeaderPage');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
-  var DiscoverPage = require('../../../support/pages/DiscoverPage');
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
   var expect = require('intern/dojo/node!expect.js');
 
   return function (bdd, scenarioManager) {
@@ -11,14 +11,12 @@ define(function (require) {
       var headerPage;
       var settingsPage;
       var discoverPage;
-      var remote;
 
       bdd.before(function () {
         common = new Common(this.remote);
         headerPage = new HeaderPage(this.remote);
         settingsPage = new SettingsPage(this.remote);
         discoverPage = new DiscoverPage(this.remote);
-        remote = this.remote;
         var fromTime = '2015-09-19 06:31:44.000';
         var toTime = '2015-09-23 18:31:44.000';
 
@@ -40,27 +38,21 @@ define(function (require) {
           common.debug('discover');
           return common.navigateToApp('discover');
         })
-        .then(function () {
-          common.debug('clickTimepicker');
-          return headerPage.clickTimepicker();
-        })
         .then(function () {
           common.debug('setAbsoluteRange');
           return headerPage.setAbsoluteRange(fromTime, toTime);
         })
-        .then(function () {
-          common.debug('collapseTimepicker');
-          return headerPage.collapseTimepicker();
-        });
+        .catch(common.handleError(this));
       });
 
 
       bdd.describe('query', function () {
         var queryName1 = 'Query # 1';
+        var fromTimeString = 'September 19th 2015, 06:31:44.000';
+        var toTimeString = 'September 23rd 2015, 18:31:44.000';
 
-        bdd.it('should show correct time range string', function () {
-          var expectedTimeRangeString =
-          'September 19th 2015, 06:31:44.000 to September 23rd 2015, 18:31:44.000';
+        bdd.it('should show correct time range string by timepicker', function () {
+          var expectedTimeRangeString = fromTimeString + ' to ' + toTimeString;
           return discoverPage.getTimespanText()
           .then(function (actualTimeString) {
             expect(actualTimeString).to.be(expectedTimeRangeString);
@@ -68,6 +60,7 @@ define(function (require) {
           .catch(common.handleError(this));
         });
 
+
         bdd.it('save query should show toast message and display query name', function () {
           var expectedSavedQueryMessage = 'Discover: Saved Data Source "' + queryName1 + '"';
           return discoverPage.saveSearch(queryName1)
@@ -100,29 +93,201 @@ define(function (require) {
           .catch(common.handleError(this));
         });
 
+        bdd.it('should show the correct hit count', function () {
+          var expectedHitCount = '14,004';
+          return common.tryForTime(20 * 1000, function tryingForTime() {
+            return discoverPage.getHitCount()
+            .then(function compareData(hitCount) {
+              expect(hitCount).to.be(expectedHitCount);
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+
+
         bdd.it('should show the correct bar chart', function () {
-          var expectedBarChartData = [0,0,0,0,1.0968749999999972,7.6781250000000085,
-            37.87875,92.210625,108.590625,71.80875,23.54625,4.753124999999997,
-            2.1206249999999898,7.60499999999999,35.319374999999994,85.044375,110.199375,
-            70.05375000000001,23.180625000000006,4.0218750000000085,1.2431250000000063,
-            6.435000000000002,36.416250000000005,88.408125,108.81,
-            69.395625,22.522499999999994,5.4112499999999955,0.29249999999998977,0,0,0,0,0,0,0,0];
+          var expectedBarChartData = [ '0', '0', '0', '0', '0', '0',
+            '2.7056249999999977', '14.771249999999995', '54.112500000000004',
+            '105.080625', '100.25437500000001', '54.916875', '13.747499999999988',
+            '2.266874999999999', '3.0712500000000063', '14.771249999999995',
+            '49.944374999999994', '99.523125', '103.471875', '51.699375',
+            '12.943124999999995', '1.9743749999999949', '2.3400000000000034',
+            '12.796875', '51.699375', '102.96000000000001', '99.08437500000001',
+            '53.08875', '14.698125000000005', '2.1206249999999898', '0', '0',
+            '0', '0', '0', '0', '0'
+          ];
           return common.sleep(4000)
           .then(function () {
-            return common.tryForTime(60 * 1000, function tryingForTime() {
-              return discoverPage.getBarChartData()
-              .then(function compareData(paths) {
-                // the largest bars are over 100 pixels high so this is less than 1% tolerance
-                var barHeightTolerance = 1;
-                for (var x = 0; x < expectedBarChartData.size; x++) {
-                  expect(Math.abs(expectedBarChartData[x] - paths[x]) < barHeightTolerance).to.be.ok();
-                }
-              });
-            });
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct time range string in chart', function () {
+          var expectedTimeRangeString = fromTimeString + ' - ' + toTimeString;
+          return discoverPage.getChartTimespan()
+          .then(function (actualTimeString) {
+            expect(actualTimeString).to.be(expectedTimeRangeString);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct initial chart interval of 3 hours', function () {
+          var expectedChartInterval = 'by 3 hours';
+          return discoverPage.getChartInterval()
+          .then(function (actualInterval) {
+            expect(actualInterval).to.be(expectedChartInterval);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data for chart interval Hourly', function () {
+          var chartInterval = 'Hourly';
+          var expectedBarChartData = [ '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
+            '0', '0', '0', '0', '0', '0', '0', '0', '1.2763636363636266', '1.914545454545447',
+            '4.680000000000007', '6.594545454545454', '11.061818181818168', '25.314545454545453',
+            '38.50363636363636', '46.374545454545455', '72.53999999999999', '93.60000000000001',
+            '102.10909090909091', '109.97999999999999', '111.04363636363637', '94.87636363636364',
+            '85.72909090909091', '68.28545454545454', '54.88363636363636', '36.58909090909091',
+            '20.209090909090904', '11.700000000000003', '8.083636363636359', '5.105454545454549',
+            '0.6381818181818204', '0.8509090909090986', '2.3400000000000034', '2.978181818181824',
+            '3.61636363636363', '8.083636363636359', '10.423636363636362', '24.46363636363637',
+            '32.33454545454545', '45.94909090909091', '67.00909090909092', '85.51636363636365',
+            '94.87636363636364', '109.1290909090909', '110.61818181818181', '100.83272727272727',
+            '89.55818181818182', '65.30727272727273', '48.92727272727274', '36.16363636363636',
+            '21.059999999999988', '10.210909090909098', '6.38181818181819', '3.190909090909088',
+            '2.127272727272725', '0.4254545454545422', '1.701818181818183', '1.4890909090909048',
+            '3.61636363636363', '7.232727272727274', '7.870909090909095', '22.123636363636365',
+            '32.54727272727273', '51.267272727272726', '66.58363636363637', '85.94181818181818',
+            '104.66181818181818', '108.91636363636364', '107.00181818181818', '100.62',
+            '80.62363636363636', '62.32909090909091', '58.92545454545455', '33.18545454545455',
+            '21.059999999999988', '11.274545454545446', '10.423636363636362', '3.403636363636366',
+            '1.914545454545447', '0.8509090909090986', '0', '0', '0', '0', '0', '0',
+            '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'
+          ];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(8000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data for chart interval Daily', function () {
+          var chartInterval = 'Daily';
+          var expectedBarChartData = [ '0', '111.3138', '107.96759999999999', '108.4122', '0'];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(8000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
           })
           .catch(common.handleError(this));
         });
 
+        bdd.it('should show correct data for chart interval Weekly', function () {
+          var chartInterval = 'Weekly';
+          var expectedBarChartData = [ '55.6569', '108.1899'];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(2000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data for chart interval Monthly', function () {
+          var chartInterval = 'Monthly';
+          var expectedBarChartData = [ '102.404'];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(2000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data for chart interval Yearly', function () {
+          var chartInterval = 'Yearly';
+          var expectedBarChartData = [ '102.404'];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(2000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+
+        bdd.it('should show correct data for chart interval Auto', function () {
+          var chartInterval = 'Auto';
+          var expectedBarChartData = [ '0', '0', '0', '0', '0', '0',
+            '2.7056249999999977', '14.771249999999995', '54.112500000000004',
+            '105.080625', '100.25437500000001', '54.916875', '13.747499999999988',
+            '2.266874999999999', '3.0712500000000063', '14.771249999999995',
+            '49.944374999999994', '99.523125', '103.471875', '51.699375',
+            '12.943124999999995', '1.9743749999999949', '2.3400000000000034',
+            '12.796875', '51.699375', '102.96000000000001', '99.08437500000001',
+            '53.08875', '14.698125000000005', '2.1206249999999898', '0', '0',
+            '0', '0', '0', '0', '0'
+          ];
+          return discoverPage.setChartInterval(chartInterval)
+          .then(function () {
+            return common.sleep(4000);
+          })
+          .then(function () {
+            return verifyChartData(expectedBarChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Auto chart interval of 3 hours', function () {
+          var expectedChartInterval = 'by 3 hours';
+          return discoverPage.getChartInterval()
+          .then(function (actualInterval) {
+            expect(actualInterval).to.be(expectedChartInterval);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        function verifyChartData(expectedBarChartData) {
+          return common.tryForTime(20 * 1000, function tryingForTime() {
+            return discoverPage.getBarChartData()
+            .then(function compareData(paths) {
+              // the largest bars are over 100 pixels high so this is less than 1% tolerance
+              var barHeightTolerance = 1;
+              var stringResults = '';
+              var hasFailure = false;
+              for (var y = 0; y < expectedBarChartData.length; y++) {
+                stringResults += y + ': expected = ' + expectedBarChartData[y] + ', actual = ' + paths[y] +
+                 ', Pass = ' + (Math.abs(expectedBarChartData[y] - paths[y]) < barHeightTolerance) + '\n';
+                if ((Math.abs(expectedBarChartData[y] - paths[y]) > barHeightTolerance)) {
+                  hasFailure = true;
+                };
+              };
+              if (hasFailure) {
+                common.log(stringResults);
+                common.log(paths);
+              }
+              for (var x = 0; x < expectedBarChartData.length; x++) {
+                expect(Math.abs(expectedBarChartData[x] - paths[x]) < barHeightTolerance).to.be.ok();
+              }
+            });
+          });
+
+        }
 
       });
     });
diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js
new file mode 100644
index 0000000000000..c36ae8e0fcae6
--- /dev/null
+++ b/test/functional/apps/discover/_field_data.js
@@ -0,0 +1,268 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('discover app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        // start each test with an empty kibana index
+        return scenarioManager.reload('emptyKibana')
+        // and load a set of makelogs data
+        .then(function loadIfEmptyMakelogs() {
+          return scenarioManager.loadIfEmpty('logstashFunctional');
+        })
+        .then(function (navigateTo) {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          common.debug('discover');
+          return common.navigateToApp('discover');
+        })
+        .then(function () {
+          common.debug('setAbsoluteRange');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('field data', function () {
+        var queryName1 = 'Query # 1';
+        var fromTimeString = 'September 19th 2015, 06:31:44.000';
+        var toTimeString = 'September 23rd 2015, 18:31:44.000';
+
+
+        bdd.it('search php should show the correct hit count', function () {
+          var expectedHitCount = '445';
+          return discoverPage.query('php')
+          .then(function () {
+            return common.tryForTime(20 * 1000, function tryingForTime() {
+              return discoverPage.getHitCount()
+              .then(function compareData(hitCount) {
+                expect(hitCount).to.be(expectedHitCount);
+              });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('the search term should be highlighted in the field data', function () {
+          // marks is the style that highlights the text in yellow
+          return discoverPage.getMarks()
+          .then(function (marks) {
+            expect(marks.length).to.be(50);
+            expect(marks.indexOf('php')).to.be(0);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('search _type:apache should show the correct hit count', function () {
+          var expectedHitCount = '11,156';
+          return discoverPage.query('_type:apache')
+          .then(function () {
+            return common.tryForTime(20 * 1000, function tryingForTime() {
+              return discoverPage.getHitCount()
+              .then(function compareData(hitCount) {
+                expect(hitCount).to.be(expectedHitCount);
+              });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('doc view should show Time and _source columns', function () {
+          var expectedHeader = 'Time _source';
+          return discoverPage.getDocHeader()
+          .then(function (header) {
+            expect(header).to.be(expectedHeader);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('doc view should show oldest time first', function () {
+          // Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
+          var ExpectedDoc =
+            'September 22nd 2015, 23:50:13.253 index:logstash-2015.09.22 @timestamp:September 22nd 2015, 23:50:13.253'
+            + ' ip:238.171.34.42 extension:jpg response:200 geo.coordinates:{ "lat": 38.66494528, "lon": -88.45299556'
+            + ' } geo.src:FR geo.dest:KH geo.srcdest:FR:KH @tags:success, info utc_time:September 22nd 2015,'
+            + ' 23:50:13.253 referer:http://twitter.com/success/nancy-currie agent:Mozilla/4.0 (compatible; MSIE 6.0;'
+            + ' Windows NT 5.1; SV1; .NET CLR 1.1.4322) clientip:238.171.34.42 bytes:7,124'
+            + ' host:media-for-the-masses.theacademyofperformingartsandscience.org request:/uploads/karl-henize.jpg'
+            + ' url:https://media-for-the-masses.theacademyofperformingartsandscience.org/uploads/karl-henize.jpg'
+            + ' @message:238.171.34.42 - - [2015-09-22T23:50:13.253Z] "GET /uploads/karl-henize.jpg HTTP/1.1" 200 7124'
+            + ' "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)" spaces:this is a'
+            + ' thing with lots of spaces wwwwoooooo xss:<script>console.log("xss")</script>'
+            + ' headings:<h3>alexander-viktorenko</h5>, http://nytimes.com/warning/michael-massimino'
+            + ' links:@www.slate.com, http://www.slate.com/security/frederick-w-leslie, www.www.slate.com'
+            + ' relatedContent:{ "url": "http://www.laweekly.com/music/bjork-at-the-nokia-theatre-12-12-2408191",'
+            + ' "og:type": "article", "og:title": "Bjork at the Nokia Theatre, 12/12", "og:description": "Bjork at the'
+            + ' Nokia Theater, December 12 By Randall Roberts Last night&rsquo;s Bjork show at the Dystopia &ndash;'
+            + ' er, I mean Nokia -- Theatre downtown di...", "og:url": "'
+            + 'http://www.laweekly.com/music/bjork-at-the-nokia-theatre-12-12-2408191", "article:published_time":'
+            + ' "2007-12-13T12:19:35-08:00", "article:modified_time": "2014-11-27T08:28:42-08:00", "article:section":'
+            + ' "Music", "og:image": "'
+            + 'http://IMAGES1.laweekly.com/imager/bjork-at-the-nokia-theatre-12-12/u/original/2470701/bjorktn003.jpg",'
+            + ' "og:image:height": "334", "og:image:width": "480", "og:site_name": "LA Weekly", "twitter:title":'
+            + ' "Bjork at the Nokia Theatre, 12/12", "twitter:description": "Bjork at the Nokia Theater, December 12'
+            + ' By Randall Roberts Last night&rsquo;s Bjork show at the Dystopia &ndash; er, I mean Nokia -- Theatre'
+            + ' downtown di...", "twitter:card": "summary", "twitter:image": "'
+            + 'http://IMAGES1.laweekly.com/imager/bjork-at-the-nokia-theatre-12-12/u/original/2470701/bjorktn003.jpg",'
+            + ' "twitter:site": "@laweekly" }, { "url": "'
+            + 'http://www.laweekly.com/music/the-rapture-at-the-mayan-7-25-2401011", "og:type": "article", "og:title":'
+            + ' "The Rapture at the Mayan, 7/25", "og:description": "If you haven&rsquo;t yet experienced the'
+            + ' phenomenon of people walk-dancing, apparently the best place to witness this is at a Rapture show.'
+            + ' Here&rsquo;s...", "og:url": "http://www.laweekly.com/music/the-rapture-at-the-mayan-7-25-2401011",'
+            + ' "article:published_time": "2007-07-26T12:42:30-07:00", "article:modified_time":'
+            + ' "2014-11-27T08:00:51-08:00", "article:section": "Music", "og:image": "'
+            + 'http://IMAGES1.laweekly.com/imager/the-rapture-at-the-mayan-7-25/u/original/2463272/rapturetn05.jpg",'
+            + ' "og:image:height": "321", "og:image:width": "480", "og:site_name": "LA Weekly", "twitter:title": "The'
+            + ' Rapture at the Mayan, 7/25", "twitter:description": "If you haven&rsquo;t yet experienced the'
+            + ' phenomenon of people walk-dancing, apparently the best place to witness this is at a Rapture show.'
+            + ' Here&rsquo;s...", "twitter:card": "summary", "twitter:image": "'
+            + 'http://IMAGES1.laweekly.com/imager/the-rapture-at-the-mayan-7-25/u/original/2463272/rapturetn05.jpg",'
+            + ' "twitter:site": "@laweekly" } machine.os:win 7 machine.ram:7,516,192,768 _id:AU_x3_g4GFA8no6QjkYX'
+            + ' _type:apache _index:logstash-2015.09.22 _score: relatedContent.article:modified_time:November 27th'
+            + ' 2014, 16:00:51.000, November 27th 2014, 16:28:42.000 relatedContent.article:published_time:July 26th'
+            + ' 2007, 19:42:30.000, December 13th 2007, 20:19:35.000';
+          return discoverPage.getDocTableIndex(1)
+          .then(function (rowData) {
+            expect(rowData).to.be(ExpectedDoc);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('doc view should sort ascending', function () {
+          // Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
+          var ExpectedDoc =
+            'September 20th 2015, 00:00:00.000 index:logstash-2015.09.20 @timestamp:September 20th 2015, 00:00:00.000'
+            + ' ip:143.84.142.7 extension:jpg response:200 geo.coordinates:{ "lat": 38.68407028, "lon": -120.9871642 }'
+            + ' geo.src:ES geo.dest:US geo.srcdest:ES:US @tags:error, info utc_time:September 20th 2015, 00:00:00.000'
+            + ' referer:http://www.slate.com/success/vladimir-kovalyonok agent:Mozilla/4.0 (compatible; MSIE 6.0;'
+            + ' Windows NT 5.1; SV1; .NET CLR 1.1.4322) clientip:143.84.142.7 bytes:1,623'
+            + ' host:media-for-the-masses.theacademyofperformingartsandscience.org request:/uploads/steven-hawley.jpg'
+            + ' url:https://media-for-the-masses.theacademyofperformingartsandscience.org/uploads/steven-hawley.jpg'
+            + ' @message:143.84.142.7 - - [2015-09-20T00:00:00.000Z] "GET /uploads/steven-hawley.jpg HTTP/1.1" 200'
+            + ' 1623 "-" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)" spaces:this is a'
+            + ' thing with lots of spaces wwwwoooooo xss:<script>console.log("xss")</script>'
+            + ' headings:<h3>kimiya-yui</h5>, http://www.slate.com/success/koichi-wakata'
+            + ' links:thomas-marshburn@twitter.com, http://www.slate.com/info/michael-p-anderson, www.twitter.com'
+            + ' relatedContent:{ "url":'
+            + ' "http://www.laweekly.com/music/jay-electronica-much-better-than-his-name-would-suggest-2412364",'
+            + ' "og:type": "article", "og:title": "Jay Electronica: Much Better Than His Name Would Suggest",'
+            + ' "og:description": "You may not know who Jay Electronica is yet, but I&#039;m willing to bet that you'
+            + ' would had he chosen a better name. Jay Electronica does not sound like the ...", "og:url":'
+            + ' "http://www.laweekly.com/music/jay-electronica-much-better-than-his-name-would-suggest-2412364",'
+            + ' "article:published_time": "2008-04-04T16:00:00-07:00", "article:modified_time":'
+            + ' "2014-11-27T08:01:03-08:00", "article:section": "Music", "og:site_name": "LA Weekly", "twitter:title":'
+            + ' "Jay Electronica: Much Better Than His Name Would Suggest", "twitter:description": "You may not know'
+            + ' who Jay Electronica is yet, but I&#039;m willing to bet that you would had he chosen a better name.'
+            + ' Jay Electronica does not sound like the ...", "twitter:card": "summary", "twitter:site": "@laweekly"'
+            + ' }, { "url": "http://www.laweekly.com/news/mandoe-on-gower-near-fountain-2368123", "og:type":'
+            + ' "article", "og:title": "MANDOE On Gower Near Fountain", "og:description": "MANDOE has a stunner on a'
+            + ' wall north of an east-west street crossing Gower around Fountain (but not on Fountain). MADNOE, PROSE'
+            + ' and FUKM are listed on t...", "og:url": "'
+            + 'http://www.laweekly.com/news/mandoe-on-gower-near-fountain-2368123", "article:published_time":'
+            + ' "2008-04-25T07:26:41-07:00", "article:modified_time": "2014-10-28T15:00:08-07:00", "article:section":'
+            + ' "News", "og:image": "'
+            + 'http://images1.laweekly.com/imager/mandoe-on-gower-near-fountain/u/original/2430891/img_6648.jpg",'
+            + ' "og:image:height": "640", "og:image:width": "480", "og:site_name": "LA Weekly", "twitter:title": '
+            + '"MANDOE On Gower Near Fountain", "twitter:description": "MANDOE has a stunner on a wall north of an'
+            + ' east-west street crossing Gower around Fountain (but not on Fountain). MADNOE, PROSE and FUKM are'
+            + ' listed on t...", "twitter:card": "summary", "twitter:image": "'
+            + 'http://images1.laweekly.com/imager/mandoe-on-gower-near-fountain/u/original/2430891/img_6648.jpg", '
+            + '"twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/meghan-finds-the-love-2373346",'
+            + ' "og:type": "article", "og:title": "Meghan Finds The Love", "og:description": "LA Weekly is the'
+            + ' definitive source of information for news, music, movies, restaurants, reviews, and events in Los'
+            + ' Angeles.", "og:url": "http://www.laweekly.com/arts/meghan-finds-the-love-2373346",'
+            + ' "article:published_time": "2005-10-20T18:10:25-07:00", "article:modified_time":'
+            + ' "2014-11-25T19:52:35-08:00", "article:section": "Arts", "og:site_name": "LA Weekly", "twitter:title":'
+            + ' "Meghan Finds The Love", "twitter:description": "LA Weekly is the definitive source of information for'
+            + ' news, music, movies, restaurants, reviews, and events in Los Angeles.", "twitter:card": "summary",'
+            + ' "twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/these-clowns-are-with-me-2371051'
+            + '", "og:type": "article", "og:title": "These Clowns Are With Me", "og:description": "&nbsp; &nbsp; I'
+            + ' didn&#039;t mean to blow off all my responsibilities yesterday, but when a schmoozy Hollywood luncheon'
+            + ' turns into a full-on party by 3pm, and...", "og:url": "'
+            + 'http://www.laweekly.com/arts/these-clowns-are-with-me-2371051", "article:published_time": '
+            + '"2006-03-04T17:03:42-08:00", "article:modified_time": "2014-11-25T17:05:47-08:00", "article:section":'
+            + ' "Arts", "og:image": "'
+            + 'http://images1.laweekly.com/imager/these-clowns-are-with-me/u/original/2434556/e4b8scd.jpg",'
+            + ' "og:image:height": "375", "og:image:width": "500", "og:site_name": "LA Weekly", "twitter:title":'
+            + ' "These Clowns Are With Me", "twitter:description": "&nbsp; &nbsp; I didn&#039;t mean to blow off all'
+            + ' my responsibilities yesterday, but when a schmoozy Hollywood luncheon turns into a full-on party by'
+            + ' 3pm, and...", "twitter:card": "summary", "twitter:image": "'
+            + 'http://images1.laweekly.com/imager/these-clowns-are-with-me/u/original/2434556/e4b8scd.jpg",'
+            + ' "twitter:site": "@laweekly" }, { "url": "http://www.laweekly.com/arts/shopping-daze-2373807",'
+            + ' "og:type": "article", "og:title": "Shopping Daze", "og:description": "LA Weekly is the definitive '
+            + 'source of information for news, music, movies, restaurants, reviews, and events in Los Angeles.",'
+            + ' "og:url": "http://www.laweekly.com/arts/shopping-daze-2373807", "article:published_time":'
+            + ' "2006-12-13T12:12:04-08:00", "article:modified_time": "2014-11-25T20:15:21-08:00", "article:section":'
+            + ' "Arts", "og:site_name": "LA Weekly", "twitter:title": "Shopping Daze", "twitter:description": "LA'
+            + ' Weekly is the definitive source of information for news, music, movies, restaurants, reviews, and'
+            + ' events in Los Angeles.", "twitter:card": "summary", "twitter:site": "@laweekly" } machine.os:osx'
+            + ' machine.ram:15,032,385,536 _id:AU_x3_g3GFA8no6QjkFm _type:apache _index:logstash-2015.09.20 _score:'
+            + ' relatedContent.article:modified_time:October 28th 2014, 22:00:08.000, November 26th 2014,'
+            + ' 01:05:47.000, November 26th 2014, 03:52:35.000, November 26th 2014, 04:15:21.000, November 27th 2014,'
+            + ' 16:01:03.000 relatedContent.article:published_time:October 21st 2005, 01:10:25.000, March 5th 2006,'
+            + ' 01:03:42.000, December 13th 2006, 20:12:04.000, April 4th 2008, 23:00:00.000, April 25th 2008,'
+            + ' 14:26:41.000';
+          return discoverPage.clickDocSortDown()
+          .then(function () {
+            // we don't technically need this sleep here because the tryForTime will retry and the
+            // results will match on the 2nd or 3rd attempt, but that debug output is huge in this
+            // case and it can be avoided with just a few seconds sleep.
+            return common.sleep(2000);
+          })
+          .then(function () {
+            return common.tryForTime(20 * 1000, function tryingForTime() {
+              return discoverPage.getDocTableIndex(1)
+              .then(function (rowData) {
+                expect(rowData).to.be(ExpectedDoc);
+              });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('a bad syntax query should show an error message', function () {
+          var expectedHitCount = '1011,156';
+          var expectedError = 'Discover: Failed to parse query [xxx(yyy]';
+          return discoverPage.query('xxx(yyy')
+          .then(function () {
+            return headerPage.getToastMessage();
+          })
+          .then(function (toastMessage) {
+            expect(toastMessage).to.be(expectedError);
+          })
+          .then(function () {
+            return headerPage.clickToastOK();
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
new file mode 100644
index 0000000000000..a61fd78fe7620
--- /dev/null
+++ b/test/functional/apps/discover/_shared_links.js
@@ -0,0 +1,140 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('shared links', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var baseUrl;
+      // The message changes for Firefox < 41 and Firefox >= 41
+      // var expectedToastMessage = 'Share search: URL selected. Press Ctrl+C to copy.';
+      // var expectedToastMessage = 'Share search: URL copied to clipboard.';
+      // Pass either one.
+      var expectedToastMessage = /Share search: URL (selected. Press Ctrl+C to copy.|copied to clipboard.)/;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+
+        baseUrl = common.getHostPort();
+
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        // start each test with an empty kibana index
+        return scenarioManager.reload('emptyKibana')
+        // and load a set of makelogs data
+        .then(function loadIfEmptyMakelogs() {
+          return scenarioManager.loadIfEmpty('logstashFunctional');
+        })
+        .then(function (navigateTo) {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          common.debug('discover');
+          return common.navigateToApp('discover');
+        })
+        .then(function () {
+          common.debug('setAbsoluteRange');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('shared link', function () {
+
+        bdd.it('should show "Share a link" caption', function () {
+          var expectedCaption = 'Share a link';
+          return discoverPage.clickShare()
+          .then(function () {
+            return discoverPage.getShareCaption();
+          })
+          .then(function (actualCaption) {
+            expect(actualCaption).to.be(expectedCaption);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show the correct formatted URL', function () {
+          var expectedUrl = baseUrl
+            + '/app/kibana?_t=1453775307251#'
+            + '/discover?_g=(refreshInterval:(display:Off,pause:!f,value:0),time'
+            + ':(from:\'2015-09-19T06:31:44.000Z\',mode:absolute,to:\'2015-09'
+            + '-23T18:31:44.000Z\'))&_a=(columns:!(_source),index:\'logstash-'
+            + '*\',interval:auto,query:(query_string:(analyze_wildcard:!t,query'
+            + ':\'*\')),sort:!(\'@timestamp\',desc))';
+          return discoverPage.getSharedUrl()
+          .then(function (actualUrl) {
+            // strip the timestamp out of each URL
+            expect(actualUrl.replace(/_t=\d{13}/,'_t=TIMESTAMP'))
+
+              .to.be(expectedUrl.replace(/_t=\d{13}/,'_t=TIMESTAMP'));
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show toast message for copy to clipboard', function () {
+          return discoverPage.clickCopyToClipboard()
+          .then(function () {
+            return headerPage.getToastMessage();
+          })
+          .then(function (toastMessage) {
+            expect(toastMessage).to.match(expectedToastMessage);
+          })
+          .then(function () {
+            return headerPage.waitForToastMessageGone();
+          })
+          .catch(common.handleError(this));
+        });
+
+        // TODO: verify clipboard contents
+
+        bdd.it('shorten URL button should produce a short URL', function () {
+          var re = new RegExp(baseUrl + '/goto/[0-9a-f]{32}$');
+          return discoverPage.clickShortenUrl()
+          .then(function () {
+            return common.tryForTime(20 * 1000, function tryingForTime() {
+              return discoverPage.getShortenedUrl()
+              .then(function (actualUrl) {
+                expect(actualUrl).to.match(re);
+              });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        // NOTE: This test has to run immediately after the test above
+        bdd.it('should show toast message for copy to clipboard', function () {
+          return discoverPage.clickCopyToClipboard()
+          .then(function () {
+            return headerPage.getToastMessage();
+          })
+          .then(function (toastMessage) {
+            expect(toastMessage).to.match(expectedToastMessage);
+          })
+          .then(function () {
+            return headerPage.waitForToastMessageGone();
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js
index 28d1e78bf3bdb..9fbebd059f08b 100644
--- a/test/functional/apps/discover/index.js
+++ b/test/functional/apps/discover/index.js
@@ -1,25 +1,21 @@
 define(function (require) {
   var bdd = require('intern!bdd');
-  var expect = require('intern/dojo/node!expect.js');
   var config = require('intern').config;
   var url = require('intern/dojo/node!url');
-  var _ = require('intern/dojo/node!lodash');
-  var Common = require('../../../support/pages/Common');
-  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager');
+  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
   var discoverTest = require('./_discover');
+  var fieldData = require('./_field_data');
+  var sharedLinks = require('./_shared_links');
+  var collapseExpand = require('./_collapse_expand');
 
   bdd.describe('discover app', function () {
-    var common;
-    var scenarioManager;
     var remote;
     var scenarioManager = new ScenarioManager(url.format(config.servers.elasticsearch));
-    this.timeout = 120000;
+    this.timeout = config.timeouts.default;
 
-    // on setup, we create an settingsPage instance
-    // that we will use for all the tests
     bdd.before(function () {
-      common = new Common(this.remote);
       remote = this.remote;
+      return remote.setWindowSize(1200,800);
     });
 
     bdd.after(function unloadMakelogs() {
@@ -28,5 +24,11 @@ define(function (require) {
 
     discoverTest(bdd, scenarioManager);
 
+    fieldData(bdd, scenarioManager);
+
+    sharedLinks(bdd, scenarioManager);
+
+    collapseExpand(bdd, scenarioManager);
+
   });
 });
diff --git a/test/functional/apps/settings/_advanced_settings.js b/test/functional/apps/settings/_advanced_settings.js
new file mode 100644
index 0000000000000..6a39e5654b528
--- /dev/null
+++ b/test/functional/apps/settings/_advanced_settings.js
@@ -0,0 +1,44 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('creating and deleting default index', function describeIndexTests() {
+      var common;
+      var settingsPage;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          return settingsPage.navigateTo();
+        });
+      });
+
+      bdd.describe('index pattern creation', function indexPatternCreation() {
+        bdd.before(function () {
+          return settingsPage.createIndexPattern();
+        });
+
+        bdd.it('should allow setting advanced settings', function () {
+          return settingsPage.clickAdvancedTab()
+          .then(function TestCallSetAdvancedSettingsForTimezone() {
+            common.log('calling setAdvancedSetting');
+            return settingsPage.setAdvancedSettings('dateFormat:tz', 'America/Phoenix');
+          })
+          .then(function GetAdvancedSetting() {
+            return settingsPage.getAdvancedSettings('dateFormat:tz');
+          })
+          .then(function (advancedSetting) {
+            expect(advancedSetting).to.be('America/Phoenix');
+          })
+          .catch(common.handleError(this));
+        });
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/settings/_creation_form_changes.js b/test/functional/apps/settings/_creation_form_changes.js
index bc3fc9cc32ef6..b6451f9b0159a 100644
--- a/test/functional/apps/settings/_creation_form_changes.js
+++ b/test/functional/apps/settings/_creation_form_changes.js
@@ -1,6 +1,6 @@
 define(function (require) {
-  var Common = require('../../../support/pages/Common');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
   var expect = require('intern/dojo/node!expect.js');
 
   return function (bdd, scenarioManager) {
diff --git a/test/functional/apps/settings/_index_pattern_create_delete.js b/test/functional/apps/settings/_index_pattern_create_delete.js
index 0f5d1f25f5219..294e187a61708 100644
--- a/test/functional/apps/settings/_index_pattern_create_delete.js
+++ b/test/functional/apps/settings/_index_pattern_create_delete.js
@@ -1,8 +1,7 @@
 define(function (require) {
-  var Common = require('../../../support/pages/Common');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
   var expect = require('intern/dojo/node!expect.js');
-  var Promise = require('bluebird');
 
   return function (bdd, scenarioManager) {
     bdd.describe('creating and deleting default index', function describeIndexTests() {
@@ -47,6 +46,7 @@ define(function (require) {
         bdd.it('should have expected table headers', function checkingHeader() {
           return settingsPage.getTableHeader()
           .then(function (headers) {
+            common.debug('header.length = ' + headers.length);
             var expectedHeaders = [
               'name',
               'type',
@@ -93,6 +93,7 @@ define(function (require) {
           return common.tryForTime(5000, function () {
             return remote.getCurrentUrl()
             .then(function (currentUrl) {
+              common.debug('currentUrl = ' + currentUrl);
               expect(currentUrl).to.not.contain('logstash-*');
             });
           })
diff --git a/test/functional/apps/settings/_index_pattern_popularity.js b/test/functional/apps/settings/_index_pattern_popularity.js
index 46ad6beb165e4..42ec83f3e814a 100644
--- a/test/functional/apps/settings/_index_pattern_popularity.js
+++ b/test/functional/apps/settings/_index_pattern_popularity.js
@@ -1,8 +1,7 @@
 define(function (require) {
-  var Common = require('../../../support/pages/Common');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
   var expect = require('intern/dojo/node!expect.js');
-  //var Promise = require('bluebird');
 
   return function (bdd, scenarioManager) {
     bdd.describe('index result popularity', function describeIndexTests() {
@@ -48,9 +47,11 @@ define(function (require) {
             return common.sleep(1000);
           })
           .then(function openControlsByName() {
+            common.debug('Starting openControlsByName (' + fieldName + ')');
             return settingsPage.openControlsByName(fieldName);
           })
           .then(function increasePopularity() {
+            common.debug('increasePopularity');
             return settingsPage.increasePopularity();
           });
         });
@@ -63,6 +64,7 @@ define(function (require) {
         bdd.it('should update the popularity input', function () {
           return settingsPage.getPopularity()
           .then(function (popularity) {
+            common.debug('popularity = ' + popularity);
             expect(popularity).to.be('1');
           })
           .catch(common.handleError(this));
@@ -82,6 +84,7 @@ define(function (require) {
             return settingsPage.getPopularity();
           })
           .then(function (popularity) {
+            common.debug('popularity = ' + popularity);
             expect(popularity).to.be('0');
           })
           .catch(common.handleError(this));
@@ -101,6 +104,7 @@ define(function (require) {
             return settingsPage.getPopularity();
           })
           .then(function (popularity) {
+            common.debug('popularity = ' + popularity);
             expect(popularity).to.be('1');
           })
           .catch(common.handleError(this));
diff --git a/test/functional/apps/settings/_index_pattern_results_sort.js b/test/functional/apps/settings/_index_pattern_results_sort.js
index 72d7474356fed..e91c0ebf6ac5d 100644
--- a/test/functional/apps/settings/_index_pattern_results_sort.js
+++ b/test/functional/apps/settings/_index_pattern_results_sort.js
@@ -1,9 +1,8 @@
 define(function (require) {
   var config = require('intern').config;
-  var Common = require('../../../support/pages/Common');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
   var expect = require('intern/dojo/node!expect.js');
-  var Promise = require('bluebird');
 
   return function (bdd, scenarioManager) {
     bdd.describe('index result field sort', function describeIndexTests() {
diff --git a/test/functional/apps/settings/_initial_state.js b/test/functional/apps/settings/_initial_state.js
index 304d7197b0e6d..a7d4f2b872ebd 100644
--- a/test/functional/apps/settings/_initial_state.js
+++ b/test/functional/apps/settings/_initial_state.js
@@ -1,7 +1,7 @@
 define(function (require) {
   var expect = require('intern/dojo/node!expect.js');
-  var Common = require('../../../support/pages/Common');
-  var SettingsPage = require('../../../support/pages/SettingsPage');
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
 
   return function (bdd, scenarioManager) {
     bdd.describe('initial state', function () {
@@ -47,6 +47,7 @@ define(function (require) {
       bdd.it('should not select the time field', function () {
         return settingsPage.getTimeFieldNameField().isSelected()
         .then(function (timeFieldIsSelected) {
+          common.debug('timeField isSelected = ' + timeFieldIsSelected);
           expect(timeFieldIsSelected).to.not.be.ok();
         })
         .catch(common.handleError(this));
diff --git a/test/functional/apps/settings/index.js b/test/functional/apps/settings/index.js
index 90fbed52f13c6..467ee268377aa 100644
--- a/test/functional/apps/settings/index.js
+++ b/test/functional/apps/settings/index.js
@@ -2,17 +2,18 @@ define(function (require) {
   var bdd = require('intern!bdd');
   var config = require('intern').config;
   var url = require('intern/dojo/node!url');
-  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenarioManager');
+  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
 
   var initialStateTest = require('./_initial_state');
   var creationChangesTest = require('./_creation_form_changes');
   var indexPatternCreateDeleteTest = require('./_index_pattern_create_delete');
   var indexPatternResultsSortTest = require('./_index_pattern_results_sort');
   var indexPatternPopularityTest = require('./_index_pattern_popularity');
+  var advancedSettingsTest = require('./_advanced_settings');
 
   bdd.describe('settings app', function () {
     var scenarioManager = new ScenarioManager(url.format(config.servers.elasticsearch));
-    this.timeout = 120000;
+    this.timeout = config.timeouts.default;
 
     // on setup, we create an settingsPage instance
     // that we will use for all the tests
@@ -30,6 +31,7 @@ define(function (require) {
       });
     });
 
+    advancedSettingsTest(bdd, scenarioManager);
     initialStateTest(bdd, scenarioManager);
     creationChangesTest(bdd, scenarioManager);
     indexPatternCreateDeleteTest(bdd, scenarioManager);
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
new file mode 100644
index 0000000000000..a456dfec3ed74
--- /dev/null
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -0,0 +1,214 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      var remote;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        remote = this.remote;
+      });
+
+      bdd.before(function () {
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickAreaChart');
+          return visualizePage.clickAreaChart();
+        })
+        .then(function clickNewSearch() {
+          common.debug('clickNewSearch');
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function clickBucket() {
+          common.debug('Click X-Axis');
+          return visualizePage.clickBucket('X-Axis');
+        })
+        .then(function selectAggregation() {
+          common.debug('Click Date Histogram');
+          return visualizePage.selectAggregation('Date Histogram');
+        })
+        .then(function getField() {
+          common.debug('Check field value');
+          return visualizePage.getField();
+        })
+        .then(function (fieldValue) {
+          common.debug('fieldValue = ' + fieldValue);
+          expect(fieldValue).to.be('@timestamp');
+        })
+        .then(function getInterval() {
+          return visualizePage.getInterval();
+        })
+        .then(function (intervalValue) {
+          common.debug('intervalValue = ' + intervalValue);
+          expect(intervalValue).to.be('Auto');
+        })
+        .then(function clickGo() {
+          return visualizePage.clickGo();
+        })
+        .then(function getSpinnerDone() {
+          common.debug('Waiting...');
+          return headerPage.getSpinnerDone();
+        })
+        .catch(common.handleError(this));
+      });
+
+      bdd.describe('area charts', function indexPatternCreation() {
+        var testSubName = 'AreaChart';
+        var vizName1 = 'Visualization ' + testSubName;
+
+        bdd.it('should save and load', function pageHeader() {
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function loadSavedVisualization() {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function () {
+            return visualizePage.waitForVisualization();
+          })
+          // We have to sleep sometime between loading the saved visTitle
+          // and trying to access the chart below with getXAxisLabels
+          // otherwise it hangs.
+          .then(function sleep() {
+            return common.sleep(2000);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct chart, take screenshot', function pageHeader() {
+          var chartHeight = 0;
+          var xAxisLabels = [ '2015-09-20 00:00', '2015-09-21 00:00',
+            '2015-09-22 00:00', '2015-09-23 00:00'
+          ];
+          var yAxisLabels = ['0','200','400','600','800','1,000','1,200','1,400','1,600'];
+          var expectedAreaChartData = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202,
+            683, 1361, 1415, 707, 177, 27, 32, 175, 707, 1408, 1355, 726, 201, 29
+          ];
+
+          return common.tryForTime(5000, function () {
+            return visualizePage.getXAxisLabels()
+            .then(function compareLabels(labels) {
+              common.debug('X-Axis labels = ' + labels);
+              expect(labels).to.eql(xAxisLabels);
+            });
+          })
+          .then(function getYAxisLabels() {
+            return visualizePage.getYAxisLabels();
+          })
+          .then(function (labels) {
+            common.debug('Y-Axis labels = ' + labels);
+            expect(labels).to.eql(yAxisLabels);
+          })
+          .then(function getAreaChartData() {
+            return visualizePage.getAreaChartData();
+          })
+          .then(function (paths) {
+            common.debug('expectedAreaChartData = ' + expectedAreaChartData);
+            common.debug('actual chart data =     ' + paths);
+            expect(paths).to.eql(expectedAreaChartData);
+          })
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct data', function pageHeader() {
+          var expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
+            'September 20th 2015, 03:00:00.000 202',
+            'September 20th 2015, 06:00:00.000 740',
+            'September 20th 2015, 09:00:00.000 1,437',
+            'September 20th 2015, 12:00:00.000 1,371',
+            'September 20th 2015, 15:00:00.000 751',
+            'September 20th 2015, 18:00:00.000 188',
+            'September 20th 2015, 21:00:00.000 31',
+            'September 21st 2015, 00:00:00.000 42',
+            'September 21st 2015, 03:00:00.000 202',
+            'September 21st 2015, 06:00:00.000 683',
+            'September 21st 2015, 09:00:00.000 1,361',
+            'September 21st 2015, 12:00:00.000 1,415',
+            'September 21st 2015, 15:00:00.000 707',
+            'September 21st 2015, 18:00:00.000 177',
+            'September 21st 2015, 21:00:00.000 27',
+            'September 22nd 2015, 00:00:00.000 32',
+            'September 22nd 2015, 03:00:00.000 175',
+            'September 22nd 2015, 06:00:00.000 707',
+            'September 22nd 2015, 09:00:00.000 1,408',
+            'September 22nd 2015, 12:00:00.000 1,355',
+            'September 22nd 2015, 15:00:00.000 726',
+            'September 22nd 2015, 18:00:00.000 201',
+            'September 22nd 2015, 21:00:00.000 29'
+          ];
+
+          return visualizePage.collapseChart()
+          .then(function setPageSize() {
+            return settingsPage.setPageSize('All');
+          })
+          .then(function getDataTableData() {
+            return visualizePage.getDataTableData();
+          })
+          .then(function showData(data) {
+            common.debug('getDataTableData = ' + data.split('\n'));
+            expect(data.trim().split('\n')).to.eql(expectedTableData);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js
new file mode 100644
index 0000000000000..6da1462ec25f6
--- /dev/null
+++ b/test/functional/apps/visualize/_chart_types.js
@@ -0,0 +1,55 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var settingsPage;
+      var visualizePage;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('chart types', function indexPatternCreation() {
+
+        bdd.it('should show the correct chart types', function pageHeader() {
+
+          var expectedChartTypes = [
+            'Area chart', 'Data table', 'Line chart', 'Markdown widget',
+            'Metric', 'Pie chart', 'Tile map', 'Vertical bar chart'
+          ];
+          // find all the chart types and make sure there all there
+          return visualizePage.getChartTypes()
+          .then(function testChartTypes(chartTypes) {
+            common.debug('returned chart types = ' + chartTypes);
+            common.debug('expected chart types = ' + expectedChartTypes);
+            expect(chartTypes).to.eql(expectedChartTypes);
+          })
+          .catch(common.handleError(this));
+        });
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
new file mode 100644
index 0000000000000..0f4e3a4faaa79
--- /dev/null
+++ b/test/functional/apps/visualize/_data_table.js
@@ -0,0 +1,137 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      var remote;
+      var fromTime;
+      var toTime;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        remote = this.remote;
+        fromTime = '2015-09-19 06:31:44.000';
+        toTime = '2015-09-23 18:31:44.000';
+
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickDataTable');
+          return visualizePage.clickDataTable();
+        })
+        .then(function clickNewSearch() {
+          common.debug('clickNewSearch');
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function clickBucket() {
+          common.debug('Bucket = Split Rows');
+          return visualizePage.clickBucket('Split Rows');
+        })
+        .then(function selectAggregation() {
+          common.debug('Aggregation = Histogram');
+          return visualizePage.selectAggregation('Histogram');
+        })
+        .then(function selectField() {
+          common.debug('Field = bytes');
+          return visualizePage.selectField('bytes');
+        })
+        .then(function setInterval() {
+          common.debug('Interval = 2000');
+          return visualizePage.setNumericInterval('2000');
+        })
+        .then(function clickGo() {
+          return visualizePage.clickGo();
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone();
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('data table', function indexPatternCreation() {
+        var testSubName = 'DataTable';
+        var vizName1 = 'Visualization ' + testSubName;
+
+        bdd.it('should be able to save and load', function pageHeader() {
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function () {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function () {
+            return visualizePage.waitForVisualization();
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct data, take screenshot', function pageHeader() {
+          var chartHeight = 0;
+          var expectedChartData = [ '0 2,088', '2,000 2,748', '4,000 2,707', '6,000 2,876',
+          '8,000 2,863', '10,000 147', '12,000 148', '14,000 129', '16,000 161', '18,000 137'
+          ];
+
+          return visualizePage.getDataTableData()
+          .then(function showData(data) {
+            common.debug(data.split('\n'));
+            expect(data.split('\n')).to.eql(expectedChartData);
+          })
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
new file mode 100644
index 0000000000000..539758e69bb6b
--- /dev/null
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -0,0 +1,165 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      var remote;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        remote = this.remote;
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickLineChart');
+          return visualizePage.clickLineChart();
+        })
+        .then(function clickNewSearch() {
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function clickBucket() {
+          common.debug('Bucket = Split Chart');
+          return visualizePage.clickBucket('Split Chart');
+        })
+        .then(function selectAggregation() {
+          common.debug('Aggregation = Terms');
+          return visualizePage.selectAggregation('Terms');
+        })
+        .then(function selectField() {
+          common.debug('Field = extension');
+          return visualizePage.selectField('extension');
+        })
+        .then(function setInterval() {
+          common.debug('switch from Rows to Columns');
+          return visualizePage.clickColumns();
+        })
+        .then(function clickGo() {
+          return visualizePage.clickGo();
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone(); // only matches the hidden spinner
+        })
+        .catch(common.handleError(this));
+      });
+
+      bdd.describe('line charts', function indexPatternCreation() {
+        var testSubName = 'LineChart';
+        var vizName1 = 'Visualization ' + testSubName;
+
+        bdd.it('should be able to save and load', function pageHeader() {
+
+          common.debug('Start of test' + testSubName + 'Visualization');
+          var remote = this.remote;
+
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function () {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function waitForVisualization() {
+            return visualizePage.waitForVisualization();
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct chart, take screenshot', function pageHeader() {
+
+          var remote = this.remote;
+
+          // this test only verifies the numerical part of this data
+          // it could also check the legend to verify the extensions
+          var expectedChartData = ['jpg 9,109', 'css 2,159', 'png 1,373', 'gif 918', 'php 445'];
+
+          // sleep a bit before trying to get the chart data
+          return common.sleep(3000)
+          .then(function () {
+            return visualizePage.getLineChartData()
+            .then(function showData(data) {
+              var tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
+              for (var x = 0; x < data.length; x++) {
+                common.debug('x=' + x + ' expectedChartData[x].split(\' \')[1] = ' +
+                  (expectedChartData[x].split(' ')[1]).replace(',', '') + '  data[x]=' + data[x] +
+                  ' diff=' + Math.abs(expectedChartData[x].split(' ')[1].replace(',', '') - data[x]));
+                expect(Math.abs(expectedChartData[x].split(' ')[1].replace(',', '') - data[x]) < tolerance).to.be.ok();
+              }
+              common.debug('Done');
+            });
+          })
+          .then(function takeScreenshot() {
+            // take a snapshot just as an example.
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data', function pageHeader() {
+
+          var remote = this.remote;
+          var expectedChartData = ['jpg 9,109', 'css 2,159', 'png 1,373', 'gif 918', 'php 445'];
+
+          return visualizePage.collapseChart()
+          .then(function getDataTableData() {
+            return visualizePage.getDataTableData();
+          })
+          .then(function showData(data) {
+            common.debug(data.split('\n'));
+            expect(data.trim().split('\n')).to.eql(expectedChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
new file mode 100644
index 0000000000000..728784784507b
--- /dev/null
+++ b/test/functional/apps/visualize/_metric_chart.js
@@ -0,0 +1,316 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      var remote;
+      var fromTime;
+      var toTime;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        remote = this.remote;
+        fromTime = '2015-09-19 06:31:44.000';
+        toTime = '2015-09-23 18:31:44.000';
+
+        var testSubName = 'MetricChart';
+        common.debug('Start of test' + testSubName + 'Visualization');
+        var vizName1 = 'Visualization ' + testSubName;
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickMetric');
+          return visualizePage.clickMetric();
+        })
+        .then(function clickNewSearch() {
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('metric chart', function indexPatternCreation() {
+
+        bdd.it('should show Count', function pageHeader() {
+          var expectedCount = ['14,004', 'Count'];
+
+          // initial metric of "Count" is selected by default
+          return common.tryForTime(2000, function () {
+            return visualizePage.getMetric()
+            .then(function (metricValue) {
+              expect(expectedCount).to.eql(metricValue.split('\n'));
+            });
+          });
+        });
+
+        bdd.it('should show Average', function pageHeader() {
+          var avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
+          return visualizePage.clickMetricEditor()
+          .then(function () {
+            common.debug('Aggregation = Average');
+            return visualizePage.selectAggregation('Average');
+          })
+          .then(function selectField() {
+            common.debug('Field = machine.ram');
+            return visualizePage.selectField('machine.ram');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(avgMachineRam).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Sum', function pageHeader() {
+          var sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
+          common.debug('Aggregation = Sum');
+          return visualizePage.selectAggregation('Sum')
+          .then(function selectField() {
+            common.debug('Field = phpmemory');
+            return visualizePage.selectField('phpmemory');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(sumPhpMemory).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Median', function pageHeader() {
+          var medianBytes = ['5,565.263', '50th percentile of bytes'];
+          //  For now, only comparing the text label part of the metric
+          common.debug('Aggregation = Median');
+          return visualizePage.selectAggregation('Median')
+          .then(function selectField() {
+            common.debug('Field = bytes');
+            return visualizePage.selectField('bytes');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  // only comparing the text label!
+                  expect(medianBytes[1]).to.eql(metricValue.split('\n')[1]);
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Min', function pageHeader() {
+          var minTimestamp = ['September 20th 2015, 00:00:00.000', 'Min @timestamp'];
+          common.debug('Aggregation = Min');
+          return visualizePage.selectAggregation('Min')
+          .then(function selectField() {
+            common.debug('Field = @timestamp');
+            return visualizePage.selectField('@timestamp');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(minTimestamp).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Max', function pageHeader() {
+          var maxRelatedContentArticleModifiedTime = ['April 4th 2015, 00:54:41.000', 'Max relatedContent.article:modified_time'];
+          common.debug('Aggregation = Max');
+          return visualizePage.selectAggregation('Max')
+          .then(function selectField() {
+            common.debug('Field = relatedContent.article:modified_time');
+            return visualizePage.selectField('relatedContent.article:modified_time');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(maxRelatedContentArticleModifiedTime).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Standard Deviation', function pageHeader() {
+          var standardDeviationBytes = [ '-1,435.138', 'Lower Standard Deviation of bytes',
+            '5,727.314', 'Average of bytes', '12,889.766', 'Upper Standard Deviation of bytes'
+          ];
+          common.debug('Aggregation = Standard Deviation');
+          return visualizePage.selectAggregation('Standard Deviation')
+          .then(function selectField() {
+            common.debug('Field = bytes');
+            return visualizePage.selectField('bytes');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(standardDeviationBytes).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Unique Count', function pageHeader() {
+          var uniqueCountClientip = ['1,000', 'Unique count of clientip'];
+          common.debug('Aggregation = Unique Count');
+          return visualizePage.selectAggregation('Unique Count')
+          .then(function selectField() {
+            common.debug('Field = clientip');
+            return visualizePage.selectField('clientip');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(uniqueCountClientip).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .then(function () {
+            return visualizePage.getMetric()
+              .then(function (metricValue) {
+                common.debug('metricValue=' + metricValue.split('\n'));
+                expect(uniqueCountClientip).to.eql(metricValue.split('\n'));
+              });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Percentiles', function pageHeader() {
+          // This SHOULD be the expected result but the top item is cut off.
+          //  See https://github.com/elastic/kibana/issues/5721
+          // var percentileMachineRam = ['2,147,483,648', '1st percentile of machine.ram', '3,221,225,472',
+          //   '5th percentile of machine.ram', '7,516,192,768', '25th percentile of machine.ram', '12,884,901,888',
+          //   '50th percentile of machine.ram', '18,253,611,008', '75th percentile of machine.ram',
+          //   '32,212,254,720', '95th percentile of machine.ram', '32,212,254,720', '99th percentile of machine.ram'
+          // ];
+          var percentileMachineRam = ['3,221,225,472',
+            '5th percentile of machine.ram', '7,516,192,768', '25th percentile of machine.ram', '12,884,901,888',
+            '50th percentile of machine.ram', '18,253,611,008', '75th percentile of machine.ram',
+            '32,212,254,720', '95th percentile of machine.ram', '32,212,254,720', '99th percentile of machine.ram'
+          ];
+          common.debug('Aggregation = Percentiles');
+          return visualizePage.selectAggregation('Percentiles')
+          .then(function selectField() {
+            common.debug('Field =  machine.ram');
+            return visualizePage.selectField('machine.ram');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(percentileMachineRam).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show Percentile Ranks', function pageHeader() {
+          var percentileRankBytes = [ '2.036%', 'Percentile rank 99 of "memory"'];
+          common.debug('Aggregation = Percentile Ranks');
+          return visualizePage.selectAggregation('Percentile Ranks')
+          .then(function selectField() {
+            common.debug('Field =  bytes');
+            return visualizePage.selectField('memory');
+          })
+          .then(function selectField() {
+            common.debug('Values =  99');
+            return visualizePage.setValue('99');
+          })
+          .then(function clickGo() {
+            return visualizePage.clickGo();
+          })
+          .then(function () {
+            return common.tryForTime(2000, function () {
+              return visualizePage.getMetric()
+                .then(function (metricValue) {
+                  expect(percentileRankBytes).to.eql(metricValue.split('\n'));
+                });
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
new file mode 100644
index 0000000000000..5490fe6af3a1c
--- /dev/null
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -0,0 +1,165 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      var remote;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        remote = this.remote;
+        var fromTime = '2015-09-19 06:31:44.000';
+        var toTime = '2015-09-23 18:31:44.000';
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickPieChart');
+          return visualizePage.clickPieChart();
+        })
+        .then(function clickNewSearch() {
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function () {
+          common.debug('select bucket Split Slices');
+          return visualizePage.clickBucket('Split Slices');
+        })
+        .then(function () {
+          common.debug('Click aggregation Histogram');
+          return visualizePage.selectAggregation('Histogram');
+        })
+        .then(function () {
+          common.debug('Click field memory');
+          return visualizePage.selectField('memory');
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone();
+        })
+        .then(function sleep() {
+          return common.sleep(1003);
+        })
+        .then(function () {
+          common.debug('setNumericInterval 4000');
+          return visualizePage.setNumericInterval('40000');
+        })
+        .then(function () {
+          common.debug('clickGo');
+          return visualizePage.clickGo();
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone();
+        });
+      });
+
+
+      bdd.describe('pie chart', function indexPatternCreation() {
+        var testSubName = 'PieChart';
+        var vizName1 = 'Visualization ' + testSubName;
+
+
+        bdd.it('should save and load', function pageHeader() {
+          common.debug('Start of test' + testSubName + 'Visualization');
+          var remote = this.remote;
+
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function () {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function waitForVisualization() {
+            return visualizePage.waitForVisualization();
+          })
+          // sleep a bit before trying to get the pie chart data below
+          .then(function sleep() {
+            return common.sleep(2000);
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show 10 slices in pie chart, take screenshot', function pageHeader() {
+          var remote = this.remote;
+          var expectedPieChartSliceCount = 10;
+
+          return visualizePage.getPieChartData()
+          .then(function (pieData) {
+            var barHeightTolerance = 1;
+            common.debug('pieData.length = ' + pieData.length);
+            expect(pieData.length).to.be(expectedPieChartSliceCount);
+          })
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct data', function pageHeader() {
+          var remote = this.remote;
+          var expectedTableData =  [ '0 55', '40,000 50', '80,000 41', '120,000 43',
+            '160,000 44', '200,000 40', '240,000 46', '280,000 39', '320,000 40', '360,000 47'
+          ];
+
+          return visualizePage.collapseChart()
+          .then(function () {
+            return settingsPage.setPageSize('All');
+          })
+          .then(function getDataTableData() {
+            return visualizePage.getDataTableData();
+          })
+          .then(function showData(data) {
+            common.debug(data.split('\n'));
+            expect(data.trim().split('\n')).to.eql(expectedTableData);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
new file mode 100644
index 0000000000000..bea797df399ed
--- /dev/null
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -0,0 +1,151 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      // var remote;
+      var fromTime;
+      var toTime;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        // remote = this.remote;
+        fromTime = '2015-09-19 06:31:44.000';
+        toTime = '2015-09-23 18:31:44.000';
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickTileMap');
+          return visualizePage.clickTileMap();
+        })
+        .then(function () {
+          return visualizePage.clickNewSearch();
+        })
+        .then(function () {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function () {
+          common.debug('select bucket Geo Coordinates');
+          return visualizePage.clickBucket('Geo Coordinates');
+        })
+        .then(function () {
+          common.debug('Click aggregation Geohash');
+          return visualizePage.selectAggregation('Geohash');
+        })
+        .then(function () {
+          common.debug('Click field geo.coordinates');
+          return common.tryForTime(1000, function () {
+            return visualizePage.selectField('geo.coordinates');
+          });
+        })
+        .then(function () {
+          return visualizePage.clickGo();
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone();
+        })
+        .catch(common.handleError(this));
+      });
+
+
+      bdd.describe('tile map chart', function indexPatternCreation() {
+
+        bdd.it('should save and load, take screenshot', function pageHeader() {
+          var testSubName = 'TileMap';
+          common.debug('Start of test' + testSubName + 'Visualization');
+          var vizName1 = 'Visualization ' + testSubName;
+          // var remote = this.remote;
+
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function () {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function waitForVisualization() {
+            return visualizePage.waitForVisualization();
+          })
+          // sleep a bit before taking the screenshot or it won't show data
+          .then(function sleep() {
+            return common.sleep(4000);
+          })
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+        bdd.it('should show correct tile map data', function pageHeader() {
+          var testSubName = 'TileMap';
+          common.debug('Start of test' + testSubName + 'Visualization');
+          // var remote = this.remote;
+          var expectedTableData = [ 'dn 1,429', 'dp 1,418', '9y 1,215', '9z 1,099', 'dr 1,076',
+            'dj 982', '9v 938', '9q 722', '9w 475', 'cb 457', 'c2 453', '9x 420', 'dq 399',
+            '9r 396', '9t 274', 'c8 271', 'dh 214', 'b6 207', 'bd 206', 'b7 167', 'f0 141',
+            'be 128', '9m 126', 'bf 85', 'de 73', 'bg 71', '9p 71', 'c1 57', 'c4 50', '9u 48',
+            'f2 46', '8e 45', 'b3 38', 'bs 36', 'c0 31', '87 28', 'bk 23', '8f 18', 'b5 14',
+            '84 14', 'dx 9', 'bu 9', 'b1 9', 'b4 6', '9n 3', '8g 3'
+          ];
+
+          return visualizePage.collapseChart()
+          .then(function () {
+            return settingsPage.setPageSize('All');
+          })
+          .then(function getDataTableData() {
+            return visualizePage.getDataTableData()
+            .then(function showData(data) {
+              common.debug(data.split('\n'));
+              expect(data.trim().split('\n')).to.eql(expectedTableData);
+            });
+          })
+          .catch(common.handleError(this));
+        });
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
new file mode 100644
index 0000000000000..7f9d942deb0a5
--- /dev/null
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -0,0 +1,173 @@
+define(function (require) {
+  var Common = require('../../../support/pages/common');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+  var DiscoverPage = require('../../../support/pages/discover_page');
+  var VisualizePage = require('../../../support/pages/visualize_page');
+  var expect = require('intern/dojo/node!expect.js');
+
+  return function (bdd, scenarioManager) {
+    bdd.describe('visualize app', function describeIndexTests() {
+      var common;
+      var headerPage;
+      var settingsPage;
+      var discoverPage;
+      var visualizePage;
+      // var remote;
+      var fromTime;
+      var toTime;
+
+      bdd.before(function () {
+        common = new Common(this.remote);
+        headerPage = new HeaderPage(this.remote);
+        settingsPage = new SettingsPage(this.remote);
+        discoverPage = new DiscoverPage(this.remote);
+        visualizePage = new VisualizePage(this.remote);
+        // remote = this.remote;
+        fromTime = '2015-09-19 06:31:44.000';
+        toTime = '2015-09-23 18:31:44.000';
+
+        return scenarioManager.reload('emptyKibana')
+        .then(function () {
+          common.debug('navigateTo');
+          return settingsPage.navigateTo();
+        })
+        .then(function () {
+          common.debug('createIndexPattern');
+          return settingsPage.createIndexPattern();
+        })
+        .then(function () {
+          return settingsPage.clickAdvancedTab();
+        })
+        .then(function GetAdvancedSetting() {
+          common.debug('check for required UTC timezone');
+          return settingsPage.getAdvancedSettings('dateFormat:tz');
+        })
+        .then(function (advancedSetting) {
+          expect(advancedSetting).to.be('UTC');
+        })
+        .then(function () {
+          common.debug('navigateToApp visualize');
+          return common.navigateToApp('visualize');
+        })
+        .then(function () {
+          common.debug('clickVerticalBarChart');
+          return visualizePage.clickVerticalBarChart();
+        })
+        .then(function clickNewSearch() {
+          return visualizePage.clickNewSearch();
+        })
+        .then(function setAbsoluteRange() {
+          common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
+          return headerPage.setAbsoluteRange(fromTime, toTime);
+        })
+        .then(function clickBucket() {
+          common.debug('Bucket = X-Axis');
+          return visualizePage.clickBucket('X-Axis');
+        })
+        .then(function selectAggregation() {
+          common.debug('Aggregation = Date Histogram');
+          return visualizePage.selectAggregation('Date Histogram');
+        })
+        .then(function selectField() {
+          common.debug('Field = @timestamp');
+          return visualizePage.selectField('@timestamp');
+        })
+        // leaving Interval set to Auto
+        .then(function clickGo() {
+          return visualizePage.clickGo();
+        })
+        .then(function () {
+          return headerPage.getSpinnerDone(); // only matches the hidden spinner
+        })
+        .then(function waitForVisualization() {
+          return visualizePage.waitForVisualization();
+        });
+      });
+
+      bdd.describe('vertical bar chart', function indexPatternCreation() {
+        var testSubName = 'VerticalBarChart';
+        var vizName1 = 'Visualization ' + testSubName;
+
+
+        bdd.it('should save and load', function pageHeader() {
+          return visualizePage.saveVisualization(vizName1)
+          .then(function (message) {
+            common.debug('Saved viz message = ' + message);
+            expect(message).to.be('Visualization Editor: Saved Visualization \"' + vizName1 + '\"');
+          })
+          .then(function testVisualizeWaitForToastMessageGone() {
+            return visualizePage.waitForToastMessageGone();
+          })
+          .then(function () {
+            return visualizePage.loadSavedVisualization(vizName1);
+          })
+          .then(function () {
+            return headerPage.getSpinnerDone(); // only matches the hidden spinner
+          })
+          .then(function waitForVisualization() {
+            return visualizePage.waitForVisualization();
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct chart, take screenshot', function pageHeader() {
+
+          var expectedChartValues = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202, 683,
+            1361, 1415, 707, 177, 27, 32, 175, 707, 1408, 1355, 726, 201, 29
+          ];
+
+          // Most recent failure on Jenkins usually indicates the bar chart is still being drawn?
+          // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
+          // try sleeping a bit before getting that data
+          return common.sleep(5000)
+          .then(function () {
+            return visualizePage.getBarChartData();
+          })
+          .then(function showData(data) {
+            common.debug('data=' + data);
+            common.debug('data.length=' + data.length);
+            expect(data).to.eql(expectedChartValues);
+          })
+          .then(function takeScreenshot() {
+            common.debug('Take screenshot');
+            common.saveScreenshot('./screenshot-' + testSubName + '.png');
+          })
+          .catch(common.handleError(this));
+        });
+
+
+        bdd.it('should show correct data', function pageHeader() {
+
+          var testSubName = 'VerticalBarChart';
+          // this is only the first page of the tabular data.
+          var expectedChartData =  [ 'September 20th 2015, 00:00:00.000 37',
+            'September 20th 2015, 03:00:00.000 202',
+            'September 20th 2015, 06:00:00.000 740',
+            'September 20th 2015, 09:00:00.000 1,437',
+            'September 20th 2015, 12:00:00.000 1,371',
+            'September 20th 2015, 15:00:00.000 751',
+            'September 20th 2015, 18:00:00.000 188',
+            'September 20th 2015, 21:00:00.000 31',
+            'September 21st 2015, 00:00:00.000 42',
+            'September 21st 2015, 03:00:00.000 202'
+          ];
+
+          return visualizePage.collapseChart()
+          .then(function showData(data) {
+            return visualizePage.getDataTableData();
+          })
+          .then(function showData(data) {
+            common.debug(data.split('\n'));
+            expect(data.trim().split('\n')).to.eql(expectedChartData);
+          })
+          .catch(common.handleError(this));
+        });
+
+
+
+      });
+    });
+  };
+});
diff --git a/test/functional/apps/visualize/index.js b/test/functional/apps/visualize/index.js
new file mode 100644
index 0000000000000..21ecf1777a3e8
--- /dev/null
+++ b/test/functional/apps/visualize/index.js
@@ -0,0 +1,68 @@
+define(function (require) {
+  var bdd = require('intern!bdd');
+  var expect = require('intern/dojo/node!expect.js');
+  var config = require('intern').config;
+  var url = require('intern/dojo/node!url');
+  var _ = require('intern/dojo/node!lodash');
+  var Common = require('../../../support/pages/common');
+  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
+  var HeaderPage = require('../../../support/pages/header_page');
+  var SettingsPage = require('../../../support/pages/settings_page');
+
+  var chartTypeTest = require('./_chart_types');
+  var areaChartTest = require('./_area_chart');
+  var lineChartTest = require('./_line_chart');
+  var dataTableTest = require('./_data_table');
+  var metricChartTest = require('./_metric_chart');
+  var pieChartTest = require('./_pie_chart');
+  var tileMapTest = require('./_tile_map');
+  var verticalBarChartTest = require('./_vertical_bar_chart');
+
+  bdd.describe('visualize app', function () {
+    var common;
+    var remote;
+    var headerPage;
+    var settingsPage;
+    var scenarioManager = new ScenarioManager(url.format(config.servers.elasticsearch));
+    this.timeout = config.timeouts.default;
+
+    // on setup, we create an settingsPage instance
+    // that we will use for all the tests
+    bdd.before(function () {
+      common = new Common(this.remote);
+      remote = this.remote;
+      headerPage = new HeaderPage(this.remote);
+      settingsPage = new SettingsPage(this.remote);
+    });
+
+    bdd.before(function () {
+      var self = this;
+      remote.setWindowSize(1200,800);
+      // load a set of makelogs data
+      common.debug('loadIfEmpty logstashFunctional ' + self.timeout);
+      return scenarioManager.loadIfEmpty('logstashFunctional');
+    });
+
+
+    bdd.after(function unloadMakelogs() {
+      return scenarioManager.unload('logstashFunctional');
+    });
+
+    chartTypeTest(bdd, scenarioManager);
+
+    areaChartTest(bdd, scenarioManager);
+
+    lineChartTest(bdd, scenarioManager);
+
+    dataTableTest(bdd, scenarioManager);
+
+    metricChartTest(bdd, scenarioManager);
+
+    pieChartTest(bdd, scenarioManager);
+
+    tileMapTest(bdd, scenarioManager);
+
+    verticalBarChartTest(bdd, scenarioManager);
+
+  });
+});
diff --git a/test/functional/status_page/index.js b/test/functional/status_page/index.js
index 8abad70f7a551..344c0050258a2 100644
--- a/test/functional/status_page/index.js
+++ b/test/functional/status_page/index.js
@@ -2,7 +2,7 @@ define(function (require) {
   var bdd = require('intern!bdd');
   var expect = require('intern/dojo/node!expect.js');
   var config = require('intern').config;
-  var Common = require('../../support/pages/Common');
+  var Common = require('../../support/pages/common');
 
   bdd.describe('status page', function () {
     var common;
@@ -21,10 +21,10 @@ define(function (require) {
         .findByCssSelector('.plugin_status_breakdown')
         .getVisibleText()
         .then(function (text) {
-          expect(text.indexOf('plugin:kibana Ready')).to.be.above(-1);
+          expect(text.indexOf('kibana 1.0.0 Ready')).to.be.above(-1);
         });
       })
       .catch(common.handleError(self));
     });
   });
-});
\ No newline at end of file
+});
diff --git a/test/intern.js b/test/intern.js
index b46ee03e1e2b3..8267e5a97a284 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -5,17 +5,17 @@ define(function (require) {
   return _.assign({
     debug: true,
     capabilities: {
-      'selenium-version': '2.47.1',
       'idle-timeout': 99
     },
     environments: [{
-      browserName: 'firefox'
+      browserName: 'chrome'
     }],
     tunnelOptions: serverConfig.servers.webdriver,
     functionalSuites: [
       'test/functional/status_page/index',
       'test/functional/apps/settings/index',
-      'test/functional/apps/discover/index'
+      'test/functional/apps/discover/index',
+      'test/functional/apps/visualize/index'
     ],
     excludeInstrumentation: /(fixtures|node_modules)\//,
     loaderOptions: {
@@ -25,6 +25,7 @@ define(function (require) {
       }
     },
     timeouts: {
+      // this is how long a test can run before timing out
       default: 90000
     },
   }, serverConfig);
diff --git a/test/screenshots/.empty b/test/screenshots/.empty
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/screenshots/failure/.empty b/test/screenshots/failure/.empty
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/screenshots/session/.empty b/test/screenshots/session/.empty
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/test/serverConfig.js b/test/serverConfig.js
index 40cfd5209e988..ea3438e728bb2 100644
--- a/test/serverConfig.js
+++ b/test/serverConfig.js
@@ -1,3 +1,5 @@
+var shield = require('./shield');
+
 var kibanaURL = '/app/kibana';
 
 module.exports = {
@@ -10,12 +12,14 @@ module.exports = {
     kibana: {
       protocol: process.env.TEST_UI_KIBANA_PROTOCOL || 'http',
       hostname: process.env.TEST_UI_KIBANA_HOSTNAME || 'localhost',
-      port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620
+      port: parseInt(process.env.TEST_UI_KIBANA_PORT, 10) || 5620,
+      auth: shield.kibanaUser.username + ':' + shield.kibanaUser.password
     },
     elasticsearch: {
       protocol: process.env.TEST_UI_ES_PROTOCOL || 'http',
       hostname: process.env.TEST_UI_ES_HOSTNAME || 'localhost',
-      port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220
+      port: parseInt(process.env.TEST_UI_ES_PORT, 10) || 9220,
+      auth: shield.admin.username + ':' + shield.admin.password
     }
   },
   apps: {
diff --git a/test/shield.js b/test/shield.js
new file mode 100644
index 0000000000000..826945be5a22a
--- /dev/null
+++ b/test/shield.js
@@ -0,0 +1,16 @@
+const env = process.env;
+
+exports.kibanaUser = {
+  username: env.SHIELD_KIBANA_USER || 'user',
+  password: env.SHIELD_KIBANA_USER_PASS || 'notsecure'
+};
+
+exports.kibanaServer = {
+  username: env.SHIELD_KIBANA_SERVER || 'kibana',
+  password: env.SHIELD_KIBANA_SERVER_PASS || 'notsecure'
+};
+
+exports.admin = {
+  username: env.SHIELD_ADMIN || 'admin',
+  password: env.SHIELD_ADMIN_PASS || 'notsecure'
+};
diff --git a/test/support/pages/DiscoverPage.js b/test/support/pages/DiscoverPage.js
deleted file mode 100644
index a3dc9ac6c1848..0000000000000
--- a/test/support/pages/DiscoverPage.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// in test/support/pages/DiscoverPage.js
-define(function (require) {
-  var config = require('intern').config;
-  var Common = require('./Common');
-
-  var defaultTimeout = config.timeouts.default;
-  var common;
-  var thisTime;
-
-  function DiscoverPage(remote) {
-    this.remote = remote;
-    common = new Common(this.remote);
-    thisTime = this.remote.setFindTimeout(defaultTimeout);
-  }
-
-  DiscoverPage.prototype = {
-    constructor: DiscoverPage,
-
-    getQueryField: function getQueryField() {
-      return thisTime
-      .findByCssSelector('input[ng-model=\'state.query\']');
-    },
-
-    getQuerySearchButton: function getQuerySearchButton() {
-      return thisTime
-      .findByCssSelector('button[aria-label=\'Search\']');
-    },
-
-    getTimespanText: function getTimespanText() {
-      return thisTime
-      .findByCssSelector('a.navbar-timepicker-time-desc pretty-duration.ng-isolate-scope')
-      .getVisibleText();
-    },
-
-    saveSearch: function saveSearch(searchName) {
-      var self = this;
-      return self.clickSaveSearchButton()
-      .then(function () {
-        common.debug('--saveSearch button clicked');
-        return thisTime.findById('SaveSearch')
-        .type(searchName);
-      })
-      .then(function clickSave() {
-        common.debug('--find save button');
-        return thisTime
-        .findByCssSelector('button[ng-disabled="!opts.savedSearch.title"]')
-        .click();
-      });
-    },
-
-    loadSavedSearch: function loadSavedSearch(searchName) {
-      var self = this;
-      return self.clickLoadSavedSearchButton()
-      .then(function () {
-        thisTime.findByLinkText(searchName).click();
-      });
-    },
-
-    clickNewSearchButton: function clickNewSearchButton() {
-      return thisTime
-      .findByCssSelector('button[aria-label="New Search"]')
-      .click();
-    },
-    clickSaveSearchButton: function clickSaveSearchButton() {
-      return thisTime
-      .findByCssSelector('button[aria-label="Save Search"]')
-      .click();
-    },
-
-    clickLoadSavedSearchButton: function clickSaveSearchButton() {
-      return thisTime
-      .findByCssSelector('button[aria-label="Load Saved Search"]')
-      .click();
-    },
-
-    getCurrentQueryName: function getCurrentQueryName() {
-      return common.tryForTime(defaultTimeout, function () {
-        return thisTime
-        .findByCssSelector('span.discover-info-title')
-        .getVisibleText();
-      });
-    },
-
-    getBarChartData: function getBarChartData() {
-      // var barMap = {};
-      var barArray = [];
-      common.debug('in getBarChartData');
-      return thisTime
-      .findAllByCssSelector('rect')
-      .then(function (chartData) {
-
-        function getChartData(chart) {
-          return chart.getAttribute('fill')
-          .then(function (fillColor) {
-            // we're only getting the Green Bars
-            if (fillColor === '#57c17b') {
-              return chart
-              .getAttribute('height')
-              .then(function (height) {
-                common.debug(': ' + height + ', ');
-                barArray.push(height);
-              });
-            }
-          });
-        }
-
-        var getChartDataPromises = chartData.map(getChartData);
-        return Promise.all(getChartDataPromises);
-      })
-      .then(function () {
-        return barArray;
-      });
-    },
-
-    getSpinnerDone: function getSpinnerDone() {
-      common.debug('--getSpinner done method');
-      return thisTime.findByCssSelector('span.spinner.ng-hide');
-    }
-
-  };
-
-  return DiscoverPage;
-});
diff --git a/test/support/pages/Common.js b/test/support/pages/common.js
similarity index 64%
rename from test/support/pages/Common.js
rename to test/support/pages/common.js
index a531c4c177efa..d27f8054d5fa2 100644
--- a/test/support/pages/Common.js
+++ b/test/support/pages/common.js
@@ -1,37 +1,81 @@
-// in test/support/pages/Common.js
+// in test/support/pages/common.js
 define(function (require) {
   var config = require('intern').config;
   var Promise = require('bluebird');
   var moment = require('moment');
+  var testSubjSelector = require('intern/dojo/node!@spalger/test-subj-selector');
   var getUrl = require('intern/dojo/node!../../utils/getUrl');
   var fs = require('intern/dojo/node!fs');
+  var _ = require('intern/dojo/node!lodash');
+  var parse = require('intern/dojo/node!url').parse;
+  var format = require('intern/dojo/node!url').format;
   var path = require('intern/dojo/node!path');
 
+  function injectTimestampQuery(func, url) {
+    var formatted = modifyQueryString(url, function (parsed) {
+      parsed.query._t = Date.now();
+    });
+    return func.call(this, formatted);
+  }
+
+  function removeTimestampQuery(func) {
+    return func.call(this)
+    .then(function (url) {
+      return modifyQueryString(url, function (parsed) {
+        parsed.query = _.omit(parsed.query, '_t');
+      });
+    });
+  }
+
+  function modifyQueryString(url, func) {
+    var parsed = parse(url, true);
+    if (parsed.query === null) {
+      parsed.query = {};
+    }
+    func(parsed);
+    return format(_.pick(parsed, 'protocol', 'hostname', 'port', 'pathname', 'query', 'hash', 'auth'));
+  }
+
   function Common(remote) {
     this.remote = remote;
+    if (remote.get.wrapper !== injectTimestampQuery) {
+      this.remote.get = _.wrap(this.remote.get, injectTimestampQuery);
+      remote.get.wrapper = injectTimestampQuery;
+      this.remote.getCurrentUrl = _.wrap(this.remote.getCurrentUrl, removeTimestampQuery);
+    }
   }
 
+
   var defaultTimeout = config.timeouts.default;
 
   Common.prototype = {
     constructor: Common,
 
+    getHostPort: function getHostPort() {
+      return getUrl.baseUrl(config.servers.kibana);
+    },
+
     navigateToApp: function (appName, testStatusPage) {
       var self = this;
-      var appUrl = getUrl(config.servers.kibana, config.apps[appName]);
+      var appUrl = getUrl.noAuth(config.servers.kibana, config.apps[appName]);
       self.debug('navigating to ' + appName + ' url: ' + appUrl);
 
       var doNavigation = function (url) {
         return self.tryForTime(defaultTimeout, function () {
           // since we're using hash URLs, always reload first to force re-render
+          self.debug('navigate to: ' + url);
           return self.remote.get(url)
           .then(function () {
+            self.debug('returned from get, calling refresh');
             return self.remote.refresh();
           })
           .then(function () {
+            self.debug('check testStatusPage');
             if (testStatusPage !== false) {
+              self.debug('self.checkForKibanaApp()');
               return self.checkForKibanaApp()
               .then(function (kibanaLoaded) {
+                self.debug('kibanaLoaded = ' + kibanaLoaded);
                 if (!kibanaLoaded) {
                   var msg = 'Kibana is not loaded, retrying';
                   self.debug(msg);
@@ -48,6 +92,7 @@ define(function (require) {
             if (!navSuccessful) {
               var msg = 'App failed to load: ' + appName +
               ' in ' + defaultTimeout + 'ms' +
+              ' appUrl = ' + appUrl +
               ' currentUrl = ' + currentUrl;
               self.debug(msg);
               throw new Error(msg);
@@ -63,11 +108,12 @@ define(function (require) {
         var lastUrl = currentUrl;
         return self.tryForTime(defaultTimeout, function () {
           // give the app time to update the URL
-          return self.sleep(500)
+          return self.sleep(501)
           .then(function () {
             return self.remote.getCurrentUrl();
           })
           .then(function (currentUrl) {
+            self.debug('in doNavigation url = ' + currentUrl);
             if (lastUrl !== currentUrl) {
               lastUrl = currentUrl;
               throw new Error('URL changed, waiting for it to settle');
@@ -135,7 +181,7 @@ define(function (require) {
     tryForTime: function (timeout, block) {
       var self = this;
       var start = Date.now();
-      var retryDelay = 500;
+      var retryDelay = 502;
       var lastTry = 0;
       var tempMessage;
 
@@ -158,17 +204,20 @@ define(function (require) {
       return Promise.try(attempt);
     },
 
-    log: function (logString) {
+    log: function log(logString) {
       console.log(moment().format('HH:mm:ss.SSS') + ': ' + logString);
     },
 
-    debug: function (logString) {
+    debug: function debug(logString) {
       if (config.debug) this.log(logString);
     },
 
-    sleep: function (sleepMilliseconds) {
-      this.debug('sleeping for ' + sleepMilliseconds + 'ms');
-      return Promise.resolve().delay(sleepMilliseconds);
+    sleep: function sleep(sleepMilliseconds) {
+      var self = this;
+      self.debug('... sleep(' + sleepMilliseconds + ') start');
+
+      return Promise.resolve().delay(sleepMilliseconds)
+      .then(function () { self.debug('... sleep(' + sleepMilliseconds + ') end'); });
     },
 
     handleError: function (testObj) {
@@ -177,28 +226,35 @@ define(function (require) {
 
       return function (reason) {
         var now = Date.now();
-        var filename = ['failure', now, testName].join('_') + '.png';
+        var fileName = ['failure', now, testName].join('_') + '.png';
 
-        return self.saveScreenshot(filename)
+        return self.saveScreenshot(fileName, true)
         .finally(function () {
           throw new Error(reason);
         });
       };
     },
 
-    saveScreenshot: function (filename) {
+    saveScreenshot: function saveScreenshot(fileName, isFailure) {
       var self = this;
-      var outDir = path.resolve('test', 'output');
+      var outDir = path.resolve('test', 'screenshots');
+      var directoryName = isFailure ? 'failure' : 'session';
+      var directoryPath = path.resolve('test', 'screenshots', directoryName);
+      var filePath = path.resolve(directoryPath, fileName);
+      self.debug('Taking screenshot "' + filePath + '"');
 
       return self.remote.takeScreenshot()
       .then(function writeScreenshot(data) {
-        var filepath = path.resolve(outDir, filename);
-        self.debug('Taking screenshot "' + filepath + '"');
-        fs.writeFileSync(filepath, data);
+        fs.writeFileSync(filePath, data);
       })
       .catch(function (err) {
         self.log('SCREENSHOT FAILED: ' + err);
       });
+    },
+
+    findTestSubject: function findTestSubject(selector) {
+      this.debug('in findTestSubject: ' + selector);
+      return this.remote.findByCssSelector(testSubjSelector(selector));
     }
   };
 
diff --git a/test/support/pages/discover_page.js b/test/support/pages/discover_page.js
new file mode 100644
index 0000000000000..2a180cdb4bc90
--- /dev/null
+++ b/test/support/pages/discover_page.js
@@ -0,0 +1,255 @@
+// in test/support/pages/discover_page.js
+define(function (require) {
+  var config = require('intern').config;
+  var Common = require('./common');
+
+  var defaultTimeout = config.timeouts.default;
+  var common;
+  var thisTime;
+
+  function DiscoverPage(remote) {
+    this.remote = remote;
+    common = new Common(this.remote);
+    thisTime = this.remote.setFindTimeout(defaultTimeout);
+  }
+
+  DiscoverPage.prototype = {
+    constructor: DiscoverPage,
+
+    getQueryField: function getQueryField() {
+      return thisTime
+      .findByCssSelector('input[ng-model=\'state.query\']');
+    },
+
+    getQuerySearchButton: function getQuerySearchButton() {
+      return thisTime
+      .findByCssSelector('button[aria-label=\'Search\']');
+    },
+
+    getTimespanText: function getTimespanText() {
+      return thisTime
+      .findByCssSelector('a.navbar-timepicker-time-desc pretty-duration.ng-isolate-scope')
+      .getVisibleText();
+    },
+
+    getChartTimespan: function getChartTimespan() {
+      return thisTime
+      .findByCssSelector('center.small > span:nth-child(1)')
+      .getVisibleText();
+    },
+
+    saveSearch: function saveSearch(searchName) {
+      var self = this;
+      return self.clickSaveSearchButton()
+      .then(function () {
+        common.sleep(1000);
+      })
+      .then(function () {
+        common.debug('--saveSearch button clicked');
+        return thisTime.findById('SaveSearch')
+        .type(searchName);
+      })
+      .then(function clickSave() {
+        common.debug('--find save button');
+        return thisTime
+        .findByCssSelector('button[ng-disabled="!opts.savedSearch.title"]')
+        .click();
+      });
+    },
+
+    loadSavedSearch: function loadSavedSearch(searchName) {
+      var self = this;
+      return self.clickLoadSavedSearchButton()
+      .then(function () {
+        thisTime.findByLinkText(searchName).click();
+      });
+    },
+
+    clickNewSearchButton: function clickNewSearchButton() {
+      return thisTime
+      .findByCssSelector('button[aria-label="New Search"]')
+      .click();
+    },
+    clickSaveSearchButton: function clickSaveSearchButton() {
+      return thisTime
+      .findByCssSelector('button[aria-label="Save Search"]')
+      .click();
+    },
+
+    clickLoadSavedSearchButton: function clickSaveSearchButton() {
+      return thisTime
+      .findByCssSelector('button[aria-label="Load Saved Search"]')
+      .click();
+    },
+
+    getCurrentQueryName: function getCurrentQueryName() {
+      return common.tryForTime(defaultTimeout, function () {
+        return thisTime
+        .findByCssSelector('span.discover-info-title')
+        .getVisibleText();
+      });
+    },
+
+    getBarChartData: function getBarChartData() {
+      return thisTime
+      .findAllByCssSelector('rect[data-label="Count"]')
+      .then(function (chartData) {
+
+        function getChartData(chart) {
+          return chart
+          .getAttribute('height');
+        }
+
+        var getChartDataPromises = chartData.map(getChartData);
+        return Promise.all(getChartDataPromises);
+      })
+      .then(function (bars) {
+        return bars;
+      });
+    },
+
+    getChartInterval: function getChartInterval() {
+      return thisTime
+      .findByCssSelector('span.results-interval:nth-child(2) > a:nth-child(1)')
+      .getVisibleText();
+    },
+
+    setChartInterval: function setChartInterval(interval) {
+      return thisTime
+      .findByCssSelector('span.results-interval:nth-child(2) > a:nth-child(1)')
+      .click()
+      .catch(function () {
+        // in some cases we have the link above, but after we've made a
+        // selection we just have a select list.
+      })
+      .then(function () {
+        return thisTime
+        .findByCssSelector('option[label="' + interval + '"]')
+        .click();
+      });
+    },
+
+    getHitCount: function getHitCount() {
+      return thisTime
+      .findByCssSelector('strong.discover-info-hits')
+      .getVisibleText();
+    },
+
+    query: function query(queryString) {
+      return thisTime
+      .findByCssSelector('input[aria-label="Search input"]')
+      .clearValue()
+      .type(queryString)
+      .then(function () {
+        return thisTime
+        .findByCssSelector('button[aria-label="Search"]')
+        .click();
+      });
+    },
+
+    getDocHeader: function getDocHeader() {
+      return thisTime
+      .findByCssSelector('thead.ng-isolate-scope > tr:nth-child(1)')
+      .getVisibleText();
+    },
+
+    getDocTableIndex: function getDocTableIndex(index) {
+      return thisTime
+      .findByCssSelector('tr.discover-table-row:nth-child(' + (index) + ')')
+      .getVisibleText();
+    },
+
+    clickDocSortDown: function clickDocSortDown() {
+      return thisTime
+      .findByCssSelector('.fa-sort-down')
+      .click();
+    },
+
+    clickDocSortUp: function clickDocSortUp() {
+      return thisTime
+      .findByCssSelector('.fa-sort-up')
+      .click();
+    },
+
+    getMarks: function getMarks() {
+      return thisTime
+      .findAllByCssSelector('mark')
+      .getVisibleText();
+    },
+
+    clickShare: function clickShare() {
+      return thisTime
+      .findByCssSelector('button[aria-label="Share Search"]')
+      .click();
+    },
+
+    clickShortenUrl: function clickShortenUrl() {
+      return thisTime
+      .findByCssSelector('button.shorten-button')
+      .click();
+    },
+
+    clickCopyToClipboard: function clickCopyToClipboard() {
+      return thisTime
+      .findByCssSelector('button.clipboard-button')
+      .click();
+    },
+
+    getShareCaption: function getShareCaption() {
+      return thisTime
+      .findByCssSelector('div.form-group > label')
+      .getVisibleText();
+    },
+
+    getSharedUrl: function getSharedUrl() {
+      return thisTime
+      .findByCssSelector('.url')
+      .getProperty('baseURI');
+    },
+
+    getShortenedUrl: function getShortenedUrl() {
+      return thisTime
+      .findByCssSelector('.url')
+      .getProperty('value');
+    },
+
+    clickLegendExpand: function clickLegendExpand() {
+      return thisTime
+      .findByCssSelector('.fa-chevron-left')
+      .click();
+    },
+
+    clickLegendCollapse: function clickLegendCollapse() {
+      return thisTime
+      .findByCssSelector('div.legend-toggle > i.fa-chevron-right')
+      .click();
+    },
+
+    getLegendWidth: function getLegendWidth() {
+      return thisTime
+      .findByCssSelector('.legend-col-wrapper')
+      .getProperty('clientWidth');
+    },
+
+    clickSidebarExpand: function clickSidebarExpand() {
+      return thisTime
+      .findByCssSelector('.chevron-cont')
+      .click();
+    },
+
+    clickSidebarCollapse: function clickSidebarCollapse() {
+      return thisTime
+      .findByCssSelector('.chevron-cont')
+      .click();
+    },
+
+    getSidebarWidth: function getSidebarWidth() {
+      return thisTime
+      .findByCssSelector('.sidebar-list')
+      .getProperty('clientWidth');
+    }
+
+  };
+
+  return DiscoverPage;
+});
diff --git a/test/support/pages/HeaderPage.js b/test/support/pages/header_page.js
similarity index 84%
rename from test/support/pages/HeaderPage.js
rename to test/support/pages/header_page.js
index 40353ade7421a..50c5bcd570b98 100644
--- a/test/support/pages/HeaderPage.js
+++ b/test/support/pages/header_page.js
@@ -1,7 +1,7 @@
 // in test/support/pages/HeaderPage.js
 define(function (require) {
   var config = require('intern').config;
-  var Common = require('./Common');
+  var Common = require('./common');
 
   var common;
 
@@ -82,8 +82,12 @@ define(function (require) {
 
     setAbsoluteRange: function setAbsoluteRange(fromTime, toTime) {
       var self = this;
-      common.debug('--Clicking Absolute button');
-      return self.clickAbsoluteButton()
+      common.debug('clickTimepicker');
+      return self.clickTimepicker()
+      .then(function () {
+        common.debug('--Clicking Absolute button');
+        return self.clickAbsoluteButton();
+      })
       .then(function () {
         common.debug('--Setting From Time : ' + fromTime);
         return self.setFromTime(fromTime);
@@ -94,6 +98,9 @@ define(function (require) {
       })
       .then(function () {
         return self.clickGoButton();
+      })
+      .then(function () {
+        self.collapseTimepicker();
       });
     },
 
@@ -128,8 +135,21 @@ define(function (require) {
           return;
         });
       });
-    }
+    },
 
+    clickToastOK: function clickToastOK() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('button[ng-if="notif.accept"]')
+      .click();
+    },
+
+    getSpinnerDone: function getSpinnerDone() {
+      var self = this;
+      return this.remote
+      .setFindTimeout(defaultTimeout * 10)
+      .findByCssSelector('span.spinner.ng-hide');
+    }
 
   };
 
diff --git a/test/support/pages/SettingsPage.js b/test/support/pages/settings_page.js
similarity index 78%
rename from test/support/pages/SettingsPage.js
rename to test/support/pages/settings_page.js
index dbba239f40f6e..5877a4902eb84 100644
--- a/test/support/pages/SettingsPage.js
+++ b/test/support/pages/settings_page.js
@@ -1,24 +1,84 @@
-// in test/support/pages/SettingsPage.js
+// in test/support/pages/settings_page.js
 define(function (require) {
   var config = require('intern').config;
   var Promise = require('bluebird');
-  var Common = require('./Common');
+  var Common = require('./common');
+  var HeaderPage = require('./header_page');
 
   var defaultTimeout = config.timeouts.default;
   var common;
+  var headerPage;
 
-  function SettingsPage(remote) {
+  function settingsPage(remote) {
     this.remote = remote;
     common = new Common(this.remote);
+    headerPage = new HeaderPage(this.remote);
   }
 
-  SettingsPage.prototype = {
-    constructor: SettingsPage,
+  settingsPage.prototype = {
+    constructor: settingsPage,
+
+    clickAdvancedTab: function () {
+      common.debug('in clickAdvancedTab');
+      return common.findTestSubject('settingsNav advanced').click();
+    },
+
+    setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) {
+      var self = this;
+      return common.findTestSubject('advancedSetting&' + propertyName + ' editButton')
+      .click()
+      .then(function setAdvancedSettingsClickPropertyValue(selectList) {
+        return self.remote.findByCssSelector('option[label="' + propertyValue + '"]')
+        .click();
+      })
+      .then(function setAdvancedSettingsClickSaveButton() {
+        return common.findTestSubject('advancedSetting&' + propertyName + ' saveButton')
+        .click();
+      });
+    },
+
+    getAdvancedSettings: function getAdvancedSettings(propertyName) {
+      common.debug('in setAdvancedSettings');
+      return common.findTestSubject('advancedSetting&' + propertyName + ' currentValue')
+      .getVisibleText();
+    },
+
+
+    clickAdvancedTab: function () {
+      common.debug('in clickAdvancedTab');
+      return common.findTestSubject('settingsNav advanced').click();
+    },
+
+    setAdvancedSettings: function setAdvancedSettings(propertyName, propertyValue) {
+      var self = this;
+      return common.findTestSubject('advancedSetting&' + propertyName + ' editButton')
+      .click()
+      .then(function () {
+        return common.sleep(1000);
+      })
+      .then(function setAdvancedSettingsClickPropertyValue(selectList) {
+        return self.remote.findByCssSelector('option[label="' + propertyValue + '"]')
+        .click();
+      })
+      .then(function setAdvancedSettingsClickSaveButton() {
+        return common.findTestSubject('advancedSetting&' + propertyName + ' saveButton')
+        .click();
+      });
+    },
+
+    getAdvancedSettings: function getAdvancedSettings(propertyName) {
+      var self = this;
+      common.debug('in setAdvancedSettings');
+      return common.findTestSubject('advancedSetting&' + propertyName + ' currentValue')
+      .getVisibleText();
+    },
+
 
     navigateTo: function () {
       return common.navigateToApp('settings');
     },
 
+
     getTimeBasedEventsCheckbox: function () {
       return this.remote.setFindTimeout(defaultTimeout)
       .findByCssSelector('input[ng-model="index.isTimeBased"]');
@@ -181,6 +241,9 @@ define(function (require) {
       )
       .then(function (page) {
         return page.click();
+      })
+      .then(function () {
+        return headerPage.getSpinnerDone();
       });
     },
 
@@ -257,6 +320,8 @@ define(function (require) {
           .then(function (currentUrl) {
             if (!currentUrl.match(/indices\/.+\?/)) {
               throw new Error('Index pattern not created');
+            } else {
+              common.debug('Index pattern created: ' + currentUrl);
             }
           });
         });
@@ -295,5 +360,5 @@ define(function (require) {
     }
   };
 
-  return SettingsPage;
+  return settingsPage;
 });
diff --git a/test/support/pages/visualize_page.js b/test/support/pages/visualize_page.js
new file mode 100644
index 0000000000000..022b94f4bdd3d
--- /dev/null
+++ b/test/support/pages/visualize_page.js
@@ -0,0 +1,687 @@
+define(function (require) {
+
+  var config = require('intern').config;
+  var registerSuite = require('intern!object');
+  var Common = require('./common');
+  var HeaderPage = require('./header_page');
+
+  var defaultTimeout = config.timeouts.default;
+  var common;
+  var headerPage;
+
+  function VisualizePage(remote) {
+    this.remote = remote;
+    common = new Common(this.remote);
+    headerPage = new HeaderPage(this.remote);
+  }
+
+  VisualizePage.prototype = {
+    constructor: VisualizePage,
+
+    clickAreaChart: function clickAreaChart() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Area chart')
+      .click();
+    },
+
+    clickDataTable: function clickDataTable() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Data table')
+      .click();
+    },
+
+    clickLineChart: function clickLineChart() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Line chart')
+        .click();
+    },
+
+    clickMarkdownWidget: function clickMarkdownWidget() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Markdown widget')
+      .click();
+    },
+
+    clickMetric: function clickMetric() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Metric')
+      .click();
+    },
+
+    clickPieChart: function clickPieChart() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Pie chart')
+      .click();
+    },
+
+    clickTileMap: function clickTileMap() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Tile map')
+      .click();
+    },
+
+    clickVerticalBarChart: function clickVerticalBarChart() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByPartialLinkText('Vertical bar chart')
+      .click();
+    },
+
+    getChartTypeCount: function getChartTypeCount() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findAllByCssSelector('a.wizard-vis-type.ng-scope')
+      .length;
+    },
+
+    getChartTypes: function getChartTypes() {
+      var types = [];
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findAllByCssSelector('a.wizard-vis-type.ng-scope h4')
+      .then(function (chartTypes) {
+        function getChartType(chart) {
+          return chart.getVisibleText();
+        }
+        var getChartTypesPromises = chartTypes.map(getChartType);
+        return Promise.all(getChartTypesPromises);
+      })
+      .then(function (texts) {
+        return texts;
+      });
+    },
+
+    clickAbsoluteButton: function clickAbsoluteButton() {
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByCssSelector('ul.nav.nav-pills.nav-stacked.kbn-timepicker-modes:contains("absolute")')
+      .click();
+    },
+
+    setFromTime: function setFromTime(timeString) {
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByCssSelector('input[ng-model="absolute.from"]')
+      .clearValue()
+      .type(timeString);
+    },
+
+    setToTime: function setToTime(timeString) {
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByCssSelector('input[ng-model="absolute.to"]')
+      .clearValue()
+      .type(timeString);
+    },
+
+    clickGoButton: function clickGoButton() {
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByClassName('kbn-timepicker-go')
+      .click()
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      });
+    },
+
+    collapseChart: function collapseChart() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('div.visualize-show-spy > div > i')
+      .click();
+    },
+
+    getMetric: function getMetric() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      // .findByCssSelector('div[ng-repeat="metric in metrics"')
+      .findByCssSelector('div[ng-controller="KbnMetricVisController"]')
+      .getVisibleText();
+    },
+
+    clickMetricEditor: function clickMetricEditor() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('button[aria-label="Open Editor"]')
+      .click();
+    },
+
+    clickNewSearch: function clickNewSearch() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('li[ng-click="stepTwoMode=\'new\'"]')
+      .click()
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      });
+    },
+
+    setValue: function setValue(newValue) {
+      var self = this.remote;
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByCssSelector('button[ng-click="numberListCntr.add()"]')
+      .click()
+      .then(function () {
+        return self
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('input[ng-model="numberListCntr.getList()[$index]"]')
+        .clearValue();
+      })
+      .then(function () {
+        return self
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('input[ng-model="numberListCntr.getList()[$index]"]')
+        .type(newValue);
+      });
+    },
+
+    clickSavedSearch: function clickSavedSearch() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('li[ng-click="stepTwoMode=\'saved\'"]')
+      .click()
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      });
+    },
+
+    selectSearch: function selectSearch(searchName) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByLinkText(searchName)
+      .click();
+    },
+
+
+    getErrorMessage: function getErrorMessage() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('.item>h4')
+      .getVisibleText();
+    },
+
+    // clickBucket(bucketType) 'X-Axis', 'Split Area', 'Split Chart'
+    clickBucket: function clickBucket(bucketName) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findAllByCssSelector('li.list-group-item.list-group-menu-item.ng-binding.ng-scope')
+      .then(function (chartTypes) {
+        common.debug('found bucket types ' + chartTypes.length);
+
+        function getChartType(chart) {
+          return chart
+          .getVisibleText()
+          .then(function (chartString) {
+            //common.debug(chartString);
+            if (chartString === bucketName) {
+              chart.click();
+            }
+          });
+        }
+        var getChartTypesPromises = chartTypes.map(getChartType);
+        return Promise.all(getChartTypesPromises);
+      });
+    },
+
+    selectAggregation: function selectAggregation(myString) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('option[label="' + myString + '"]')
+      .click();
+    },
+
+    getField: function getField() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('.ng-valid-required[name="field"] option[selected="selected"]')
+      .getVisibleText();
+    },
+
+    selectField: function selectField(fieldValue) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      // the css below should be more selective
+      .findByCssSelector('option[label="' + fieldValue + '"]')
+      .click();
+    },
+
+    orderBy: function orderBy(fieldValue) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('select.form-control.ng-pristine.ng-valid.ng-untouched.ng-valid-required[ng-model="agg.params.orderBy"] ' +
+        'option.ng-binding.ng-scope:contains("' + fieldValue + '")'
+      )
+      .click();
+    },
+
+    getInterval: function getInterval() {
+      var self = this;
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('select[ng-model="agg.params.interval"]')
+      .getProperty('selectedIndex')
+      .then(function (selectedIndex) {
+        return self.remote
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('select[ng-model="agg.params.interval"] option:nth-child(' + (selectedIndex + 1) + ')')
+        .getProperty('label');
+      });
+    },
+
+    setInterval: function setInterval(newValue) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('select[ng-model="agg.params.interval"]')
+      .type(newValue);
+    },
+
+    setNumericInterval: function setNumericInterval(newValue) {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('input.form-control:nth-child(2)')
+      .type(newValue);
+    },
+
+    clickGo: function clickGo() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('.btn-success')
+      .click()
+      .then(function () {
+        return headerPage.getSpinnerDone();
+      });
+    },
+
+
+    clickNewVisualization: function clickNewVisualization() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('button.ng-scope[aria-label="New Visualization"]')
+      .click();
+    },
+
+
+    saveVisualization: function saveVisualization(vizName) {
+      var self = this;
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('button.ng-scope[aria-label="Save Visualization"]')
+      .click()
+      .then(function () {
+        return common.sleep(1000);
+      })
+      .then(function () {
+        common.debug('saveButton button clicked');
+        return self.remote
+        .setFindTimeout(defaultTimeout)
+        .findByName('visTitle')
+        .type(vizName);
+      })
+      //   // click save button
+      .then(function () {
+        return self.remote
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('.btn-primary')
+        .click();
+      })
+      // verify that green message at the top of the page.
+      // it's only there for about 5 seconds
+      .then(function () {
+        return self.remote
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('kbn-truncated.toast-message.ng-isolate-scope')
+        .getVisibleText();
+      });
+    },
+
+    // saved visualizations are paginated 5 to a page!
+    loadSavedVisualization: function loadSavedVisualization(vizName) {
+      var self = this;
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('button.ng-scope[aria-label="Load Saved Visualization"]')
+      .click()
+      .then(function findVizByLinkedText() {
+        common.debug('Load Saved Vis button clicked');
+        return self.remote
+        .setFindTimeout(defaultTimeout)
+        .findByLinkText(vizName)
+        .click();
+      });
+    },
+
+    getXAxisLabels: function getXAxisLabels() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findAllByCssSelector('.x > g')
+      .then(function (chartTypes) {
+        function getChartType(chart) {
+          return chart
+          .getVisibleText();
+        }
+        var getChartTypesPromises = chartTypes.map(getChartType);
+        return Promise.all(getChartTypesPromises);
+      })
+      .then(function (texts) {
+        // common.debug('returning types array ' + texts + ' array length =' + texts.length);
+        return texts;
+      });
+    },
+
+
+    getYAxisLabels: function getYAxisLabels() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findAllByCssSelector('.y > g')
+      .then(function (chartTypes) {
+        function getChartType(chart) {
+          return chart
+          .getVisibleText();
+        }
+        var getChartTypesPromises = chartTypes.map(getChartType);
+        return Promise.all(getChartTypesPromises);
+      })
+      .then(function (texts) {
+        // common.debug('returning types array ' + texts + ' array length =' + texts.length);
+        return texts;
+      });
+    },
+
+
+    /*
+     ** This method gets the chart data and scales it based on chart height and label.
+     ** Returns an array of height values
+     */
+    getAreaChartData: function getAreaChartData() {
+
+      var self = this.remote;
+      var chartData = [];
+      var tempArray = [];
+      var chartSections = 0;
+      var chartMap = {};
+      var height = 0;
+      var yAxisLabel = 0;
+      var yAxisHeight = 0;
+
+      // 1). get the maximim chart Y-Axis marker value
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
+      .then(function setYAxisLabel(y) {
+        return y.getVisibleText();
+      })
+      .then(function (yLabel) {
+        yAxisLabel = yLabel.replace(',', '');
+        common.debug('yAxisLabel = ' + yAxisLabel);
+        return yLabel;
+      })
+      // 2). find and save the y-axis pixel size (the chart height)
+      .then(function () {
+        return self
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('rect.background'); // different here
+      })
+      .then(function (chartAreaObj) {
+        return chartAreaObj.getAttribute('height');
+      })
+      .then(function (chartH) {
+        yAxisHeight = chartH;
+        common.debug('height --------- ' + yAxisHeight);
+      })
+      .then(function () {
+        return self.setFindTimeout(defaultTimeout * 2)
+        .findAllByCssSelector('path')
+        .then(function (chartTypes) {
+
+          function getChartType(chart) {
+            return chart
+            .getAttribute('data-label')
+            .then(function (chartString) {
+              //common.debug('data-label  = ' + chartString);
+              if (chartString === 'Count') {
+                return chart.getAttribute('d')
+                .then(function (data) {
+                  common.debug(data);
+                  tempArray = data.split('L');
+                  chartSections = tempArray.length / 2;
+                  common.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
+                  chartData[0] = Math.round((yAxisHeight - tempArray[0].split(',')[1]) / yAxisHeight * yAxisLabel);
+                  common.debug('chartData[0] =' + chartData[0]);
+                  for (var i = 1; i < chartSections; i++) {
+                    chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) / yAxisHeight * yAxisLabel);
+                    common.debug('chartData[i] =' + chartData[i]);
+                  }
+                  return chartData;
+                });
+              }
+            });
+          }
+          var getChartTypesPromises = chartTypes.map(getChartType);
+          return Promise.all(getChartTypesPromises);
+        });
+      })
+      .then(function (chartData) {
+        return chartData[1]; // MAGIC NUMBER - we find multiple 'path's and only one of them is the right one.
+      });
+    },
+
+    // The current test shows dots, not a line.  This function gets the dots and normalizes their height.
+    getLineChartData: function getLineChartData() {
+      var self = this.remote;
+      var yAxisLabel = 0;
+      var yAxisHeight;
+
+      // 1). get the maximim chart Y-Axis marker value
+      return this.remote
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
+        .then(function setYAxisLabel(y) {
+          return y
+          .getVisibleText();
+        })
+        .then(function (yLabel) {
+          yAxisLabel = yLabel.replace(',', '');
+          common.debug('yAxisLabel = ' + yAxisLabel);
+          return yLabel;
+        })
+        // 2). find and save the y-axis pixel size (the chart height)
+        .then(function getRect() {
+          return self
+          .setFindTimeout(defaultTimeout)
+          .findByCssSelector('clipPath rect')
+          .then(function getRectHeight(chartAreaObj) {
+            return chartAreaObj
+            .getAttribute('height');
+          })
+          .then(function (theHeight) {
+            yAxisHeight = theHeight - 5; // MAGIC NUMBER - clipPath extends a bit above the top of the y-axis and below x-axis
+            common.debug('theHeight = ' + theHeight);
+            return theHeight;
+          });
+        })
+        // 3). get the chart-wrapper elements
+        .then(function getChartWrapper() {
+          return self
+          .setFindTimeout(defaultTimeout * 2)
+          .findAllByCssSelector('.chart-wrapper')
+          .then(function (chartTypes) {
+
+            // 5). for each chart element, find the green circle, then the cy position
+            function getChartType(chart) {
+              return chart
+              .findByCssSelector('circle[fill="#57c17b"]')
+              .then(function (circleObject) {
+                // common.debug('circleObject = ' + circleObject + ' yAxisHeight= ' + yAxisHeight + ' yAxisLabel= ' + yAxisLabel);
+                return circleObject
+                .getAttribute('cy');
+              })
+              .then(function (cy) {
+                // common.debug(' yAxisHeight=' + yAxisHeight + ' yAxisLabel=' + yAxisLabel + '  cy=' + cy +
+                //   ' ((yAxisHeight - cy)/yAxisHeight * yAxisLabel)=' + ((yAxisHeight - cy) / yAxisHeight * yAxisLabel));
+                return Math.round((yAxisHeight - cy) / yAxisHeight * yAxisLabel);
+              });
+            }
+
+            // 4). pass the chartTypes to the getChartType function
+            var getChartTypesPromises = chartTypes.map(getChartType);
+            return Promise.all(getChartTypesPromises);
+          });
+        })
+
+      .then(function (yCoords) {
+        return yCoords;
+      });
+    },
+
+
+    // this is ALMOST identical to DiscoverPage.getBarChartData
+    getBarChartData: function getBarChartData() {
+      var self = this.remote;
+      var yAxisLabel = 0;
+      var yAxisHeight;
+
+      // 1). get the maximim chart Y-Axis marker value
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('div.y-axis-div-wrapper > div > svg > g > g:last-of-type')
+      .then(function setYAxisLabel(y) {
+        return y
+        .getVisibleText()
+        .then(function (yLabel) {
+          yAxisLabel = yLabel.replace(',', '');
+          common.debug('yAxisLabel = ' + yAxisLabel);
+          return yLabel;
+        });
+      })
+      // 2). find and save the y-axis pixel size (the chart height)
+      .then(function getRect() {
+        return self
+        .setFindTimeout(defaultTimeout)
+        .findByCssSelector('rect.background')
+        .then(function getRectHeight(chartAreaObj) {
+          return chartAreaObj
+          .getAttribute('height')
+          .then(function (theHeight) {
+            yAxisHeight = theHeight; // - 5; // MAGIC NUMBER - clipPath extends a bit above the top of the y-axis and below x-axis
+            common.debug('theHeight = ' + theHeight);
+            return theHeight;
+          });
+        });
+      })
+      // 3). get the chart-wrapper elements
+      .then(function () {
+        return self
+        .setFindTimeout(defaultTimeout * 2)
+        // #kibana-body > div.content > div > div > div > div.vis-editor-canvas > visualize > div.visualize-chart > div > div.vis-col-wrapper > div.chart-wrapper > div > svg > g > g.series.\30 > rect:nth-child(1)
+        .findAllByCssSelector('svg > g > g.series.\\30 > rect') // rect
+        .then(function (chartTypes) {
+          function getChartType(chart) {
+            return chart
+            .getAttribute('fill')
+            .then(function (fillColor) {
+              // we're only getting the Green Bars
+              if (fillColor === '#57c17b') {
+                return chart
+                .getAttribute('height')
+                .then(function (barHeight) {
+                  return Math.round(barHeight / yAxisHeight * yAxisLabel);
+                });
+              }
+            });
+          }
+          var getChartTypesPromises = chartTypes.map(getChartType);
+          return Promise.all(getChartTypesPromises);
+        })
+        .then(function (bars) {
+          return bars;
+        });
+      });
+    },
+
+    getPieChartData: function getPieChartData() {
+      var self = this.remote;
+
+      // 1). get the maximim chart Y-Axis marker value
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      // path.slice:nth-child(11)
+      .findAllByCssSelector('path.slice')
+      .then(function (chartTypes) {
+        function getChartType(chart) {
+          return chart
+          .getAttribute('d')
+          .then(function (slice) {
+            return slice;
+          });
+        }
+        var getChartTypesPromises = chartTypes.map(getChartType);
+        return Promise.all(getChartTypesPromises);
+      })
+      .then(function (slices) {
+        common.debug('slices=' + slices);
+        return slices;
+      });
+    },
+
+    getChartAreaWidth: function getChartAreaWidth() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('clipPath rect')
+      .getAttribute('width');
+    },
+    getChartAreaHeight: function getChartAreaHeight() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('clipPath rect')
+      .getAttribute('height');
+    },
+
+    getDataTableData: function getDataTableData() {
+      return this.remote
+      .setFindTimeout(defaultTimeout * 2)
+      .findByCssSelector('table.table.table-condensed tbody')
+      .getVisibleText();
+    },
+
+    clickColumns: function clickColumns() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('div.schemaEditors.ng-scope > div > div > button:nth-child(2)')
+      .click();
+    },
+
+    waitForToastMessageGone: function waitForToastMessageGone() {
+      var self = this;
+      return common.tryForTime(defaultTimeout * 5, function tryingForTime() {
+        return self.remote
+        .setFindTimeout(100)
+        .findAllByCssSelector('kbn-truncated.toast-message.ng-isolate-scope')
+        .then(function toastMessage(messages) {
+          if (messages.length > 0) {
+            throw new Error('waiting for toast message to clear');
+          } else {
+            common.debug('now messages = 0 "' + messages + '"');
+            return messages;
+          }
+        });
+      });
+    },
+
+    waitForVisualization: function waitForVisualization() {
+      return this.remote
+      .setFindTimeout(defaultTimeout)
+      .findByCssSelector('visualize-legend');
+    }
+
+  };
+
+  return VisualizePage;
+});
diff --git a/test/utils/base_auth.js b/test/utils/base_auth.js
new file mode 100644
index 0000000000000..2940b93e884e5
--- /dev/null
+++ b/test/utils/base_auth.js
@@ -0,0 +1,4 @@
+export function header(user, pass) {
+  const encoded = new Buffer(`${user}:${pass}`).toString('base64');
+  return `Basic ${encoded}`;
+}
diff --git a/test/utils/getUrl.js b/test/utils/getUrl.js
index 7a5301d757821..8dd676d98b627 100644
--- a/test/utils/getUrl.js
+++ b/test/utils/getUrl.js
@@ -8,7 +8,8 @@ var url = require('url');
 *   {
 *      protocol: 'http',
 *      hostname: 'localhost',
-*      port: 9220
+*      port: 9220,
+*      auth: shield.kibanaUser.username + ':' + shield.kibanaUser.password
 *   }
 * @param {object} app The params to append
 *   example:
@@ -18,6 +19,20 @@ var url = require('url');
 *   }
 * @return {string}
 */
-module.exports = function getPage(config, app) {
+
+module.exports = getUrl;
+
+function getUrl(config, app) {
   return url.format(_.assign(config, app));
 };
+
+getUrl.noAuth = function getUrlNoAuth(config, app) {
+  config = _.pick(config, function (val, param) {
+    return param !== 'auth';
+  });
+  return getUrl(config, app);
+};
+
+getUrl.baseUrl = function getBaseUrl(config) {
+  return url.format(_.pick(config, 'protocol', 'hostname', 'port'));
+};
diff --git a/test/utils/kbn_server.js b/test/utils/kbn_server.js
new file mode 100644
index 0000000000000..4c362c5035b08
--- /dev/null
+++ b/test/utils/kbn_server.js
@@ -0,0 +1,64 @@
+import { defaultsDeep, set } from 'lodash';
+import requirefrom from 'requirefrom';
+import { header as basicAuthHeader } from './base_auth';
+import { kibanaUser, kibanaServer } from '../shield';
+
+const src = requirefrom('src');
+const KbnServer = src('server/KbnServer');
+
+const SERVER_DEFAULTS = {
+  server: {
+    autoListen: false,
+    xsrf: {
+      disableProtection: true
+    }
+  },
+  logging: {
+    quiet: true
+  },
+  plugins: {},
+  optimize: {
+    enabled: false
+  },
+  elasticsearch: {
+    url: 'http://localhost:9210',
+    username: kibanaServer.username,
+    password: kibanaServer.password
+  }
+};
+
+/**
+ * Creates an instance of KbnServer with default configuration
+ * tailored for unit tests
+ *
+ * @param {object} params Any config overrides for this instance
+ */
+export function createServer(params = {}) {
+  params = defaultsDeep({}, params, SERVER_DEFAULTS);
+  return new KbnServer(params);
+};
+
+/**
+ * Creates request configuration with a basic auth header
+ */
+export function authOptions() {
+  const { username, password } = kibanaUser;
+  const authHeader = basicAuthHeader(username, password);
+  return set({}, 'headers.Authorization', authHeader);
+};
+
+/**
+ * Makes a request with test headers via hapi server inject()
+ *
+ * The given options are decorated with default testing options, so it's
+ * recommended to use this function instead of using inject() directly whenever
+ * possible throughout the tests.
+ *
+ * @param {KbnServer} kbnServer
+ * @param {object}    options Any additional options or overrides for inject()
+ * @param {Function}  fn The callback to pass as the second arg to inject()
+ */
+export function makeRequest(kbnServer, options, fn) {
+  options = defaultsDeep({}, authOptions(), options);
+  return kbnServer.server.inject(options, fn);
+};
diff --git a/webpackShims/angular.js b/webpackShims/angular.js
index de4ae3a67cfa9..df9833dbddd6c 100644
--- a/webpackShims/angular.js
+++ b/webpackShims/angular.js
@@ -3,6 +3,5 @@ require('node_modules/angular/angular');
 module.exports = window.angular;
 
 require('node_modules/angular-elastic/elastic');
-require('node_modules/angular-route/angular-route');
 
-require('ui/modules').get('kibana', ['ngRoute', 'monospaced.elastic']);
+require('ui/modules').get('kibana', ['monospaced.elastic']);