diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index fb410bc174..0be134e069 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.1.66",
-  "_release": "1.1.66",
+  "version": "1.1.70",
+  "_release": "1.1.70",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.66",
-    "commit": "a8e8f6bbf1df9a88af95b0500b002eeed19a3add"
+    "tag": "1.1.70",
+    "commit": "d1fb54ac22cb5fab3fbd5622ddeb635685cd1337"
   },
   "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "~1.1.5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js
index d91c71cd49..92f298abf3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/router.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/router.js
@@ -334,7 +334,22 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
         ctx.handled = true;
     }
 
-    var baseRoute = window.location.href.split('?')[0].replace('/index.html', '');
+    function getRequestFile() {
+        var path = window.location.pathname;
+        
+        if (path == '/') {
+            path = '/index.html';
+        }
+
+        var index = path.lastIndexOf('/');
+        if (index != -1) {
+            return path.substring(index);
+        }
+
+        return '/' + path;
+    }
+
+    var baseRoute = window.location.href.split('?')[0].replace(getRequestFile(), '');
     // support hashbang
     baseRoute = baseRoute.split('#')[0];
     if (baseRoute.lastIndexOf('/') == baseRoute.length - 1) {
@@ -489,7 +504,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
     }
 
     function setBaseRoute() {
-        var baseRoute = window.location.pathname.replace('/index.html', '');
+        var baseRoute = window.location.pathname.replace(getRequestFile(), '');
         if (baseRoute.lastIndexOf('/') == baseRoute.length - 1) {
             baseRoute = baseRoute.substring(0, baseRoute.length - 1);
         }
diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json
index 9784e3a3b7..f0167baf13 100644
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -32,14 +32,14 @@
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/PolymerElements/iron-icon",
+  "homepage": "https://github.com/polymerelements/iron-icon",
   "_release": "1.0.8",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.8",
     "commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
   },
-  "_source": "git://github.com/PolymerElements/iron-icon.git",
+  "_source": "git://github.com/polymerelements/iron-icon.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-icon"
+  "_originalSource": "polymerelements/iron-icon"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3685f8c94f..46fa15518d 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1379,6 +1379,7 @@ var AppInfo = {};
         AppInfo.enableHomeTabs = true;
         AppInfo.enableNowPlayingPageBottomTabs = true;
         AppInfo.enableAutoSave = browserInfo.mobile;
+        AppInfo.enableHashBang = Dashboard.isRunningInCordova();
 
         AppInfo.enableAppStorePolicy = isCordova;
 
@@ -1921,8 +1922,10 @@ var AppInfo = {};
 
         // mock this for now. not used in this app
         define("skinManager", [], function () {
+
             return {
                 loadUserSkin: function () {
+
                     Emby.Page.show('/home.html');
                 }
             };
@@ -2943,7 +2946,7 @@ var AppInfo = {};
             defineCoreRoutes();
             Emby.Page.start({
                 click: true,
-                hashbang: true
+                hashbang: AppInfo.enableHashBang
             });
 
             var postInitDependencies = [];