diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index e2f0f6ca59..93b8a69534 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.2.23",
-  "_release": "1.2.23",
+  "version": "1.2.25",
+  "_release": "1.2.25",
   "_resolution": {
     "type": "version",
-    "tag": "1.2.23",
-    "commit": "dd2ac882405ff68e910711e43704d1adfb3100d9"
+    "tag": "1.2.25",
+    "commit": "7d3165462b584cfe4e1a76dd0afd4bade40274f5"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
index 342472cdb5..3633bb78bf 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
@@ -178,7 +178,7 @@
 
         if (options.showCancel) {
             html += '<div class="buttons">';
-            html += '<paper-button dialog-dismiss>' + dialogText.get('Cancel') + '</paper-button>';
+            html += '<paper-button class="btnCancel">' + dialogText.get('Cancel') + '</paper-button>';
             html += '</div>';
         }
         html += '</div>';
@@ -189,6 +189,12 @@
             addCenterFocus(dlg);
         }
 
+        if (options.showCancel) {
+            dlg.querySelector('.btnCancel').addEventListener('click', function () {
+                dialogHelper.close(dlg);
+            });
+        }
+
         document.body.appendChild(dlg);
 
         // Seeing an issue in some non-chrome browsers where this is requiring a double click
diff --git a/dashboard-ui/bower_components/emby-webcomponents/scrollhelper.js b/dashboard-ui/bower_components/emby-webcomponents/scrollhelper.js
index 52b0520f99..870de44633 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/scrollhelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/scrollhelper.js
@@ -1,4 +1,4 @@
-define(['focusManager'], function (focusManager) {
+define(['focusManager', 'scrollStyles'], function (focusManager) {
 
     function getOffsets(elems) {
 
diff --git a/dashboard-ui/bower_components/iron-input/.bower.json b/dashboard-ui/bower_components/iron-input/.bower.json
index f6848bcf7f..28b0a135d8 100644
--- a/dashboard-ui/bower_components/iron-input/.bower.json
+++ b/dashboard-ui/bower_components/iron-input/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "iron-input",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "An input element with data binding",
   "authors": [
     "The Polymer Authors"
@@ -32,11 +32,11 @@
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "_release": "1.0.9",
+  "_release": "1.0.10",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.9",
-    "commit": "6565b5d1b5f7030eb05378718163def8e9c709b7"
+    "tag": "1.0.10",
+    "commit": "01d17407672ad8033ee447c9c7a65162f13c8f49"
   },
   "_source": "git://github.com/PolymerElements/iron-input.git",
   "_target": "^1.0.0",
diff --git a/dashboard-ui/bower_components/iron-input/.github/ISSUE_TEMPLATE.md b/dashboard-ui/bower_components/iron-input/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..b01fd73e1e
--- /dev/null
+++ b/dashboard-ui/bower_components/iron-input/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,33 @@
+<!-- Instructions: https://github.com/PolymerElements/iron-input/CONTRIBUTING.md#filing-issues -->
+### Description
+<!-- Example: The `paper-foo` element causes the page to turn pink when clicked. -->
+
+### Expected outcome
+
+<!-- Example: The page stays the same color. -->
+
+### Actual outcome
+
+<!-- Example: The page turns pink. -->
+
+### Live Demo
+<!-- Example: https://jsbin.com/cagaye/edit?html,output -->
+
+### Steps to reproduce
+
+<!-- Example
+1. Put a `paper-foo` element in the page.
+2. Open the page in a web browser.
+3. Click the `paper-foo` element.
+-->
+
+### Browsers Affected
+<!-- Check all that apply -->
+- [ ] Chrome
+- [ ] Firefox
+- [ ] Safari 9
+- [ ] Safari 8
+- [ ] Safari 7
+- [ ] Edge
+- [ ] IE 11
+- [ ] IE 10
diff --git a/dashboard-ui/bower_components/iron-input/.travis.yml b/dashboard-ui/bower_components/iron-input/.travis.yml
index fb3535f650..05aea78b05 100644
--- a/dashboard-ui/bower_components/iron-input/.travis.yml
+++ b/dashboard-ui/bower_components/iron-input/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
-sudo: false
+sudo: required
 before_script:
   - npm install -g bower polylint web-component-tester
   - bower install
@@ -8,18 +8,16 @@ env:
   global:
     - secure: AnFRDBxxASn2RP4u+CHJS04g2klVTM+YL1fgNfkNIiECChymGRkeBiF7zvWPfodqPGKWhBZPAMxVuFKbztawQ95kWlbPSTNJtWhHhPcRarV5AYvjhyUV372E3REZ4CGt+T8nghD9bdJiMX5x0pXAz+wfBPPpiHwbiSPPjFLFvTs=
     - secure: SvsE+VQL35CZ967ZVy0+7o5xclnBM8egjhsjNRG7WxVPZQboCQ3Xwm8tIDQSWeagM3ZQRkTGca4ta91F1ZEhm4Jdt5CwKhhSNC6JgS3CX819r9UKgUnSS3nvWdqcZq4GXcMoOZm4qE9ttd3xdoKCfkLRQlEGAvM2TEw69mBhj24=
-    - CXX=g++-4.8
 node_js: stable
 addons:
   firefox: latest
   apt:
     sources:
       - google-chrome
-      - ubuntu-toolchain-r-test
     packages:
       - google-chrome-stable
-      - g++-4.8
   sauce_connect: true
 script:
   - xvfb-run wct
   - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
+dist: trusty
diff --git a/dashboard-ui/bower_components/iron-input/bower.json b/dashboard-ui/bower_components/iron-input/bower.json
index 9b92c35081..018f4a163f 100644
--- a/dashboard-ui/bower_components/iron-input/bower.json
+++ b/dashboard-ui/bower_components/iron-input/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "iron-input",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "An input element with data binding",
   "authors": [
     "The Polymer Authors"
diff --git a/dashboard-ui/bower_components/iron-input/iron-input.html b/dashboard-ui/bower_components/iron-input/iron-input.html
index 4eee9f3c62..3424b64a3a 100644
--- a/dashboard-ui/bower_components/iron-input/iron-input.html
+++ b/dashboard-ui/bower_components/iron-input/iron-input.html
@@ -108,6 +108,7 @@ is separate from validation, and `allowed-pattern` does not affect how the input
       'keypress': '_onKeypress'
     },
 
+    /** @suppress {checkTypes} */
     registered: function() {
       // Feature detect whether we need to patch dispatchEvent (i.e. on FF and IE).
       if (!this._canDispatchEventOnDisabled()) {
diff --git a/dashboard-ui/bower_components/iron-input/test/index.html b/dashboard-ui/bower_components/iron-input/test/index.html
index 482b8debb7..0e3c37ca54 100644
--- a/dashboard-ui/bower_components/iron-input/test/index.html
+++ b/dashboard-ui/bower_components/iron-input/test/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html><!--
+@license
 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/dashboard-ui/bower_components/iron-input/test/iron-input.html b/dashboard-ui/bower_components/iron-input/test/iron-input.html
index 13c089271d..fddf9ae93c 100644
--- a/dashboard-ui/bower_components/iron-input/test/iron-input.html
+++ b/dashboard-ui/bower_components/iron-input/test/iron-input.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index c88ed41aaf..43e942ccc6 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.4.0",
     "commit": "554f7418fdbd97688eb21518b5f8172167d53a95"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 4b3900a124..fe89952cb9 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -205,6 +205,7 @@
 
 .dashboardDocument .viewMenuBar #selectionBar {
     background: #fff !important;
+    height: 3px;
 }
 
 .viewMenuBarTabs {
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 61084ca2e9..527c898cba 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -783,7 +783,7 @@ paper-input + .fieldDescription {
 }
 
 .mainDrawerPanel:not([narrow]) .withTabs .content-primary {
-    padding-top: 128px!important;
+    padding-top: 135px!important;
 }
 
 .mainDrawerPanel:not([narrow]) .content-primary ul:first-child {
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 744b948ab3..3c7d5cb199 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -1,4 +1,4 @@
-<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage,scripts/taskbutton">
+<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage,scripts/taskbutton">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 8389777196..074a9f64e7 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -1,4 +1,4 @@
-<div id="libraryPathMappingPage" data-role="page" class="page type-interior librarySectionPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/librarypathmapping">
+<div id="libraryPathMappingPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/librarypathmapping">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index c76afc1969..2d8f42cc94 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -1,4 +1,4 @@
-<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="jqmcollapsible,scripts/librarysettings,paper-input,paper-checkbox">
+<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 413dc51fa4..55b34b4763 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -744,7 +744,9 @@
 
                 require(['paper-tabs'], function () {
 
-                    viewMenuBarTabs.innerHTML = '<paper-tabs selected="' + selectedIndex + '" hidescrollbuttons noink>' + builder().map(function (t) {
+                    var noInk = browserInfo.animate ? '' : ' noink';
+
+                    viewMenuBarTabs.innerHTML = '<paper-tabs selected="' + selectedIndex + '" hidescrollbuttons ' + noInk + '>' + builder().map(function (t) {
 
                         return '<paper-tab link><a class="clearLink paperTabLink" href="' + t.href + '"><div>' + t.name + '</div></a></paper-tab>';
 
diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js
index 439bed7ddf..45a2471d60 100644
--- a/dashboard-ui/scripts/librarypathmapping.js
+++ b/dashboard-ui/scripts/librarypathmapping.js
@@ -112,6 +112,18 @@
         return false;
     }
 
+    function getTabs() {
+        return [
+        {
+            href: 'library.html',
+            name: Globalize.translate('TabFolders')
+        },
+         {
+             href: 'librarypathmapping.html',
+             name: Globalize.translate('TabPathSubstitution')
+         }];
+    }
+
     $(document).on('pageinit', "#libraryPathMappingPage", function () {
 
         var page = this;
@@ -122,6 +134,7 @@
 
     }).on('pageshow', "#libraryPathMappingPage", function () {
 
+        LibraryMenu.setTabs('librarysetup', 1, getTabs);
         Dashboard.showLoadingMsg();
 
         var page = this;
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 2d0575b752..e33b4b4fc1 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -452,6 +452,19 @@
             });
         }
     };
+
+    function getTabs() {
+        return [
+        {
+            href: 'library.html',
+            name: Globalize.translate('TabFolders')
+        },
+         {
+             href: 'librarypathmapping.html',
+             name: Globalize.translate('TabPathSubstitution')
+         }];
+    }
+
     pageClassOn('pageshow', "mediaLibraryPage", function () {
 
         var page = this;
@@ -461,6 +474,7 @@
 
     pageIdOn('pageshow', "mediaLibraryPage", function () {
 
+        LibraryMenu.setTabs('librarysetup', 0, getTabs);
         var page = this;
 
         // on here
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 02506d9291..b7cb264c03 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -741,11 +741,9 @@ var Dashboard = {
             icon: 'people'
         }, {
             divider: true,
-            name: Globalize.translate('TabLibrary')
-        }, {
-            name: Globalize.translate('TabFolders'),
+            name: Globalize.translate('TabLibrary'),
             href: "library.html",
-            pageIds: ['mediaLibraryPage'],
+            pageIds: ['mediaLibraryPage', 'libraryPathMappingPage'],
             icon: 'folder',
             color: '#009688'
         }, {
@@ -754,11 +752,6 @@ var Dashboard = {
             pageIds: ['metadataConfigurationPage', 'metadataImagesConfigurationPage', 'metadataNfoPage'],
             icon: 'insert-drive-file',
             color: '#FF9800'
-        }, {
-            name: Globalize.translate('TabPathSubstitution'),
-            href: "librarypathmapping.html",
-            pageIds: ['libraryPathMappingPage'],
-            icon: 'mode-edit'
         }, {
             name: Globalize.translate('TabSubtitles'),
             href: "metadatasubtitles.html",